Unicodeモード時、レス書き込み及びプレビューの際にコピーライトマークが「c」に変換されてしまう不具合を修正

[gikonavigoeson/gikonavi.git] / GikoDataModule.pas

diff --git a/GikoDataModule.pas b/GikoDataModule.pas
index f8a5a28..464417e 100644 (file)
--- a/GikoDataModule.pas
+++ b/GikoDataModule.pas
@@ -253,6 +253,7 @@ type
     GikoNaviGoesonWebPageAction: TAction;
     GoWikiFAQWebPageAction: TAction;
     ThreadSearchAction: TAction;
+    ThreadNgEditAction: TAction;
        procedure EditNGActionExecute(Sender: TObject);
        procedure ReloadActionExecute(Sender: TObject);
        procedure GoFowardActionExecute(Sender: TObject);
@@ -472,6 +473,7 @@ type
     procedure GikoNaviGoesonWebPageActionExecute(Sender: TObject);
     procedure GoWikiFAQWebPageActionExecute(Sender: TObject);
     procedure ThreadSearchActionExecute(Sender: TObject);
+    procedure ThreadNgEditActionExecute(Sender: TObject);
   private
        { Private \90é\8c¾ }
        procedure ClearResFilter;
@@ -529,7 +531,7 @@ uses
        RoundName, RoundData, Menus, ListViewUtils,
        ThreadControl, GikoMessage, InputAssist,
     DefaultFileManager, Forms, NewBoardURL, UpdateCheck,
-    PopupMenuSetting, ThreadSearch;
+    PopupMenuSetting, ThreadSearch, ThreadNGEdt;
 
 const
        MSG_ERROR : string = '\83G\83\89\81[';
@@ -1622,8 +1624,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é
@@ -4734,14 +4735,31 @@ 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.Visible = True) then
+    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.