This commit was manufactured by cvs2svn to create branch 'Bb62'.

[gikonavigoeson/gikonavi.git] / Giko.pas

diff --git a/Giko.pas b/Giko.pas
index aa33d7f..c57e798 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -425,6 +425,7 @@ type
     URL2: TMenuItem;
     URLPATHINFO1: TMenuItem;
     URLQUERYSTRING1: TMenuItem;
+    N86: TMenuItem;
                                procedure FormCreate(Sender: TObject);
                procedure FormDestroy(Sender: TObject);
         procedure SaveSettingAll();
@@ -692,7 +693,7 @@ type
         //! \82à\82Á\82Æ\82à\8cÃ\82¢Browser\82Ì\8aJ\95ú
         procedure ReleaseOldestBrowser;
         //! \83A\83N\83e\83B\83u\82È\83^\83u\82Æ\93¯\82¶\94Â\82Ì\8aJ\82¢\82Ä\82¢\82é\83X\83\8c\83b\83h\82ð\83\81\83j\83\85\81[\83A\83C\83e\83\80\82É\92Ç\89Á
-        procedure AddMenuSameBoardThread;
+        procedure AddMenuSameBoardThread(MenuItem: TMenuItem);
         //!  \83A\83N\83e\83B\83u\82È\83^\83u\82Æ\93¯\82¶\94Â\82Ì\8aJ\82¢\82Ä\82¢\82é\83X\83\8c\83b\83h\83N\83\8a\83b\83N\83C\83x\83\93\83g
         procedure SameBoardThreadSubItemOnClick(Sender: TObject);
         //! \83|\83b\83v\83A\83b\83v\83u\83\89\83E\83U\8dì\90¬
@@ -705,6 +706,8 @@ type
         procedure UpdateListView();
         //! \83A\83C\83R\83\93\93Ç\82Ý\8d\9e\82Ý
         procedure LoadIcon();
+        //! \83|\83b\83v\83A\83b\83v\83\81\83j\83\85\81[\93Ç\82Ý\8d\9e\82Ý
+        procedure LoadPopupMenu();
        protected
                procedure CreateParams(var Params: TCreateParams); override;
                procedure WndProc(var Message: TMessage); override;
@@ -877,7 +880,7 @@ uses
        About, Option, Round, Splash, Sort, ListSelect, Imm,
        NewBoard, MojuUtils, Clipbrd, GikoBayesian,Y_TextConverter,
        HTMLCreate, ListViewUtils, GikoDataModule, GikoMessage,
-  InputAssistDataModule, Types, ReplaceDataModule;
+  InputAssistDataModule, Types, ReplaceDataModule, PopupMenuUtil;
 
 const
        BLANK_HTML: string = 'about:blank';
@@ -1313,9 +1316,10 @@ begin
        GikoDM.RepaintStatusBar;
        StatusBarResize(Sender);
 
-       dummy1.Caption  := ItemReservPMenu.Caption;
-       dummy1.Hint     := ItemReservPMenu.Hint;
-
+//     dummy1.Caption  := ItemReservPMenu.Caption;
+//     dummy1.Hint     := ItemReservPMenu.Hint;
+    // \83u\83\89\83E\83U\83|\83b\83v\83A\83b\83v\83\81\83j\83\85\81[\82Ì\8f\89\8aú\89»
+    PopupMenuUtil.ReadSetting(GikoDM.GikoFormActionList, BrowserTabPopupMenu);
     // \83}\83E\83X\83W\83F\83X\83`\83\83\81[
     MouseGesture := TMouseGesture.Create;
 
@@ -1331,7 +1335,8 @@ begin
        if GikoSys.Setting.AutoLogin then
                GikoDM.LoginAction.Execute;
 
-       GikoSys.Setting.BeLogin := GikoSys.Setting.BeAutoLogin;
+    if GikoSys.Setting.BeAutoLogin then
+        GikoDM.BeLogInOutAction.Execute;
 
        //\83L\83\83\83v\83V\83\87\83\93\82ª\8fã\8f\91\82«\82³\82ê\82Ä\82µ\82Ü\82¤\82Ì\82Å\81A\82±\82±\82Å\8dÄ\90Ý\92è
        FavoriteAddToolButton.Caption := '\92Ç\89Á...';
@@ -1349,6 +1354,7 @@ begin
     // D&D\82ð\8eó\82¯\8eæ\82é
     DragAcceptFiles(ListView.Handle, True);
 
