スレ一覧の絞込みで未確定入力を有効にするかどうかの設定を追加。

diff --git a/Giko.dfm b/Giko.dfm
index 805ebbb..49997de 100644 (file)
--- a/Giko.dfm
+++ b/Giko.dfm
@@ -5,7 +5,7 @@ object GikoForm: TGikoForm
   VertScrollBar.Visible = False
   AutoScroll = False
   Caption = '-'
-  ClientHeight = 571
+  ClientHeight = 563
   ClientWidth = 854
   Color = clBtnFace
   Font.Charset = SHIFTJIS_CHARSET
@@ -28,7 +28,7 @@ object GikoForm: TGikoForm
   TextHeight = 12
   object StatusBar: TStatusBar
     Left = 0
-    Top = 551
+    Top = 543
     Width = 854
     Height = 20
     Panels = <
@@ -48,13 +48,13 @@ object GikoForm: TGikoForm
     Left = 0
     Top = 77
     Width = 854
-    Height = 474
+    Height = 466
     Align = alClient
     BevelOuter = bvNone
     TabOrder = 1
     object MessageSplitter: TSplitter
       Left = 0
-      Top = 435
+      Top = 427
       Width = 854
       Height = 5
       Cursor = crVSplit
@@ -67,7 +67,7 @@ object GikoForm: TGikoForm
       Left = 0
       Top = 0
       Width = 854
-      Height = 435
+      Height = 427
       Align = alClient
       BevelOuter = bvNone
       TabOrder = 0
@@ -75,7 +75,7 @@ object GikoForm: TGikoForm
         Left = 145
         Top = 0
         Width = 5
-        Height = 435
+        Height = 427
         Cursor = crHSplit
         AutoSnap = False
         ResizeStyle = rsUpdate
@@ -84,7 +84,7 @@ object GikoForm: TGikoForm
         Left = 0
         Top = 0
         Width = 145
-        Height = 435
+        Height = 427
         Align = alLeft
         BevelOuter = bvNone
         TabOrder = 0
@@ -271,7 +271,7 @@ object GikoForm: TGikoForm
         Left = 150
         Top = 0
         Width = 704
-        Height = 435
+        Height = 427
         Align = alClient
         BevelOuter = bvNone
         TabOrder = 1
@@ -547,7 +547,7 @@ object GikoForm: TGikoForm
           Left = 0
           Top = 194
           Width = 704
-          Height = 241
+          Height = 233
           Align = alClient
           BevelOuter = bvNone
           TabOrder = 1
@@ -555,7 +555,7 @@ object GikoForm: TGikoForm
             Left = 0
             Top = 46
             Width = 704
-            Height = 175
+            Height = 167
             Align = alClient
             BevelOuter = bvNone
             UseDockManager = False
@@ -565,7 +565,7 @@ object GikoForm: TGikoForm
               Left = 0
               Top = 0
               Width = 704
-              Height = 175
+              Height = 167
               Align = alClient
               TabOrder = 0
               OnEnter = BrowserEnter
