OSDN Git Service

タブの自動保存・読み出し時に、保存または読み出すタブが無い旨のメッセージを表示しないように変更。
authoryoffy <yoffy>
Mon, 16 Aug 2004 13:55:32 +0000 (13:55 +0000)
committeryoffy <yoffy>
Mon, 16 Aug 2004 13:55:32 +0000 (13:55 +0000)
Giko.pas

index c99f87a..36ed980 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -547,11 +547,11 @@ type
     dat1: TMenuItem;
     SelectItemSaveForDat: TAction;
     LogFolderOpenAction: TAction;
-    OpenLogFolder: TMenuItem;
+               OpenLogFolder: TMenuItem;
     Browser: TWebBrowser;
     TabSave: TMenuItem;
     TabOpen: TMenuItem;
-    TabsSaveAction: TAction;
+               TabsSaveAction: TAction;
     TabsOpenAction: TAction;
     ResRangePopupMenu: TPopupMenu;
     N1001: TMenuItem;
@@ -911,9 +911,9 @@ type
       NewHeight: Integer; var Resize: Boolean);
     procedure LogFolderOpenActionExecute(Sender: TObject);
     procedure LogFolderOpenActionUpdate(Sender: TObject);
-    procedure TabsSaveActionExecute(Sender: TObject);
-    procedure TabsOpenActionExecute(Sender: TObject);
-    procedure TabsSaveToFileActionExecute(Sender: TObject);
+               procedure TabsSaveActionExecute(Sender: TObject);
+               procedure TabsOpenActionExecute(Sender: TObject);
+               procedure TabsSaveToFileActionExecute(Sender: TObject);
     procedure TabsOpenFromFileActionExecute(Sender: TObject);
     procedure OnlyAHundredResActionExecute(Sender: TObject);
     procedure OnlyKokoResActionExecute(Sender: TObject);
@@ -1074,8 +1074,12 @@ type
                procedure SetBBSMenu;
                function WebBrowserClick(Sender: TObject): WordBool;
                procedure SkinorCSSFilesCopy(path: string);
-               //\83^\83u\95Û\91
-               procedure GetTabURLs(AStringList: TStringList; Result:Boolean);
+               // \83^\83u\8eæ\93¾
+               function GetTabURLs(AStringList: TStringList) : Boolean;
+               // \83^\83u\95Û\91
+               function SaveTabURLs : Boolean;
+               // \83^\83u\93Ç\82Ý\8fo\82µ
+               function LoadTabURLs : Boolean;
                // \83o\83\93\83h\95\9d\82ð\8dÄ\8cv\8eZ\81E\8dÄ\90Ý\92è\82·\82é
                procedure ResetBandInfo( bar : TGikoCoolBar; band : TToolBar );
        protected
@@ -1852,11 +1856,11 @@ begin
 
        FIsIgnoreResize := False;
 
-        //TabAutoLoad
-        //FormCrete\82©\82ç\88Ú\93®\81B
-        if GikoSys.Setting.TabAutoLoadSave then begin
-                TabsOpenActionExecute(Sender);
-        end;
+       //TabAutoLoad
+       //FormCrete\82©\82ç\88Ú\93®\81B
+       if GikoSys.Setting.TabAutoLoadSave then begin
+               TabAutoLoadAction.Execute;
+       end;
 
 end;
 
@@ -1870,9 +1874,7 @@ begin
                        Exit;
        end else begin
                CanClose := True;
-                if GikoSys.Setting.TabAutoLoadSave then begin
-                        TabsSaveActionExecute(Sender);
-                end;
+               TabAutoSaveAction.Execute;
        end;
        //Application.HookMainWindow(Hook);
        Application.UnhookMainWindow(Hook);
@@ -10848,15 +10850,15 @@ begin
                LogFolderOpenAction.Enabled := False;
 end;
 
-procedure TGikoForm.GetTabURLs(AStringList: TStringList; Result:Boolean);
+function TGikoForm.GetTabURLs(AStringList: TStringList) : Boolean;
 var
   rec : TBrowserRecord;
   i, bound : Integer;
 begin
   bound := BrowserTab.Tabs.Count -1;
-  if bound = -1 then begin
-        Result := False;
-        Exit; //for\82É\94ò\82Î\82È\82¢\82Å\91\80\8dì\82ð\94²\82¯\82é
+       if bound = -1 then begin
+               Result := False;
+               Exit; //for\82É\94ò\82Î\82È\82¢\82Å\91\80\8dì\82ð\94²\82¯\82é
   end;
 
   for i := 0 to bound do begin
@@ -10868,16 +10870,19 @@ begin
 end;
 
 procedure TGikoForm.TabsSaveActionExecute(Sender: TObject);
+begin
+       if not SaveTabURLs then begin
+               ShowMessage('\95Û\91\82·\82é\83^\83u\82ª\82 \82è\82Ü\82¹\82ñ');
+       end;
+end;
+
+function TGikoForm.SaveTabURLs : Boolean;
 var
        SaveStringList: TStringList;
-        Result: Boolean;
 begin
        SaveStringList := TStringList.Create;
        try
-               GetTabURLs(SaveStringList, Result);
-                if not Result then begin
-                        ShowMessage('\95Û\91\82·\82é\83^\83u\82ª\82 \82è\82Ü\82¹\82ñ');
-                end;
+               Result := GetTabURLs(SaveStringList);
                SaveStringList.SaveToFile(ExtractFilePath(Application.ExeName) + 'tab.sav');
        finally
                SaveStringList.Free
