まちBBSで削除レスがあるレス番号とスレの件数がずれる不具合を修正

[gikonavigoeson/gikonavi.git] / GikoDataModule.pas

diff --git a/GikoDataModule.pas b/GikoDataModule.pas
index 3bc16ed..a39a11f 100644 (file)
--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -37,12 +37,16 @@ const
        PROTOCOL_HTTP : string = 'http://';
        //! \83M\83R\83i\83r\83T\83C\83g\82ÌURL
        URL_GIKONAVI: string = 'gikonavi.sourceforge.jp/';
+       //! \83M\83R\83i\83r(\94ð\93ï\8f\8a\94Å)\83T\83C\83g\82ÌURL
+       URL_GIKONAVIGO: string = 'gikonavigoeson.sourceforge.jp/';
        //! Monazilla\83T\83C\83g\82ÌURL
        URL_MONAZILLA: string = 'www.monazilla.org/';
        //! 2\82¿\82á\82ñ\82Ë\82é\82ÌURL
        URL_2ch: string = 'www.2ch.net/';
        //! \83M\83R\83i\83rWiki\82ÌURL
        URL_Wiki: string = 'sourceforge.jp/projects/gikonavi/wiki/FAQ';
+       //! \83M\83R\83i\83r(\94ð\93ï\8f\8a\94Å)Wiki\82ÌURL
+       URL_GoWiki: string = 'sourceforge.jp/projects/gikonavigoeson/wiki/FAQ';
 
        SELECTCOMBOBOX_NAME: string = ''; // '\83X\83\8c\83b\83h\8di\8d\9e\8c\9f\8dõ';
        SELECTCOMBOBOX_COLOR: TColor = clWindow;
@@ -246,6 +250,10 @@ type
     konoURLPATHAction: TAction;
     konoURLQueryAction: TAction;
     PopupMenuSettingAction: TAction;
+    GikoNaviGoesonWebPageAction: TAction;
+    GoWikiFAQWebPageAction: TAction;
+    ThreadSearchAction: TAction;
+    ThreadNgEditAction: TAction;
        procedure EditNGActionExecute(Sender: TObject);
        procedure ReloadActionExecute(Sender: TObject);
        procedure GoFowardActionExecute(Sender: TObject);
@@ -462,6 +470,10 @@ type
     procedure konoURLQueryActionExecute(Sender: TObject);
     procedure konoURLQueryActionUpdate(Sender: TObject);
     procedure PopupMenuSettingActionExecute(Sender: TObject);
+    procedure GikoNaviGoesonWebPageActionExecute(Sender: TObject);
+    procedure GoWikiFAQWebPageActionExecute(Sender: TObject);
+    procedure ThreadSearchActionExecute(Sender: TObject);
+    procedure ThreadNgEditActionExecute(Sender: TObject);
   private
        { Private \90é\8c¾ }
        procedure ClearResFilter;
@@ -477,7 +489,7 @@ type
        procedure ClearSelectComboBox;
     procedure ClearMailAllEditor();
     procedure ClearNameTextAllEditor();
