Changeset 151 for trunk

Timestamp:

Oct 16, 2017, 2:31:46 PM (7 years ago)

Author:

chronos

Message:

• Added: Option to disable auto reopen last file on start.

Location:

trunk

Files:

• AcronymDecoder.lpi (modified) (1 diff)
• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormMain.pas (modified) (2 diffs)
• Forms/UFormSettings.lfm (modified) (2 diffs)
• Forms/UFormSettings.lrt (modified) (1 diff)
• Forms/UFormSettings.pas (modified) (3 diffs)
• Languages/AcronymDecoder.cs.po (modified) (1 diff)
• Languages/AcronymDecoder.po (modified) (1 diff)
• UCore.pas (modified) (7 diffs)

trunk/AcronymDecoder.lpi

@@ -2 +2 @@
 <CONFIG>
   <ProjectOptions>
-    <Version Value="9"/>
+    <Version Value="10"/>
     <PathDelim Value="\"/>
     <General>

trunk/Forms/UFormMain.lfm

@@ -14 +14 @@
   OnHide = FormHide
   OnShow = FormShow
-  LCLVersion = '1.6.2.0'
+  LCLVersion = '1.6.4.0'
   object PanelMain: TPanel
     Left = 0

trunk/Forms/UFormMain.pas

@@ -689 +689 @@
     RootKey := HKEY_CURRENT_USER;
     OpenKey(DefaultRegKey, True);
-    if ValueExists('LanguageCode') then
-      Core.CoolTranslator1.Language := Core.CoolTranslator1.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
-      else Core.CoolTranslator1.Language := Core.CoolTranslator1.Languages.SearchByCode('');
-    Core.AlwaysOnTop := ReadBoolWithDefault('AlwaysOnTop', False);
-    Core.StartMinimizedToTray := ReadBoolWithDefault('StartMinimizedToTray', False);
     AFilterSameLength.Checked := ReadBoolWithDefault('SameLength', False);
     AFilterSameLetterCase.Checked := ReadBoolWithDefault('SameLetterCase', False);
@@ -722 +717 @@
     RootKey := HKEY_CURRENT_USER;
     OpenKey(DefaultRegKey, True);
-    if Assigned(Core.CoolTranslator1.Language) and (Core.CoolTranslator1.Language.Code <> '') then
-      WriteString('LanguageCode', Core.CoolTranslator1.Language.Code)
-      else DeleteValue('LanguageCode');
-    WriteBool('AlwaysOnTop', Core.AlwaysOnTop);
-    WriteBool('StartMinimizedToTray', Core.StartMinimizedToTray);
     WriteBool('SameLength', AFilterSameLength.Checked);
     WriteBool('SameLetterCase', AFilterSameLetterCase.Checked);

trunk/Forms/UFormSettings.lfm

@@ -10 +10 @@
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '1.6.0.4'
+  LCLVersion = '1.6.4.0'
   object ComboBoxLanguage: TComboBox
     Left = 184
@@ -104 +104 @@
     Visible = False
   end
+  object CheckBoxReopenLastFileOnStart: TCheckBox
+    Left = 360
+    Height = 24
+    Top = 64
+    Width = 181
+    Caption = 'Reopen last file on start'
+    TabOrder = 8
+  end
 end

trunk/Forms/UFormSettings.lrt

@@ -8 +8 @@
 TFORMSETTINGS.CHECKBOXAUTOMATICDPI.CAPTION=Automatic DPI
 TFORMSETTINGS.LABEL2.CAPTION=DPI:
+TFORMSETTINGS.CHECKBOXREOPENLASTFILEONSTART.CAPTION=Reopen last file on start

trunk/Forms/UFormSettings.pas

@@ -16 +16 @@
     ButtonOk: TButton;
     ButtonCancel: TButton;
+    CheckBoxReopenLastFileOnStart: TCheckBox;
     CheckBoxAutomaticDPI: TCheckBox;
     CheckBoxStartMinimizedToTray: TCheckBox;
@@ -84 +85 @@
   CheckBoxAutomaticDPI.Checked := Core.ScaleDPI1.AutoDetect;
   SpinEditDPI.Value := Core.ScaleDPI1.DPI.X;
