タブ自動保存・復元のチェックボックスを一つに統一

diff --git a/Option.dfm b/Option.dfm
index 072c7e9..3bf1ade 100644 (file)
--- a/Option.dfm
+++ b/Option.dfm
@@ -51,9 +51,9 @@ object OptionDialog: TOptionDialog
     Top = 4
     Width = 509
     Height = 389
-    ActivePage = TabSheet3
+    ActivePage = TabSheet4
     MultiLine = True
-    TabIndex = 4
+    TabIndex = 8
     TabOrder = 0
     OnChange = OptionTabChange
     object ConnectSheet: TTabSheet
@@ -1260,22 +1260,14 @@ object OptionDialog: TOptionDialog
         Height = 50
         Caption = 'Tab'#33258#21205#20445#23384#12539#24489#20803
         TabOrder = 1
-        object CloseTabAutoSave: TCheckBox
+        object TabLoadSave: TCheckBox
           Left = 13
           Top = 18
-          Width = 180
+          Width = 212
           Height = 17
-          Caption = #32066#20102#26178#12395#12479#12502#12398#38918#30058#12434#33258#21205#20445#23384
+          Caption = #32066#20102#26178#12395#12479#12502#12398#38918#30058#12434#33258#21205#20445#23384#12539#24489#20803
           TabOrder = 0
         end
-        object OpenTabAutoLoad: TCheckBox
-          Left = 232
-          Top = 18
-          Width = 185
-          Height = 17
-          Caption = #36215#21205#26178#12395#12479#12502#12398#38918#30058#12434#33258#21205#24489#20803
-          TabOrder = 1
-        end
       end
     end
     object SoundSheet: TTabSheet

diff --git a/Option.pas b/Option.pas
index 5f908d5..f69a86a 100644 (file)
--- a/Option.pas
+++ b/Option.pas
@@ -190,8 +190,7 @@ type
     Label4: TLabel;
     Label6: TLabel;
     TabAutoSaveLoad: TGroupBox;
-    CloseTabAutoSave: TCheckBox;
-               OpenTabAutoLoad: TCheckBox;
+    TabLoadSave: TCheckBox;
                ResRangeHoldComboBox: TComboBox;
     GroupBox18: TGroupBox;
     DatOchiSortCombo: TComboBox;
@@ -268,8 +267,7 @@ type
                 TabAddRadio: Integer;                          
                 procedure SaveSetting;
                 property TabAddPro: TRadioGroup read TabAddRadioGroup write TabAddRadioGroup;
-                property TabAutoSave: TCheckBox read CloseTabAutoSave write CloseTabAutoSave;
-                property TabAutoLoad: TCheckBox read OpenTabAutoLoad write OpenTabAutoLoad;
+                property TabAutoLoadSave: TCheckBox read TabLoadSave write TabLoadSave;
        end;
 
 var
@@ -837,8 +835,7 @@ begin
        DeleteSyriaCheckBox.Checked := GikoSys.Setting.DeleteSyria;
 
         //TabAutoLoad
-        TabAutoSave.Checked := GikoSys.Setting.TabAutoSave;
-        TabAutoLoad.Checked := GikoSys.Setting.TabAutoLoad
+        TabLoadSave.Checked := Gikosys.Setting.TabAutoLoadSave;
 
 end;
 
@@ -1114,8 +1111,7 @@ begin
         GikoSys.Setting.DeleteSyria := DeleteSyriaCheckBox.Checked;
 
         //Tab\8e©\93®\95Û\91¶
-        GikoSys.Setting.TabAutoSave := CloseTabAutoSave.Checked;
-        GikoSys.Setting.TabAutoLoad := OpenTabAutoLoad.Checked;
+        GikoSys.Setting.TabAutoLoadSave := TabLoadSave.Checked;
 end;
 
 procedure TOptionDialog.SettingApply;

diff --git a/Setting.pas b/Setting.pas
index 0a653fc..bc7a477 100644 (file)
--- a/Setting.pas
+++ b/Setting.pas
@@ -328,8 +328,7 @@ type
                FResAnchorJamp: Boolean;
 
                 //Tab\8e©\93®\95Û\91¶
-                FTabAutoSave: Boolean;
-                FTabAutoLoad: Boolean;
+                FTabAutoLoadSave : Boolean;
                // \83G\83f\83B\83^
                FSpaceToNBSP    : Boolean;      ///< \94¼\8ap\83X\83y\81[\83X\81ATab \82ð &nbsp; \82É\92u\8a·
                FAmpToCharRef   : Boolean;      ///< '&' \82ð &amp; \82É\92u\8a·
@@ -616,8 +615,7 @@ type
 
                property SelectInterval : Integer       read FSelectInterval    write FSelectInterval;
                 //Tab\95Û\91¶
-                property TabAutoSave: Boolean           read FTabAutoSave       write FTabAutoSave;
-                property TabAutoLoad: Boolean           read FTabAutoLoad       write FTabAutoLoad;
+                property TabAutoLoadSave: Boolean           read FTabAutoLoadSave      write FTabAutoLoadSave;
 end;
 
 
@@ -1030,8 +1028,7 @@ begin
                FAmpToCharRef   := ini.ReadBool( 'Editor', 'AmpToCharRef', False );
 
                 //Tab\8e©\93®\95Û\91¶\81A\93Ç\82Ý\8d\9e\82Ý
-                FTabAutoSave    := ini.ReadBool('TabAuto', 'TabAutoSave', False);
-                FTabAutoLoad    := ini.ReadBool('TabAuto', 'TabAutoLoad', False);
+                FTabAutoLoadSave    := ini.ReadBool('TabAuto', 'TabAutoLoadSave', False);
 
 
        finally
@@ -1121,8 +1118,7 @@ begin
                ini.WriteString('Window', 'HintBackColor', ColorToString(FHintBackColor));
 
                 //\8e©\93®\95Û\91¶¥\95\9c\8c³
-                ini.WriteBool('TabAuto', 'TabAutoLoad', FTabAutoLoad);
-                ini.WriteBool('TabAuto', 'TabAutoSave', FTabAutoSave);
+                ini.WriteBool('TabAuto', 'TabAutoLoadSave', FTabAutoLoadSave);
 
                ini.UpdateFile;
        finally
@@ -1333,8 +1329,7 @@ begin
                ini.WriteBool( 'Editor', 'SpaceToNBSP', FSpaceToNBSP );
                ini.WriteBool( 'Editor', 'AmpToCharRef', FAmpToCharRef );
 
-                ini.WriteBool('TabAuto', 'TabAutoSave', FTabAutoSave);
-                ini.WriteBool('TabAuto', 'TabAutoLoad', FTabAutoLoad);
+                ini.WriteBool('TabAuto', 'TabAutoSaveLoad', FTabAutoLoadSave);
 
                ini.UpdateFile;
        finally