-    procedure MoveURLWithHistory(URL : String; KeyMask: Boolean = False);
+//    procedure MoveURLWithHistory(URL : String; KeyMask: Boolean = False);
     procedure BackToHistory(item: TMoveHistoryItem);
     function GetActiveThreadLinks : IHTMLElementCollection;
     procedure GetLinkURLs(links : IHTMLElementCollection;
@@ -488,6 +500,8 @@ type
     function EditorFormExists(): boolean;
     procedure GetTabURLs(AStringList: TStringList);
     procedure OpenURLs(AStringList: TStringList);
+    procedure MoveURLWithHistory(URL : String; KeyMask: Boolean = False);
+    procedure SaveThreadSearchSetting;
   published
        { Published \90é\8c¾ }
        //! TAction\82ÅGetActiveContent\82ªnil\88È\8aO\82Å\97L\8cø\82É\82È\82é
@@ -517,7 +531,7 @@ uses
        RoundName, RoundData, Menus, ListViewUtils,
        ThreadControl, GikoMessage, InputAssist,
     DefaultFileManager, Forms, NewBoardURL, UpdateCheck,
-    PopupMenuSetting;
+    PopupMenuSetting, ThreadSearch, ThreadNGEdt;
 
 const
        MSG_ERROR : string = '\83G\83\89\81[';
@@ -559,7 +573,8 @@ end;
 procedure TGikoDM.EditNGActionExecute(Sender: TObject);
 begin
        //\83e\83L\83X\83g\82É\8aÖ\98A\95t\82¯\82ç\82ê\82½\83A\83v\83\8a\82ÅNG\83\8f\81[\83h\83t\83@\83C\83\8b\82ð\83I\81[\83v\83\93
-       GikoSys.FAbon.EditNGwords;
+       if (GikoSys.FAbon.EditNGwords(GikoForm) = True) then
+        ReloadAction.Execute;
 end;
 // *************************************************************************
 //! NG\83\8f\81[\83h\93Ç\82Ý\8d\9e\82Ý\81i\8dÄ\93Ç\82Ý\8d\9e\82Ý\81j
@@ -1133,7 +1148,7 @@ begin
        Editor := TEditorForm.Create(GikoForm.GetMainForm);
        Editor.SetThreadItem(Item);
        Editor.Show;
-       Editor.BodyEdit.SetFocus;
+    Editor.SetFocusEdit;
 end;
 // *************************************************************************
 //! \83X\83\8c\82ð\83u\83\89\83E\83U\82Å\95\\8e¦\82·\82é
@@ -1610,8 +1625,7 @@ begin
     // GikoDM\82æ\82è\82à\91\81\82­\8f\89\8aú\89»\82³\82ê\82é\95K\97v\82ª\82 \82é\83t\83@\83C\83\8b\82ª\82¢\82é\82Æ\82±\82¯\82é\81I\81I
     // \8f\89\8aú\89»\8f\87\94Ô\82É\92\8d\88Ó\82·\82é\82±\82Æ\81I\81I
     //\8f\89\89ñ\8bN\93®\8e\9e\82Ì\8f\89\8aú\89»\83t\83@\83C\83\8b\90Ý\92è
-    TDefaultFileManager.CopyDefaultFiles(
-        GikoSys.GetAppDir + 'defaultFiles.ini');
+    TDefaultFileManager.CopyDefaultFiles(GikoSys.Setting.GetDefaultFilesFileName);
 end;
 // *************************************************************************
 //! \83\8d\83O\8c\9f\8dõ\83_\83C\83A\83\8d\83O\82ð\95\\8e¦\82·\82é
@@ -2430,9 +2444,9 @@ begin
 
        Editor := TEditorForm.Create(GikoForm);
        Editor.SetThreadItem(Item);
-       Editor.BodyEdit.Text := '>>' + IntToStr(Number) + #13#10;
+    Editor.SetTextEdit('>>' + IntToStr(Number) + #13#10);
        Editor.Show;
-       Editor.BodyEdit.SetFocus;
+    Editor.SetFocusEdit;
 end;
 // *************************************************************************
 //! \91I\91ð\82µ\82½\83\8c\83X\82ð\83R\83s\81[\82·\82é
@@ -2594,6 +2608,13 @@ begin
        GikoSys.OpenBrowser(PROTOCOL_HTTP + URL_GIKONAVI, gbtAuto);
 end;
 // *************************************************************************
+//! \83M\83R\83i\83r(\94ð\93ï\8f\8a\94Å)\82Ì\83E\83F\83u\83T\83C\83g\82ð\95\\8e¦\82·\82é
+// *************************************************************************
+procedure TGikoDM.GikoNaviGoesonWebPageActionExecute(Sender: TObject);
+begin
+       GikoSys.OpenBrowser(PROTOCOL_HTTP + URL_GIKONAVIGO, gbtAuto);
+end;
+// *************************************************************************
 //! \83\82\83i\83W\83\89\82Ì\83E\83F\83u\83T\83C\83g\82ð\95\\8e¦\82·\82é
 // *************************************************************************
 procedure TGikoDM.MonazillaWebPageActionExecute(Sender: TObject);
@@ -2655,6 +2676,13 @@ procedure TGikoDM.WikiFAQWebPageActionExecute(Sender: TObject);
 begin
        GikoSys.OpenBrowser(PROTOCOL_HTTP + URL_Wiki, gbtAuto);
 end;
+// *************************************************************************
+//! \83M\83R\83i\83r(\94ð\93ï\8f\8a\94Å)Wiki\82Ì\83E\83F\83u\83T\83C\83g\82ð\95\\8e¦\82·\82é
+// *************************************************************************
+procedure TGikoDM.GoWikiFAQWebPageActionExecute(Sender: TObject);
+begin
+       GikoSys.OpenBrowser(PROTOCOL_HTTP + URL_GoWiki, gbtAuto);
+end;
 ////////////////////////////////\83w\83\8b\83v\82Ü\82Å\82¨\82µ\82Ü\82¢/////////////////////
 // *************************************************************************
 //! \83\8a\83X\83g\94Ô\8d\86\95\\8e¦\82ð\95Ï\8dX\82·\82é
@@ -2891,7 +2919,7 @@ begin
        Editor := TEditorForm.Create(GikoForm);
        Editor.SetBoard(TBoard(GikoForm.GetActiveList));
        Editor.Show;
-       Editor.BodyEdit.SetFocus;
+    Editor.SetFocusEdit;
 end;
 // *************************************************************************
 //! \8c»\8dÝ\95\\8e¦\82µ\82Ä\82¢\82é\94Â\82ð\83u\83\89\83E\83U\82Å\95\\8e¦\82·\82é
@@ -4606,7 +4634,7 @@ begin
        end;
     GikoForm.UpdateExePath := '';
     GikoForm.UpdateExeArgs := '';
-    form := TUpdateCheckForm.Create(Self);
+    form := TUpdateCheckForm.Create(GikoForm);
     try
         form.ShowModal;
         shutdown := form.Allowshutdown;
@@ -4682,7 +4710,7 @@ end;
 //! \82±\82Ì\83\8c\83X\82ÌURL\83R\83s\81[\81iQuery_STRING\81j\82Ì\97\98\97p\83`\83F\83b\83N
 procedure TGikoDM.konoURLQueryActionUpdate(Sender: TObject);
 const
-       LIVEDOOR_URL = 'http://jbbs.livedoor.jp/';
+       LIVEDOOR_URL = 'http://jbbs.shitaraba.net/';
 begin
     // 2ch\82Æ\82µ\82½\82ç\82Î\82Í\97\98\97p\82Å\82«\82È\82¢\82æ\82¤\82É\82·\82é\81i\82¤\82Ü\82­\83\8c\83X\8ew\92è\82Å\82«\82È\82¢\82Ì\82Å\81j
     konoURLQueryAction.Enabled := false;
@@ -4706,5 +4734,33 @@ begin
        end;
 end;
 
+procedure TGikoDM.ThreadSearchActionExecute(Sender: TObject);
+begin
+    if (ThreadSrch <> nil) and (ThreadSrch.Visible = False) then begin
+        ThreadSrch.Free;
+        ThreadSrch := nil;
+    end;
+    if (ThreadSrch = nil) then begin
+        ThreadSrch := TThreadSrch.Create(GikoForm);
+    end;
+    ThreadSrch.Show;
+end;
+
+procedure TGikoDM.SaveThreadSearchSetting;
+begin
+    if (ThreadSrch <> nil) and (ThreadSrch.Visible = True) then
+        ThreadSrch.SaveSetting;
+end;
+
+procedure TGikoDM.ThreadNgEditActionExecute(Sender: TObject);
+begin
+    ThreadNGEdit := TThreadNGEdit.Create(GikoForm);
+    if (ThreadNGEdit.ShowModal = mrOk) then begin
+        GikoForm.ListView.Refresh;
+    end;
+    ThreadNGEdit.Free;
+    ThreadNGEdit := nil;
+end;
+
 end.