ハ゛タ50リリース２までの分をマージ

diff --git a/Editor.pas b/Editor.pas
index 35e96ce..e2c4f83 100644 (file)
--- a/Editor.pas
+++ b/Editor.pas
@@ -17,7 +17,7 @@ uses
        IdAntiFreezeBase,       IdAntiFreeze, IdBaseComponent, IdComponent,
        IdTCPConnection, IdTCPClient, IdHTTP, ActnList, StdActns, IdIntercept,
        IdLogBase, IdLogDebug, IdException, DateUtils, MojuUtils, bmRegExp,
-       GestureModel;
+       Gesture;
 
 type
 //     TSetLayeredWindowAttributes = function(wnd: HWND; crKey: DWORD; bAlpha: BYTE; dwFlag: DWORD): Boolean; stdcall;
@@ -189,7 +189,7 @@ type
                FSambaTime: TDateTime;
                FHost: string;
                FNow: TDateTime;
-               FGestures       : TGestureModel;
+               FGestures       : TMouseGesture;
                procedure Preview;
                function RepHtml(s: string): string;
                function Check: Boolean;
@@ -259,7 +259,7 @@ type
 implementation
 
 uses
-       Giko, ItemDownload, Gesture, IdGlobal;
+       Giko, ItemDownload, IdGlobal;
 const
        CAPTION_NAME_NEW: string = '\83M\83R\83i\83r \83X\83\8c\97§\82Ä\83G\83f\83B\83^';
        CAPTION_NAME_RES: string = '\83M\83R\83i\83r \83\8c\83X\83G\83f\83B\83^';
@@ -432,8 +432,10 @@ begin
        // \83}\83E\83X\83W\83F\83X\83`\83\83\81[\82Ì\83C\83\93\83X\83g\81[\83\8b
        if GikoSys.Setting.GestureEnabled then begin
                MouseGesture.UnHook;
