マルチモニタでのウィンドウ座標を調整

板一覧更新で同じ板名がある場合の不具合修正

diff --git a/About.dfm b/About.dfm
index e9cea9f..96e88a4 100644 (file)
--- a/About.dfm
+++ b/About.dfm
@@ -16,7 +16,6 @@ object AboutDialog: TAboutDialog
   FormStyle = fsStayOnTop
   KeyPreview = True
   OldCreateOrder = False
-  Position = poOwnerFormCenter
   Scaled = False
   OnClose = FormClose
   OnCreate = FormCreate

diff --git a/About.pas b/About.pas
index 2eeda52..9903895 100644 (file)
--- a/About.pas
+++ b/About.pas
@@ -68,7 +68,17 @@ const
 //{$R gikoSound.res}
 
 procedure TAboutDialog.FormCreate(Sender: TObject);
+var
+    CenterForm: TCustomForm;
 begin
+    CenterForm := TCustomForm(Owner);
+    if Assigned(CenterForm) then begin
+        Left := ((CenterForm.Width - Width) div 2) + CenterForm.Left;
+        Top := ((CenterForm.Height - Height) div 2) + CenterForm.Top;
+    end else begin
+        Left := (Screen.Width - Width) div 2;
+        Top := (Screen.Height - Height) div 2;
+    end;
        VersionMemo.Clear;
        VersionMemo.Lines.Add('Version ' + BETA_VERSION_NAME_J
                                                                        + FloatToStr(BETA_VERSION)

diff --git a/BoardGroup.pas b/BoardGroup.pas
index 270add3..d2e36db 100644 (file)
--- a/BoardGroup.pas
+++ b/BoardGroup.pas
@@ -41,6 +41,7 @@ type
                function Find(key: string): TCategory;
                function FindBBSID(const BBSID: string): TBoard;
                function FindBoardFromTitle(const Title: string): TBoard;
+               function FindBoardFromTitleAndCategory(const CategoryTitle: string; const BoardTitle: string): TBoard;
                function FindBoardFromURL(const inURL: string): TBoard;
                function FindThreadFromURL(const inURL : string ) : TThreadItem;
                function FindThreadItem(const BBSID, FileName: string): TThreadItem;
@@ -662,6 +663,25 @@ begin
 end;
 
 //*************************************************************************
+// \83J\83e\83S\83\8a\96¼\82Æ\94Â\96¼\82Ì\88ê\92v\82·\82é\94Â\82ð\92T\82·
+//*************************************************************************)
+function TBBS.FindBoardFromTitleAndCategory(const CategoryTitle: string; const BoardTitle: string): TBoard;
+var
+       i: Integer;
+begin
+       if not IsBoardFileRead then
+       GikoSys.ReadBoardFile( Self );
+       for i := Count - 1 downto 0 do begin
+        if AnsiCompareStr(Items[ i ].Title, CategoryTitle) = 0 then begin
+            Result := Items[ i ].FindBoardFromTitle(BoardTitle);
+            if Result <> nil then
+                Exit;
+       end;
+       end;
+       Result := nil;
+end;
+
+//*************************************************************************
 // URL \82ð\8eó\82¯\95t\82¯\82é\94Â\82ð\92T\82·
 //*************************************************************************)
 function TBBS.FindBoardFromURL(const inURL: string): TBoard;

diff --git a/Editor.pas b/Editor.pas
index 79c54a4..1712ac9 100644 (file)
--- a/Editor.pas
+++ b/Editor.pas
@@ -365,8 +365,9 @@ begin
        FBoard := nil;
        FThreadItem := nil;
 
-       //\83E\83B\83\93\83h\83E\82Ì\88Ê\92u\90Ý\92è
-    SetWindowRect;
+    if (Owner <> nil) and (Owner.ClassNameIs('TKeySettingForm') = False) then
+       //\83E\83B\83\93\83h\83E\82Ì\88Ê\92u\90Ý\92è
+        SetWindowRect;
 
        EditorPage.ActivePage := EditorTab;
        FNameComboEdit := GetWindow(NameComboBox.Handle, GW_CHILD);
@@ -648,17 +649,19 @@ var
 begin
     FSambaTimer.Free;
     
-       //\8dÅ\91å\89»\81E\83E\83B\83\93\83h\83E\88Ê\92u\95Û\91¶
-       wp.length := sizeof(wp);
-       GetWindowPlacement(Handle, @wp);
-
-       GikoSys.Setting.EditWindowTop := wp.rcNormalPosition.Top;
-       GikoSys.Setting.EditWindowLeft := wp.rcNormalPosition.Left;
-       GikoSys.Setting.EditWindowHeight := wp.rcNormalPosition.Bottom - wp.rcNormalPosition.Top;
-       GikoSys.Setting.EditWindowWidth := wp.rcNormalPosition.Right - wp.rcNormalPosition.Left;
-       GikoSys.Setting.EditWindowMax := WindowState = wsMaximized;
-       //GikoSys.Setting.EditWindowStay := FormStyle = fsStayOnTop;      // \83X\83e\83C\8fó\91Ô\82Ì\95Û\91¶
-       GikoSys.Setting.EditWindowTranslucent := TransAction.Checked;   // \94¼\93§\96¾\8fó\91Ô\82Ì\95Û\91¶
+    if (Owner <> nil) and (Owner.ClassNameIs('TKeySettingForm') = False) then begin
+        //\8dÅ\91å\89»\81E\83E\83B\83\93\83h\83E\88Ê\92u\95Û\91¶
+        wp.length := sizeof(wp);
+        GetWindowPlacement(Handle, @wp);
+
+        GikoSys.Setting.EditWindowTop := wp.rcNormalPosition.Top;
+        GikoSys.Setting.EditWindowLeft := wp.rcNormalPosition.Left;
+        GikoSys.Setting.EditWindowHeight := wp.rcNormalPosition.Bottom - wp.rcNormalPosition.Top;
+        GikoSys.Setting.EditWindowWidth := wp.rcNormalPosition.Right - wp.rcNormalPosition.Left;
+        GikoSys.Setting.EditWindowMax := WindowState = wsMaximized;
+        //GikoSys.Setting.EditWindowStay := FormStyle = fsStayOnTop;      // \83X\83e\83C\8fó\91Ô\82Ì\95Û\91¶
+        GikoSys.Setting.EditWindowTranslucent := TransAction.Checked;   // \94¼\93§\96¾\8fó\91Ô\82Ì\95Û\91¶
+    end;
 
 end;
 
@@ -2340,6 +2343,12 @@ end;
 procedure TEditorForm.SetWindowRect;
 var
     wp: TWindowPlacement;
+    MonCnt: Integer;
+    MonOk: Boolean;
+    MonR: Integer;
+    MonB: Integer;
+    Right: Integer;
+    Bottom: Integer;
 begin
        //\83E\83B\83\93\83h\83E\82Ì\88Ê\92u\90Ý\92è
        wp.length := sizeof(wp);
@@ -2356,17 +2365,28 @@ begin
     end;
 
        //\83E\83B\83\93\83h\83E\82ª\89æ\96Ê\8aO\82È\82ç\89æ\96Ê\93à\82É\88Ú\93®\82·\82é
-       if (Left + Width) > Screen.Width then begin
-               Left := 0;
-    end;
-       if (Top + Height) > Screen.Height then begin
-               Top := 0;
-    end;
-       if Left < 0 then begin
-               Left := 0;
+    Right := Left + Width;
+    Bottom := Top + Height;
+    MonOk := False;
+    MonCnt := 0;
+    while (MonCnt < Screen.MonitorCount) do begin
+        MonR := Screen.Monitors[MonCnt].Left + Screen.Monitors[MonCnt].Width;
+        MonB := Screen.Monitors[MonCnt].Top  + Screen.Monitors[MonCnt].Height;
+
+        if ((Left  >= Screen.Monitors[MonCnt].Left) and (Left   <  MonR) and
+            (Top   >= Screen.Monitors[MonCnt].Top)  and (Top    <  MonB) and
+            (Right  > Screen.Monitors[MonCnt].Left) and (Right  <= MonR) and
+            (Bottom > Screen.Monitors[MonCnt].Top)  and (Bottom <= MonB)) then begin
+            MonOk := True;
+            Break;
+        end;
+
+        MonCnt := MonCnt + 1;
     end;
-       if Top < 0 then begin
-               Top := 0;
+
+    if (MonOk = False) then begin
+        Left := 0;
+        Top := 0;
     end;
 
     //\8c»\8dÝ\82Ì\83E\83B\83\93\83h\83E\82Ì\88Ê\92u\82ð\95Û\91¶

diff --git a/FavoriteAdd.dfm b/FavoriteAdd.dfm
index 199788e..d318e13 100644 (file)
--- a/FavoriteAdd.dfm
+++ b/FavoriteAdd.dfm
@@ -13,7 +13,6 @@ object FavoriteAddDialog: TFavoriteAddDialog
   Font.Style = []
   FormStyle = fsStayOnTop
   OldCreateOrder = False
-  Position = poOwnerFormCenter
   OnCreate = FormCreate
   PixelsPerInch = 96
   TextHeight = 12

diff --git a/FavoriteAdd.pas b/FavoriteAdd.pas
index 2bf2192..89d3f09 100644 (file)
--- a/FavoriteAdd.pas
+++ b/FavoriteAdd.pas
@@ -63,7 +63,17 @@ procedure TFavoriteAddDialog.FormCreate(Sender: TObject);
 var
        src             : TTreeNode;
        node    : TTreeNode;
+    CenterForm: TCustomForm;
 begin
+    CenterForm := TCustomForm(Owner);
+    if Assigned(CenterForm) then begin
+        Left := ((CenterForm.Width - Width) div 2) + CenterForm.Left;
+        Top := ((CenterForm.Height - Height) div 2) + CenterForm.Top;
+    end else begin
+        Left := (Screen.Width - Width) div 2;
+        Top := (Screen.Height - Height) div 2;
+    end;
+
        FolderTreeView.Items.BeginUpdate;
 
        // FavoriteDM \82Ì\83t\83H\83\8b\83_\8aK\91w\82ð\83R\83s\81[

diff --git a/FavoriteArrange.dfm b/FavoriteArrange.dfm
index 4a5d921..6c420de 100644 (file)
--- a/FavoriteArrange.dfm
+++ b/FavoriteArrange.dfm
@@ -15,7 +15,6 @@ object FavoriteArrangeDialog: TFavoriteArrangeDialog
   Font.Style = []
   FormStyle = fsStayOnTop
   OldCreateOrder = False
-  Position = poOwnerFormCenter
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   PixelsPerInch = 96
@@ -24,7 +23,7 @@ object FavoriteArrangeDialog: TFavoriteArrangeDialog
     Left = 0
     Top = 0
     Width = 257
-    Height = 278
+    Height = 267
     Align = alLeft
     BevelOuter = bvNone
     TabOrder = 0
@@ -70,8 +69,8 @@ object FavoriteArrangeDialog: TFavoriteArrangeDialog
   object Panel2: TPanel
     Left = 257
     Top = 0
-    Width = 272
-    Height = 278
+    Width = 264
+    Height = 267
     Align = alClient
     BevelOuter = bvNone
     BorderWidth = 10
@@ -79,8 +78,8 @@ object FavoriteArrangeDialog: TFavoriteArrangeDialog
     object FolderTreeView: TTreeView
       Left = 10
       Top = 10
-      Width = 252
-      Height = 258
+      Width = 244
+      Height = 247
       Align = alClient
       DragCursor = crDefault
       DragMode = dmAutomatic
@@ -98,14 +97,14 @@ object FavoriteArrangeDialog: TFavoriteArrangeDialog
   end
   object Panel3: TPanel
     Left = 0
-    Top = 278
-    Width = 529
+    Top = 267
+    Width = 521
     Height = 30
     Align = alBottom
     BevelOuter = bvNone
     TabOrder = 2
     object Panel4: TPanel
-      Left = 422
+      Left = 414
       Top = 0
       Width = 107
       Height = 30

diff --git a/FavoriteArrange.pas b/FavoriteArrange.pas
index dfb234e..456148a 100644 (file)
--- a/FavoriteArrange.pas
+++ b/FavoriteArrange.pas
@@ -79,7 +79,18 @@ begin
 end;
 
 procedure TFavoriteArrangeDialog.FormCreate(Sender: TObject);
+var
+    CenterForm: TCustomForm;
 begin
+    CenterForm := TCustomForm(Owner);
+    if Assigned(CenterForm) then begin
+        Left := ((CenterForm.Width - Width) div 2) + CenterForm.Left;
+        Top := ((CenterForm.Height - Height) div 2) + CenterForm.Top;
+    end else begin
+        Left := (Screen.Width - Width) div 2;
+        Top := (Screen.Height - Height) div 2;
+    end;
+
        FDeleteList := TList.Create;
        FolderTreeView.Items := FavoriteDM.TreeView.Items;
 

diff --git a/Giko.pas b/Giko.pas
index 927ac14..f5b1fc2 100644 (file)
--- a/Giko.pas
+++ b/Giko.pas
@@ -1497,6 +1497,12 @@ end;
 procedure TGikoForm.FormShow(Sender: TObject);
 var
        item        : TThreadItem;
+    MonCnt: Integer;
+    MonOk: Boolean;
+    MonR: Integer;
+    MonB: Integer;
+    Right: Integer;
+    Bottom: Integer;
 begin
        if FStartUp then begin
        FStartUp := false;
@@ -1549,6 +1555,42 @@ begin
                 //ShowWindow(Self.Handle, SW_SHOW);
             end;
                end;
+
+//===== \83}\83\8b\83`\83\82\83j\83^\8aÂ\8b«\82ÅFormCreate\82Å\82Í\83t\83H\81[\83\80\88Ê\92u\82ª\90³\82µ\82­\94½\89f\82³\82ê\82È\82¢\8fê\8d\87
+//===== \82ª\82 \82é\82½\82ßFormShow\8f\89\89ñ\82Å\8dÀ\95W\90Ý\92è\82ð\8ds\82¤
+        Top := GikoSys.Setting.WindowTop;
+        Left := GikoSys.Setting.WindowLeft;
+        Height := GikoSys.Setting.WindowHeight;
+        Width := GikoSys.Setting.WindowWidth;
+
+        //\83E\83B\83\93\83h\83E\82ª\89æ\96Ê\8aO\82È\82ç\89æ\96Ê\93à\82É\88Ú\93®\82·\82é
+        Right := Left + Width;
+        Bottom := Top + Height;
+        MonOk := False;
+        MonCnt := 0;
+        while (MonCnt < Screen.MonitorCount) do begin
+            MonR := Screen.Monitors[MonCnt].Left + Screen.Monitors[MonCnt].Width;
+            MonB := Screen.Monitors[MonCnt].Top  + Screen.Monitors[MonCnt].Height;
+
+            if ((Left  >= Screen.Monitors[MonCnt].Left) and (Left   <  MonR) and
+                (Top   >= Screen.Monitors[MonCnt].Top)  and (Top    <  MonB) and
+                (Right  > Screen.Monitors[MonCnt].Left) and (Right  <= MonR) and
+                (Bottom > Screen.Monitors[MonCnt].Top)  and (Bottom <= MonB)) then begin
+                MonOk := True;
+                Break;
+            end;
+
+            MonCnt := MonCnt + 1;
+        end;
+
+        if (MonOk = False) then begin
+            Left := 0;
+            Top := 0;
+        end;
+
+        if GikoSys.Setting.WindowMax then
+            WindowState := wsMaximized;
+//==========================================================================
        end;
 end;
 

diff --git a/GikoUtil.pas b/GikoUtil.pas
index aa4eab9..c64b2b0 100644 (file)
--- a/GikoUtil.pas
+++ b/GikoUtil.pas
@@ -52,10 +52,10 @@ begin
                        MsgBoxR := MoveRect(MsgBoxR,
                                                                                                        ParentR.Left + ((GetW(ParentR) - GetW(MsgBoxR)) div 2),
                                                                                                        ParentR.Top + ((GetH(ParentR) - GetH(MsgBoxR)) div 2));
-                       if MsgBoxR.Left < 0 then
-                               MsgBoxR := MoveRect(MsgBoxR, 0, MsgBoxR.Top);
-                       if MsgBoxR.Top < 0 then
-                               MsgBoxR := MoveRect(MsgBoxR, MsgBoxR.Left, 0);
+//                     if MsgBoxR.Left < 0 then
+//                             MsgBoxR := MoveRect(MsgBoxR, 0, MsgBoxR.Top);
+//                     if MsgBoxR.Top < 0 then
+//                             MsgBoxR := MoveRect(MsgBoxR, MsgBoxR.Left, 0);
                        if MsgBoxR.Left + GetW(MsgBoxR) > Screen.WorkAreaWidth then
                                MsgBoxR := MoveRect(MsgBoxR, Screen.WorkAreaWidth - GetW(MsgBoxR), MsgBoxR.Top);
                        if MsgBoxR.Top + GetH(MsgBoxR) > Screen.WorkAreaHeight then

diff --git a/IndividualAbon.dfm b/IndividualAbon.dfm
index 49c1ed0..adaf284 100644 (file)
--- a/IndividualAbon.dfm
+++ b/IndividualAbon.dfm
@@ -1,8 +1,8 @@
 object IndividualAbonForm: TIndividualAbonForm
   Left = 264
   Top = 314
-  Width = 269
-  Height = 115
+  Width = 277
+  Height = 124
   Caption = #20491#21029#12354#12412#12540#12435#35299#38500
   Color = clBtnFace
   Font.Charset = SHIFTJIS_CHARSET
@@ -18,7 +18,7 @@ object IndividualAbonForm: TIndividualAbonForm
   TextHeight = 12
   object Panel1: TPanel
     Left = 0
-    Top = 47
+    Top = 45
     Width = 261
     Height = 41
     Align = alBottom
@@ -75,7 +75,7 @@ object IndividualAbonForm: TIndividualAbonForm
     Left = 0
     Top = 0
     Width = 261
-    Height = 47
+    Height = 45
     Align = alClient
     BevelOuter = bvNone
     TabOrder = 1

diff --git a/KeySetting.dfm b/KeySetting.dfm
index 85d667a..7d2546a 100644 (file)
--- a/KeySetting.dfm
+++ b/KeySetting.dfm
@@ -18,7 +18,6 @@ object KeySettingForm: TKeySettingForm
   FormStyle = fsStayOnTop
   KeyPreview = True
   OldCreateOrder = False
-  Position = poOwnerFormCenter
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnKeyDown = FormKeyDown
@@ -26,8 +25,8 @@ object KeySettingForm: TKeySettingForm
   TextHeight = 12
   object Panel1: TPanel
     Left = 0
-    Top = 255
-    Width = 680
+    Top = 244
+    Width = 672
     Height = 78
     Align = alBottom
     BevelOuter = bvNone
@@ -115,7 +114,7 @@ object KeySettingForm: TKeySettingForm
       end
     end
     object Panel3: TPanel
-      Left = 467
+      Left = 459
       Top = 0
       Width = 213
       Height = 78
@@ -148,7 +147,6 @@ object KeySettingForm: TKeySettingForm
             Bevel = pbNone
             Width = 50
           end>
-        SimplePanel = False
       end
       object CancelBotton: TButton
         Left = 116
@@ -165,8 +163,8 @@ object KeySettingForm: TKeySettingForm
   object Panel4: TPanel
     Left = 0
     Top = 0
-    Width = 680
-    Height = 255
+    Width = 672
+    Height = 244
     Align = alClient
     BevelOuter = bvNone
     BorderWidth = 4
@@ -174,19 +172,18 @@ object KeySettingForm: TKeySettingForm
     object PageControl1: TPageControl
       Left = 4
       Top = 4
-      Width = 672
-      Height = 247
+      Width = 664
+      Height = 236
       ActivePage = TabSheet1
       Align = alClient
-      TabIndex = 0
       TabOrder = 0
       object TabSheet1: TTabSheet
         Caption = #12513#12452#12531
         object ListView: TListView
           Left = 0
           Top = 0
-          Width = 664
-          Height = 220
+          Width = 656
+          Height = 209
           Align = alClient
           Columns = <
             item

diff --git a/KeySetting.pas b/KeySetting.pas
index eb1adf3..d701f47 100644 (file)
--- a/KeySetting.pas
+++ b/KeySetting.pas
@@ -85,6 +85,7 @@ var
        i: Integer;
        ListItem: TListItem;
        KeyItem: TKeySettingItem;
+    CenterForm: TCustomForm;
 
 begin
        //for i := 0 to GikoForm.ActionList.ActionCount - 1 do begin
@@ -147,6 +148,15 @@ begin
        MouseGesture.OnGestureMove := OnGestureMove;
        MouseGesture.OnGestureEnd := OnGestureEnd;
        MouseGesture.SetHook( Handle );
+
+    CenterForm := TCustomForm(Owner);
+    if Assigned(CenterForm) then begin
+        Left := ((CenterForm.Width - Width) div 2) + CenterForm.Left;
+        Top := ((CenterForm.Height - Height) div 2) + CenterForm.Top;
+    end else begin
+        Left := (Screen.Width - Width) div 2;
+        Top := (Screen.Height - Height) div 2;
+    end;
 end;
 
 procedure TKeySettingForm.FormDestroy(Sender: TObject);

diff --git a/Kotehan.dfm b/Kotehan.dfm
index b70f390..13a0b94 100644 (file)
--- a/Kotehan.dfm
+++ b/Kotehan.dfm
@@ -15,15 +15,14 @@ object KotehanDialog: TKotehanDialog
   Font.Style = []
   FormStyle = fsStayOnTop
   OldCreateOrder = False
-  Position = poOwnerFormCenter
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   PixelsPerInch = 96
   TextHeight = 12
   object Panel1: TPanel
     Left = 0
-    Top = 272
-    Width = 528
+    Top = 261
+    Width = 520
     Height = 55
     Align = alBottom
     BevelOuter = bvNone
@@ -45,7 +44,7 @@ object KotehanDialog: TKotehanDialog
       FocusControl = MailEdit
     end
     object Panel2: TPanel
-      Left = 344
+      Left = 336
       Top = 0
       Width = 184
       Height = 55
@@ -62,7 +61,6 @@ object KotehanDialog: TKotehanDialog
             Bevel = pbNone
             Width = 0
           end>
-        SimplePanel = False
       end
       object OKButton: TButton
         Left = 0
@@ -113,8 +111,8 @@ object KotehanDialog: TKotehanDialog
   object Panel3: TPanel
     Left = 0
     Top = 0
-    Width = 528
-    Height = 272
+    Width = 520
+    Height = 261
     Align = alClient
     BevelOuter = bvNone
     BorderWidth = 4
@@ -122,8 +120,8 @@ object KotehanDialog: TKotehanDialog
     object KotehanListView: TListView
       Left = 4
       Top = 53
-      Width = 520
-      Height = 215
+      Width = 512
+      Height = 204
       Align = alClient
       Columns = <
         item
@@ -150,7 +148,7 @@ object KotehanDialog: TKotehanDialog
     object Panel4: TPanel
       Left = 4
       Top = 4
-      Width = 520
+      Width = 512
       Height = 49
       Align = alTop
       BevelOuter = bvNone

diff --git a/Kotehan.pas b/Kotehan.pas
index 8abae83..ebd3ddb 100644 (file)
--- a/Kotehan.pas
+++ b/Kotehan.pas
@@ -62,7 +62,17 @@ var
        Category: TCategory;
        Board: TBoard;
        KoteData: TKotehanData;
+    CenterForm: TCustomForm;
 begin
+    CenterForm := TCustomForm(Owner);
+    if Assigned(CenterForm) then begin
+        Left := ((CenterForm.Width - Width) div 2) + CenterForm.Left;
+        Top := ((CenterForm.Height - Height) div 2) + CenterForm.Top;
+    end else begin
+        Left := (Screen.Width - Width) div 2;
+        Top := (Screen.Height - Height) div 2;
+    end;
+
        FList := TList.Create;
 
   for k := 0 to Length( BBSs ) - 1 do begin

diff --git a/KuroutSetting.dfm b/KuroutSetting.dfm
index 8c5c503..84a19ee 100644 (file)
--- a/KuroutSetting.dfm
+++ b/KuroutSetting.dfm
@@ -13,7 +13,6 @@ object KuroutOption: TKuroutOption
   Font.Style = []
   FormStyle = fsStayOnTop
   OldCreateOrder = False
-  Position = poOwnerFormCenter
   OnCreate = FormCreate
   PixelsPerInch = 96
   TextHeight = 12
@@ -23,7 +22,6 @@ object KuroutOption: TKuroutOption
     Width = 517
     Height = 393
     ActivePage = TabSheet2
-    TabIndex = 3
     TabOrder = 0
     object TabSheet1: TTabSheet
       Caption = #35443#32048#35373#23450#65297
@@ -222,10 +220,8 @@ object KuroutOption: TKuroutOption
           Width = 15
           Height = 20
           Associate = SentIniFileSizeEdit
-          Min = 0
           Position = 100
           TabOrder = 1
-          Wrap = False
         end
       end
     end
@@ -459,7 +455,6 @@ object KuroutOption: TKuroutOption
           EditLabel.Height = 12
           EditLabel.Caption = #20808#38957#34920#31034#12524#12473#25968
           LabelPosition = lpLeft
-          LabelSpacing = 3
           TabOrder = 0
           Text = '1'
           OnExit = AHandredLabeledEditExit
@@ -473,7 +468,6 @@ object KuroutOption: TKuroutOption
           Min = 1
           Position = 1
           TabOrder = 1
-          Wrap = False
         end
         object ResRangeLabeledEdit: TLabeledEdit
           Left = 317
@@ -485,7 +479,6 @@ object KuroutOption: TKuroutOption
           EditLabel.Caption = #34920#31034#12524#12473#25968'(100-9999)'
           ImeMode = imDisable
           LabelPosition = lpLeft
-          LabelSpacing = 3
           TabOrder = 2
           Text = '100'
           OnExit = ResRangeLabeledEditExit
@@ -501,7 +494,6 @@ object KuroutOption: TKuroutOption
           Position = 100
           TabOrder = 3
           Thousands = False
-          Wrap = False
         end
       end
       object ThreadGroupBox: TGroupBox
@@ -535,7 +527,6 @@ object KuroutOption: TKuroutOption
           EditLabel.Height = 12
           EditLabel.Caption = 'URL'#21462#24471#25313#24373#23376
           LabelPosition = lpLeft
-          LabelSpacing = 3
           TabOrder = 1
           OnExit = ExtListLabeledEditExit
         end
@@ -676,9 +667,7 @@ object KuroutOption: TKuroutOption
           Associate = DeltaXLabeledEdit
           Min = -25
           Max = 25
-          Position = 0
           TabOrder = 2
-          Wrap = False
         end
         object DeltaYUpDown: TUpDown
           Left = 353
@@ -688,9 +677,7 @@ object KuroutOption: TKuroutOption
           Associate = DeltaYLabeledEdit
           Min = -25
           Max = 25
-          Position = 0
           TabOrder = 3
-          Wrap = False
         end
         object RespopupWaitLabeledEdit: TLabeledEdit
           Left = 76
@@ -712,13 +699,11 @@ object KuroutOption: TKuroutOption
           Width = 17
           Height = 20
           Associate = RespopupWaitLabeledEdit
-          Min = 0
           Max = 5000
           Increment = 100
           Position = 100
           TabOrder = 5
           Thousands = False
-          Wrap = False
         end
         object RespopupMailToCheckBox: TCheckBox
           Left = 16

diff --git a/KuroutSetting.pas b/KuroutSetting.pas
index 32e7f62..bf4b88d 100644 (file)
--- a/KuroutSetting.pas
+++ b/KuroutSetting.pas
@@ -279,7 +279,18 @@ begin
 end;
 
 procedure TKuroutOption.FormCreate(Sender: TObject);
+var
+    CenterForm: TCustomForm;
 begin
+    CenterForm := TCustomForm(Owner);
+    if Assigned(CenterForm) then begin
+        Left := ((CenterForm.Width - Width) div 2) + CenterForm.Left;
+        Top := ((CenterForm.Height - Height) div 2) + CenterForm.Top;
+    end else begin
+        Left := (Screen.Width - Width) div 2;
+        Top := (Screen.Height - Height) div 2;
+    end;
+
        SetValue;
        PostTimeCheckBoxClick(Sender);
 

diff --git a/ListSelect.dfm b/ListSelect.dfm
index 0084ea1..d12566f 100644 (file)
--- a/ListSelect.dfm
+++ b/ListSelect.dfm
@@ -15,7 +15,7 @@ object ListSelectDialog: TListSelectDialog
   Font.Style = []
   FormStyle = fsStayOnTop
   OldCreateOrder = False
-  Position = poOwnerFormCenter
+  OnCreate = FormCreate
   PixelsPerInch = 96
   TextHeight = 12
   object TitleLabel: TLabel

diff --git a/ListSelect.pas b/ListSelect.pas
index 7a3fec8..b791b96 100644 (file)
--- a/ListSelect.pas
+++ b/ListSelect.pas
@@ -13,6 +13,7 @@ type
                KubetsuCheckBox: TCheckBox;
                OkButton: TButton;
                CancelButton: TButton;
+    procedure FormCreate(Sender: TObject);
        private
                { Private \90é\8c¾ }
   public
@@ -26,4 +27,18 @@ implementation
 
 {$R *.dfm}
 
+procedure TListSelectDialog.FormCreate(Sender: TObject);
+var
+    CenterForm: TCustomForm;
+begin
+    CenterForm := TCustomForm(Owner);
+    if Assigned(CenterForm) then begin
+        Left := ((CenterForm.Width - Width) div 2) + CenterForm.Left;
+        Top := ((CenterForm.Height - Height) div 2) + CenterForm.Top;
+    end else begin
+        Left := (Screen.Width - Width) div 2;
+        Top := (Screen.Height - Height) div 2;
+    end;
+end;
+
 end.

diff --git a/NewBoard.dfm b/NewBoard.dfm
index 2f4a387..9069dfc 100644 (file)
--- a/NewBoard.dfm
+++ b/NewBoard.dfm
@@ -13,7 +13,6 @@ object NewBoardDialog: TNewBoardDialog
   Font.Style = []
   FormStyle = fsStayOnTop
   OldCreateOrder = False
-  Position = poOwnerFormCenter
   OnClose = FormClose
   OnCreate = FormCreate
   PixelsPerInch = 96

diff --git a/NewBoard.pas b/NewBoard.pas
index 90d9866..759e97d 100644 (file)
--- a/NewBoard.pas
+++ b/NewBoard.pas
@@ -277,7 +277,7 @@ begin
                             if Length(BBSs) = 0 then begin
                                 Board := nil;
                             end else begin
-                                Board := BBSs[ 0 ].FindBoardFromTitle(Title);
+                                Board := BBSs[ 0 ].FindBoardFromTitleAndCategory(cate, Title);
                             end;
                             if Board = nil then begin
                                MessageMemo.Lines.Add('\90V\94Â\92Ç\89Á\81u' + Title + '(' + URL + ')\81v');
@@ -374,7 +374,18 @@ begin
     end;
 end;
 procedure TNewBoardDialog.FormCreate(Sender: TObject);
+var
+    CenterForm: TCustomForm;
 begin
+    CenterForm := TCustomForm(Owner);
+    if Assigned(CenterForm) then begin
+        Left := ((CenterForm.Width - Width) div 2) + CenterForm.Left;
+        Top := ((CenterForm.Height - Height) div 2) + CenterForm.Top;
+    end else begin
+        Left := (Screen.Width - Width) div 2;
+        Top := (Screen.Height - Height) div 2;
+    end;
+
        StopButton.Enabled := False;
        BoardURLComboBox.Clear;
        BoardURLComboBox.Items.AddStrings(GikoSys.Setting.BoardURLs);

diff --git a/NewBoardURL.dfm b/NewBoardURL.dfm
index 3f93874..d754136 100644 (file)
--- a/NewBoardURL.dfm
+++ b/NewBoardURL.dfm
@@ -13,7 +13,6 @@ object NewBoardURLForm: TNewBoardURLForm
   Font.Style = []
   FormStyle = fsStayOnTop
   OldCreateOrder = False
-  Position = poDesktopCenter
   OnCreate = FormCreate
   PixelsPerInch = 96
   TextHeight = 12

diff --git a/NewFavoriteFolder.dfm b/NewFavoriteFolder.dfm
index 0e08327..d010ae5 100644 (file)
--- a/NewFavoriteFolder.dfm
+++ b/NewFavoriteFolder.dfm
@@ -13,7 +13,6 @@ object NewFavoriteFolderDialog: TNewFavoriteFolderDialog
   Font.Style = []
   FormStyle = fsStayOnTop
   OldCreateOrder = False
-  Position = poOwnerFormCenter
   OnCreate = FormCreate
   PixelsPerInch = 96
   TextHeight = 12

diff --git a/NewFavoriteFolder.pas b/NewFavoriteFolder.pas
index 169cac5..f7b748c 100644 (file)
--- a/NewFavoriteFolder.pas
+++ b/NewFavoriteFolder.pas
@@ -43,7 +43,18 @@ begin
 end;
 
 procedure TNewFavoriteFolderDialog.FormCreate(Sender: TObject);
+var
+    CenterForm: TCustomForm;
 begin
+    CenterForm := TCustomForm(Owner);
+    if Assigned(CenterForm) then begin
+        Left := ((CenterForm.Width - Width) div 2) + CenterForm.Left;
+        Top := ((CenterForm.Height - Height) div 2) + CenterForm.Top;
+    end else begin
+        Left := (Screen.Width - Width) div 2;
+        Top := (Screen.Height - Height) div 2;
+    end;
+
        ErrLabel.Caption := '';
 end;
 

diff --git a/Option.dfm b/Option.dfm
index 6a3a3de..588df2d 100644 (file)
--- a/Option.dfm
+++ b/Option.dfm
@@ -13,7 +13,6 @@ object OptionDialog: TOptionDialog
   Font.Style = []
   FormStyle = fsStayOnTop
   OldCreateOrder = False
-  Position = poOwnerFormCenter
   OnClose = FormClose
   OnCreate = FormCreate
   OnDestroy = FormDestroy
@@ -63,7 +62,6 @@ object OptionDialog: TOptionDialog
     Height = 389
     ActivePage = UserIDSheet
     MultiLine = True
-    TabIndex = 11
     TabOrder = 3
     OnChange = OptionTabChange
     object ConnectSheet: TTabSheet
@@ -1753,14 +1751,11 @@ object OptionDialog: TOptionDialog
     Font.Height = -12
     Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
     Font.Style = []
-    MinFontSize = 0
-    MaxFontSize = 0
     Options = [fdAnsiOnly, fdEffects]
     Left = 8
     Top = 396
   end
   object ColorDialog: TColorDialog
-    Ctl3D = True
     Options = [cdSolidColor]
     Left = 40
     Top = 396

diff --git a/Option.pas b/Option.pas
index 89d9562..9216ac4 100644 (file)
--- a/Option.pas
+++ b/Option.pas
@@ -327,7 +327,17 @@ const
 {$R *.DFM}
 
 procedure TOptionDialog.FormCreate(Sender: TObject);
+var
+    CenterForm: TCustomForm;
 begin
+    CenterForm := TCustomForm(Owner);
+    if Assigned(CenterForm) then begin
+        Left := ((CenterForm.Width - Width) div 2) + CenterForm.Left;
+        Top := ((CenterForm.Height - Height) div 2) + CenterForm.Top;
+    end else begin
+        Left := (Screen.Width - Width) div 2;
+        Top := (Screen.Height - Height) div 2;
+    end;
 
        CSSBrowser.Navigate('about:blank');
        FClose := True;

diff --git a/PopupMenuSetting.dfm b/PopupMenuSetting.dfm
index eb560ec..8e2dd0f 100644 (file)
--- a/PopupMenuSetting.dfm
+++ b/PopupMenuSetting.dfm
@@ -1,6 +1,6 @@
 object PopupMenuSettingDialog: TPopupMenuSettingDialog
-  Left = 253
-  Top = 121
+  Left = 288
+  Top = 163
   Width = 529
   Height = 360
   Caption = #12509#12483#12503#12450#12483#12503#12513#12491#12517#12540#35373#23450
@@ -11,7 +11,6 @@ object PopupMenuSettingDialog: TPopupMenuSettingDialog
   Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
   Font.Style = []
   OldCreateOrder = False
-  Position = poDesktopCenter
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   PixelsPerInch = 96
@@ -19,7 +18,7 @@ object PopupMenuSettingDialog: TPopupMenuSettingDialog
   object TopPanel: TPanel
     Left = 0
     Top = 0
-    Width = 521
+    Width = 513
     Height = 41
     Align = alTop
     BevelOuter = bvNone
@@ -60,32 +59,30 @@ object PopupMenuSettingDialog: TPopupMenuSettingDialog
   object MainPanel: TPanel
     Left = 0
     Top = 41
-    Width = 521
-    Height = 285
+    Width = 513
+    Height = 281
     Align = alClient
     BevelOuter = bvNone
     TabOrder = 1
     object Splitter1: TSplitter
-      Left = 293
+      Left = 285
       Top = 0
-      Width = 3
-      Height = 285
-      Cursor = crHSplit
+      Height = 281
       Align = alRight
     end
     object Panel1: TPanel
       Left = 0
       Top = 0
-      Width = 293
-      Height = 285
+      Width = 285
+      Height = 281
       Align = alClient
       BevelOuter = bvNone
       TabOrder = 0
       object Panel2: TPanel
-        Left = 185
+        Left = 177
         Top = 0
         Width = 108
-        Height = 285
+        Height = 281
         Align = alRight
         BevelOuter = bvNone
         TabOrder = 0
@@ -156,18 +153,18 @@ object PopupMenuSettingDialog: TPopupMenuSettingDialog
       object ActionListBox: TListBox
         Left = 0
         Top = 0
-        Width = 185
-        Height = 285
+        Width = 177
+        Height = 281
         Align = alClient
         ItemHeight = 12
         TabOrder = 1
       end
     end
     object Panel4: TPanel
-      Left = 296
+      Left = 288
       Top = 0
       Width = 225
-      Height = 285
+      Height = 281
       Align = alRight
       BevelOuter = bvNone
       TabOrder = 1
@@ -175,7 +172,7 @@ object PopupMenuSettingDialog: TPopupMenuSettingDialog
         Left = 0
         Top = 0
         Width = 225
-        Height = 285
+        Height = 281
         Align = alClient
         HideSelection = False
         Indent = 19

diff --git a/Round.dfm b/Round.dfm
index bc05a86..7eb9ac2 100644 (file)
--- a/Round.dfm
+++ b/Round.dfm
@@ -13,14 +13,13 @@ object RoundDialog: TRoundDialog
   Font.Style = []
   FormStyle = fsStayOnTop
   OldCreateOrder = False
-  Position = poOwnerFormCenter
   OnCreate = FormCreate
   PixelsPerInch = 96
   TextHeight = 12
   object Panel1: TPanel
     Left = 0
     Top = 0
-    Width = 592
+    Width = 584
     Height = 49
     Align = alTop
     BevelOuter = bvNone
@@ -54,8 +53,8 @@ object RoundDialog: TRoundDialog
   object Panel2: TPanel
     Left = 0
     Top = 49
-    Width = 592
-    Height = 314
+    Width = 584
+    Height = 303
     Align = alClient
     BevelOuter = bvNone
     BorderWidth = 4
@@ -63,8 +62,8 @@ object RoundDialog: TRoundDialog
     object RoundListView: TListView
       Left = 4
       Top = 4
-      Width = 584
-      Height = 306
+      Width = 576
+      Height = 295
       Align = alClient
       Checkboxes = True
       Columns = <
@@ -94,8 +93,8 @@ object RoundDialog: TRoundDialog
   end
   object Panel3: TPanel
     Left = 0
-    Top = 363
-    Width = 592
+    Top = 352
+    Width = 584
     Height = 37
     Align = alBottom
     BevelOuter = bvNone
@@ -128,7 +127,7 @@ object RoundDialog: TRoundDialog
       OnClick = RoundDeleteButtonClick
     end
     object Panel4: TPanel
-      Left = 384
+      Left = 376
       Top = 0
       Width = 208
       Height = 37
@@ -145,7 +144,6 @@ object RoundDialog: TRoundDialog
             Bevel = pbNone
             Width = 0
           end>
-        SimplePanel = False
       end
       object Button1: TButton
         Left = 104
@@ -190,7 +188,7 @@ object RoundDialog: TRoundDialog
     Top = 4
     Bitmap = {
       494C010104000900040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
-      0000000000003600000028000000400000003000000001001000000000000018
+      0000000000003600000028000000400000003000000001002000000000000030
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -324,64 +322,256 @@ object RoundDialog: TRoundDialog
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000010421863186318631863
-      1863186318631863186318631863000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000010421042104210421042
-      104210421042104210421042000000000000000000001042FF7FFF7FFF7FFF7F
-      FF7FFF7FFF7FFF7FFF7FFF7F1863000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000001042FF7F1863E07F1863
-      E07F1863E07F1863E07F1042000000000000000000001042FF7F104210421042
-      10421042104210421042FF7F1863000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000000000001042FF7F1863E07F1863E07F
-      1863E07F1863E07F18630000104200000000000000001042FF7FFF7FFF7FFF7F
-      FF7FFF7FFF7FFF7FFF7FFF7F186300000000000000000000FF7FFF7FFF7FFF7F
-      FF7FFF7FFF7FFF7F000000000000000000000000000000000000000000001042
-      FF7F0000000000000000000000000000000010421042FF7FE07F1863E07F1863
-      E07F1863E07F186310420000000000000000000000001042FF7F104210421042
-      10421042104210421042FF7F1863000000000000000000001042104200000000
-      00000000FF7FFF7F000000000000000000000000000000000000000010421042
-      FF7FFF7F00000000000000000000000000001042FF7FE07F1863E07F1863E07F
-      1863E07F1863E07F00001863186300000000000000001042FF7FFF7FFF7FFF7F
-      FF7FFF7FFF7FFF7FFF7FFF7F1863000000000000000000000000104200000000
-      00000000FF7F0000000000000000000000000000000000000000000010420000
-      0000FF7F00000000000000000000000000001042FF7FFF7FFF7FFF7FFF7FFF7F
-      FF7FFF7FFF7F104200001F00FF7F18630000000000001042FF7F104210421042
-      10421042104210421042FF7F1863000000000000000000000000104210420000
-      0000FF7FFF7F0000000000000000000000000000000000000000104210420000
-      0000FF7FFF7F0000000000000000000000000000104210421042104210421042
-      10421042104210421042FF7FFF7F00000000000000001042FF7FFF7FFF7FFF7F
-      FF7FFF7FFF7FFF7FFF7FFF7F1863000000000000000000000000000010420000
-      0000FF7F00000000000000000000000000000000000000000000104200000000
-      00000000FF7F00000000000000000000000000001042FF7FE07F18631042FF7F
-      FF7F1F0018631F00FF7FFF7F000000000000000000001042FF7F104210421042
-      10421042104210421042FF7F1863000000000000000000000000000010421042
-      FF7FFF7F00000000000000000000000000000000000000001042104200000000
-      00000000FF7FFF7F0000000000000000000000001042FF7F1863E07F18631042
-      FF7FFF7F1F00FF7FFF7F0000104200000000000000001042FF7FFF7FFF7FFF7F
-      FF7FFF7FFF7FFF7FFF7FFF7F1863000000000000000000000000000000001042
-      FF7F000000000000000000000000000000000000000000001042104210421042
-      10421042104210420000000000000000000000001042FF7FE07F1863E07F1863
-      1042FF7FFF7FFF7F00001042104200000000000000001042FF7F104210421042
-      10421042104210421042FF7F1863000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000001042FF7FFF7FFF7FFF7F
-      10421042FF7F000000000000000000000000000000001042FF7FFF7FFF7FFF7F
-      FF7FFF7FFF7FFF7F000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000001042104210421042
-      000000000000000000000000000000000000000000001042FF7FFF7FFF7FFF7F
-      FF7FFF7FFF7FFF7F1863FF7F1042000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      000000000000000000000000000000000000000000001042FF7FFF7FFF7FFF7F
-      FF7FFF7FFF7FFF7F186310420000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000010421042104210421042
-      1042104210421042104200000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000084848400C6C6
+      C600C6C6C600C6C6C600C6C6C600C6C6C600C6C6C600C6C6C600C6C6C600C6C6
+      C600C6C6C600C6C6C60000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000848484008484
+      8400848484008484840084848400848484008484840084848400848484008484
+      840084848400000000000000000000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00C6C6C60000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000084848400FFFF
+      FF00C6C6C60000FFFF00C6C6C60000FFFF00C6C6C60000FFFF00C6C6C60000FF
+      FF0084848400000000000000000000000000000000000000000084848400FFFF
+      FF00848484008484840084848400848484008484840084848400848484008484
+      8400FFFFFF00C6C6C60000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000084848400FFFFFF00C6C6
+      C60000FFFF00C6C6C60000FFFF00C6C6C60000FFFF00C6C6C60000FFFF00C6C6
+      C60000000000848484000000000000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00C6C6C6000000000000000000000000000000000000000000FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000084848400FFFFFF000000000000000000000000000000
+      0000000000000000000000000000000000008484840084848400FFFFFF0000FF
+      FF00C6C6C60000FFFF00C6C6C60000FFFF00C6C6C60000FFFF00C6C6C6008484
+      840000000000000000000000000000000000000000000000000084848400FFFF
+      FF00848484008484840084848400848484008484840084848400848484008484
+      8400FFFFFF00C6C6C60000000000000000000000000000000000000000008484
+      84008484840000000000000000000000000000000000FFFFFF00FFFFFF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000008484840084848400FFFFFF00FFFFFF0000000000000000000000
+      00000000000000000000000000000000000084848400FFFFFF0000FFFF00C6C6
+      C60000FFFF00C6C6C60000FFFF00C6C6C60000FFFF00C6C6C60000FFFF000000
+      0000C6C6C600C6C6C6000000000000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00C6C6C60000000000000000000000000000000000000000000000
+      00008484840000000000000000000000000000000000FFFFFF00000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000848484000000000000000000FFFFFF0000000000000000000000
+      00000000000000000000000000000000000084848400FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00848484000000
+      0000FF000000FFFFFF00C6C6C60000000000000000000000000084848400FFFF
+      FF00848484008484840084848400848484008484840084848400848484008484
+      8400FFFFFF00C6C6C60000000000000000000000000000000000000000000000
+      000084848400848484000000000000000000FFFFFF00FFFFFF00000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000084848400848484000000000000000000FFFFFF00FFFFFF00000000000000
+      0000000000000000000000000000000000000000000084848400848484008484
+      8400848484008484840084848400848484008484840084848400848484008484
+      8400FFFFFF00FFFFFF000000000000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00C6C6C60000000000000000000000000000000000000000000000
+      000000000000848484000000000000000000FFFFFF0000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      00008484840000000000000000000000000000000000FFFFFF00000000000000
+      0000000000000000000000000000000000000000000084848400FFFFFF0000FF
+      FF00C6C6C60084848400FFFFFF00FFFFFF00FF000000C6C6C600FF000000FFFF
+      FF00FFFFFF00000000000000000000000000000000000000000084848400FFFF
+      FF00848484008484840084848400848484008484840084848400848484008484
+      8400FFFFFF00C6C6C60000000000000000000000000000000000000000000000
+      0000000000008484840084848400FFFFFF00FFFFFF0000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000008484
+      84008484840000000000000000000000000000000000FFFFFF00FFFFFF000000
+      0000000000000000000000000000000000000000000084848400FFFFFF00C6C6
+      C60000FFFF00C6C6C60084848400FFFFFF00FFFFFF00FF000000FFFFFF00FFFF
+      FF0000000000848484000000000000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
+      FF00FFFFFF00C6C6C60000000000000000000000000000000000000000000000
+      0000000000000000000084848400FFFFFF000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000008484
+      8400848484008484840084848400848484008484840084848400848484000000
+      0000000000000000000000000000000000000000000084848400FFFFFF0000FF
+      FF00C6C6C60000FFFF00C6C6C60084848400FFFFFF00FFFFFF00FFFFFF000000
+      000084848400848484000000000000000000000000000000000084848400FFFF
+      FF00848484008484840084848400848484008484840084848400848484008484
+      8400FFFFFF00C6C6C60000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF008484840084848400FFFFFF00000000000000
+      000000000000000000000000000000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000008484
+      8400848484008484840084848400000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C6C6
+      C600FFFFFF008484840000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000084848400FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00C6C6
+      C600848484000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000848484008484
+      8400848484008484840084848400848484008484840084848400848484008484
+      8400000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       000000000000000000000000000000000000424D3E000000000000003E000000
       2800000040000000300000000100010000000000800100000000000000000000

diff --git a/Round.pas b/Round.pas
index db3f95d..da8d776 100644 (file)
--- a/Round.pas
+++ b/Round.pas
@@ -201,7 +201,17 @@ end;
 procedure TRoundDialog.FormCreate(Sender: TObject);
 var
        i: Integer;
+    CenterForm: TCustomForm;
 begin
+    CenterForm := TCustomForm(Owner);
+    if Assigned(CenterForm) then begin
+        Left := ((CenterForm.Width - Width) div 2) + CenterForm.Left;
+        Top := ((CenterForm.Height - Height) div 2) + CenterForm.Top;
+    end else begin
+        Left := (Screen.Width - Width) div 2;
+        Top := (Screen.Height - Height) div 2;
+    end;
+
        //\8c»\8dÝ\82Ì\8f\84\89ñ\83f\81[\83^\82ð\83t\83@\83C\83\8b\83A\83E\83g\82·\82é
        RoundList.SaveRoundFile;
        RoundNameComboBox.Items.Add('\81i\82·\82×\82Ä\81j');

diff --git a/RoundName.dfm b/RoundName.dfm
index f81ac11..1cd87d3 100644 (file)
--- a/RoundName.dfm
+++ b/RoundName.dfm
@@ -13,7 +13,6 @@ object RoundNameDialog: TRoundNameDialog
   Font.Style = []
   FormStyle = fsStayOnTop
   OldCreateOrder = False
-  Position = poOwnerFormCenter
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   PixelsPerInch = 96

diff --git a/RoundName.pas b/RoundName.pas
index a87684d..408c9d8 100644 (file)
--- a/RoundName.pas
+++ b/RoundName.pas
@@ -32,7 +32,18 @@ implementation
 {$R *.dfm}
 
 procedure TRoundNameDialog.FormCreate(Sender: TObject);
+var
+    CenterForm: TCustomForm;
 begin
+    CenterForm := TCustomForm(Owner);
+    if Assigned(CenterForm) then begin
+        Left := ((CenterForm.Width - Width) div 2) + CenterForm.Left;
+        Top := ((CenterForm.Height - Height) div 2) + CenterForm.Top;
+    end else begin
+        Left := (Screen.Width - Width) div 2;
+        Top := (Screen.Height - Height) div 2;
+    end;
+
        FCloseFlag := False;
 end;
 

diff --git a/Search.dfm b/Search.dfm
index 978b0ea..7f41311 100644 (file)
--- a/Search.dfm
+++ b/Search.dfm
@@ -15,13 +15,12 @@ object SearchDialog: TSearchDialog
   Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
   Font.Style = []
   OldCreateOrder = False
-  Position = poOwnerFormCenter
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   DesignSize = (
-    450
-    303)
+    442
+    292)
   PixelsPerInch = 96
   TextHeight = 12
   object BoardLabel: TLabel
@@ -263,8 +262,6 @@ object SearchDialog: TSearchDialog
     Top = 275
     Width = 145
     Height = 16
-    Min = 0
-    Max = 100
     Smooth = True
     Step = 1
     TabOrder = 8

diff --git a/Search.pas b/Search.pas
index c476e4c..147310a 100644 (file)
--- a/Search.pas
+++ b/Search.pas
@@ -80,7 +80,18 @@ begin
 end;
 
 procedure TSearchDialog.FormCreate(Sender: TObject);
+var
+    CenterForm: TCustomForm;
 begin
+    CenterForm := TCustomForm(Owner);
+    if Assigned(CenterForm) then begin
+        Left := ((CenterForm.Width - Width) div 2) + CenterForm.Left;
+        Top := ((CenterForm.Height - Height) div 2) + CenterForm.Top;
+    end else begin
+        Left := (Screen.Width - Width) div 2;
+        Top := (Screen.Height - Height) div 2;
+    end;
+
        SetCategoryList;
        CheckItem(FChkItem);
 end;

diff --git a/ToolBarSetting.dfm b/ToolBarSetting.dfm
index 933563c..8038460 100644 (file)
--- a/ToolBarSetting.dfm
+++ b/ToolBarSetting.dfm
@@ -15,7 +15,6 @@ object ToolBarSettingDialog: TToolBarSettingDialog
   Font.Style = []
   FormStyle = fsStayOnTop
   OldCreateOrder = False
-  Position = poOwnerFormCenter
   OnCreate = FormCreate
   OnDestroy = FormDestroy
   OnShow = FormShow

diff --git a/ToolBarSetting.pas b/ToolBarSetting.pas
index 1e45aa7..c0e8b2a 100644 (file)
--- a/ToolBarSetting.pas
+++ b/ToolBarSetting.pas
@@ -111,7 +111,18 @@ end;
 
 //\83t\83H\81[\83\80\8dì\90¬
 procedure TToolBarSettingDialog.FormCreate(Sender: TObject);
+var
+    CenterForm: TCustomForm;
 begin
+    CenterForm := TCustomForm(Owner);
+    if Assigned(CenterForm) then begin
+        Left := ((CenterForm.Width - Width) div 2) + CenterForm.Left;
+        Top := ((CenterForm.Height - Height) div 2) + CenterForm.Top;
+    end else begin
+        Left := (Screen.Width - Width) div 2;
+        Top := (Screen.Height - Height) div 2;
+    end;
+
        FAllList := TList.Create;
 end;
 

diff --git a/UpdateCheck.dfm b/UpdateCheck.dfm
index fcec032..b7ccb17 100644 (file)
--- a/UpdateCheck.dfm
+++ b/UpdateCheck.dfm
@@ -11,14 +11,13 @@ object UpdateCheckForm: TUpdateCheckForm
   Font.Name = #65325#65331' '#65328#12468#12471#12483#12463
   Font.Style = []
   OldCreateOrder = False
-  Position = poOwnerFormCenter
   OnCreate = FormCreate
   PixelsPerInch = 96
   TextHeight = 12
   object Panel1: TPanel
     Left = 0
     Top = 0
-    Width = 484
+    Width = 476
     Height = 41
     Align = alTop
     TabOrder = 0
@@ -73,16 +72,16 @@ object UpdateCheckForm: TUpdateCheckForm
   object Panel2: TPanel
     Left = 0
     Top = 41
-    Width = 484
-    Height = 172
+    Width = 476
+    Height = 168
     Align = alClient
     Caption = 'Panel2'
     TabOrder = 1
     object ResultMemo: TMemo
       Left = 1
       Top = 1
-      Width = 482
-      Height = 170
+      Width = 474
+      Height = 166
       Align = alClient
       Lines.Strings = (
         'ResultMemo')

diff --git a/UpdateCheck.pas b/UpdateCheck.pas
index 2495065..dd25272 100644 (file)
--- a/UpdateCheck.pas
+++ b/UpdateCheck.pas
@@ -281,7 +281,18 @@ end;
 
 //! Form\83R\83\93\83X\83g\83\89\83N\83^
 procedure TUpdateCheckForm.FormCreate(Sender: TObject);
+var
+    CenterForm: TCustomForm;
 begin
+    CenterForm := TCustomForm(Owner);
+    if Assigned(CenterForm) then begin
+        Left := ((CenterForm.Width - Width) div 2) + CenterForm.Left;
+        Top := ((CenterForm.Height - Height) div 2) + CenterForm.Top;
+    end else begin
+        Left := (Screen.Width - Width) div 2;
+        Top := (Screen.Height - Height) div 2;
+    end;
+
     ResultMemo.Lines.Clear;
     FExecPath := '';
     FExecArgs := '';

diff --git a/gikoNavi.res b/gikoNavi.res
index 5230e11..4c531b3 100644 (file)
Binary files a/gikoNavi.res and b/gikoNavi.res differ