+
     // \8f\89\8aú\89»\82É\8e¸\94s\82µ\82½\83\82\83W\83\85\81[\83\8b\83`\83F\83b\83N
     if (FavoriteDM.AbEnd) then begin
         GikoUtil.MsgBox(Self.Handle,
@@ -1629,7 +1635,8 @@ begin
     GikoSys.Setting.WriteWindowSettingFile;
     // \96¼\91O\82Æ\83\81\81[\83\8b\82Ì\95Û\91¶\82È\82Ì\82Å\83G\83f\83B\83^\82ª\95Â\82¶\82½\8cã\82È\82ç\82¢\82Â\82Å\82à\82¢\82¢
     GikoSys.Setting.WriteNameMailSettingFile;
-
+    // \96`\8c¯\82Ì\8f\91\82Ì\95Û\91¶
+    GikoSys.Setting.WriteBoukenSettingFile;
        //\93ü\97Í\83A\83V\83X\83g\8b@\8d\\82Ì\90Ý\92è\82Ì\95Û\91¶
        InputAssistDM.SaveToFile(GikoSys.GetInputAssistFileName);
 
@@ -3864,6 +3871,7 @@ begin
                TreeSelectFavoriteAddPupupMenu.Visible := False;
                TreeSelectLogDeleteSeparator.Visible := False;
                TreeSelectLogDeletePopupMenu.Visible := False;
+        SearchBoardName.Visible := False;
        end else if TObject(FClickNode.Data) is TBoard then begin
                TreeSelectThreadPupupMenu.Visible := False;
                TreeSelectBoardPupupMenu.Visible := True;
@@ -3874,6 +3882,7 @@ begin
                TreeSelectFavoriteAddPupupMenu.Visible := True;
                TreeSelectLogDeleteSeparator.Visible := False;
                TreeSelectLogDeletePopupMenu.Visible := False;
+        SearchBoardName.Visible := True;
        end else if TObject(FClickNode.Data) is TFavoriteBoardItem then begin
                TreeSelectThreadPupupMenu.Visible := False;
                TreeSelectBoardPupupMenu.Visible := True;
@@ -3884,6 +3893,7 @@ begin
                TreeSelectFavoriteAddPupupMenu.Visible := True;
                TreeSelectLogDeleteSeparator.Visible := False;
                TreeSelectLogDeletePopupMenu.Visible := False;
+        SearchBoardName.Visible := False;
        end else if (TObject(FClickNode.Data) is TThreadItem) then begin
                TreeSelectThreadPupupMenu.Visible := True;
                TreeSelectBoardPupupMenu.Visible := False;
@@ -3894,6 +3904,7 @@ begin
                TreeSelectFavoriteAddPupupMenu.Visible := True;
                TreeSelectLogDeleteSeparator.Visible := True;
                TreeSelectLogDeletePopupMenu.Visible := True;
+        SearchBoardName.Visible := False;
        end else if (TObject(FClickNode.Data) is TFavoriteThreadItem) then begin
                TreeSelectThreadPupupMenu.Visible := True;
                TreeSelectBoardPupupMenu.Visible := False;
@@ -3904,6 +3915,7 @@ begin
                TreeSelectFavoriteAddPupupMenu.Visible := True;
                TreeSelectLogDeleteSeparator.Visible := True;
                TreeSelectLogDeletePopupMenu.Visible := True;
+        SearchBoardName.Visible := False;
        end else if (TObject(FClickNode.Data) is TCategory) then begin
                TreeSelectThreadPupupMenu.Visible := False;
                TreeSelectBoardPupupMenu.Visible := False;
@@ -3914,6 +3926,7 @@ begin
                TreeSelectFavoriteAddPupupMenu.Visible := False;
                TreeSelectLogDeleteSeparator.Visible := False;
                TreeSelectLogDeletePopupMenu.Visible := False;
+        SearchBoardName.Visible := True;
        end else if FClickNode.IsFirstNode then begin
                TreeSelectThreadPupupMenu.Visible := False;
                TreeSelectBoardPupupMenu.Visible := False;
@@ -3924,6 +3937,7 @@ begin
                TreeSelectFavoriteAddPupupMenu.Visible := False;
                TreeSelectLogDeleteSeparator.Visible := False;
                TreeSelectLogDeletePopupMenu.Visible := False;
+        SearchBoardName.Visible := True;
        end else begin
                TreeSelectThreadPupupMenu.Visible := False;
                TreeSelectBoardPupupMenu.Visible := False;
@@ -3934,6 +3948,7 @@ begin
                TreeSelectFavoriteAddPupupMenu.Visible := False;
                TreeSelectLogDeleteSeparator.Visible := False;
                TreeSelectLogDeletePopupMenu.Visible := False;
+        SearchBoardName.Visible := False;
        end;
 end;
 
@@ -4389,7 +4404,7 @@ procedure TGikoForm.SetSelectItemRound(RoundFlag: Boolean; RoundName: string; Pa
 var
        threadItem : TThreadItem;
 begin
-       if ParentName <> 'dummy1' then begin
+       if ParentName <> 'RoundItem' then begin
                SetSelectItemRound(RoundFlag, RoundName);
        end else begin
                threadItem := GetActiveContent;
@@ -6495,17 +6510,24 @@ end;
 
 
 procedure TGikoForm.BrowserTabPopupMenuPopup(Sender: TObject);
+var
+    i:Integer;
 begin
-       AddRoundNameMenu(dummy1);
-    AddMenuSameBoardThread;
+    for i := 0  to BrowserTabPopupMenu.Items.Count - 1 do begin
+        if (BrowserTabPopupMenu.Items[i].Name='RoundItem') then begin
+            AddRoundNameMenu(BrowserTabPopupMenu.Items[i]);
+        end else if (BrowserTabPopupMenu.Items[i].Name='BoardThreadItem') then begin
+            AddMenuSameBoardThread(BrowserTabPopupMenu.Items[i])
+        end;
+    end;
 end;
 //! \83A\83N\83e\83B\83u\82È\83^\83u\82Æ\93¯\82¶\94Â\82Ì\8aJ\82¢\82Ä\82¢\82é\83X\83\8c\83b\83h\82ð\83\81\83j\83\85\81[\83A\83C\83e\83\80\82É\92Ç\89Á
-procedure TGikoForm.AddMenuSameBoardThread;
+procedure TGikoForm.AddMenuSameBoardThread(MenuItem: TMenuItem);
 var
        i: Integer;
        Item: TMenuItem;
 begin
-    SameBoardThreadItem.Clear;
+    MenuItem.Clear;
     for i := 0 to BrowserTab.Tabs.Count - 1 do begin
         // \93¯\82¶\94Â\82©\82Ç\82¤\82©
         if (FActiveContent.Thread.ParentBoard =
@@ -6515,23 +6537,23 @@ begin
                 TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread then begin
                 Item := TMenuItem.Create(Self);
                 Item.Caption := TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread.Title;
+                Item.Hint    := TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread.URL;
                 Item.OnClick := SameBoardThreadSubItemOnClick;
-                SameBoardThreadItem.Add(Item);
+                MenuItem.Add(Item);
             end;
         end;
     end;
     // \89½\82à\96³\82¢\82È\82ç\8eg\97p\82Å\82«\82È\82¢\82æ\82¤\82É\82·\82é
-    SameBoardThreadItem.Enabled := SameBoardThreadItem.Count > 0;
+    MenuItem.Enabled := MenuItem.Count > 0;
 end;
 //!  \83A\83N\83e\83B\83u\82È\83^\83u\82Æ\93¯\82¶\94Â\82Ì\8aJ\82¢\82Ä\82¢\82é\83X\83\8c\83b\83h\83N\83\8a\83b\83N\83C\83x\83\93\83g
 procedure TGikoForm.SameBoardThreadSubItemOnClick(Sender: TObject);
 var
-       i, j: Integer;
+       i: Integer;
        MenuItem: TMenuItem;
 begin
        if Sender is TMenuItem then begin
         try
-            j := 0;
             MenuItem := TMenuItem(Sender);
             for i := 0 to BrowserTab.Tabs.Count - 1 do begin
                 // \93¯\82¶\94Â\82©\82Ç\82¤\82©
@@ -6539,12 +6561,11 @@ begin
                     TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread.ParentBoard) then begin
                     if FActiveContent.Thread <>
                         TBrowserRecord(BrowserTab.Tabs.Objects[i]).Thread then begin
-                        if (SameBoardThreadItem.Items[j] = MenuItem) then begin
-                            MoveToURL( TBrowserRecord(BrowserTab.Tabs.Objects[i])
-                                .Thread.URL);
+                        if (MenuItem.Hint = TBrowserRecord(BrowserTab.Tabs.Objects[i])
+                                .Thread.URL) then begin
+                            MoveToURL( MenuItem.Hint);
                             Exit;
                         end;
-                        Inc(j);
                     end;
                 end;
             end;
@@ -8075,6 +8096,12 @@ begin
             GikoSys.Setting.GetAppDir + ICONTOOL, clPurple);
     end;
 end;
+//! \83|\83b\83v\83A\83b\83v\83\81\83j\83\85\81[\93Ç\82Ý\8d\9e\82Ý
+procedure TGikoForm.LoadPopupMenu();
+begin
+
+
+end;
 
 initialization
                                OleInitialize(nil);