-               FGestures := TGestureModel.Create;
-               FGestures.LoadGesture(
+               FGestures := TMouseGesture.Create;
+               GikoSys.Setting.Gestures.ClearGesture;
+
+               GikoSys.Setting.Gestures.LoadGesture(
                        GikoSys.Setting.GetGestureFileName, ActionList );
                MouseGesture.OnGestureStart := OnGestureStart;
                MouseGesture.OnGestureMove := OnGestureMove;
@@ -1605,6 +1607,9 @@ begin
        if ( Timer1.Enabled ) and ( FThreadItem <> nil )then
                ReadSambaTime(FHost);
        if GikoSys.Setting.GestureEnabled then begin
+               GikoSys.Setting.Gestures.ClearGesture;
+               GikoSys.Setting.Gestures.LoadGesture(
+                       GikoSys.Setting.GetGestureFileName, ActionList );
                MouseGesture.UnHook;
                MouseGesture.OnGestureStart := OnGestureStart;
                MouseGesture.OnGestureMove := OnGestureMove;
@@ -2027,7 +2032,7 @@ var
 begin
        s := MouseGesture.GetGestureStr;
        ActStr := '';
-       Action := FGestures.GetGestureAction(s);
+       Action := GikoSys.Setting.Gestures.GetGestureAction(s);
        if Action <> nil then
                ActStr := '\81i' + Action.Caption + '\81j';
        s := '\83W\83F\83X\83`\83\83\81[: ' + s + ActStr;
@@ -2040,7 +2045,7 @@ var
        Action: TAction;
 begin
        s := MouseGesture.GetGestureStr;
-       Action := FGestures.GetGestureAction(s);
+       Action := GikoSys.Setting.Gestures.GetGestureAction(s);
        if Action <> nil then
                Action.Execute;
        StatusBar.Panels[0].Text := '';

diff --git a/FavoriteAdd.dfm b/FavoriteAdd.dfm
index 096f650..199788e 100644 (file)
--- a/FavoriteAdd.dfm
+++ b/FavoriteAdd.dfm
@@ -11,6 +11,7 @@ object FavoriteAddDialog: TFavoriteAddDialog
   Font.Height = -12
   Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
   Font.Style = []
+  FormStyle = fsStayOnTop
   OldCreateOrder = False
   Position = poOwnerFormCenter
   OnCreate = FormCreate

diff --git a/FavoriteArrange.dfm b/FavoriteArrange.dfm
index 6166254..e84ad35 100644 (file)
--- a/FavoriteArrange.dfm
+++ b/FavoriteArrange.dfm
@@ -13,6 +13,7 @@ object FavoriteArrangeDialog: TFavoriteArrangeDialog
   Font.Height = -12
   Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
   Font.Style = []
+  FormStyle = fsStayOnTop
   OldCreateOrder = False
   Position = poOwnerFormCenter
   OnCreate = FormCreate

diff --git a/Giko.pas b/Giko.pas
index 1470c92..9a841e0 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -4016,14 +4016,14 @@ var
 begin
 //     if FActiveList <> Obj then begin
                FActiveList := Obj;
-        try
+               try
                        if ListView.Selected <> nil then
                                idx := ListView.Selected.Index
                        else
                                idx := -1;
-        except
-               idx := -1;
-        end;
+               except
+                       idx := -1;
+               end;
                ListView.Items.Count := 0;
                ListView.Items.Clear;
                ListView.Selected := nil;
@@ -4085,7 +4085,7 @@ begin
                        gvtNew: Board.NewThreadCount := Board.GetNewThreadCount;
                        gvtUser: Board.UserThreadCount:= Board.GetUserThreadCount;
                end;
-               
+
                SetActiveList(Board);
                //
                //SetThreadListItem(Board); //SetActiveList\93à\82Å\8cÄ\82Î\82ê\82é\82©\82ç2\8fd\82É\8cÄ\82Ñ\8fo\82·\95K\97v\82È\82µ
@@ -4148,12 +4148,7 @@ begin
                Item.Board := Board;
                Item.DownType := gdtBoard;
                Item.ForceDownload := ForceDownload;
-//             AbortToolButton.Enabled := True;
-//             Animate.Active := True;
-//             FDownload.Add(Item);
                FControlThread.AddItem(Item);
-//             Animate.Active := False;
-//             AbortToolButton.Enabled := False;
                if FWorkCount = 0 then begin
                        try
                                Animate.Active := True;
@@ -4176,12 +4171,7 @@ begin
                Item.ThreadItem := ThreadItem;
                Item.DownType := gdtThread;
                Item.ForceDownload := ForceDownload;
-//             AbortToolButton.Enabled := True;
-//             Animate.Active := True;
-//             FDownload.Add(Item);
                FControlThread.AddItem(Item);
-//             Animate.Active := False;
-//             AbortToolButton.Enabled := False;
                if FWorkCount = 0 then begin
                        try
                                Animate.Active := True;
@@ -4744,8 +4734,6 @@ procedure TGikoForm.ListDoubleClick(Shift: TShiftState);
 var
        ThreadItem: TThreadItem;
        shiftDown: Boolean;
-       cNode : TTreeNode;
-       bNode : TTreeNode;
 begin
        shiftDown := (ssShift in Shift);
 
@@ -5235,23 +5223,11 @@ end;
 procedure TGikoForm.UpFolderActionExecute(Sender: TObject);
 begin
        if GetActiveList is TBoard then begin
-////           if FTreeType = gtt2ch then
-//                     SelectTreeNode(TBoard(GetActiveList).ParentCategory, True);
-//             //SetActiveList(TBoard(GetActiveList).ParentCategory);
-               //if TreeView.Selected <> nil then begin
-               //      if TObject(TreeView.Selected.Parent.Data) is TCategory then
-               //              SelectTreeNode(TCategory(TreeView.Selected.Parent.Data), True);
-               //end;
                if TBoard(GetActiveList).ParentCategory <> nil then
                        SelectTreeNode(TBoard(GetActiveList).ParentCategory, True);
        end else if GetActiveList is TCategory then begin
-//             if FTreeType = gtt2ch then
-                       SelectTreeNode(TCategory(GetActiveList).ParenTBBS, True);
-               //SetActiveList(TCategory(GetActiveList).ParenTBBS);
+               SelectTreeNode(TCategory(GetActiveList).ParenTBBS, True);
        end;
-//     if TreeView.Selected = nil then Exit;
-//     if TreeView.Selected.Level = 0 then Exit;
-//     TreeView.Selected.Parent.Selected := True;
 end;
 
 procedure TGikoForm.RoundActionExecute(Sender: TObject);
@@ -6427,26 +6403,7 @@ begin
                idx := BrowserTab.IndexOfTabAt(p.X, p.Y);
                if idx <> -1 then
                        DeleteTab(TBrowserRecord(BrowserTab.Tabs.Objects[idx]));
-       //end else if Button = mbRight then begin
-       //PopupMenu\82ÅBrowserTabPoupMenu\82ð\8ew\92è\82µ\82Ä\82¢\82é\82Ì\82Å\82±\82±\82Å\82í\82´\82í\82´\8cÄ\82Ñ\8fo\82·\82Æ\82Q\8fd\82É\82È\82é
-       //OnContextPopup\82Å\82à\82µ\82àActive\82ÈTab\88È\8aO\82Å\8cÄ\82Ñ\8fo\82³\82ê\82½\82çTab\82ð\90Ø\82è\91Ö\82¦\82é\82æ\82¤\82É\82µ\82½\81B
-{              // \83}\83E\83X\89E\83{\83^\83\93
-               GetCursorPos(p);
-               p2 := p;
-//             GetCursorPos(p2);
-               p := BrowserTab.ScreenToClient(p);
-//             idx := BrowserTab.ItemAtPos(p);
-               idx := BrowserTab.IndexOfTabAt(p.X, p.Y);
-               if idx <> -1 then begin
-                       OldIndex := BrowserTab.TabIndex;
-                       BrowserTab.TabIndex := idx;
-                       if OldIndex <> idx then
-                               BrowserTab.OnChange(nil);
-                       BrowserTabPopupMenu.Tag := idx;
-                       BrowserTabPopupMenu.Popup(p2.X, p2.Y);
-               end;
-}
-       end else if BUtton = mbLeft then begin
+       end else if Button = mbLeft then begin
                FDragWFirst := true;
                FMouseDownPos.X := X;
                FMouseDownPos.Y := Y;
@@ -6936,17 +6893,22 @@ begin
        try
                if Dlg.ShowModal = mrOk then begin
                        GikoSys.SaveKeySetting(ActionList);
+            GikoSys.SaveEditorKeySetting(Dlg.EditorForm.ActionList);
                        GikoSys.Setting.Gestures.SaveGesture( GikoSys.Setting.GetGestureFileName );
                end;
-               GikoSys.SaveEditorKeySetting(Dlg.EditorForm.ActionList);
+
        finally
                Dlg.Release;
                MouseGesture.UnHook;
                MouseGesture.OnGestureStart := OnGestureStart;
                MouseGesture.OnGestureMove := OnGestureMove;
                MouseGesture.OnGestureEnd := OnGestureEnd;
-               if GikoSys.Setting.GestureEnabled then
+               if GikoSys.Setting.GestureEnabled then begin
+                       GikoSys.Setting.Gestures.ClearGesture;
+                       GikoSys.Setting.Gestures.LoadGesture(
+                               GikoSys.Setting.GetGestureFileName, ActionList );
                        MouseGesture.SetHook( Handle );
+               end;
        end;
 end;
 
@@ -8350,9 +8312,11 @@ begin
 
        LinkToolButton := TLinkToolButton( Sender );
        SenderNode := TreeNodeDataFind( FavoriteTreeView.Items.GetFirstNode, LinkToolButton.Data );
-
+       SenderNode.Selected := False;
        FavoriteDragDrop( SenderNode, Source );
 
+       SetLinkBar;
+
 end;
 
 procedure TGikoForm.LinkToolButtonOnMouseDown(Sender: TObject; Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
@@ -9509,7 +9473,7 @@ begin
 
        end;
 
-       SetLinkBar;
+
 
 end;
 
@@ -9519,6 +9483,12 @@ var
        SenderNode: TTreeNode;
 begin
 
+       SenderNode := FavoriteTreeView.GetNodeAt(X, Y);
+       if SenderNode <> nil then begin
+               FavoriteDragDrop( SenderNode, Source );
+       end;
+
+       //\8bó\94\92\8d\80\96Ú\82ª\82¢\82½\82ç\8dí\8f\9c\82·\82é
        if FDropSpaceNode <> nil then begin
                try
                        FDropSpaceNode.Delete;
@@ -9527,11 +9497,8 @@ begin
                end;
        end;
 
-       SenderNode := FavoriteTreeView.GetNodeAt(X, Y);
-       if SenderNode <> nil then begin
-               FavoriteDragDrop( SenderNode, Source );
-       end;
 
+       SetLinkBar;
 
 end;
 
@@ -10031,9 +9998,11 @@ begin
                        Break;
                end;
        end;
-
+       SenderNode.Selected := False;
+       
        FavoriteDragDrop( SenderNode, Source );
 
+       SetLinkBar;
 end;
 
 procedure TGikoForm.BrowserTabMouseUp(Sender: TObject;
@@ -10961,7 +10930,7 @@ begin
                if TreeView.Visible then
                        TreeView.Refresh;
                if ListView.Visible then
-               ListView.Refresh;
+                       ListView.Refresh;
        finally
                List.Free;
        end;
@@ -10986,7 +10955,7 @@ begin
                if TreeView.Visible then
                        TreeView.Refresh;
                if ListView.Visible then
-               ListView.Refresh;
+                       ListView.Refresh;
        finally
                List.Free;
        end;
@@ -11322,7 +11291,7 @@ begin
                BoardOrder := TGikoBoardColumnList.Create;
                try
                        for i := 0 to ListView.Columns.Count - 1 do begin
-                               // \8f\87\8f\98\82Ì\8eæ\93¾
+                               // \8f\87\8f\98\82Ì\8eæ\93¾
                                idx := ListView.Column[ i ].Tag;
                                id := Ord( GikoSys.Setting.BoardColumnOrder[ idx ] );
                                BoardOrder.Add( TGikoBoardColumnID( id ) );
@@ -11336,7 +11305,7 @@ begin
                        BoardOrder.Free;
                end;
        end;
-       
+
 end;
 
 procedure TGikoForm.ListViewColumnRightClick(Sender: TObject;
@@ -11507,9 +11476,9 @@ var
        ActStr: string;
        P : TPoint;
 begin
-    //\83}\83E\83X\88Ê\92u\82Ì\8eæ\93¾
+       //\83}\83E\83X\88Ê\92u\82Ì\8eæ\93¾
        GetCursorPos(P);
-    //\83R\83\93\83|\81[\83l\83\93\83g\96¼\8eæ\93¾
+       //\83R\83\93\83|\81[\83l\83\93\83g\96¼\8eæ\93¾
        s := MouseGesture.GetGestureStr;
        ActStr := '';
        Action := GikoSys.Setting.Gestures.GetGestureAction(s);
@@ -11523,21 +11492,12 @@ procedure TGikoForm.OnGestureEnd(Sender: TObject);
 var
        s: string;
        Action: TAction;
-       Comp : TComponent;
-       P : TPoint;
 begin
-    //\83}\83E\83X\88Ê\92u\82Ì\8eæ\93¾
-    GetCursorPos(P);
-    //\83R\83\93\83|\81[\83l\83\93\83g\96¼\8eæ\93¾
-    //\83M\83R\83i\83r\82Ì\83t\83H\81[\83\80\8aO\81A\82à\82µ\82­\82Í\81A\83R\83\93\83e\83L\83X\83g\83\81\83j\83\85\81[\8fã\82¾\82Ænil\82ª\95Ô\82é
-    Comp := FindDragTarget(P, True);
-    if (Comp <> nil) then begin
-               s := MouseGesture.GetGestureStr;
-               Action := GikoSys.Setting.Gestures.GetGestureAction(s);
-               if Action <> nil then
-               Action.Execute;
-               StatusBar.Panels[1].Text := '';
-    end;
+       s := MouseGesture.GetGestureStr;
+       Action := GikoSys.Setting.Gestures.GetGestureAction(s);
+       if Action <> nil then
+               Action.Execute;
+       StatusBar.Panels[1].Text := '';
 end;
 
 procedure TGikoForm.ListViewCustomDrawItem(Sender: TCustomListView;
@@ -11568,6 +11528,9 @@ end;
 procedure TGikoForm.FormActivate(Sender: TObject);
 begin
        if GikoSys.Setting.GestureEnabled then begin
+               GikoSys.Setting.Gestures.ClearGesture;
+               GikoSys.Setting.Gestures.LoadGesture(
+                       GikoSys.Setting.GetGestureFileName, ActionList );
                MouseGesture.UnHook;
                MouseGesture.OnGestureStart := OnGestureStart;
                MouseGesture.OnGestureMove := OnGestureMove;
@@ -12102,31 +12065,31 @@ begin
             if Pos( '?', Copy( AText, wkInt, MaxInt ) ) = 0 then
                 // Text \82à PATH_INFO \93n\82µ
                 Result := Result + Copy( AText, LastDelimiter( '/', AText ) + 1, MaxInt )
-            else
-                // Text \82Í QUERY_STRING \93n\82µ
-                Result := Result + Copy( AText, LastDelimiter( '?', AText ) + 1, MaxInt );
-        end else begin
-            // Thread.URL \82Í QUERY_STRING \93n\82µ
-            Result := Copy( AThreadURL, 1,  LastDelimiter( '?', AThreadURL ) );
-            wkInt := LastDelimiter( '/', AText );
-            if Pos( '?', Copy( Text, wkInt, MaxInt ) ) = 0 then begin
-                // Text \82Í PATH_INFO \93n\82µ
-                // URL \82É\94Â\82Æ\83L\81[\82ª\91«\82ç\82È\82¢\82Ì\82Å Text \82©\82ç\92¸\91Õ\82·\82é
-                wkInt := LastDelimiter( '/', Copy( AText, 1, wkInt - 1 ) );
-                wkInt := LastDelimiter( '/', Copy( AText, 1, wkInt - 1 ) );
-                Result := Copy( Result, 1, Length( Result ) - 1 ) + Copy( AText, wkInt, MaxInt );
-            end else begin
-                // Text \82à QUERY_STRING \93n\82µ
-                Result := Result + Copy( Text, LastDelimiter( '?', AText ) + 1, MaxInt )
-            end;
-        end;
-    end else if Pos('about:blank/bbs/', AText) = 1 then begin
-       //\82µ\82½\82ç\82ÎJBBS\82Ì\8ed\95Ï\82Ì\8bz\8eû
-        AText := CustomStringReplace(AText, 'about:blank/bbs/', 'about:blank../../bbs/');
-       Result := GetRespopupURL(AText, AThreadURL);
-    end else begin
-        Result := AText;
-    end;
+                       else
+                               // Text \82Í QUERY_STRING \93n\82µ
+                               Result := Result + Copy( AText, LastDelimiter( '?', AText ) + 1, MaxInt );
+               end else begin
+                       // Thread.URL \82Í QUERY_STRING \93n\82µ
+                       Result := Copy( AThreadURL, 1,  LastDelimiter( '?', AThreadURL ) );
+                       wkInt := LastDelimiter( '/', AText );
+                       if Pos( '?', Copy( Text, wkInt, MaxInt ) ) = 0 then begin
+                               // Text \82Í PATH_INFO \93n\82µ
+                               // URL \82É\94Â\82Æ\83L\81[\82ª\91«\82ç\82È\82¢\82Ì\82Å Text \82©\82ç\92¸\91Õ\82·\82é
+                               wkInt := LastDelimiter( '/', Copy( AText, 1, wkInt - 1 ) );
+                               wkInt := LastDelimiter( '/', Copy( AText, 1, wkInt - 1 ) );
+                               Result := Copy( Result, 1, Length( Result ) - 1 ) + Copy( AText, wkInt, MaxInt );
+                       end else begin
+                               // Text \82à QUERY_STRING \93n\82µ
+                               Result := Result + Copy( Text, LastDelimiter( '?', AText ) + 1, MaxInt )
+                       end;
+               end;
+       end else if Pos('about:blank/bbs/', AText) = 1 then begin
+               //\82µ\82½\82ç\82ÎJBBS\82Ì\8ed\95Ï\82Ì\8bz\8eû
+               AText := CustomStringReplace(AText, 'about:blank/bbs/', 'about:blank../../bbs/');
+               Result := GetRespopupURL(AText, AThreadURL);
+       end else begin
+               Result := AText;
+       end;
 
 end;
 //ListView\82Ì\91I\91ð\8fó\91Ô\82ð\89ð\8f\9c\82·\82é
@@ -12195,7 +12158,7 @@ end;
 procedure TGikoForm.FavoriteTreeViewEditing(Sender: TObject;
   Node: TTreeNode; var AllowEdit: Boolean);
 begin
-    //\95Ò\8fW\91O\82Ì\95¶\8e\9a\97ñ\82ð\88ê\8e\9e\95Û\91¶\82·\82é
+       //\95Ò\8fW\91O\82Ì\95¶\8e\9a\97ñ\82ð\88ê\8e\9e\95Û\91¶\82·\82é
        FOrigenCaption := Node.Text;
 end;
 //\97á\8aO\8f\88\97\9d\82³\82ê\82È\82©\82Á\82½\97á\8aO\82ð\8f\88\97\9d\82·\82é
@@ -12212,6 +12175,7 @@ begin
        MsgBox(Handle, s, '\8f\88\97\9d\82³\82ê\82È\82©\82Á\82½\97á\8aO', MB_OK or MB_ICONSTOP);
 end;
 
+
 initialization
                                OleInitialize(nil);
 finalization

diff --git a/GikoBayesian.pas b/GikoBayesian.pas
index e865ed4..7e28dbe 100644 (file)
--- a/GikoBayesian.pas
+++ b/GikoBayesian.pas
@@ -4,7 +4,8 @@ unit GikoBayesian;
 \file          GikoBayesian.pas
 \brief \83x\83C\83W\83A\83\93\83t\83B\83\8b\83^
 
-$Id: GikoBayesian.pas,v 1.19 2005/07/23 11:49:34 h677 Exp $
+
+$Id: GikoBayesian.pas,v 1.20 2005/08/18 14:17:47 h677 Exp $
 }
 
 //! \95½\89¼\96¼\82ð\8e«\8f\91\82É\8aÜ\82ß\82È\82¢

diff --git a/GikoSystem.pas b/GikoSystem.pas
index c331026..aa1df62 100644 (file)
--- a/GikoSystem.pas
+++ b/GikoSystem.pas
@@ -4241,6 +4241,7 @@ begin
                if BoardGroups[i].BoardPlugIn <> nil then begin
                        BoardGroups[i].BoardPlugIn.VersionInfo(agent, major, minor, release, revision);
 
+
                        //"Plugin\82Ì\96¼\91O(major.minor.revision)"
                        Result := Result +
                                Format('%s(%d.%d.%d)', [agent, major, minor, revision]) + #13#10;

diff --git a/IndividualAbon.dfm b/IndividualAbon.dfm
index 424c47b..15ca4f9 100644 (file)
--- a/IndividualAbon.dfm
+++ b/IndividualAbon.dfm
@@ -10,6 +10,7 @@ object IndividualAbonForm: TIndividualAbonForm
   Font.Height = -12
   Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
   Font.Style = []
+  FormStyle = fsStayOnTop
   OldCreateOrder = False
   OnCreate = FormCreate
   OnDestroy = FormDestroy

diff --git a/KeySetting.dfm b/KeySetting.dfm
index b03e5fb..85d667a 100644 (file)
--- a/KeySetting.dfm
+++ b/KeySetting.dfm
@@ -1,6 +1,6 @@
 object KeySettingForm: TKeySettingForm
-  Left = 92
-  Top = 240
+  Left = 258
+  Top = 263
   Width = 688
   Height = 360
   HorzScrollBar.Visible = False
@@ -15,6 +15,7 @@ object KeySettingForm: TKeySettingForm
   Font.Height = -12
   Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
   Font.Style = []
+  FormStyle = fsStayOnTop
   KeyPreview = True
   OldCreateOrder = False
   Position = poOwnerFormCenter
@@ -175,9 +176,9 @@ object KeySettingForm: TKeySettingForm
       Top = 4
       Width = 672
       Height = 247
-      ActivePage = TabSheet2
+      ActivePage = TabSheet1
       Align = alClient
-      TabIndex = 1
+      TabIndex = 0
       TabOrder = 0
       object TabSheet1: TTabSheet
         Caption = #12513#12452#12531

diff --git a/KeySetting.pas b/KeySetting.pas
index 80acc37..9ed48dd 100644 (file)
--- a/KeySetting.pas
+++ b/KeySetting.pas
@@ -119,12 +119,12 @@ begin
                                ListItem.SubItems.Add(ShortCutToText(TAction(EditorForm.ActionList.Actions[i]).ShortCut));
                                ListItem.ImageIndex := TAction(EditorForm.ActionList.Actions[i]).ImageIndex;
                                ListItem.SubItems.Add( GikoSys.Setting.Gestures.GetActionGesture(
-                                       TAction( GikoForm.ActionList.Actions[i] ) ) );
+                                       TAction( EditorForm.ActionList.Actions[i] ) ) );
                                KeyItem := TKeySettingItem.Create;
                                KeyItem.Action := TAction(EditorForm.ActionList.Actions[i]);
                                KeyItem.ShortCut := TAction(EditorForm.ActionList.Actions[i]).ShortCut;
                                KeyItem.Gesture := GikoSys.Setting.Gestures.GetActionGesture(
-                                       TAction( GikoForm.ActionList.Actions[i] ) );
+                                       TAction( EditorForm.ActionList.Actions[i] ) );
                                ListItem.Data := KeyItem;
                        end;
                end;
@@ -285,10 +285,11 @@ const
        ERR_MSG = '\93ü\97Í\82µ\82½\83W\83F\83X\83`\83\83\81[\82Í\8aù\82É\8eg\97p\82³\82ê\82Ä\82¢\82Ü\82·';
        ERR_TITLE = '\83G\83\89\81[';
 var
-       i: Integer;
+       i, j: Integer;
        Item: TListItem;
        KeyItem: TKeySettingItem;
        ActiveListView: TListView;
+       chechList : TListView;
 begin
        if PageControl1.ActivePage.TabIndex <> 0 then
                ActiveListView := ListView1
@@ -308,20 +309,28 @@ begin
        end;
 
        // \8c»\8dÝ\91I\91ð\82³\82ê\82Ä\82¢\82éAction\88È\8aO\82Å\93¯\82¶\83W\83F\83X\83`\83\83\81[\82ª\82 \82ê\82Î\83G\83\89\81[\82Æ\82·\82é
-       for i := 0 to ActiveListView.Items.Count - 1 do begin
-               if ActiveListView.Selected = ActiveListView.Items[i] then
-                       Continue;
-               Item := ActiveListView.Items[i];
-               if TObject(Item.Data) is TKeySettingItem then begin
-                       KeyItem := TKeySettingItem(Item.Data);
-                       if (GestureEdit.Text <> GUESTURE_NOTHING)
-                       and (KeyItem.Gesture = GestureEdit.Text) then begin
-                               MsgBox(Handle, ERR_MSG, ERR_TITLE, MB_OK or MB_ICONSTOP);
-                               HotKey.SetFocus;
-                               Exit;
+       chechList := ListView;
+       for j := 0 to 1 do begin
+               if j <> 0 then begin
+                       chechList := ListView1;
+               end;
+
+               for i := 0 to chechList.Items.Count - 1 do begin
+                       if ActiveListView.Selected = chechList.Items[i] then
+                               Continue;
+                       Item := chechList.Items[i];
+                       if TObject(Item.Data) is TKeySettingItem then begin
+                               KeyItem := TKeySettingItem(Item.Data);
+                               if (GestureEdit.Text <> GUESTURE_NOTHING)
+                               and (KeyItem.Gesture = GestureEdit.Text) then begin
+                                       MsgBox(Handle, ERR_MSG, ERR_TITLE, MB_OK or MB_ICONSTOP);
+                                       HotKey.SetFocus;
+                                       Exit;
+                               end;
                        end;
                end;
        end;
+
        // \83W\83F\83X\83`\83\83\81[\90Ý\92è
        if TObject(ActiveListView.Selected.Data) is TKeySettingItem then begin
                KeyItem := TKeySettingItem(ActiveListView.Selected.Data);

diff --git a/Kotehan.dfm b/Kotehan.dfm
index 9dd37d1..b70f390 100644 (file)
--- a/Kotehan.dfm
+++ b/Kotehan.dfm
@@ -13,6 +13,7 @@ object KotehanDialog: TKotehanDialog
   Font.Height = -12
   Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
   Font.Style = []
+  FormStyle = fsStayOnTop
   OldCreateOrder = False
   Position = poOwnerFormCenter
   OnCreate = FormCreate
@@ -61,6 +62,7 @@ object KotehanDialog: TKotehanDialog
             Bevel = pbNone
             Width = 0
           end>
+        SimplePanel = False
       end
       object OKButton: TButton
         Left = 0

diff --git a/KuroutSetting.dfm b/KuroutSetting.dfm
index b40c063..5c20522 100644 (file)
--- a/KuroutSetting.dfm
+++ b/KuroutSetting.dfm
@@ -10,6 +10,7 @@ object KuroutOption: TKuroutOption
   Font.Height = -12
   Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
   Font.Style = []
+  FormStyle = fsStayOnTop
   OldCreateOrder = False
   Position = poOwnerFormCenter
   OnCreate = FormCreate

diff --git a/ListSelect.dfm b/ListSelect.dfm
index 4586270..0084ea1 100644 (file)
--- a/ListSelect.dfm
+++ b/ListSelect.dfm
@@ -13,6 +13,7 @@ object ListSelectDialog: TListSelectDialog
   Font.Height = -12
   Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
   Font.Style = []
+  FormStyle = fsStayOnTop
   OldCreateOrder = False
   Position = poOwnerFormCenter
   PixelsPerInch = 96

diff --git a/NewBoard.dfm b/NewBoard.dfm
index 262909c..4591f4e 100644 (file)
--- a/NewBoard.dfm
+++ b/NewBoard.dfm
@@ -11,6 +11,7 @@ object NewBoardDialog: TNewBoardDialog
   Font.Height = -12
   Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
   Font.Style = []
+  FormStyle = fsStayOnTop
   OldCreateOrder = False
   Position = poOwnerFormCenter
   OnClose = FormClose

diff --git a/NewFavoriteFolder.dfm b/NewFavoriteFolder.dfm
index 62aa3d8..0e08327 100644 (file)
--- a/NewFavoriteFolder.dfm
+++ b/NewFavoriteFolder.dfm
@@ -11,6 +11,7 @@ object NewFavoriteFolderDialog: TNewFavoriteFolderDialog
   Font.Height = -12
   Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
   Font.Style = []
+  FormStyle = fsStayOnTop
   OldCreateOrder = False
   Position = poOwnerFormCenter
   OnCreate = FormCreate

diff --git a/Option.dfm b/Option.dfm
index fb00ff6..867e4c5 100644 (file)
--- a/Option.dfm
+++ b/Option.dfm
@@ -11,6 +11,7 @@ object OptionDialog: TOptionDialog
   Font.Height = -12
   Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
   Font.Style = []
+  FormStyle = fsStayOnTop
   OldCreateOrder = False
   Position = poOwnerFormCenter
   OnClose = FormClose

diff --git a/Round.dfm b/Round.dfm
index 8b47936..e8d1822 100644 (file)
--- a/Round.dfm
+++ b/Round.dfm
@@ -11,6 +11,7 @@ object RoundDialog: TRoundDialog
   Font.Height = -12
   Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
   Font.Style = []
+  FormStyle = fsStayOnTop
   OldCreateOrder = False
   Position = poOwnerFormCenter
   OnCreate = FormCreate

diff --git a/RoundName.dfm b/RoundName.dfm
index 8d86c59..f81ac11 100644 (file)
--- a/RoundName.dfm
+++ b/RoundName.dfm
@@ -11,6 +11,7 @@ object RoundNameDialog: TRoundNameDialog
   Font.Height = -12
   Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
   Font.Style = []
+  FormStyle = fsStayOnTop
   OldCreateOrder = False
   Position = poOwnerFormCenter
   OnCloseQuery = FormCloseQuery

diff --git a/ToolBarSetting.dfm b/ToolBarSetting.dfm
index 264f5c2..933563c 100644 (file)
--- a/ToolBarSetting.dfm
+++ b/ToolBarSetting.dfm
@@ -13,6 +13,7 @@ object ToolBarSettingDialog: TToolBarSettingDialog
   Font.Height = -12
   Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
   Font.Style = []
+  FormStyle = fsStayOnTop
   OldCreateOrder = False
   Position = poOwnerFormCenter
   OnCreate = FormCreate

diff --git a/gikoNavi.res b/gikoNavi.res
index 0bc197f..6a3f437 100644 (file)
Binary files a/gikoNavi.res and b/gikoNavi.res differ

diff --git a/readme/Samba.default b/readme/Samba.default
index 367d3b3..0f0923a 100644 (file)
--- a/readme/Samba.default
+++ b/readme/Samba.default
@@ -1,56 +1,56 @@
 [Setting]
-2chplus=10
-aa5=10
-academy3=10
-anime=30
-book3=10
+2chplus=30
+aa5=30
+academy3=30
+anime=45
+book3=30
 bubble4=120
-comic6=10
+comic6=30
 dso=10
-etc3=10
-etc4=10
-ex9=10
-ex10=5
-ex11=15
-ex12=10
-ex13=10
-food6=10
-game9=10
-game10=10
-hobby7=10
-hobby8=10
-human5=10
-life7=10
-live14=2
-live16=2
-live18=2
-live19=2
-live20=2
-live21=2
-love3=10
-money4=10
-music4=10
-music5=10
-news18=10
+etc3=30
+etc4=30
+ex9=20
+ex10=20
+ex11=45
+ex12=20
+ex13=20
+food6=30
+game9=30
+game10=30
+hobby7=30
+hobby8=30
+human5=30
+life7=30
+live14=15
+live16=15
+live18=15
+live19=15
+live20=15
+live21=15
+love3=30
+money4=30
+music4=30
+music5=30
+news18=30
 news19=120
-off3=10
-pc7=10
-pc8=10
-qa=10
-qb5=10
-qb6=20
-school5=10
-science3=10
-society3=10
+off3=30
+pc7=30
+pc8=30
+qa=30
+qb5=30
+qb6=30
+school5=30
+science3=30
+society3=30
 sports2=0
-sports9=10
-that3=10
-tmp5=10
-travel2=10
-tv7=10
-tv8=10
-idol=10
-pie=10
-sakura01=10
-sakura02=10
-sakura03=10
+sports9=30
+that3=30
+tmp5=45
+travel2=30
+tv7=30
+tv8=45
+idol=30
+pie=30
+sakura01=30
+sakura02=30
+sakura03=30

diff --git a/readme/readme.txt b/readme/readme.txt
index 50b42db..f6d23d8 100644 (file)
--- a/readme/readme.txt
+++ b/readme/readme.txt
@@ -98,10 +98,12 @@ LICENSE
 ------------------------------
 \97\9a\97ð
 ------------------------------
-2005/07/XX
+2005/08/20
   Version ÊÞÀ50 \83\8a\83\8a\81[\83X2
   \83\8c\83X\83G\83f\83B\83^\82ª\95\\8e¦\82³\82ê\82Ä\82¢\82é\82Æ\81Aplugin\82ð\97\98\97p\82·\82éBBS\82ÌDL\82ª\82Å\82«\82È\82¢\95s\8bï\8d\87\82Ì\8fC\90³
   \83L\83\83\83r\83l\83b\83g\82Å\82¨\8bC\82É\93ü\82è\81^\97\9a\97ð\82ð\95\\8e¦\82µ\82Ä\82¢\82é\82Æ\81A\91½\8fd\93o\98^\82³\82ê\82Ä\82¢\82é\94Â\82ª\8aJ\82¯\82È\82¢\8fê\8d\87\82ª\82 \82é\95s\8bï\8d\87\82Ì\8fC\90³
+  \83L\83\83\83r\83l\83b\83g\82Å\82¨\8bC\82É\93ü\82è\82ð\90®\97\9d\82·\82é\82Æ\81A\83\8a\83\93\83N\83o\81[\82É\8bó\94\92\82ª\93ü\82é\95s\8bï\8d\87\82Ì\8fC\90³
+  \83\81\83C\83\93\82Æ\83G\83f\83B\83^\82Å\93¯\82¶\83}\83E\83X\83W\83F\83X\83`\83\83\81[\82ð\93o\98^\82Å\82«\82È\82¢\82æ\82¤\82É\8fC\90³
   
 2005/07/18
   Version ÊÞÀ50