@@ -10885,12 +10890,31 @@ begin
 end;
 
 procedure TGikoForm.TabsOpenActionExecute(Sender: TObject);
+begin
+       if not LoadTabURLs then begin
+               ShowMessage('\95\\8e¦\82·\82é\83^\83u\82ª\82 \82è\82Ü\82¹\82ñ\81B');
+       end;
+end;
+{
+ procedure TGikoForm.FileTabSaveClick(Sender: TObject);
+var
+       SaveStringList: TStringList;
+begin
+                SaveTabList := TStringList.Create;
+                SaveTabList := GetTabURLs;
+                if TabSaveDialog.Execute then begin
+                                SaveTabList.SaveToFile(TabSaveDialog.FileName);
+                end;
+end;
+}
+
+function TGikoForm.LoadTabURLs : Boolean;
 var
        i, bound    : Integer;
        item        : TThreadItem;
-       URLs : TStringList;
-       GikoTab: TGikoTabAppend;
-       fileName: string;
+       URLs                            : TStringList;
+       GikoTab                 : TGikoTabAppend;
+       fileName                : string;
 begin
        fileName := ExtractFilePath(Application.ExeName) + 'tab.sav';
        URLs := TStringList.Create();
@@ -10900,13 +10924,13 @@ begin
                                URLs.LoadFromFile(fileName);
                except
                        on EFOpenError do
-                                       ShowMessage('\83^\83u\83t\83@\83C\83\8b\82ª\8aJ\82¯\82Ü\82¹\82ñ');
+                               ShowMessage('\83^\83u\83t\83@\83C\83\8b\82ª\8aJ\82¯\82Ü\82¹\82ñ');
                end;
                bound    := URLs.Count - 1;
-                if bound = -1 then begin
-                        ShowMessage('\95\\8e¦\82·\82é\83^\83u\82ª\82 \82è\82Ü\82¹\82ñ\81B');
-                        Exit;
-                end;
+               if bound = -1 then begin
+                       Result := False;
+                       Exit;
+               end;
 
                GikoTab := GikoSys.Setting.BrowserTabAppend;
                GikoSys.Setting.BrowserTabAppend := gtpLast;//TGikoTabAppend(1);
@@ -10919,19 +10943,9 @@ begin
                GikoSys.Setting.BrowserTabAppend := GikoTab;
                URLs.Free;
        end;
+       Result := True;
 end;
-{
- procedure TGikoForm.FileTabSaveClick(Sender: TObject);
-var
-       SaveStringList: TStringList;
-begin
-                SaveTabList := TStringList.Create;
-                SaveTabList := GetTabURLs;
-                if TabSaveDialog.Execute then begin
-                                SaveTabList.SaveToFile(TabSaveDialog.FileName);
-                end;
-end;
-}
+
 procedure TGikoForm.TabsSaveToFileActionExecute(Sender: TObject);
 var
        SaveTabList: TStringList;
@@ -10939,7 +10953,7 @@ var
 begin
        SaveTabList := TStringList.Create;
        try
-               GetTabURLs(SaveTabList, Result);
+               Result := GetTabURLs(SaveTabList);
 //             if TabSaveDialog.Execute then begin
 //                     SaveTabList.SaveToFile(TabSaveDialog.FileName);
 //             end;
@@ -11146,51 +11160,13 @@ begin
 end;
 
 procedure TGikoForm.TabAutoSaveActionExecute(Sender: TObject);
-var
-        SaveStringList: TStringList;
-        Result: Boolean;
 begin
-       SaveStringList := TStringList.Create;
-       try
-               GetTabURLs(SaveStringList, Result);
-
-               SaveStringList.SaveToFile(ExtractFilePath(Application.ExeName) + 'tab.sav');
-       finally
-               SaveStringList.Free
-       end;
+       SaveTabURLs;
 end;
 
 procedure TGikoForm.TabAutoLoadActionExecute(Sender: TObject);
-var
-        fileName: String;
-        URLs: TStringList;
-        bound, i: Integer;
-        GikoTab: TGikoTabAppend;
-        item: TThreadItem;
 begin
-       fileName := ExtractFilePath(Application.ExeName) + 'tab.sav';
-       URLs := TStringList.Create();
-       try
-               try
-                       if FileExists(fileName) then
-                               URLs.LoadFromFile(fileName);
-               except
-                       on EFOpenError do
-                                       ShowMessage('\83^\83u\83t\83@\83C\83\8b\82ª\8aJ\82¯\82Ü\82¹\82ñ');
-               end;
-               bound    := URLs.Count - 1;
-
-               GikoTab := GikoSys.Setting.BrowserTabAppend;
-               GikoSys.Setting.BrowserTabAppend := gtpLast;//TGikoTabAppend(1);
-               for i := 0 to URLs.Count - 1 do begin
-                       item := BBSsFindThreadFromURL( URLs[ i ] );
-                       if item <> nil then
-                               InsertBrowserTab( item, false );
-               end;
-       finally
-               GikoSys.Setting.BrowserTabAppend := GikoTab;
-               URLs.Free;
-       end;
+       LoadTabURLs;
 end;
 
 initialization