コミット: 14eb15e5f0007500f7121006c9942ab634126878 - gikonavi (git)

ギコナビ

コミットメタ情報

• リビジョン: 14eb15e5f0007500f7121006c9942ab634126878 (tree)
• 日時: 2006-08-06 23:37:45
• 作者: cvs2git <cvs2git>
• コミッター: cvs2git

ログメッセージ

This commit was manufactured by cvs2svn to create tag 'v1_54_0_674'.

変更サマリ

• modified: AbonUnit.pas
• modified: Giko.dfm
• modified: Giko.pas
• modified: GikoDataModule.dfm
• modified: GikoDataModule.pas
• modified: GikoSystem.pas
• modified: KuroutSetting.dfm
• modified: KuroutSetting.pas
• add: MoveHistoryItem.pas
• modified: Option.dfm
• modified: Option.pas
• modified: Setting.pas
• modified: Trip.pas
• modified: gikoNavi.dpr
• modified: gikoNavi.res
• modified: readme/readme.txt
• modified: res/default/Samba.default

差分

--- a/AbonUnit.pas
+++ b/AbonUnit.pas
@@ -883,8 +883,11 @@ begin
 				Dec(ps);
 
 			//ƒVƒŠƒAŒêƒuƒ‰ƒNƒ‰‚Ì‚Å‚È‚¢
-			if (icode <1792) or (icode > 1871) then
-				Result := Result + Copy(AString, 1, ps - PChar(AString) + 1);
+            if ( icode < 1758) or
+                ((icode > 1871) and (icode < 1958)) or
+                (icode > 1968) then begin
+                Result := Result + Copy(AString, 1, ps - PChar(AString) + 1);
+            end;
 
 			Delete(AString, 1, ps - PChar(AString) + 1);
 		end else begin

--- a/Giko.dfm
+++ b/Giko.dfm
@@ -159,7 +159,7 @@ object GikoForm: TGikoForm
           object ToolBar1: TToolBar
             Left = 2
             Top = 4
-            Width = 15
+            Width = 16
             Height = 18
             Align = alNone
             AutoSize = True
@@ -971,7 +971,7 @@ object GikoForm: TGikoForm
           OnResize = AddressToolBarResize
           object AddressComboBox: TComboBox
             Left = 0
-            Top = 0
+            Top = 1
             Width = 177
             Height = 20
             DropDownCount = 20
@@ -4520,6 +4520,12 @@ object GikoForm: TGikoForm
       object N61: TMenuItem
         Caption = '-'
       end
+      object N77: TMenuItem
+        Action = GikoDM.StoredTaskTrayAction
+      end
+      object N78: TMenuItem
+        Caption = '-'
+      end
       object ExitMenu: TMenuItem
         Action = GikoDM.ExitAction
       end

--- a/Giko.pas
+++ b/Giko.pas
@@ -18,7 +18,8 @@ uses
 	Editor, RoundData, GikoPanel, Favorite, HTMLDocumentEvent,
 	HintWindow, GikoCoolBar, GikoListView, Search, ExternalBoardManager,
 	ExternalBoardPlugInMain, StdActns, Variants, ExtActns,IdTCPConnection,
-	IdBaseComponent, IdTCPClient, AppEvnts, BrowserRecord;
+	IdBaseComponent, IdTCPClient, AppEvnts, BrowserRecord, MoveHistoryItem,
+    ShellAPI;
 
 const
 	NGWORDNAME_PANEL = 3;
@@ -409,6 +410,8 @@ type
     DAT3: TMenuItem;
     N76: TMenuItem;
     FavoriteTreeItemNameCopyPopupMenu: TMenuItem;
