From 63826601214345c0d39643283afa6497d703d285 Mon Sep 17 00:00:00 2001
From: yoffy <yoffy>
Date: Thu, 12 Aug 2004 06:56:59 +0000
Subject: [PATCH] =?utf8?q?[=E6=9C=80=E6=96=B0100=E3=83=AC=E3=82=B9?=
 =?utf8?q?=E3=81=AE=E3=81=BF=E8=A1=A8=E7=A4=BA]=20=E3=82=92=20[=E3=83=AC?=
 =?utf8?q?=E3=82=B9=E3=81=AE=E8=A1=A8=E7=A4=BA=E7=AF=84=E5=9B=B2=E3=82=92?=
 =?utf8?q?=E8=A8=AD=E5=AE=9A]=20=E3=81=AB=E7=BD=AE=E3=81=8D=E6=8F=9B?=
 =?utf8?q?=E3=81=88=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?=
 =?utf8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Giko.dfm        | 16 +++++++++-------
 Giko.pas        | 10 +++++-----
 Setting.pas     |  1 -
 ToolBarUtil.pas | 16 ++++++++++++++--
 4 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/Giko.dfm b/Giko.dfm
index 32b8351..5f5de3c 100644
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -4659,7 +4659,7 @@ object GikoForm: TGikoForm
     Left = 4
     Top = 244
     Bitmap = {
-      494C010133003600040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
+      494C010133003600040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       000000000000360000002800000040000000E0000000010020000000000000E0
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -6511,13 +6511,14 @@ object GikoForm: TGikoForm
       00000000C003FFFF0000000080017FFF0000000080013F7F0000000000000E3F
       000000000000861F800000000000C20FC00100000000E007F81F00000000F043
       F00F00000000F861E00700008001FC70C003803F8001FEFCF81FC07FC003FFFE
-      F81FE0FFE007FFFFF83FFFFFF81FFFFF}
+      F81FE0FFE007FFFFF83FFFFFF81FFFFF00000000000000000000000000000000
+      000000000000}
   end
   object ToobarImageList: TImageList
     Left = 36
     Top = 244
     Bitmap = {
-      494C010133003600040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
+      494C010133003600040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       000000000000360000002800000040000000E0000000010020000000000000E0
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -8369,7 +8370,8 @@ object GikoForm: TGikoForm
       00000000C003FFFF0000000080017FFF0000000080013F7F0000000000000E3F
       000000000000861F800000000000C20FC00100000000E007F81F00000000F043
       F00F00000000F861E00700008001FC70C003803F8001FEFCF81FC07FC003FFFE
-      F81FE0FFE007FFFFF83FFFFFF81FFFFF}
+      F81FE0FFE007FFFFF83FFFFFF81FFFFF00000000000000000000000000000000
+      000000000000}
   end
   object ItemImageList: TImageList
     Left = 4
@@ -9929,14 +9931,14 @@ object GikoForm: TGikoForm
     Images = ToobarImageList
     Left = 8
     Top = 372
-    object OnlyAHundredRes: TAction
+    object OnlyAHundredResAction: TAction
       Category = #12473#12524#12483#12489
       AutoCheck = True
       Caption = #26368#26032'100'#12524#12473#12398#12415#34920#31034'(&H)'
       GroupIndex = 2
       Hint = #26368#26032'100'#12524#12473#12398#12415#34920#31034
       ImageIndex = 38
-      OnExecute = OnlyAHundredResExecute
+      OnExecute = OnlyAHundredResActionExecute
     end
     object OnlyKokoResAction: TAction
       Category = #12473#12524#12483#12489
@@ -11412,7 +11414,7 @@ object GikoForm: TGikoForm
       AutoCheck = True
     end
     object N1001: TMenuItem
-      Action = OnlyAHundredRes
+      Action = OnlyAHundredResAction
       AutoCheck = True
     end
     object N501: TMenuItem
diff --git a/Giko.pas b/Giko.pas
index 970412a..41ea366 100644
--- a/Giko.pas
+++ b/Giko.pas
@@ -558,7 +558,7 @@ type
     N1001: TMenuItem;
     N501: TMenuItem;
     N22: TMenuItem;
-    OnlyAHundredRes: TAction;
+    OnlyAHundredResAction: TAction;
     OnlyNewResAction: TAction;
     OnlyKokoResAction: TAction;
     A14: TMenuItem;
