お気に入りキャビネットでの、コンテキストメニューの調整

diff --git a/Giko.dfm b/Giko.dfm
index 107312f..42138f8 100644 (file)
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -4469,7 +4469,7 @@ object GikoForm: TGikoForm
     Left = 4
     Top = 244
     Bitmap = {
-      494C010138003B00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
+      494C010138003B00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       000000000000360000002800000040000000F0000000010020000000000000F0
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -6453,7 +6453,8 @@ object GikoForm: TGikoForm
       00000000C003FFFF0000000080017FFF0000000080013F7F0000000000000E3F
       000000000000861F800000000000C20FC00100000000E007F81F00000000F043
       F00F00000000F861E00700008001FC70C003803F8001FEFCF81FC07FC003FFFE
-      F81FE0FFE007FFFFF83FFFFFF81FFFFF}
+      F81FE0FFE007FFFFF83FFFFFF81FFFFF00000000000000000000000000000000
+      000000000000}
   end
   object ItemImageList: TImageList
     Left = 4
@@ -7885,10 +7886,12 @@ object GikoForm: TGikoForm
       end
       object N76: TMenuItem
         Action = GikoDM.LiveItemAction
+        AutoCheck = True
         GroupIndex = 1
       end
       object DAT3: TMenuItem
         Action = GikoDM.ArchiveItemAction
+        AutoCheck = True
         GroupIndex = 1
       end
       object S2: TMenuItem
@@ -8646,6 +8649,9 @@ object GikoForm: TGikoForm
     object N58: TMenuItem
       Caption = '-'
     end
+    object FavoriteTreeItemNameCopyPopupMenu: TMenuItem
+      Action = GikoDM.FavoriteTreeViewItemNameCopyAction
+    end
     object FavoriteTreeURLCopyPopupMenu: TMenuItem
       Action = GikoDM.FavoriteTreeViewURLCopyAction
     end
@@ -8722,9 +8728,11 @@ object GikoForm: TGikoForm
     end
     object N75: TMenuItem
       Action = GikoDM.LiveItemAction
+      AutoCheck = True
     end
     object DAT2: TMenuItem
       Action = GikoDM.ArchiveItemAction
+      AutoCheck = True
     end
     object N68: TMenuItem
       Caption = '-'

diff --git a/Giko.pas b/Giko.pas
index e02f57e..bdec7b2 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -408,6 +408,7 @@ type
     N75: TMenuItem;
     DAT3: TMenuItem;
     N76: TMenuItem;
