OSDN Git Service

リファクタリング中
authorh677 <h677>
Sat, 10 Dec 2005 09:09:55 +0000 (09:09 +0000)
committerh677 <h677>
Sat, 10 Dec 2005 09:09:55 +0000 (09:09 +0000)
AbonUnit.pas
BoardGroup.pas
GikoDataModule.dfm
GikoDataModule.pas

index d46ebed..20e0c0d 100644 (file)
@@ -374,7 +374,6 @@ var
        pos : Integer;
        buftoken : String;
 begin
-       pos := 0;
        bufstl := TStringList.Create;
        try
                if Length(argline) > 0 then begin
index 6e9b1e5..c4f13f5 100644 (file)
@@ -90,6 +90,7 @@ type
                property NodeExpand: Boolean read FExpand write FExpand;
        end;
 
+       
        // \94Â(\83X\83\8c\83b\83h URL \82Ì\83\8a\83X\83g)
 //     TBoard = class(THashedStringList)
        TBoard = class(TStringList)
index 0b50ec4..75d04cf 100644 (file)
@@ -1030,13 +1030,6 @@ object GikoDM: TGikoDM
       ImageIndex = 44
       OnExecute = SelectItemSaveForDatExecute
     end
-    object FileSaveAs1: TFileSaveAs
-      Tag = -1
-      Category = #12501#12449#12452#12523
-      Caption = #21517#21069#12434#20184#12369#12390#20445#23384'(&A)...'
-      Hint = #21029#21517#12391#20445#23384'|'#29694#22312#12398#12501#12449#12452#12523#12395#26032#12375#12356#21517#21069#12434#12388#12369#12390#20445#23384
-      ImageIndex = 44
-    end
     object LogFolderOpenAction: TAction
       Category = #26495
       Caption = 'Explorer'#12391'Log'#12501#12457#12523#12480#12434#38283#12367
@@ -3194,4 +3187,8 @@ object GikoDM: TGikoDM
       F81FE0FFE007FFFFF83FFFFFF81FFFFF00000000000000000000000000000000
       000000000000}
   end
+  object SaveDialog: TSaveDialog
+    Left = 48
+    Top = 128
+  end
 end
index 81b5e6e..510e41a 100644 (file)
@@ -11,7 +11,7 @@ uses
        SHDocVw_TLB,
        MSHTML_TLB,
 {$IFEND}
-  ComCtrls, BrowserRecord, Graphics, Messages, Setting;
+  ComCtrls, BrowserRecord, Graphics, Messages, Setting, Dialogs;
 
 const
        CAPTION_NAME: string = '\83M\83R\83i\83r';
@@ -185,7 +185,6 @@ type
        BrowserMaxAndFocusAction: TAction;
        SelectItemSaveForHTML: TAction;
        SelectItemSaveForDat: TAction;
-       FileSaveAs1: TFileSaveAs;
        LogFolderOpenAction: TAction;
        TabsSaveAction: TAction;
        TabsOpenAction: TAction;
@@ -211,6 +210,7 @@ type
        UnSelectedListViewAction: TAction;
        WikiFAQWebPageAction: TAction;
        ToobarImageList: TImageList;
+    SaveDialog: TSaveDialog;
        procedure EditNGActionExecute(Sender: TObject);
        procedure ReloadActionExecute(Sender: TObject);
        procedure GoFowardActionExecute(Sender: TObject);
@@ -402,6 +402,7 @@ type
        procedure SetThreadAreaVerNormal;
        procedure SetThreadAreaVertical(gls : TGikoListState);
        procedure SetThreadReadProperty(read: Boolean);
+       procedure SelectThreadSaveToFile(dat: Boolean);
   public
        { Public \90é\8c¾ }
   published
@@ -421,7 +422,7 @@ var
 implementation
 
 uses
-       Windows, Math, Dialogs, Clipbrd,
+       Windows, Math, Clipbrd,
        Giko, GikoSystem, GikoUtil, BoardGroup,
        FavoriteArrange, Favorite, MojuUtils,
        Editor, ListSelect, Search, Option, Round,
@@ -2037,9 +2038,9 @@ begin
        end;
 end;
 // *************************************************************************
-//! \91I\91ð\83X\83\8c\83b\83h\82ðHTML\89»\82µ\82Ä\95Û\91
+//! \91I\91ð\83X\83\8c\83b\83h\82ð\83t\83@\83C\83\8b\82É\95Û\91\82·\82é
 // *************************************************************************
-procedure TGikoDM.SelectItemSaveForHTMLExecute(Sender: TObject);
+procedure TGikoDM.SelectThreadSaveToFile(dat: Boolean);
 var
        List: TList;
        i: Integer;
@@ -2058,20 +2059,34 @@ begin
                else if(List.Count = 0) then
                        ShowMessage('\83X\83\8c\83b\83h\82ð\91I\91ð\82µ\82Ä\82­\82¾\82³\82¢')
                else begin