+  CheckBoxReopenLastFileOnStart.Checked := Core.ReopenLastFileOnStart;
   UpdateInterface;
 end;
@@ -94 +96 @@
   Core.ScaleDPI1.AutoDetect := CheckBoxAutomaticDPI.Checked;
   Core.ScaleDPI1.DPI := Point(SpinEditDPI.Value, SpinEditDPI.Value);
+  Core.ReopenLastFileOnStart := CheckBoxReopenLastFileOnStart.Checked;
 end;
 

trunk/Languages/AcronymDecoder.cs.po

@@ -693 +693 @@
 msgstr "Automatické DPI"
 
+#: tformsettings.checkboxreopenlastfileonstart.caption
+msgid "Reopen last file on start"
+msgstr "Při startu znovu otevřít poslední soubor"
+
 #: tformsettings.checkboxstartminimizedtotray.caption
 msgid "Start minimized to tray"

trunk/Languages/AcronymDecoder.po

@@ -683 +683 @@
 msgstr ""
 
+#: tformsettings.checkboxreopenlastfileonstart.caption
+msgid "Reopen last file on start"
+msgstr ""
+
 #: tformsettings.checkboxstartminimizedtotray.caption
 msgid "Start minimized to tray"

trunk/UCore.pas

@@ -44 +44 @@
     StartOnLogon: Boolean;
     StartMinimizedToTray: Boolean;
+    ReopenLastFileOnStart: Boolean;
     InitializeStarted: Boolean;
     InitializeFinished: Boolean;
@@ -107 +108 @@
 var
   FileNameOption: string;
+  ExampleFileName: string;
 begin
   if not InitializeStarted then begin
@@ -126 +128 @@
     end;
 
+    ExampleFileName := ExtractFileDir(Application.ExeName) + DirectorySeparator + ExampleFile;
     FileNameOption := FindFirstNonOption;
     if FileNameOption <> '' then begin
@@ -131 +134 @@
       FormMain.ProjectOpen(FileNameOption);
     end else
-    if (FormMain.LastOpenedList1.Items.Count > 0) and FileExists(FormMain.LastOpenedList1.Items[0]) then begin
+    if ReopenLastFileOnStart and (FormMain.LastOpenedList1.Items.Count > 0) and
+      FileExists(FormMain.LastOpenedList1.Items[0]) then begin
       // Open last opened file
       FormMain.ProjectOpen(FormMain.LastOpenedList1.Items[0])
-    end else begin
+    end else
+    if FileExists(ExampleFileName) then begin
       // Open default database with examples if no item is in recent openned history
       FileNameOption := ExtractFileDir(Application.ExeName) + DirectorySeparator + ExampleFile;
@@ -143 +148 @@
       {$ENDIF}
       FormMain.ProjectOpen(FileNameOption);
+    end else begin
+      // Create empty file
+      FormMain.AFileNew.Execute;
     end;
 
@@ -164 +172 @@
     ScaleDPI1.DPI := Point(ReadIntegerWithDefault('DPIX', 96), ReadIntegerWithDefault('DPIY', 96));
     ScaleDPI1.AutoDetect := ReadBoolWithDefault('DPIAuto', True);
+    if ValueExists('LanguageCode') then
+      CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
+      else CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode('');
+    AlwaysOnTop := ReadBoolWithDefault('AlwaysOnTop', False);
+    StartMinimizedToTray := ReadBoolWithDefault('StartMinimizedToTray', False);
+    ReopenLastFileOnStart := ReadBoolWithDefault('ReopenLastFileOnStart', True);
   finally
     Free;
@@ -180 +194 @@
     WriteInteger('DPIY', ScaleDPI1.DPI.Y);
     WriteBool('DPIAuto', ScaleDPI1.AutoDetect);
+    if Assigned(CoolTranslator1.Language) and (CoolTranslator1.Language.Code <> '') then
+      WriteString('LanguageCode', CoolTranslator1.Language.Code)
+      else DeleteValue('LanguageCode');
+    WriteBool('AlwaysOnTop', AlwaysOnTop);
+    WriteBool('StartMinimizedToTray', StartMinimizedToTray);
+    WriteBool('ReopenLastFileOnStart', ReopenLastFileOnStart);
   finally
     Free;