@@ -904,7 +904,7 @@ type
     procedure TabsOpenActionExecute(Sender: TObject);
     procedure TabsSaveToFileActionExecute(Sender: TObject);
     procedure TabsOpenFromFileActionExecute(Sender: TObject);
-    procedure OnlyAHundredResExecute(Sender: TObject);
+    procedure OnlyAHundredResActionExecute(Sender: TObject);
     procedure OnlyKokoResActionExecute(Sender: TObject);
     procedure OnlyNewResActionExecute(Sender: TObject);
     procedure BrowsBoradHeadActionExecute(Sender: TObject);
@@ -1590,7 +1590,7 @@ begin
 		case FResRangeMenuSelect of
 		Ord( grrKoko ):	OnlyKokoResAction.Checked	:= True;
 		Ord( grrNew ):	OnlyNewResAction.Checked	:= True;
-		100:						OnlyAHundredRes.Checked		:= True;
+		100:						OnlyAHundredResAction.Checked		:= True;
 		end;
 	end;
 
@@ -9754,7 +9754,7 @@ begin
 	Ord( grrAll ):	AllResAction.Execute;
 	Ord( grrKoko ):	OnlyKokoResAction.Execute;
 	Ord( grrNew ):	OnlyNewResAction.Execute;
-	100:						OnlyAHundredRes.Execute;
+	100:						OnlyAHundredResAction.Execute;
 	end;
 end;
 
@@ -10910,7 +10910,7 @@ begin
 	end;
 end;
 
-procedure TGikoForm.OnlyAHundredResExecute(Sender: TObject);
+procedure TGikoForm.OnlyAHundredResActionExecute(Sender: TObject);
 var
 	ThreadItem : TThreadItem;
 	FilterList : TStringList;
diff --git a/Setting.pas b/Setting.pas
index 1093955..e0c749e 100644
--- a/Setting.pas
+++ b/Setting.pas
@@ -1200,7 +1200,6 @@ begin
 		//Mail—“•\Ž¦
 		ini.WriteBool('Thread', 'ShowMail', FShowMail);
 		// ƒŒƒX•\Ž¦”͈Í
-		ini.DeleteKey( 'Thread', 'OnlyAHundredRes' );	// ŒÃ‚¢Ý’è‚̍폜
 		ini.WriteInteger('Thread', 'ResRange', FResRange);
 		ini.WriteBool('Thread', 'ResRangeHold', FResRangeHold);
 		//ƒƒOíœŠm”F
diff --git a/ToolBarUtil.pas b/ToolBarUtil.pas
index 5b4018e..95a659a 100644
--- a/ToolBarUtil.pas
+++ b/ToolBarUtil.pas
@@ -5,7 +5,7 @@ interface
 uses
 	Windows, Messages, SysUtils, Classes, Controls,
 	StdCtrls, ExtCtrls, ComCtrls, ActnList, IniFiles,
-	GikoSystem;
+	GikoSystem, MojuUtils;
 
 const
 	//•W€ƒc[ƒ‹ƒo[ƒfƒtƒHƒ‹ƒg
@@ -91,7 +91,7 @@ const
 																					'ListNumberVisibleAction',
 																					'AllResAction',
 																					'SelectResAction',
-																					'OnlyAHundredRes',
+																					'OnlyAHundredResAction',
 																					'OnlyKokoResAction',
 																					'OnlyNewResAction'
 																					);
@@ -118,6 +118,17 @@ const
     procedure MakeDefaultINIFile();
 implementation
 
+function ConvertToolButton( setting : string ) : string;
+begin
+
+	// ‹Œ [ÅV100ƒŒƒX‚Ì‚Ý•\Ž¦] ‚ð [ƒŒƒX‚Ì•\Ž¦”͈͂ðÝ’è] ‚É’uŠ·
+	if setting = 'OnlyAHundredRes' then
+		Result := 'ResRangeAction'
+	else
+		Result := setting;
+
+end;
+
 procedure ReadToolBarSetting(ActionList: TActionList; ToolBar: TToolBar);
 var
 	FileName: string;
@@ -137,6 +148,7 @@ begin
 			i := 0;
 			while True do begin
 				s := ini.ReadString(ToolBar.Name, 'Button' + IntToStr(i), '');
+				s := ConvertToolButton( s );
 				if s = '-' then begin
 					ToolButton := TToolButton.Create(ToolBar);
 					ToolButton.Style := tbsSeparator;
-- 
2.11.0