+    N77: TMenuItem;
+    N78: TMenuItem;
 				procedure FormCreate(Sender: TObject);
 		procedure FormDestroy(Sender: TObject);
 		procedure BrowserStatusTextChange(Sender: TObject;
@@ -594,6 +597,7 @@ type
 		FOrigenCaption: String;				//‚¨‹C‚É“ü‚èƒcƒŠ[‚̃AƒCƒeƒ€•ÒWŽž‚̕ҏW‘O‚Ì•¶Žš—ñ
 		FPreviewBrowserRect: TRect;			///< ƒvƒŒƒrƒ…[‚Ì•\Ž¦ˆÊ’u‚ð‹L‰¯‚·‚é
 		FActionListGroupIndexes: array of Integer;	///<GikoDMã‚̃AƒNƒVƒ‡ƒ“ƒŠƒXƒg‚ÌŠeƒAƒNƒVƒ‡ƒ“‚ɐݒ肳‚ꂽGroupIndex‚ð•Û‘¶‚·‚é”z—ñ
+
 		procedure DownloadEnd(Sender: TObject; Item: TDownloadItem);
 		procedure DownloadMsg(Sender: TObject; Item: TDownloadItem; Msg: string; Icon: TGikoMessageIcon);
 		procedure WorkBegin(Sender: TObject; AWorkMode: TWorkMode; const AWorkCountMax: Integer; Number: Integer; const AWorkTitle: string);
@@ -665,6 +669,8 @@ type
 		procedure RefreshListView(Thread: TThreadItem);
 		//! ƒXƒŒƒbƒhˆê——‚Ì•\Ž¦”͈͐ݒèƒ`ƒFƒbƒNƒNƒŠƒA
 		procedure ClearThreadRengeAction;
+        //! ƒ^ƒXƒNƒgƒŒƒC‚̃AƒCƒRƒ“íœ•ƒtƒH[ƒ€•\Ž¦
+        procedure UnStoredTaskTray;
 	protected
 		procedure CreateParams(var Params: TCreateParams); override;
 		procedure WndProc(var Message: TMessage); override;
@@ -677,6 +683,7 @@ type
 		LastRoundTime: TDateTime;
 		BrowserNullTab: TBrowserRecord;
 		FControlThread: TThreadControl;
+        FIconData : TNotifyIconData;
 		procedure MoveToURL(const inURL: string);
 		function InsertBrowserTab(ThreadItem: TThreadItem; ActiveTab: Boolean = True) : TBrowserRecord;
 		procedure ReloadBBS;
@@ -788,6 +795,11 @@ type
 		//! ƒc[ƒ‹ƒo[‚ɃXƒŒiž‚݃Rƒ“ƒ{ƒ{ƒbƒNƒX‚ðÝ’è‚·‚é
 		procedure SetSelectComboBox();
 
+        //! ƒ^ƒXƒNƒgƒŒƒC‚ÉŠi”[‚µ‚½ƒAƒCƒRƒ“‚ðƒNƒŠƒbƒN‚µ‚½‚Æ‚«‚̏ˆ—
+        procedure TaskTrayIconMessage(var Msg : TMsg); message WM_USER + 2010;
+        //! ƒ^ƒXƒNƒgƒŒƒC‚ɃAƒCƒRƒ““o˜^•ƒtƒH[ƒ€‰B‚µ
+        procedure StoredTaskTray;
+
 	published
 		property EnabledCloseButton: Boolean read FEnabledCloseButton write SetEnabledCloseButton;
 	end;
@@ -820,7 +832,7 @@ implementation
 
 uses
 	GikoUtil, IndividualAbon, Math, Kotehan, KeySetting,
-	YofUtils, ShellAPI, ToolBarUtil, ToolBarSetting,
+	YofUtils, ToolBarUtil, ToolBarSetting,
 	GikoXMLDoc, RoundName, IniFiles, FavoriteAdd,
 	FavoriteArrange, AddressHistory, Preview, Gesture,
 	About, Option, Round, Splash, Sort, ListSelect, Imm,
@@ -843,6 +855,7 @@ const
 	USER_MINIMIZED					= WM_USER + 2002;
 	USER_SETLINKBAR					= WM_USER + 2003;
 	USER_DOCUMENTCOMPLETE		= WM_USER + 2004;	///< wParam : TWebBrowser
+    USER_TASKTRAY               = WM_USER + 2010;
 {$R *.DFM}
 
 procedure TGikoForm.CreateParams(var Params: TCreateParams);
@@ -889,7 +902,8 @@ begin
 	GetGroupIndex(GikoDM.GikoFormActionList);
 	FSearchDialog := nil;
 	CreateBrowsers(BROWSER_COUNT);
-
+    FIconData.uID := 0;
+    
 	//ƒƒjƒ…[ƒtƒHƒ“ƒg
 	SetMenuFont;
 
@@ -1287,6 +1301,7 @@ begin
 
 	//“ü—̓AƒVƒXƒg‹@\‚̏‰Šú‰»
 	InputAssistDM.Init(GikoSys.GetInputAssistFileName);
+
 end;
 
 // CoolBar ‚̐ݒè‚ð•Ï”‚É•Û‘¶
@@ -3884,15 +3899,17 @@ var
 	wkIntTo: Integer;
     BNum, BRes: string;
     threadItem: TThreadItem;
+    aElement : IHTMLElement;
 begin
-
 	Cancel := True;
-	if (IHTMLDocument2(TWebBrowser(Sender).Document).activeElement <> nil) then begin
-		Text := IHTMLDocument2(TWebBrowser(Sender).Document).activeElement.Get_outerText;
-		Html := IHTMLDocument2(TWebBrowser(Sender).Document).activeElement.Get_outerHTML;
+    aElement := IHTMLDocument2(TWebBrowser(Sender).Document).activeElement;
+	if ( aElement <> nil) then begin
+		Text := aElement.Get_outerText;
+		Html := aElement.Get_outerHTML;
 		if(AnsiPos('>>', Text) = 1) or (AnsiPos('>', Text) = 1)
 			or (AnsiPos('„„', Text) = 1) or (AnsiPos('„', Text) = 1) then begin
 			if GikoSys.Setting.ResAnchorJamp then begin
+
 				Text := ZenToHan(Trim(Text));
 
 				if(AnsiPos('>>', Text) = 1) then begin
@@ -3915,6 +3932,7 @@ begin
 
 				if wkIntSt <> 0 then begin
 					FActiveContent.IDAnchorPopup('');
+                    MoveHisotryManager.pushItem(FActiveContent);
 					BrowserMovement(IntToStr(wkIntSt));
 				end;
 
@@ -3948,6 +3966,7 @@ begin
 						AddressComboBox.Items.Insert(0, URL);
 					end;
 				end;
+                MoveHisotryManager.pushItem(FActiveContent);
 				MoveToURL( URL );
 			end;
 		end;
@@ -4830,7 +4849,13 @@ begin
 		USER_RESIZED:
 			OnResized;
 		USER_MINIMIZED:
-			OnMinimized;
+            begin
+                if (GikoSys.Setting.StoredTaskTray) then begin
+                    //  ƒ^ƒXƒNƒgƒŒƒC‚ɃAƒCƒRƒ“‚ð’ljÁ‚·‚é
+                    StoredTaskTray;
+                end;
+	    		OnMinimized;
+            end;
 		USER_SETLINKBAR:
 			SetLinkBar;
 		USER_DOCUMENTCOMPLETE:
@@ -7696,6 +7721,52 @@ begin
     end;
 end;
 
+procedure TGikoForm.TaskTrayIconMessage(var Msg: TMsg);
+begin
+    //  ¶ƒNƒŠƒbƒN‚È‚ç•œŒ³‚·‚é
+    if  (Msg.wParam = WM_LBUTTONUP) then  begin
+        UnStoredTaskTray;
+    end;
+end;
+//! ƒ^ƒXƒNƒgƒŒƒC‚ɃAƒCƒRƒ““o˜^•ƒtƒH[ƒ€‰B‚µ
+procedure TGikoForm.StoredTaskTray;
+begin
+    try
+        if (FIconData.uID = 0) then begin
+            FIconData.cbSize  :=  SizeOf(TNotifyIconData);
+            FIconData.uID     :=  Self.Handle;
+            FIconData.Wnd     :=  Handle;
+            FIconData.uFlags  :=  NIF_MESSAGE or NIF_ICON or NIF_TIP;
+            FIconData.uCallbackMessage  :=  USER_TASKTRAY;
+            FIconData.hIcon   :=  Application.Icon.Handle;  {ƒAƒCƒRƒ“Žw’è}
+            FIconData.szTip   :=  'ƒMƒRƒiƒr';      {ƒqƒ“ƒg•¶Žš—ñ}
+            Shell_NotifyIcon(NIM_ADD, @FIconData);
+            ShowWindow(Self.Handle, SW_HIDE);
+        end;
+    except
+    end;
+end;
+//! ƒ^ƒXƒNƒgƒŒƒC‚̃AƒCƒRƒ“íœ•ƒtƒH[ƒ€•\Ž¦
+procedure TGikoForm.UnStoredTaskTray;
+begin
+    try
+        try
+            Shell_NotifyIcon(NIM_DELETE, @FIconData);
+            SetForegroundWindow(Application.Handle);
+        except
+        end;
+    finally
+        FIconData.uID := 0;
+        // Action‚©‚çŠi”[‚µ‚½‚Æ‚«‚ÍTag‚Ì’l‚Í0ˆÈŠO
+        if (GikoDM.StoredTaskTrayAction.Tag = 0) then begin
+            ShowWindow(Self.Handle, SW_RESTORE);
+        end else begin
+            ShowWindow(Self.Handle, SW_SHOW);
+        end;
+        GikoDM.StoredTaskTrayAction.Tag := 0;
+    end;
+end;
+
 initialization
 				OleInitialize(nil);
 finalization

--- a/GikoDataModule.dfm
+++ b/GikoDataModule.dfm
@@ -1235,6 +1235,56 @@ object GikoDM: TGikoDM
       OnExecute = CloseAllEditorActionExecute
       OnUpdate = CloseAllEditorActionUpdate
     end
+    object PrevMoveHistory: TAction
+      Category = #25805#20316
+      Caption = #12522#12531#12463#23653#27508#12434#25147#12427
+      Hint = #12522#12531#12463#23653#27508#12434#25147#12427
+      OnExecute = PrevMoveHistoryExecute
+      OnUpdate = PrevMoveHistoryUpdate
+    end
+    object NextMoveHistory: TAction
+      Category = #25805#20316
+      Caption = #12522#12531#12463#23653#27508#12434#36914#12416
+      Hint = #12522#12531#12463#23653#27508#12434#36914#12416
+      OnExecute = NextMoveHistoryExecute
+      OnUpdate = NextMoveHistoryUpdate
+    end
+    object ClickActiveElementAction: TAction
+      Category = #12473#12524#12483#12489
+      Caption = #12450#12463#12486#12451#12502#12394#35201#32032#12434#12463#12522#12483#12463#12377#12427
+      Hint = #12450#12463#12486#12451#12502#12394#35201#32032#12434#12463#12522#12483#12463#12377#12427
+      OnExecute = ClickActiveElementActionExecute
+    end
+    object VKDownAction: TAction
+      Category = #25805#20316
+      Caption = #19979#30690#21360#12461#12540#25276#19979
+      Hint = #19979#30690#21360#12461#12540#25276#19979
+      OnExecute = VKDownActionExecute
+    end
+    object VKUpAction: TAction
+      Category = #25805#20316
+      Caption = #19978#30690#21360#12461#12540#25276#19979
+      Hint = #19978#30690#21360#12461#12540#25276#19979
+      OnExecute = VKUpActionExecute
+    end
+    object VKRightAction: TAction
+      Category = #25805#20316
+      Caption = #21491#30690#21360#12461#12540#25276#19979
+      Hint = #21491#30690#21360#12461#12540#25276#19979
+      OnExecute = VKRightActionExecute
+    end
+    object VKLeftAction: TAction
+      Category = #25805#20316
+      Caption = #24038#30690#21360#12461#12540#25276#19979
+      Hint = #24038#30690#21360#12461#12540#25276#19979
+      OnExecute = VKLeftActionExecute
+    end
+    object StoredTaskTrayAction: TAction
+      Category = #25805#20316
+      Caption = #12479#12473#12463#12488#12524#12452#12395#26684#32013#12377#12427
+      Hint = #12479#12473#12463#12488#12524#12452#12395#26684#32013#12377#12427
+      OnExecute = StoredTaskTrayActionExecute
+    end
   end
   object ToobarImageList: TImageList
     Left = 44

--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -12,7 +12,7 @@ uses
 	MSHTML_TLB,
 {$IFEND}
   ComCtrls, BrowserRecord, Graphics, Messages, Setting, Dialogs,
-  ActiveX;
+  ActiveX, MoveHistoryItem;
 
 const
 	CAPTION_NAME: string = 'ƒMƒRƒiƒr';
@@ -219,6 +219,14 @@ type
     LiveItemAction: TAction;
     FavoriteTreeViewItemNameCopyAction: TAction;
     CloseAllEditorAction: TAction;
+    PrevMoveHistory: TAction;
+    NextMoveHistory: TAction;
+    ClickActiveElementAction: TAction;
+    VKDownAction: TAction;
+    VKUpAction: TAction;
+    VKRightAction: TAction;
+    VKLeftAction: TAction;
+    StoredTaskTrayAction: TAction;
 	procedure EditNGActionExecute(Sender: TObject);
 	procedure ReloadActionExecute(Sender: TObject);
 	procedure GoFowardActionExecute(Sender: TObject);
@@ -406,6 +414,16 @@ type
     procedure FavoriteTreeViewItemNameCopyActionExecute(Sender: TObject);
     procedure CloseAllEditorActionExecute(Sender: TObject);
     procedure CloseAllEditorActionUpdate(Sender: TObject);
+    procedure PrevMoveHistoryUpdate(Sender: TObject);
+    procedure PrevMoveHistoryExecute(Sender: TObject);
+    procedure NextMoveHistoryUpdate(Sender: TObject);
+    procedure NextMoveHistoryExecute(Sender: TObject);
+    procedure ClickActiveElementActionExecute(Sender: TObject);
+    procedure VKDownActionExecute(Sender: TObject);
+    procedure VKUpActionExecute(Sender: TObject);
+    procedure VKRightActionExecute(Sender: TObject);
+    procedure VKLeftActionExecute(Sender: TObject);
+    procedure StoredTaskTrayActionExecute(Sender: TObject);
   private
 	{ Private éŒ¾ }
 	procedure ClearResFilter;
@@ -421,6 +439,8 @@ type
 	procedure ClearSelectComboBox;
     procedure ClearMailAllEditor();
     procedure ClearNameTextAllEditor();
+    procedure MoveURLWithHistory(URL : String);
+    procedure BackToHistory(item: TMoveHistoryItem);
   public
 	{ Public éŒ¾ }
 	procedure RepaintStatusBar;
@@ -554,24 +574,10 @@ end;
 //! ƒAƒhƒŒƒXƒo[‚É•\Ž¦‚µ‚Ä‚¢‚éƒAƒhƒŒƒX‚ÖˆÚ“®‚·‚é
 // *************************************************************************
 procedure TGikoDM.MoveToActionExecute(Sender: TObject);
-var
-	URL: string;
-	idx: Integer;
 begin
 	//ƒAƒhƒŒƒXƒRƒ“ƒ{ƒ{ƒbƒNƒX‚©‚çURL‚ðŽæ“¾
-	URL := Trim(GikoForm.AddressComboBox.Text);
 	//URL‚Ɉړ®
-	GikoForm.MoveToURL(URL);
-	//ˆÈ‰ºA—š—ð‚̏ˆ—
-	idx := GikoForm.AddressComboBox.Items.IndexOf(URL);
-	if idx = -1 then begin
-		GikoForm.AddressComboBox.Items.Insert(0, URL);
-		if GikoForm.AddressComboBox.Items.Count > GikoSys.Setting.AddressHistoryCount then
-			GikoForm.AddressComboBox.Items.Delete(GikoForm.AddressComboBox.Items.Count - 1);
-	end else begin
-		GikoForm.AddressComboBox.Items.Delete(idx);
-		GikoForm.AddressComboBox.Items.Insert(0, URL);
-	end;
+    MoveURLWithHistory( Trim(GikoForm.AddressComboBox.Text) );
 end;
 // *************************************************************************
 //! ‚¨‹C‚É“ü‚è‚̒ljÁƒ_ƒCƒAƒƒO‚ðŠJ‚­
@@ -2235,7 +2241,8 @@ begin
         URLs.Free;
 	end;
 
-    if (GikoForm.BrowserTab.Tabs.Count = 0) then  begin
+    if (GikoForm.BrowserTab.Tabs.Count = 0) and
+        (TabsOpenAction.Tag <> 1) then  begin
         ShowMessage('•\Ž¦‚·‚éƒ^ƒu‚ª‚ ‚è‚Ü‚¹‚ñB');
     end;
 end;
@@ -3685,7 +3692,7 @@ end;
 // *************************************************************************
 procedure TGikoDM.SetFocusForBrowserActionExecute(Sender: TObject);
 begin
-	GikoForm.ActiveContent.Browser.SetFocus;
+    GikoForm.ActiveContent.Browser.SetFocus;
 end;
 // *************************************************************************
 //! ƒuƒ‰ƒEƒU‚ɃtƒH[ƒJƒX‚ð“–‚Ä‚éUpdateƒCƒxƒ“ƒg
@@ -4038,5 +4045,137 @@ begin
 	end;
 end;
 
+// *************************************************************************
+//! ƒŠƒ“ƒN—š—ð‚ð–ß‚é‚̍XVˆ—
+// *************************************************************************
+procedure TGikoDM.PrevMoveHistoryUpdate(Sender: TObject);
+begin
+      PrevMoveHistory.Enabled :=
+          (MoveHisotryManager.HisotryIndex > 0)
+end;
+// *************************************************************************
+//! ƒŠƒ“ƒN—š—ð‚ð–ß‚é
+// *************************************************************************
+procedure TGikoDM.PrevMoveHistoryExecute(Sender: TObject);
+begin
+    if ( GikoForm.BrowserTab.TabIndex >= 0 ) then begin
+        BackToHistory(MoveHisotryManager.getPrevItem
+            (TBrowserRecord(GikoForm.BrowserTab.Tabs
+                    .Objects[GikoForm.BrowserTab.TabIndex])));
+    end else begin
+        BackToHistory(MoveHisotryManager.getPrevItem( nil ) );
+    end;
+end;
+//! ƒŠƒ“ƒN—š—ðˆ—
+procedure TGikoDM.BackToHistory(item: TMoveHistoryItem);
+var
+    browser : TWebBrowser;
+    doc : OleVariant;
+begin
+    if ( item <> nil ) then begin
+        if ( GikoForm.GetActiveContent = item.ThreadItem ) then begin
+            browser := TBrowserRecord(GikoForm.BrowserTab.Tabs
+                .Objects[GikoForm.BrowserTab.TabIndex]).Browser;
+            if (browser <> nil) then begin
+                try
+                    doc := Idispatch( olevariant(browser.ControlInterface).Document) as IHTMLDocument2;
+                    doc.Body.ScrollTop := item.ScrollTop;
+                except
+                end;
+            end;
+        end else begin
+            //URL‚Ɉړ®
+            MoveURLWithHistory(item.ThreadItem.URL);
+        end;
+    end;
+end;
+//! —š—ðˆ—‚‚«URLˆÚ“®
+procedure TGikoDM.MoveURLWithHistory(URL : String);
+var
+    idx : Integer;
+begin
+    //URL‚Ɉړ®
+    GikoForm.MoveToURL(URL);
+    //ˆÈ‰ºA—š—ð‚̏ˆ—
+    idx := GikoForm.AddressComboBox.Items.IndexOf(URL);
+    if idx = -1 then begin
+        GikoForm.AddressComboBox.Items.Insert(0, URL);
+        if GikoForm.AddressComboBox.Items.Count > GikoSys.Setting.AddressHistoryCount then
+            GikoForm.AddressComboBox.Items.Delete(GikoForm.AddressComboBox.Items.Count - 1);
+    end else begin
+        GikoForm.AddressComboBox.Items.Delete(idx);
+        GikoForm.AddressComboBox.Items.Insert(0, URL);
+    end;
+end;
+// *************************************************************************
+//! ƒŠƒ“ƒN—š—ð‚ði‚ނ̍XVˆ—
+// *************************************************************************
+procedure TGikoDM.NextMoveHistoryUpdate(Sender: TObject);
+begin
+    NextMoveHistory.Enabled :=
+          (MoveHisotryManager.HisotryIndex < MoveHisotryManager.Count - 1);
+end;
+// *************************************************************************
+//! ƒŠƒ“ƒN—š—ð‚ði‚Þ
+// *************************************************************************
+procedure TGikoDM.NextMoveHistoryExecute(Sender: TObject);
+begin
+    BackToHistory(MoveHisotryManager.getNextItem);
+end;
+// *************************************************************************
+//! ƒAƒNƒeƒBƒu—v‘f‚̃NƒŠƒbƒN
+// *************************************************************************
+procedure TGikoDM.ClickActiveElementActionExecute(Sender: TObject);
+var
+    browser : TWebBrowser;
+    elem : IHTMLElement;
+begin
+    if (GikoForm.GetActiveContent <> nil) then begin
+        if (GikoForm.BrowserTab.Tabs.Count > 0) and
+            (GikoForm.BrowserTab.TabIndex >= 0) then begin
+            browser := TBrowserRecord(GikoForm.BrowserTab.Tabs
+                .Objects[GikoForm.BrowserTab.TabIndex]).Browser;
+            if (browser <> nil) then begin
+                try
+                    elem := IHTMLDocument2(browser.Document).activeElement;
+                    elem.click;
+                except
+                end;
+            end;
+
+        end;
+    end;
+end;
+//! «ƒL[‚̃Gƒ~ƒ…ƒŒ[ƒgƒAƒNƒVƒ‡ƒ“
+procedure TGikoDM.VKDownActionExecute(Sender: TObject);
+begin
+    keybd_event(VK_DOWN, 0, KEYEVENTF_EXTENDEDKEY, 0);
+    keybd_event(VK_DOWN, 0, KEYEVENTF_EXTENDEDKEY or KEYEVENTF_KEYUP, 0);
+end;
+//! ªƒL[‚̃Gƒ~ƒ…ƒŒ[ƒgƒAƒNƒVƒ‡ƒ“
+procedure TGikoDM.VKUpActionExecute(Sender: TObject);
+begin
+    keybd_event(VK_UP, 0, KEYEVENTF_EXTENDEDKEY, 0);
+    keybd_event(VK_UP, 0, KEYEVENTF_EXTENDEDKEY or KEYEVENTF_KEYUP, 0);
+end;
+//! ¨ƒL[‚̃Gƒ~ƒ…ƒŒ[ƒgƒAƒNƒVƒ‡ƒ“
+procedure TGikoDM.VKRightActionExecute(Sender: TObject);
+begin
+    keybd_event(VK_RIGHT, 0, KEYEVENTF_EXTENDEDKEY, 0);
+    keybd_event(VK_RIGHT, 0, KEYEVENTF_EXTENDEDKEY or KEYEVENTF_KEYUP, 0);
+end;
+//! ©ƒL[‚̃Gƒ~ƒ…ƒŒ[ƒgƒAƒNƒVƒ‡ƒ“
+procedure TGikoDM.VKLeftActionExecute(Sender: TObject);
+begin
+    keybd_event(VK_LEFT, 0, KEYEVENTF_EXTENDEDKEY, 0);
+    keybd_event(VK_LEFT, 0, KEYEVENTF_EXTENDEDKEY or KEYEVENTF_KEYUP, 0);
+end;
+//! ƒ^ƒXƒNƒgƒŒƒC‚ÉŠi”[‚·‚é
+procedure TGikoDM.StoredTaskTrayActionExecute(Sender: TObject);
+begin
+    GikoForm.StoredTaskTray;
+    StoredTaskTrayAction.Tag := -1;
+end;
+
 end.
 

--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -256,7 +256,7 @@ const
 	ZERO_DATE: Integer	= 25569;
 	BETA_VERSION_NAME_E = 'beta';
 	BETA_VERSION_NAME_J = 'ÊÞÀ';
-	BETA_VERSION				= 53;
+	BETA_VERSION				= 54;
 	BETA_VERSION_BUILD	= '';				//!< debug”Å‚È‚Ç
 	APP_NAME						= 'gikoNavi';
 	BE_PHP_URL = 'http://be.2ch.net/test/p.php?i=';

--- a/KuroutSetting.dfm
+++ b/KuroutSetting.dfm
@@ -395,6 +395,35 @@ object KuroutOption: TKuroutOption
           TabOrder = 0
         end
       end
+      object GroupBox3: TGroupBox
+        Left = 16
+        Top = 126
+        Width = 473
+        Height = 51
+        Caption = #12522#12531#12463#31227#21205#23653#27508
+        TabOrder = 1
+        object Label10: TLabel
+          Left = 8
+          Top = 20
+          Width = 84
+          Height = 12
+          Caption = #23653#27508#26368#22823#20445#25345#25968
+        end
+        object Label11: TLabel
+          Left = 227
+          Top = 20
+          Width = 158
+          Height = 12
+          Caption = #65288#12487#12501#12457#12523#12488'=20 '#20877#36215#21205#24460#26377#21177#65289
+        end
+        object MoveHistoryMaxEdit: TEdit
+          Left = 112
+          Top = 16
+          Width = 105
+          Height = 20
+          TabOrder = 0
+        end
+      end
     end
   end
   object OkBotton: TButton

--- a/KuroutSetting.pas
+++ b/KuroutSetting.pas
@@ -61,6 +61,10 @@ type
     Label8: TLabel;
     FixedCookieEdit: TEdit;
     Label9: TLabel;
+    GroupBox3: TGroupBox;
+    Label10: TLabel;
+    MoveHistoryMaxEdit: TEdit;
+    Label11: TLabel;
 	procedure OkBottonClick(Sender: TObject);
 	procedure FormCreate(Sender: TObject);
 	procedure CDeleteButtonClick(Sender: TObject);
@@ -123,6 +127,8 @@ begin
 	RemoteTrapAtt.Checked := GikoSys.Setting.RemoteTrapAtt;
 	// Cookie
     FixedCookieEdit.Text := GikoSys.Setting.FixedCookie;
+    // ƒŠƒ“ƒNˆÚ“®—š—ð
+    MoveHistoryMaxEdit.Text := IntToStr( GikoSys.Setting.MoveHistorySize );
 end;
 
 procedure TKuroutOption.SaveSetting;
@@ -150,6 +156,9 @@ begin
 	// Cookie
 	GikoSys.Setting.FixedCookie := FixedCookieEdit.Text;
 
+    // ƒŠƒ“ƒNˆÚ“®—š—ð
+    GikoSys.Setting.MoveHistorySize :=
+        StrToIntDef( MoveHistoryMaxEdit.Text, 20 );
 
 	GikoSys.Setting.KuroutSettingTabIndex := PageControl1.ActivePageIndex;
 end;

--- /dev/null
+++ b/MoveHistoryItem.pas
@@ -0,0 +1,182 @@
+unit MoveHistoryItem;
+
+interface
+ 
+uses
+    SysUtils, Classes, BoardGroup, BrowserRecord,
+{$IF Defined(DELPRO) }
+	SHDocVw,
+	MSHTML,
+{$ELSE}
+	SHDocVw_TLB,
+	MSHTML_TLB,
+{$IFEND}
+    OleCtrls, ActiveX;
+type
+
+    TMoveHistoryItem = class(TObject)
+    private
+        FThreadItem : TThreadItem;
+        FScrollTop  : Integer;
+    public
+        property ThreadItem : TThreadItem read FThreadItem write FThreadItem;
+        property ScrollTop : Integer read FScrollTop write FScrollTop;
+    end;
+
+    TMoveHistory = class(TList)
+    private
+        FHistoryMax : Integer;
+        FIndex : Integer;
+        {
+        \brief ƒŠƒ“ƒNˆÚ“®—š—ðÅ‘å•ÛŽ”‚ðÝ’è‚·‚éB
+        \param  AVal •ÛŽ”
+        }
+        procedure SetHistoryMax(AVal: Integer);
+        {
+        \brief ƒŠƒ“ƒNˆÚ“®—š—ðÅ‘å•ÛŽ”‚ðŽæ“¾‚·‚éB
+        \return •ÛŽ”( > 0 )
+        }
+        function GetHistoryMax: Integer;
+    public
+        constructor Create( max : Integer ); overload;
+        function pushItem( item: TMoveHistoryItem): Integer; overload;
+        function pushItem( item: TBrowserRecord): Integer; overload;
+        function getPrevItem( item: TBrowserRecord): TMoveHistoryItem;
+        function getNextItem: TMoveHistoryItem;
+        procedure clear; override;
+        property HistoryMax : Integer read GetHistoryMax write SetHistoryMax;
+        property HisotryIndex: Integer read FIndex;
+    end;
+
+var
+    MoveHisotryManager : TMoveHistory;
+
+implementation
+
+uses
+    GikoSystem;
+
+
+//! ƒRƒ“ƒXƒgƒ‰ƒNƒ^
+constructor TMoveHistory.Create( max : Integer );
+begin
+    inherited Create;
+
+    FIndex := 0;
+    
+    SetHistoryMax( GikoSys.Setting.MoveHistorySize );
+end;
+//! ˆÚ“®—š—ð‚̃AƒCƒeƒ€’ljÁ
+function TMoveHistory.pushItem( item: TMoveHistoryItem): Integer;
+var
+    i : Integer;
+    top: TMoveHistoryItem;
+begin
+    Result := -1;
+    if (Self.Count > 0) then begin
+        top := TMoveHistoryItem( Self.Items[Self.Count - 1] );
+        if (top.FThreadItem = item.FThreadItem) and
+            (top.FScrollTop = item.FScrollTop) then begin
+            Exit;
+        end;
+    end;
+    // •ÛŽ”‚̍őå’l‚ð’´‚¦‚éê‡æ“ª‚ðíœ
+    if (FIndex + 1 > FHistoryMax) then begin
+        if ( Self.Items[0] <> nil ) then begin
+            TMoveHistoryItem( Self.Items[0] ).Free;
+        end;
+        Self.Delete(0);
+        Dec(Findex);
+    end;
+    // FIndex‚æ‚èŒã‚ë‚̃AƒCƒeƒ€‚ðíœ‚·‚é
+    for i := Self.Count - 1 downto Findex do begin
+        if (Self.Items [i] <> nil) then begin
+            TMoveHistoryItem( Self.Items[i] ).Free;
+        end;
+        Self.Delete(i);
+    end;
+    Inc(FIndex);
+    Result := Self.Add( item );
+end;
+//! ˆÚ“®—š—ð‚̃AƒCƒeƒ€’ljÁ
+function TMoveHistory.pushItem( item: TBrowserRecord): Integer;
+var
+    history : TMoveHistoryItem;
+    doc : OleVariant;
+begin
+    Result := -1;
+    if ( item <> nil ) and ( item.Thread <> nil )
+        and ( item.Browser <> nil) then begin
+        history := TMoveHistoryItem.Create;
+        history.FThreadItem := item.Thread;
+        doc := Idispatch( olevariant(item.Browser.ControlInterface).Document) as IHTMLDocument2;
+        history.ScrollTop := doc.Body.ScrollTop;
+
+        Result := pushItem( history );
+    end;
+end;
+//! ˆê‚‘O‚Ì—š—ðƒAƒCƒeƒ€Žæ“¾
+function TMoveHistory.getPrevItem(item: TBrowserRecord): TMoveHistoryItem;
+begin
+    Result := nil;
+    if (FIndex = Self.Count) and (item <> nil) then begin
+        pushItem( item );
+        Dec(FIndex);
+    end;
+    if ( FIndex > 0 ) then begin
+        Dec( FIndex );
+        Result := TMoveHistoryItem( Self.items[ FIndex  ] );
+    end;
+end;
+//! ˆê‚ÂŒã‚ë‚Ì—š—ðƒAƒCƒeƒ€Žæ“¾
+function TMoveHistory.getNextItem: TMoveHistoryItem;
+begin
+    Result := nil;
+    if ( FIndex < Self.Count - 1 ) then begin
+        Inc( FIndex );
+        Result := TMoveHistoryItem( Self.items[ FIndex ] );
+    end;
+end;
+//! —š—ð‚Ì‘SÁ‹Ž
+procedure TMoveHistory.clear;
+var
+    i : Integer;
+begin
+    // ƒAƒCƒeƒ€‚ðíœ‚·‚é
+    for i := Self.Count - 1 downto 0 do begin
+        if (Self.Items [i] <> nil) then begin
+            TMoveHistoryItem( Self.Items[i] ).Free;
+        end;
+        Self.Delete(i);
+    end;
+    Self.Capacity := 0;
+    FIndex := 0;
+    inherited;
+end;
+
+procedure TMoveHistory.SetHistoryMax(AVal: Integer);
+begin
+    // —š—ð‚̃TƒCƒY‚Í0‚æ‚è‘å‚«‚­‚È‚¢‚Æ‚¢‚¯‚È‚¢
+    if ( AVal > 0 ) then begin
+        if ((AVal + 1) <> FHistoryMax) then begin
+            Self.clear;
+            // ˆÚ“®‚µ‚½Û‚ɁA–߂郊ƒ“ƒN‚ð1‚‘«‚·‚Ì‚Å
+            FHistoryMax := AVal + 1;
+        end;
+    end;
+end;
+function TMoveHistory.GetHistoryMax: Integer;
+begin
+    // ˆÚ“®‚µ‚½Û‚ɁA–߂郊ƒ“ƒN‚ð1‚‘«‚·‚Ì‚Å
+    Result := FHistoryMax - 1;
+end;
+initialization
+	MoveHisotryManager := TMoveHistory.Create( 20 );
+
+finalization
+	if MoveHisotryManager <> nil then begin
+		MoveHisotryManager.clear;
+        MoveHisotryManager.Free;
+		MoveHisotryManager := nil;
+	end;
+end.

--- a/Option.dfm
+++ b/Option.dfm
@@ -61,9 +61,9 @@ object OptionDialog: TOptionDialog
     Top = 4
     Width = 509
     Height = 389
-    ActivePage = TabSheet3
+    ActivePage = TabSheet4
     MultiLine = True
-    TabIndex = 3
+    TabIndex = 7
     TabOrder = 3
     OnChange = OptionTabChange
     object ConnectSheet: TTabSheet
@@ -1207,9 +1207,9 @@ object OptionDialog: TOptionDialog
         end
       end
       object GroupBox19: TGroupBox
-        Left = 11
+        Left = 12
         Top = 74
-        Width = 465
+        Width = 473
         Height = 49
         Caption = #23653#27508
         TabOrder = 1
@@ -1238,6 +1238,22 @@ object OptionDialog: TOptionDialog
           OnExit = MaxRecordCountEditExit
         end
       end
+      object GroupBox21: TGroupBox
+        Left = 11
+        Top = 133
+        Width = 473
+        Height = 52
+        Caption = #26368#23567#21270#26178#12479#12473#12463#12488#12524#12452
+        TabOrder = 2
+        object StoredTaskTrayCB: TCheckBox
+          Left = 11
+          Top = 24
+          Width = 118
+          Height = 17
+          Caption = #26377#21177#12395#12377#12427
+          TabOrder = 0
+        end
+      end
     end
     object SoundSheet: TTabSheet
       Caption = #12469#12454#12531#12489

--- a/Option.pas
+++ b/Option.pas
@@ -205,6 +205,8 @@ type
     GroupBox20: TGroupBox;
     AutoSortCheckBox: TCheckBox;
     Label24: TLabel;
+    GroupBox21: TGroupBox;
+    StoredTaskTrayCB: TCheckBox;
 		procedure FormCreate(Sender: TObject);
 		procedure FormDestroy(Sender: TObject);
 		procedure ApplyButtonClick(Sender: TObject);
@@ -864,6 +866,8 @@ begin
 	BeAutoLoginCheckBox.Checked := GikoSys.Setting.BeAutoLogin;
 	//—š—ð‚̍őå•Û‘¶”
 	MaxRecordCountEdit.Text := IntToStr(GikoSys.Setting.MaxRecordCount);
+    // Å¬‰»Žž‚Ƀ^ƒXƒNƒgƒŒƒC‚ÉŠi”[‚·‚é‚©
+    StoredTaskTrayCB.Checked := GikoSys.Setting.StoredTaskTray;
 end;
 
 procedure TOptionDialog.SaveSetting;
@@ -1151,6 +1155,7 @@ begin
 		GikoSys.Setting.BeAutoLogin := BeAutoLoginCheckBox.Checked;
 	//—š—ð‚̍őå•Û‘¶”
 	GikoSys.Setting.MaxRecordCount := Max(StrToInt64Def(MaxRecordCountEdit.Text,100),1);
+    GikoSys.Setting.StoredTaskTray := StoredTaskTrayCB.Checked;
 end;
 
 procedure TOptionDialog.SettingApply;

--- a/Setting.pas
+++ b/Setting.pas
@@ -430,9 +430,12 @@ type
 		FInputAssistFormWidth: Integer;
 		FInputAssistFormHeight: Integer;
 
-		// Cookie‚É•t‰Á‚·‚éŒÅ’èƒR[ƒh
+		//! Cookie‚É•t‰Á‚·‚éŒÅ’èƒR[ƒh
 		FFixedCookie: String;
-
+        //! ƒŠƒ“ƒNˆÚ“®—š—ð‚Ì•ÛŽ”
+        FMoveHistorySize : Integer;
+        //! Å¬‰»‚µ‚½‚Æ‚«‚Ƀ^ƒXƒNƒgƒŒƒC‚ÉŠi”[‚·‚é‚©
+        FStoredTaskTray : Boolean;
 		function GetMainCoolSet(Index: Integer): TCoolSet;
 		function GetBoardCoolSet(Index: Integer): TCoolSet;
 		function GetBrowserCoolSet(Index: Integer): TCoolSet;
@@ -503,6 +506,11 @@ type
 		function GetEditorKeyFileName: String;
 		procedure WriteLogFolder(AVal : String);
 		function GetInputAssistFileName : String;
+        {
+        \brief  ƒŠƒ“ƒN—š—ð‚Ì•ÛŽƒTƒCƒY‚Ìsetter
+        \param  AVal    Ý’è‚·‚éƒTƒCƒY( >0) 
+        }
+        procedure SetMoveHistorySize(AVal : Integer);
 		//ŽóMƒoƒbƒtƒ@ƒTƒCƒY
 		property RecvBufferSize: Integer read FRecvBufferSize write FRecvBufferSize;
 		//HTTP1.1Žg—p
@@ -758,7 +766,10 @@ type
 		property InputAssistFormHeight: Integer read FInputAssistFormHeight write FInputAssistFormHeight;
 		//! Cookie‚É•t‰Á‚·‚éŒÅ’èƒR[ƒh
 		property FixedCookie: String read FFixedCookie write FFixedCookie;
-
+        //! ƒŠƒ“ƒNˆÚ“®—š—ð‚Ì•ÛŽ”
+        property MoveHistorySize : Integer read FMoveHistorySize write SetMoveHistorySize;
+        //! Å¬‰»Žž‚Ƀ^ƒXƒNƒgƒŒƒC‚ÉŠi”[‚·‚é‚©
+        property StoredTaskTray : Boolean read FStoredTaskTray write FStoredTaskTray;
 end;
 
 
@@ -1381,6 +1392,11 @@ begin
 		// Cookie‚É•t‰Á‚·‚éŒÅ’èƒR[ƒh
 		FFixedCookie := ini.ReadString('Cookie', 'fixedString', FIXED_COOKIE);
 
+        // ƒŠƒ“ƒNˆÚ“®—š—ð‚̍őå•ÛŽ”
+        FMoveHistorySize := ini.ReadInteger('MoveHisotry', 'Max', 20);
+
+        FStoredTaskTray := ini.ReadBool('Function', 'StroedTaskTray', false);
+
 		ini.UpdateFile;
 	finally
 		ini.Free;
@@ -1752,6 +1768,11 @@ begin
 		// ŒÅ’è‚ÌCookie•¶Žš—ñ
         ini.WriteString('Cookie', 'fixedString', FFixedCookie);
 
+        // ƒŠƒ“ƒNˆÚ“®—š—ð‚̍őå•ÛŽ”
+        ini.WriteInteger('MoveHisotry', 'Max', FMoveHistorySize);
+
+        ini.WriteBool('Function', 'StroedTaskTray', FStoredTaskTray);
+
 		ini.UpdateFile;
 	finally
 		ini.Free;
@@ -2225,7 +2246,12 @@ function TSetting.GetInputAssistFileName : String;
 begin
 	Result := GetConfigDir + INPUTASSIST_FILE_NAME;
 end;
-
+procedure TSetting.SetMoveHistorySize(AVal : Integer);
+begin
+    if (AVal > 0) then begin
+        FMoveHistorySize := AVal;
+    end;
+end;
 end.
 
 

--- a/Trip.pas
+++ b/Trip.pas
@@ -33,6 +33,16 @@ function get_2ch_trip(
 	const pw : PChar
 ) : string;
 
+{!
+\brief  ƒgƒŠƒbƒv‚̐¶¬‚É•K—v‚Èsalt‚̐¶¬
+\parm   pw  salt‚ÌŒ³‚É‚È‚éƒpƒXƒ[ƒh
+\param  salt    ¶¬‚µ‚½salt‚ªŠi”[‚³‚ê‚é (array[0..2] of char)
+}
+procedure get_salt(
+    const pw : PChar;
+    salt : PChar
+);
+
 const
 	kCryptInitialTr : CryptOrdering = ( o_data: (
 		#58,#50,#42,#34,#26,#18,#10, #2,#60,#52,#44,#36,#28,#20,#12, #4,
@@ -413,18 +423,30 @@ function get_2ch_trip(
 var
 	s : CryptData;
 	salt : array [0..2] of char;
-
-	i : Integer;
-	len : Integer;
 begin
 
-	salt[ 0 ] := #0;
 	if pw[ 0 ] = #0 then
 	begin
 		Result := '';
 		Exit;
 	end;
 
+    get_salt( pw, salt );
+
+
+	Result := Copy( crypt_r( pw, salt, s ), 4, 100 );
+
+end;
+
+procedure get_salt(
+    const pw : PChar;
+    salt : PChar
+);
+var
+    i, len : Integer;
+begin
+	salt[ 0 ] := #0;
+
 	if pw[ 1 ] <> #0 then
 	begin
 		if pw[ 2 ] <> #0 then
@@ -438,8 +460,11 @@ begin
 			else
 				salt[ i ] := '.';
 
-			if Pos( salt[ i ], ':;<=>?@[\\]^_`' ) > 0 then
-				salt[ i ] := Char( Integer( salt[ i ] ) + 7 );
+            if Pos ( salt[ i ], ':;<=>?@' ) > 0 then begin
+                salt[ i ] := Char( Integer( salt[ i ] ) + 7 );
+            end else if Pos( salt[ i ], '[\\]^_`' ) > 0 then begin
+				salt[ i ] := Char( Integer( salt[ i ] ) + 6 );
+            end;
 		end;
 		if len = 1 then
 			salt[ 1 ] := 'H';
@@ -448,9 +473,6 @@ begin
 		salt[ 0 ] := 'H';
 		salt[ 1 ] := '.';
 	end;
-
-	Result := Copy( crypt_r( pw, salt, s ), 4, 100 );
-
 end;
 
 end.

--- a/gikoNavi.dpr
+++ b/gikoNavi.dpr
@@ -72,7 +72,8 @@ uses
   GikoMessage in 'GikoMessage.pas',
   InputAssist in 'InputAssist.pas' {InputAssistForm},
   InputAssistDataModule in 'InputAssistDataModule.pas' {InputAssistDM: TDataModule},
-  DefaultFileManager in 'DefaultFileManager.pas';
+  DefaultFileManager in 'DefaultFileManager.pas',
+  MoveHistoryItem in 'MoveHistoryItem.pas';
 
 {$R *.RES}
 {$R gikoResource.res}

Binary files a/gikoNavi.res and b/gikoNavi.res differ

--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -1,4 +1,4 @@
-¡ƒMƒRƒiƒr Version1.00 ÊÞÀ53 Readme.txt
+¡ƒMƒRƒiƒr Version1.00 ÊÞÀ54 Readme.txt
 
 
 ------------------------------
@@ -50,7 +50,7 @@
 ------------------------------
 ƒoƒO‚â—v–]‚́AƒMƒRƒiƒrƒXƒŒƒbƒh‚Ŏ󂯕t‚¯‚Ä‚¨‚è‚Ü‚·B
 ƒMƒRƒiƒrƒTƒCƒgFhttp://gikonavi.sourceforge.jp/
-ƒMƒRƒiƒrƒXƒŒFhttp://pc7.2ch.net/test/read.cgi/software/1149268313/l50
+ƒMƒRƒiƒrƒXƒŒFhttp://pc7.2ch.net/test/read.cgi/software/1151728347/l50
 
 ------------------------------
 “]Ú‚ɂ‚¢‚Ä
@@ -107,7 +107,12 @@ LICENSE
 ------------------------------
 —š—ð
 ------------------------------
-2006/XX/XX
+2006/12/XX
+  Version ÊÞÀ54
+@ƒXƒŒƒbƒh“à‚ł̃Šƒ“ƒN‚ňړ®‚µ‚½‚Æ‚«‚Ì—š—ð‚ð’H‚ê‚é‹@”\‚ð’ljÁ
+@ƒ^ƒXƒNƒgƒŒƒC‚ÉŠi”[‚·‚é‹@”\‚ð’ljÁiƒIƒvƒVƒ‡ƒ“‚ōŏ¬‰»Žž‚àj
+
+2006/08/07
   Version ÊÞÀ53
 @IE7(beta)‚ðƒCƒ“ƒXƒg[ƒ‹‚·‚é‚ƃŒƒXƒAƒ“ƒJ[‚̃|ƒbƒvƒAƒbƒv‚Å•\Ž¦‚³‚ê‚È‚¢•s‹ï‡‚̏C³
 @‚µ‚½‚ç‚ÎJBBS”XV‚ªA“®ì‚µ‚È‚¢•s‹ï‡‚̏C³
@@ -116,8 +121,8 @@ LICENSE
 @„‰ñ—\–ñ–¼‚̕ύX‚ª”½‰f‚³‚ê‚È‚¢•s‹ï‡‚̏C³
 @—š—ðíœ‚É”º‚¤•s‹ï‡‚̏C³
 @ƒJƒ“ƒ}‚ŘA‘±‚·‚郌ƒXƒAƒ“ƒJ[‚ɃŠƒ“ƒN‚ªÝ’肳‚ê‚È‚¢•s‹ï‡‚̏C³
-@
-
+@ƒfƒtƒHƒ‹ƒg‚̐ݒèƒtƒ@ƒCƒ‹‚̈µ‚¢‚𓝈ê
+@ƒŒƒXƒGƒfƒBƒ^‚̃vƒŒƒrƒ…[‚Å•\Ž¦‚³‚ê‚éƒgƒŠƒbƒvƒL[‚ÆŽÀÛ‚̃gƒŠƒbƒvƒL[‚ªˆÙ‚È‚é•s‹ï‡‚̏C³
 
 2006/06/18
   Version ÊÞÀ52

--- a/res/default/Samba.default
+++ b/res/default/Samba.default
@@ -3,15 +3,14 @@ aa5=30
 academy4=30
 anime=45
 book3=30
-bubble4=120
+bubble4=30
 comic6=30
 etc3=30
 etc4=30
 ex9=15
 ex11=15
-ex12=15
-ex13=15
-ex14=15
+ex13=120
+ex16=15
 food6=30
 game9=30
 game10=30
@@ -22,29 +21,31 @@ life7=30
 live14=10
 live19=10
 live22x=10
+live23=10
 love3=30
 money4=30
-music4=30
 music5=30
+music6=30
 news18=30
 news19=120
+news20=120
 off3=30
 pc7=30
 pc8=30
 qa=30
-qb5=30
+qb5=120
 qb6=30
 school5=30
 science4=30
 society3=30
 sports9=60
 that4=30
-tmp5=45
-travel2=30
+tmp6=45
+travel2=120
 tv7=30
-tv8=60
-pie=30
+tv8=120
 idol=30
+pie=30
 sakura01=30
 sakura02=30
-sakura03=30
+sakura03=120