+    FavoriteTreeItemNameCopyPopupMenu: TMenuItem;
                                procedure FormCreate(Sender: TObject);
                procedure FormDestroy(Sender: TObject);
                procedure BrowserStatusTextChange(Sender: TObject;
@@ -1911,8 +1912,8 @@ begin
                                tmp2 := ZenToHan(e.Get_outerText);
                                if (GikoSys.IsNumeric(tmp2)) then begin
                                        //\82\93\82Í\83\8c\83X\94Ô\8d\86\82Á\82Û\82¢\82Á\82·\81B
-                                       wkIntSt := StrToInt(tmp2);
-                                       wkIntTo := StrToInt(tmp2);
+                                       wkIntSt := StrToInt64(tmp2);
+                                       wkIntTo := StrToInt64(tmp2);
                                                //s := GetThreadText(wkBBS, wkKey, wkIntSt, wkIntTo, False, False);
                                        FHint.PopupType := gptThread;
                                        HTMLCreater.SetResPopupText(FHint, GetActiveContent, wkIntSt, wkIntTo, False, False);
@@ -4622,7 +4623,7 @@ begin
                threadNumber := ChangeFileExt(Thread.FileName, '');
                GikoSys.GetPopupResNumber( URL, stRes, edRes );
                // \83X\83\8c\82Ì\94Ô\8d\86\82ð\83\8c\83X\94Ô\82Æ\8cë\82Á\82Ä\94F\8e¯\82µ\82Ä\82¢\82é\82Ì\82ð\83N\83\8a\83A
-               if (StrToInt(threadNumber) = stRes) then begin
+               if (StrToInt64(threadNumber) = stRes) then begin
                        if not (AnsiEndsText(threadNumber + '/' + threadNumber, URL))
                                and (Pos('&st=' + threadNumber , URL) = 0) then begin
                                stRes := 0;
@@ -5098,7 +5099,7 @@ begin
 
                        ThreadItem := GetActiveContent;
                        if ThreadItem <> nil then begin
-                               Num := StrToInt(s);
+                               Num := StrToInt64(s);
                                FHint.PopupType := gptThread;
                                HTMLCreater.SetResPopupText(FHint, ThreadItem, Num, Num, False, False);
                                if FHint.ResCount <> 0 then
@@ -6237,26 +6238,29 @@ begin
                FavoriteTreeNameURLCopyPopupMenu.Visible := False;
                FavoriteTreeReloadPopupMenu.Visible := False;
                FavoriteTreeLogDeletePopupMenu.Visible := False;
+               FavoriteTreeItemNameCopyPopupMenu.Visible := False;
        end else if FClickNode.IsFirstNode then begin
                FavoriteTreeBrowseFolderPopupMenu.Visible := True;
                FavoriteTreeDeletePopupMenu.Visible := False;
                FavoriteTreeRenamePopupMenu.Visible := False;
                FavoriteTreeNewFolderPopupMenu.Visible := True;
                FavoriteTreeURLCopyPopupMenu.Visible := False;
-               FavoriteTreeNameCopyPopupMenu.Visible := True;
+               FavoriteTreeNameCopyPopupMenu.Visible := False;
                FavoriteTreeNameURLCopyPopupMenu.Visible := False;
                FavoriteTreeReloadPopupMenu.Visible := False;
                FavoriteTreeLogDeletePopupMenu.Visible := False;
+               FavoriteTreeItemNameCopyPopupMenu.Visible := True;
        end else if FClickNode.Text = Favorite.FAVORITE_LINK_NAME then begin
                FavoriteTreeBrowseFolderPopupMenu.Visible := True;
                FavoriteTreeDeletePopupMenu.Visible := True;
                FavoriteTreeRenamePopupMenu.Visible := False;
                FavoriteTreeNewFolderPopupMenu.Visible := True;
                FavoriteTreeURLCopyPopupMenu.Visible := False;
-               FavoriteTreeNameCopyPopupMenu.Visible := True;
+               FavoriteTreeNameCopyPopupMenu.Visible := False;
                FavoriteTreeNameURLCopyPopupMenu.Visible := False;
                FavoriteTreeReloadPopupMenu.Visible := False;
                FavoriteTreeLogDeletePopupMenu.Visible := False;
+               FavoriteTreeItemNameCopyPopupMenu.Visible := True;
        end else if TObject(FClickNode.Data) is TFavoriteFolder then begin
                FavoriteTreeBrowseFolderPopupMenu.Visible := True;
                FavoriteTreeDeletePopupMenu.Visible := True;
@@ -6267,6 +6271,7 @@ begin
                FavoriteTreeNameURLCopyPopupMenu.Visible := False;
                FavoriteTreeReloadPopupMenu.Visible := False;
                FavoriteTreeLogDeletePopupMenu.Visible := False;
+               FavoriteTreeItemNameCopyPopupMenu.Visible := True;
        end else if TObject(FClickNode.Data) is TFavoriteThreadItem then begin
                FavoriteTreeBrowseFolderPopupMenu.Visible := False;
                FavoriteTreeDeletePopupMenu.Visible := True;
@@ -6277,6 +6282,7 @@ begin
                FavoriteTreeNameURLCopyPopupMenu.Visible := True;
                FavoriteTreeReloadPopupMenu.Visible := True;
                FavoriteTreeLogDeletePopupMenu.Visible := True;
+               FavoriteTreeItemNameCopyPopupMenu.Visible := True;
        end else if TObject(FClickNode.Data) is TFavoriteBoardItem then begin
                FavoriteTreeBrowseFolderPopupMenu.Visible := False;
                FavoriteTreeDeletePopupMenu.Visible := True;
@@ -6287,6 +6293,7 @@ begin
                FavoriteTreeNameURLCopyPopupMenu.Visible := True;
                FavoriteTreeReloadPopupMenu.Visible := True;
                FavoriteTreeLogDeletePopupMenu.Visible := False;
+               FavoriteTreeItemNameCopyPopupMenu.Visible := True;
        end else begin
                FavoriteTreeBrowseFolderPopupMenu.Visible := False;
                FavoriteTreeDeletePopupMenu.Visible := False;
@@ -6297,6 +6304,7 @@ begin
                FavoriteTreeNameURLCopyPopupMenu.Visible := False;
                FavoriteTreeReloadPopupMenu.Visible := False;
                FavoriteTreeLogDeletePopupMenu.Visible := False;
+               FavoriteTreeItemNameCopyPopupMenu.Visible := False;
        end;
 
 end;

diff --git a/GikoDataModule.dfm b/GikoDataModule.dfm
index 5ce12da..cdfffa8 100644 (file)
--- a/GikoDataModule.dfm
+++ b/GikoDataModule.dfm
@@ -913,7 +913,7 @@ object GikoDM: TGikoDM
     object FavoriteTreeViewURLCopyAction: TAction
       Tag = -1
       Category = #12362#27671#12395#20837#12426#12484#12522#12540#12509#12483#12503#12450#12483#12503
-      Caption = 'URL'#12434#12467#12500#12540'(&C)'
+      Caption = 'URL'#12434#12467#12500#12540'(&U)'
       Hint = #36984#25246#12373#12428#12390#12356#12427#12473#12524#12483#12489#12398'URL'#12434#12467#12500#12540#12377#12427
       OnExecute = FavoriteTreeViewURLCopyActionExecute
     end
@@ -1234,6 +1234,12 @@ object GikoDM: TGikoDM
       ShortCut = 16454
       OnExecute = OpenFindDialogActionExecute
     end
+    object FavoriteTreeViewItemNameCopyAction: TAction
+      Category = #12362#27671#12395#20837#12426#12484#12522#12540#12509#12483#12503#12450#12483#12503
+      Caption = #34920#31034#21517#12434#12467#12500#12540'(&S)'
+      Hint = #34920#31034#12375#12390#12356#12427#21517#21069#12434#12463#12522#12483#12503#12508#12540#12489#12395#12467#12500#12540#12377#12427
+      OnExecute = FavoriteTreeViewItemNameCopyActionExecute
+    end
   end
   object ToobarImageList: TImageList
     Left = 44

diff --git a/GikoDataModule.pas b/GikoDataModule.pas
index cada351..e1fbc19 100644 (file)
--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -217,6 +217,7 @@ type
     OpenFindDialogAction: TAction;
     ArchiveItemAction: TAction;
     LiveItemAction: TAction;
+    FavoriteTreeViewItemNameCopyAction: TAction;
        procedure EditNGActionExecute(Sender: TObject);
        procedure ReloadActionExecute(Sender: TObject);
        procedure GoFowardActionExecute(Sender: TObject);
@@ -403,6 +404,7 @@ type
     procedure OpenFindDialogActionExecute(Sender: TObject);
     procedure ArchiveItemActionExecute(Sender: TObject);
     procedure LiveItemActionExecute(Sender: TObject);
+    procedure FavoriteTreeViewItemNameCopyActionExecute(Sender: TObject);
   private
        { Private \90é\8c¾ }
        procedure ClearResFilter;
@@ -724,7 +726,7 @@ begin
 
 end;
 // *************************************************************************
-//! \91I\91ð\82³\82ê\82Ä\82¢\82é\83X\83\8c\83b\83h\82ÌURL\82ð\83R\83s\81[\82·\82é
+//! \91I\91ð\82³\82ê\82Ä\82¢\82é\82¨\8bC\82É\93ü\82è\82ÌURL\82ð\83R\83s\81[\82·\82é
 // *************************************************************************
 procedure TGikoDM.FavoriteTreeViewURLCopyActionExecute(Sender: TObject);
 begin
@@ -736,7 +738,7 @@ begin
        end;
 end;
 // *************************************************************************
-//! \91I\91ð\82³\82ê\82Ä\82¢\82é\94Â\82Ì\96¼\91O\82ð\83R\83s\81[\82·\82é
+//! \91I\91ð\82³\82ê\82Ä\82¢\82é\82¨\8bC\82É\93ü\82è\82Ì\96¼\91O\82ð\83R\83s\81[\82·\82é
 // *************************************************************************
 procedure TGikoDM.FavoriteTreeViewNameCopyActionExecute(Sender: TObject);
 begin
@@ -746,10 +748,14 @@ begin
        if (TObject(GikoForm.ClickNode.Data) is TFavoriteItem) then begin
                Clipboard.AsText :=
                        TFavoriteItem(GikoForm.ClickNode.Data).GetItemTitle + #13#10;
+       end else begin
+               Clipboard.AsText :=
+                       GikoForm.ClickNode.Text + #13#10;
+
        end;
 end;
 // *************************************************************************
-//! \91I\91ð\82³\82ê\82Ä\82¢\82é\83X\83\8c\83b\83h\82Ì\96¼\91O\82ÆURL\82ð\83R\83s\81[\82·\82é
+//! \91I\91ð\82³\82ê\82Ä\82¢\82é\82¨\8bC\82É\93ü\82è\82Ì\96¼\91O\82ÆURL\82ð\83R\83s\81[\82·\82é
 // *************************************************************************
 procedure TGikoDM.FavoriteTreeViewNameURLCopyActionExecute(
   Sender: TObject);
@@ -767,7 +773,7 @@ begin
 
 end;
 // *************************************************************************
-//! \91I\91ð\82³\82ê\82Ä\82¢\82é\83X\83\8c\83b\83h\82ð\8dí\8f\9c\82·\82é
+//! \91I\91ð\82³\82ê\82Ä\82¢\82é\82¨\8bC\82É\93ü\82è\83X\83\8c\83b\83h\82ð\8dí\8f\9c\82·\82é
 // *************************************************************************
 procedure TGikoDM.FavoriteTreeViewLogDeleteActionExecute(Sender: TObject);
 const
@@ -3859,6 +3865,17 @@ begin
        end;
 end;
 
+// *************************************************************************
+//! \91I\91ð\82³\82ê\82Ä\82¢\82é\82¨\8bC\82É\93ü\82è\82Ì\95\\8e¦\96¼\82ð\83R\83s\81[\82·\82é
+// *************************************************************************
+procedure TGikoDM.FavoriteTreeViewItemNameCopyActionExecute(
+  Sender: TObject);
+begin
+       if GikoForm.ClickNode = nil then Exit;
+
+       Clipboard.AsText :=
+                       GikoForm.ClickNode.Text + #13#10;
+end;
 
 end.