From e3a424cdb0a2eb03f1d6f327ca3a1ed6f7d0c0a7 Mon Sep 17 00:00:00 2001 From: "C.Ponapalt" Date: Wed, 13 Jul 2005 08:33:57 +0000 Subject: [PATCH] =?utf8?q?=E3=82=A8=E3=83=87=E3=82=A3=E3=82=BF=E3=83=97?= =?utf8?q?=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC=E3=82=A6=E3=82=A3=E3=83=B3?= =?utf8?q?=E3=83=89=E3=82=A6=E3=81=AE=E8=A1=A8=E7=A4=BA=E7=8A=B6=E6=85=8B?= =?utf8?q?=E3=82=92=E4=BF=9D=E5=AD=98=E3=81=97=E6=AC=A1=E5=9B=9E=E8=B5=B7?= =?utf8?q?=E5=8B=95=E6=99=82=E3=81=AB=E8=87=AA=E5=8B=95=E8=A1=A8=E7=A4=BA(?= =?utf8?q?ToDo=20ID=3D365)=20=E3=82=84=E3=81=95=E3=81=90=E3=82=8C=E3=82=AF?= =?utf8?q?=E3=83=A9=E3=82=A4=E3=82=A2=E3=83=B3=E3=83=88=E3=81=8B=E3=82=89?= =?utf8?q?=E9=81=8E=E5=8E=BB=E3=81=84=E3=81=8F=E3=81=A4=E3=81=8B=E4=BF=AE?= =?utf8?q?=E6=AD=A3=E3=82=92=E5=8F=8D=E6=98=A0=E3=81=95=E3=81=9B=E3=81=9F?= =?utf8?q?=E3=81=AE=E3=81=A7E01=E3=81=95=E3=82=93=E3=81=AE=E5=90=8D?= =?utf8?q?=E5=89=8D=E3=82=92About=E3=81=AB=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- bottleclient/BottleDef.pas | 14 ++++++++++---- bottleclient/EditorTalkShow.dfm | 9 +++++---- bottleclient/EditorTalkShow.pas | 10 ++++++++++ bottleclient/MainForm.pas | 7 +++++++ 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/bottleclient/BottleDef.pas b/bottleclient/BottleDef.pas index bc640ac..1c9a14f 100755 --- a/bottleclient/BottleDef.pas +++ b/bottleclient/BottleDef.pas @@ -102,6 +102,7 @@ type FBrowserExeName: string; FReplacePresets: TReplacePresets; FNoWarnOfEmptyFMO: Boolean; + FShowEditorPreviewWindow: Boolean; procedure SetDblClkInsert(const Value: boolean); procedure SetDefaultScript(const Value: String); @@ -281,6 +282,9 @@ type //SSTPƒT[ƒo”ñ‘¶ÝŒx‚̃Jƒbƒg‚ð‚·‚é‚© property NoWarnOfEmptyFMO: Boolean read FNoWarnOfEmptyFMO write FNoWarnOfEmptyFMO; + //ƒGƒfƒBƒ^ƒvƒŒƒrƒ…[ƒEƒCƒ“ƒhƒE‚̏ó‘Ô•Û‘¶—p + property ShowEditorPreviewWindow: Boolean + read FShowEditorPreviewWindow write FShowEditorPreviewWindow; //ƒRƒ“ƒXƒgƒ‰ƒNƒ^EƒfƒXƒgƒ‰ƒNƒ^E•Û‘¶ constructor Create; @@ -365,8 +369,8 @@ const SentLogFile = 'sent.log'; - BottleDisclaimer = '(C)2001-2004 WinBottle Project'#13#10 + - 'naru, C.Ponapalt, Yune Kotomi, yese, Mikage Sawatari'#13#10 + + BottleDisclaimer = '(C)2001-2005 WinBottle Project'#13#10 + + 'naru, C.Ponapalt, Yune Kotomi, yese, Mikage Sawatari, E01'#13#10 + DefaultHomePage; ChannelDefault = '(CH„§)'; @@ -546,6 +550,7 @@ begin ConfirmOnExit := FIni.ReadBool('System', 'ConfirmOnExit', false); ConfirmOnTabClose := FIni.ReadBool('System', 'ConfirmOnTabClose', false); NoWarnOfEmptyFMO := FIni.ReadBool('System', 'NoWarnOfEmptyFMO', False); + ShowEditorPreviewWindow := FIni.ReadBool('System', 'ShowEditorPreviewWindow', False); AutoClip := FIni.ReadBool('System', 'AutoClip', false); AutoStart := FIni.ReadBool('System', 'AutoStart', false); @@ -1084,8 +1089,9 @@ begin FIni.WriteBool('System', 'SurfacePreviewOnScriptPoint', SurfacePreviewOnScriptPoint); FIni.WriteInteger('System', 'SurfacePreviewOnScriptPointPosition', Ord(SurfacePreviewOnScriptPointPosition)); - FIni.WriteString('System', 'BrowserExeName', FBrowserExeName); - FIni.WriteBool('System', 'NoWarnOfEmptyFMO', FNoWarnOfEmptyFMO); + FIni.WriteString('System', 'BrowserExeName', BrowserExeName); + FIni.WriteBool('System', 'NoWarnOfEmptyFMO', NoWarnOfEmptyFMO); + FIni.WriteBool('System', 'ShowEditorPreviewWindow', ShowEditorPreviewWindow); Strs := TStringList.Create; try diff --git a/bottleclient/EditorTalkShow.dfm b/bottleclient/EditorTalkShow.dfm index b535ba9..ba14b5a 100644 --- a/bottleclient/EditorTalkShow.dfm +++ b/bottleclient/EditorTalkShow.dfm @@ -11,6 +11,7 @@ object frmEditorTalkShow: TfrmEditorTalkShow Font.Name = #65325#65331' '#65328#12468#12471#12483#12463 Font.Style = [] OldCreateOrder = False + OnClose = FormClose OnCreate = FormCreate OnDestroy = FormDestroy PixelsPerInch = 96 @@ -19,19 +20,19 @@ object frmEditorTalkShow: TfrmEditorTalkShow Left = 0 Top = 0 Width = 385 - Height = 466 + Height = 470 Align = alClient TabOrder = 0 inherited PanelBevel: TPanel Width = 385 - Height = 466 + Height = 470 inherited PaintBox: TPaintBox Width = 367 - Height = 464 + Height = 468 end inherited ScrollBar: TScrollBar Left = 368 - Height = 464 + Height = 468 end end end diff --git a/bottleclient/EditorTalkShow.pas b/bottleclient/EditorTalkShow.pas index f760cab..f082d6b 100644 --- a/bottleclient/EditorTalkShow.pas +++ b/bottleclient/EditorTalkShow.pas @@ -12,6 +12,7 @@ type SsParser: TSsParser; procedure FormCreate(Sender: TObject); procedure FormDestroy(Sender: TObject); + procedure FormClose(Sender: TObject; var Action: TCloseAction); private { Private éŒ¾ } public @@ -54,6 +55,15 @@ begin Pref.EditorPreviewWindowPosition := ARect; end; +procedure TfrmEditorTalkShow.FormClose(Sender: TObject; + var Action: TCloseAction); +begin + Pref.ShowEditorPreviewWindow := False; + + //ˆê‰ž–¾Ž¦“I‚Ɂu‰B‚ê‚év“®ì‚ðŽwŽ¦‚µ‚Ä‚¨‚­iƒfƒtƒHƒ‹ƒg‚ʼnB‚ê‚éj + Action := caHide; +end; + initialization frmEditorTalkShow := nil; diff --git a/bottleclient/MainForm.pas b/bottleclient/MainForm.pas index 92439a7..6c077b2 100755 --- a/bottleclient/MainForm.pas +++ b/bottleclient/MainForm.pas @@ -949,11 +949,17 @@ begin //LUID‚ªŽæ“¾‚³‚ê‚Ä‚¢‚ê‚Α‘¬“o˜^B‚»‚¤‚Å‚È‚¯‚ê‚ÎLUIDŽæ“¾B if Pref.LUID <> '' then BeginConnect else mnGetNewIdClick(Self); + FAutoAddAfterGetChannel := Pref.AutoStart; FBooted := true; + frmLog.Show; frmSurfacePreview.Show; Self.Show; + + //ƒGƒfƒBƒ^ƒvƒŒƒrƒ…[‚ª‘O‰ñ•\Ž¦ó‘ԂȂ炱‚±‚Å•\Ž¦‚·‚é + if Pref.ShowEditorPreviewWindow then actEditorPreviewExecute(Sender); + SakuraSeeker.BeginDetect; SakuraSeekerDetectResultChanged(self); if (SakuraSeeker.Count = 0) and not Pref.NoWarnOfEmptyFMO then @@ -2830,6 +2836,7 @@ begin frmEditorTalkShow.TalkShowFrame.SetPreviewFont(memScript.Font); frmEditorTalkShow.Show; end; + Pref.ShowEditorPreviewWindow := True; EditorPreview; end; -- 2.11.0