-                       FileSaveAs1.Dialog.Title := '\91I\91ð\83X\83\8c\83b\83h\82ðHTML\89»\82µ\82Ä\95Û\91¶';
-                       FileSaveAs1.Dialog.Filter := 'HTML\83t\83@\83C\83\8b(*.html)|*.html';
+                       if dat then begin
+                               SaveDialog.Title := '\91I\91ð\83X\83\8c\83b\83h\82ðdat\82Ì\82Ü\82Ü\95Û\91¶';
+                               SaveDialog.Filter := 'DAT\83t\83@\83C\83\8b(*.dat)|*.dat';
+                       end else begin
+                               SaveDialog.Title := '\91I\91ð\83X\83\8c\83b\83h\82ðHTML\89»\82µ\82Ä\95Û\91¶';
+                               SaveDialog.Filter := 'HTML\83t\83@\83C\83\8b(*.html)|*.html';
+                       end;
                        for i := 0 to List.Count - 1 do begin
                                if (TObject(List[i]) is TThreadItem) and (TThreadItem(List[i]).IsLogFile) then begin
-                                       FileSaveAs1.Dialog.FileName := ReplaseNoValidateChar(TThreadItem(List[i]).Title) + '.html';
-                                       if FileSaveAs1.Dialog.Execute then begin
-                                               html := TStringList.Create;
-                                               title := TThreadItem(List[i]).Title;
-                                               try
-                                                       HTMLCreater.CreateHTML3(html, TThreadItem(List[i]), title);
-                                                       html.SaveToFile(FileSaveAs1.Dialog.FileName);
-                                                       THTMLCreate.SkinorCSSFilesCopy(ExtractFilePath(FileSaveAs1.Dialog.FileName));
-                                               finally
-                                                       html.Free;
+                                       if dat then begin
+                                               SaveDialog.FileName := TThreadItem(List[i]).FileName;
+                                       end else begin
+                                               SaveDialog.FileName := ReplaseNoValidateChar(TThreadItem(List[i]).Title) + '.html';
+                                       end;
+                                       if SaveDialog.Execute then begin
+                                               if dat then begin
+                                                       CopyFile(PChar(TThreadItem(List[i]).FilePath),
+                                                                       PChar(SaveDialog.FileName), true);
+                                               end else begin
+                                                       html := TStringList.Create;
+                                                       title := TThreadItem(List[i]).Title;
+                                                       try
+                                                               HTMLCreater.CreateHTML3(html, TThreadItem(List[i]), title);
+                                                               html.SaveToFile(SaveDialog.FileName);
+                                                               THTMLCreate.SkinorCSSFilesCopy(ExtractFilePath(SaveDialog.FileName));
+                                                       finally
+                                                               html.Free;
+                                                       end;
                                                end;
                                        end;
                                end;
@@ -2083,42 +2098,18 @@ begin
        end;
 end;
 // *************************************************************************
+//! \91I\91ð\83X\83\8c\83b\83h\82ðHTML\89»\82µ\82Ä\95Û\91
+// *************************************************************************
+procedure TGikoDM.SelectItemSaveForHTMLExecute(Sender: TObject);
+begin
+       SelectThreadSaveToFile(false);
+end;
+// *************************************************************************
 //! \91I\91ð\83X\83\8c\83b\83h\82ðDAT\8c`\8e®\82Ì\82Ü\82Ü\95Û\91
 // *************************************************************************
 procedure TGikoDM.SelectItemSaveForDatExecute(Sender: TObject);
-var
-       List: TList;
-       i: Integer;
 begin
-       List := TList.Create;
-       try
-               GikoForm.ScreenCursor := crHourGlass;
-               GikoForm.SelectListItem(List);
-               if ((GikoSys.Setting.ListOrientation = gloVertical) and
-                       (GikoSys.Setting.ListHeightState = glsMax)) or
-                       ((GikoSys.Setting.ListOrientation = gloHorizontal) and
-                       (GikoSys.Setting.ListWidthState = glsMax)) then
-                       ShowMessage('\83X\83\8c\83b\83h\88ê\97\97\82ð\95\\8e¦\82µ\82Ä\82­\82¾\82³\82¢')
-               else if(List.Count = 0) then
-                       ShowMessage('\83X\83\8c\83b\83h\82ð\91I\91ð\82µ\82Ä\82­\82¾\82³\82¢')
-               else begin
-                       FileSaveAs1.Dialog.Title := '\91I\91ð\83X\83\8c\83b\83h\82ðdat\82Ì\82Ü\82Ü\95Û\91¶';
-                       FileSaveAs1.Dialog.Filter := 'DAT\83t\83@\83C\83\8b(*.dat)|*.dat';
-                       for i := 0 to List.Count - 1 do begin
-                               if (TObject(List[i]) is TThreadItem) and (TThreadItem(List[i]).IsLogFile) then begin
-                                       FileSaveAs1.Dialog.FileName := TThreadItem(List[i]).FileName;
-                                       if FileSaveAs1.Dialog.Execute then begin
-                                               CopyFile(PChar(TThreadItem(List[i]).FilePath),
-                                               PChar(FileSaveAs1.Dialog.FileName), true);
-                                       end;
-                               end;
-                       end;
-               end;
-       finally
-               GikoForm.ScreenCursor := crDefault;
-               List.Free;
-       end;
-
+       SelectThreadSaveToFile(true);
 end;
 // *************************************************************************
 //! \83^\83u\82Ì\8f\87\94Ô\82ð\95Û\91
@@ -3649,9 +3640,6 @@ end;
 //! \91I\91ð\82³\82ê\82Ä\82¢\82é\83X\83\8c\83b\83h\82ð\8aù\93Ç\82É\82·\82é
 // *************************************************************************
 procedure TGikoDM.KidokuActionExecute(Sender: TObject);
-var
-       List: TList;
-       i: Integer;
 begin
        SetThreadReadProperty(true);
 end;