@@ -575,7 +575,7 @@ object GikoForm: TGikoForm
               OnNewWindow2 = BrowserNewWindow2
               OnDocumentComplete = BrowserDocumentComplete
               ControlData = {
-                4C000000C3480000161200000000000000000000000000000000000000000000
+                4C000000C3480000431100000000000000000000000000000000000000000000
                 000000004C000000000000000000000001000000E0D057007335CF11AE690800
                 2B2E12620A000000000000004C0000000114020000000000C000000000000046
                 8000000000000000000000000000000000000000000000000000000000000000
@@ -584,7 +584,7 @@ object GikoForm: TGikoForm
           end
           object BrowserBottomPanel: TGikoPanel
             Left = 0
-            Top = 221
+            Top = 213
             Width = 704
             Height = 20
             Align = alBottom
@@ -862,7 +862,7 @@ object GikoForm: TGikoForm
     end
     object MessagePanel: TPanel
       Left = 0
-      Top = 440
+      Top = 432
       Width = 854
       Height = 34
       Align = alBottom

diff --git a/Giko.pas b/Giko.pas
index e9e766c..00d64bf 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -2731,8 +2731,8 @@ begin
 //             if ListNumberVisibleAction.Checked then
 //                     RepStr := IntToStr(ThreadItem.No) + ': ' + ThreadItem.Title
 //             else
-               RepStr := ThreadItem.Title;
-               RepStr := CustomStringReplace(RepStr, '&lt;', '<' );
+               //RepStr := ThreadItem.Title;
+               RepStr := CustomStringReplace(ThreadItem.Title, '&lt;', '<' );
                RepStr := CustomStringReplace(RepStr, '&gt;', '>' );
                RepStr := CustomStringReplace(RepStr, '&quot;', '"' );
                RepStr := CustomStringReplace(RepStr, '&amp;', '&' );
@@ -9050,19 +9050,21 @@ begin
        begin
                ModifySelectList;
        end else if Key = 229 then begin
-               IMC := ImmGetContext(SelectComboBox.Handle); //\83R\83\93\83e\83L\83X\83g\8eæ\93¾
-               Len := ImmGetCompositionString(IMC, GCS_COMPSTR, nil, 0); //\82Ü\82¸\92·\82³\82ð\8eæ\93¾
-               SetLength(Str, Len + 1); //Buffer\82Ì\83\81\83\82\83\8a\82ð\90Ý\92è
-               ImmGetCompositionString(IMC, GCS_COMPSTR, PChar(Str), Len + 1); //\82Ü\82¸\92·\82³\82ð\8eæ\93¾
-               ImmReleaseContext(SelectComboBox.Handle, IMC);  //\83R\83\93\83e\83L\83X\83g\89ð\95ú
-               SetLength(Str, Len);
-               if SelectComboBox.SelLength > 0 then begin //\91I\91ð\92\86\82Ì\95¶\8e\9a\97ñ\82ª\82 \82é\82©
-                       tmp := Copy(SelectComboBox.Text, 1, SelectComboBox.SelStart);
-                       Str := tmp + Str + Copy(SelectComboBox.Text, SelectComboBox.SelStart + SelectComboBox.SelLength + 1, Length(SelectComboBox.Text));
-               end else
-                       Str := SelectComboBox.Text + Str;
+               if GikoSys.Setting.UseUndecided then begin
+                       IMC := ImmGetContext(SelectComboBox.Handle); //\83R\83\93\83e\83L\83X\83g\8eæ\93¾
+                       Len := ImmGetCompositionString(IMC, GCS_COMPSTR, nil, 0); //\82Ü\82¸\92·\82³\82ð\8eæ\93¾
+                       SetLength(Str, Len + 1); //Buffer\82Ì\83\81\83\82\83\8a\82ð\90Ý\92è
+                       ImmGetCompositionString(IMC, GCS_COMPSTR, PChar(Str), Len + 1); //\82Ü\82¸\92·\82³\82ð\8eæ\93¾
+                       ImmReleaseContext(SelectComboBox.Handle, IMC);  //\83R\83\93\83e\83L\83X\83g\89ð\95ú
+                       SetLength(Str, Len);
+                       if SelectComboBox.SelLength > 0 then begin //\91I\91ð\92\86\82Ì\95¶\8e\9a\97ñ\82ª\82 \82é\82©
+                               tmp := Copy(SelectComboBox.Text, 1, SelectComboBox.SelStart);
+                               Str := tmp + Str + Copy(SelectComboBox.Text, SelectComboBox.SelStart + SelectComboBox.SelLength + 1, Length(SelectComboBox.Text));
+                       end else
+                               Str := SelectComboBox.Text + Str;
 
-               SetSelectWord(Str);
+                       SetSelectWord(Str);
+               end;
        end else if Length( SelectComboBox.Text ) = 0 then
        begin
                {* SelectComboBox.Text\82ª\8bó\82Å\82à\81A\93ü\97Í\93r\92\86\82ÅEsc\82µ\82½\82Æ\82©

diff --git a/Option.dfm b/Option.dfm
index 2bb50c6..9e8095f 100644 (file)
--- a/Option.dfm
+++ b/Option.dfm
@@ -1,6 +1,6 @@
 object OptionDialog: TOptionDialog
-  Left = 190
-  Top = 198
+  Left = 287
+  Top = 152
   BorderStyle = bsDialog
   Caption = #12458#12503#12471#12519#12531
   ClientHeight = 428
@@ -60,9 +60,9 @@ object OptionDialog: TOptionDialog
     Top = 4
     Width = 509
     Height = 389
-    ActivePage = NGwordSheet
+    ActivePage = TabSheet1
     MultiLine = True
-    TabIndex = 9
+    TabIndex = 5
     TabOrder = 3
     OnChange = OptionTabChange
     object ConnectSheet: TTabSheet
@@ -1033,7 +1033,7 @@ object OptionDialog: TOptionDialog
       end
     end
     object TabSheet2: TTabSheet
-      Caption = #12381#12398#20182#21205#20316
+      Caption = #12381#12398#20182#21205#20316#65297
       ImageIndex = 8
       object GroupBox7: TGroupBox
         Left = 12
@@ -1147,6 +1147,26 @@ object OptionDialog: TOptionDialog
         end
       end
     end
+    object TabSheet4: TTabSheet
+      Caption = #12381#12398#20182#21205#20316#65298
+      ImageIndex = 11
+      object GroupBox13: TGroupBox
+        Left = 12
+        Top = 8
+        Width = 473
+        Height = 57
+        Caption = #12473#12524#12483#12489#32094#36796#12415
+        TabOrder = 0
+        object UseUndecidedCheckBox: TCheckBox
+          Left = 12
+          Top = 20
+          Width = 213
+          Height = 17
+          Caption = #26410#30906#23450#20837#21147#12391#12398#32094#36796#12415#12434#26377#21177#12395#12377#12427
+          TabOrder = 0
+        end
+      end
+    end
     object SoundSheet: TTabSheet
       Caption = #12469#12454#12531#12489
       ImageIndex = 6

diff --git a/Option.pas b/Option.pas
index 9ec98e1..967ee1c 100644 (file)
--- a/Option.pas
+++ b/Option.pas
@@ -186,6 +186,9 @@ type
     OkBotton: TButton;
     GroupBox11: TGroupBox;
     SpamFilterAlgorithmComboBox: TComboBox;
+    TabSheet4: TTabSheet;
+    GroupBox13: TGroupBox;
+    UseUndecidedCheckBox: TCheckBox;
                procedure FormCreate(Sender: TObject);
                procedure FormDestroy(Sender: TObject);
                procedure ApplyButtonClick(Sender: TObject);
@@ -827,8 +830,9 @@ begin
        SpamFilterAlgorithmComboBox.ItemIndex :=
                Ord( GikoSys.Setting.SpamFilterAlgorithm );
 
-        //TabAutoLoad
-        TabLoadSave.Checked := Gikosys.Setting.TabAutoLoadSave;
+       //TabAutoLoad
+       TabLoadSave.Checked := Gikosys.Setting.TabAutoLoadSave;
+       UseUndecidedCheckBox.Checked := GikoSys.Setting.UseUndecided;
 end;
 
 procedure TOptionDialog.SaveSetting;
@@ -1101,8 +1105,9 @@ begin
                FRepaintThread := True;
        end;
 
-        //Tab\8e©\93®\95Û\91¶
-        GikoSys.Setting.TabAutoLoadSave := TabLoadSave.Checked;
+       //Tab\8e©\93®\95Û\91¶
+       GikoSys.Setting.TabAutoLoadSave := TabLoadSave.Checked;
+       GikoSys.Setting.UseUndecided := UseUndecidedCheckBox.Checked;
 end;
 
 procedure TOptionDialog.SettingApply;

diff --git a/Setting.pas b/Setting.pas
index 1682217..6264258 100644 (file)
--- a/Setting.pas
+++ b/Setting.pas
@@ -427,6 +427,8 @@ type
                FSpamFilterAlgorithm : TGikoSpamFilterAlgorithm;
                //\83~\83\85\81[\83g\82µ\82Ä\82é\82©
                FMute: Boolean;
+               //\83X\83\8c\8di\8d\9e\82Ý\82Å\96¢\8am\92è\95¶\8e\9a\82à\97L\8cø\82É\82·\82é\82©
+               FUseUndecided: Boolean;
                function GetMainCoolSet(Index: Integer): TCoolSet;
                function GetBoardCoolSet(Index: Integer): TCoolSet;
                function GetBrowserCoolSet(Index: Integer): TCoolSet;
@@ -727,6 +729,7 @@ type
                property SpamFilterAlgorithm : TGikoSpamFilterAlgorithm
                        read FSpamFilterAlgorithm write FSpamFilterAlgorithm;
                property Mute: Boolean read FMute write FMute;
+               property UseUndecided: Boolean read FUseUndecided write FUseUndecided;
 end;
 
 
@@ -1260,7 +1263,7 @@ begin
                FPopUpAbon               := ini.ReadBool('Abon','Popup',false);
                FShowNGLinesNum := ini.ReadBool('Abon','ShowNGLines',false);
                FAddResAnchor := ini.ReadBool('Abon','AddResAnchor',false);
-                FDeleteSyria :=  ini.ReadBool('Abon','DeleteSyria',false);
+                               FDeleteSyria :=  ini.ReadBool('Abon','DeleteSyria',false);
 
                // \83G\83f\83B\83^
                FSpaceToNBSP    := ini.ReadBool( 'Editor', 'SpaceToNBSP', False );
@@ -1286,6 +1289,7 @@ begin
                FSpamFilterAlgorithm := TGikoSpamFilterAlgorithm(
                        ini.ReadInteger( 'Abon', 'SpamFilterAlgorithm', Ord( gsfaNone ) ) );
                FMute := ini.ReadBool('Function', 'Mute', false);
+               FUseUndecided := ini.ReadBool('ThreadList', 'UseUndecided', False);
                ini.UpdateFile;
        finally
                ini.Free;
@@ -1633,6 +1637,7 @@ begin
                // \8eg\97p\82·\82é\83X\83p\83\80\83t\83B\83\8b\83^
                ini.WriteInteger( 'Abon', 'SpamFilterAlgorithm', Ord( FSpamFilterAlgorithm ) );
         ini.WriteBool('Function', 'Mute', FMute);
+        ini.WriteBool('ThreadList', 'UseUndecided', FUseUndecided);
                ini.UpdateFile;
        finally
                ini.Free;