- buttons are left aligned and their size comforms to Windows XP visual

  guidelines

diff --git a/modules/gui/win32/disc.dfm b/modules/gui/win32/disc.dfm
index 707d1a27ee6da244e07ed5a1e63a8a12900ddfa6..3d5903e8ae67ce99b20c30445063aab8eaabf88f 100644 (file)
--- a/modules/gui/win32/disc.dfm
+++ b/modules/gui/win32/disc.dfm
@@ -5,8 +5,8 @@ object DiscDlg: TDiscDlg
   BorderIcons = [biSystemMenu, biMinimize]\r
   BorderStyle = bsDialog\r
   Caption = 'Open Disc'\r
-  ClientHeight = 178\r
-  ClientWidth = 242\r
+  ClientHeight = 173\r
+  ClientWidth = 248\r
   Color = clBtnFace\r
   Font.Charset = DEFAULT_CHARSET\r
   Font.Color = clWindowText\r
@@ -21,23 +21,16 @@ object DiscDlg: TDiscDlg
   object LabelDevice: TLabel\r
     Tag = 3\r
     Left = 8\r
-    Top = 113\r
+    Top = 117\r
     Width = 66\r
     Height = 13\r
     Caption = 'Device &name:'\r
   end\r
-  object Bevel1: TBevel\r
-    Left = 8\r
-    Top = 136\r
-    Width = 225\r
-    Height = 2\r
-    Anchors = [akLeft, akTop, akRight]\r
-  end\r
   object GroupBoxPosition: TGroupBox\r
     Tag = 3\r
     Left = 96\r
     Top = 8\r
-    Width = 137\r
+    Width = 144\r
     Height = 97\r
     Caption = 'Starting position'\r
     TabOrder = 1\r
@@ -60,7 +53,7 @@ object DiscDlg: TDiscDlg
     object SpinEditTitle: TCSpinEdit\r
       Left = 56\r
       Top = 39\r
-      Width = 73\r
+      Width = 80\r
       Height = 22\r
       TabStop = True\r
       Font.Charset = DEFAULT_CHARSET\r
@@ -78,7 +71,7 @@ object DiscDlg: TDiscDlg
     object SpinEditChapter: TCSpinEdit\r
       Left = 56\r
       Top = 67\r
-      Width = 73\r
+      Width = 80\r
       Height = 22\r
       TabStop = True\r
       MaxValue = 65535\r
@@ -101,7 +94,7 @@ object DiscDlg: TDiscDlg
     Tag = 3\r
     Left = 8\r
     Top = 8\r
-    Width = 81\r
+    Width = 80\r
     Height = 97\r
     Caption = 'Disc type'\r
     ItemIndex = 0\r
@@ -113,10 +106,10 @@ object DiscDlg: TDiscDlg
   end\r
   object ButtonOk: TButton\r
     Tag = 3\r
-    Left = 24\r
-    Top = 144\r
-    Width = 81\r
-    Height = 25\r
+    Left = 82\r
+    Top = 142\r
+    Width = 75\r
+    Height = 23\r
     Caption = 'OK'\r
     Default = True\r
     ModalResult = 1\r
@@ -125,10 +118,10 @@ object DiscDlg: TDiscDlg
   end\r
   object ButtonCancel: TButton\r
     Tag = 3\r
-    Left = 136\r
-    Top = 144\r
-    Width = 81\r
-    Height = 25\r
+    Left = 165\r
+    Top = 142\r
+    Width = 75\r
+    Height = 23\r
     Cancel = True\r
     Caption = 'Cancel'\r
     ModalResult = 2\r
@@ -138,8 +131,8 @@ object DiscDlg: TDiscDlg
   object EditDevice: TEdit\r
     Tag = 5\r
     Left = 96\r
-    Top = 109\r
-    Width = 137\r
+    Top = 113\r
+    Width = 144\r
     Height = 21\r
     TabOrder = 2\r
     Text = 'F:\'\r

diff --git a/modules/gui/win32/disc.h b/modules/gui/win32/disc.h
index 6ba741377cd39850dbc75cb86d93aa45bbef4bad..7aa18473c7f4b3e953abeb28d6d752c0dd302d05 100644 (file)
--- a/modules/gui/win32/disc.h
+++ b/modules/gui/win32/disc.h
@@ -46,7 +46,6 @@ __published:  // IDE-managed Components
     TCSpinEdit *SpinEditTitle;\r
     TCSpinEdit *SpinEditChapter;\r
     TCheckBox *CheckBoxMenus;\r
-    TBevel *Bevel1;\r
     void __fastcall FormShow( TObject *Sender );\r
     void __fastcall FormHide( TObject *Sender );\r
     void __fastcall ButtonCancelClick( TObject *Sender );\r

diff --git a/modules/gui/win32/network.dfm b/modules/gui/win32/network.dfm
index 9796a2e4b471d54498c004a1721e7d1dc0494709..99dae116254d38fa964d55ce04886ed053f093c4 100644 (file)
--- a/modules/gui/win32/network.dfm
+++ b/modules/gui/win32/network.dfm
@@ -1,11 +1,11 @@
 object NetworkDlg: TNetworkDlg\r
   Tag = 3\r
-  Left = 507\r
-  Top = 259\r
+  Left = 358\r
+  Top = 414\r
   BorderStyle = bsDialog\r
   Caption = 'Open network'\r
-  ClientHeight = 198\r
-  ClientWidth = 497\r
+  ClientHeight = 191\r
+  ClientWidth = 496\r
   Color = clBtnFace\r
   Font.Charset = DEFAULT_CHARSET\r
   Font.Color = clWindowText\r
@@ -252,8 +252,8 @@ object NetworkDlg: TNetworkDlg
     Tag = 3\r
     Left = 8\r
     Top = 8\r
-    Width = 481\r
-    Height = 145\r
+    Width = 479\r
+    Height = 144\r
     Anchors = [akLeft, akTop, akRight]\r
     Caption = 'Network mode'\r
     TabOrder = 0\r
@@ -267,7 +267,7 @@ object NetworkDlg: TNetworkDlg
     end\r
     object LabelMulticastPort: TLabel\r
       Tag = 3\r
-      Left = 388\r
+      Left = 386\r
       Top = 54\r
       Width = 22\r
       Height = 13\r
@@ -277,7 +277,7 @@ object NetworkDlg: TNetworkDlg
     end\r
     object LabelCSPort: TLabel\r
       Tag = 3\r
-      Left = 388\r
+      Left = 386\r
       Top = 82\r
       Width = 22\r
       Height = 13\r
@@ -358,7 +358,7 @@ object NetworkDlg: TNetworkDlg
       Tag = 5\r
       Left = 208\r
       Top = 50\r
-      Width = 161\r
+      Width = 159\r
       Height = 21\r
       Anchors = [akLeft, akTop, akRight]\r
       Enabled = False\r
@@ -369,7 +369,7 @@ object NetworkDlg: TNetworkDlg
       Tag = 5\r
       Left = 208\r
       Top = 78\r
-      Width = 161\r
+      Width = 159\r
       Height = 21\r
       Anchors = [akLeft, akTop, akRight]\r
       Enabled = False\r
@@ -383,7 +383,7 @@ object NetworkDlg: TNetworkDlg
       Tag = 5\r
       Left = 208\r
       Top = 106\r
-      Width = 265\r
+      Width = 263\r
       Height = 21\r
       Anchors = [akLeft, akTop, akRight]\r
       Enabled = False\r
@@ -401,7 +401,7 @@ object NetworkDlg: TNetworkDlg
       Value = 1234\r
     end\r
     object SpinEditMulticastPort: TCSpinEdit\r
-      Left = 416\r
+      Left = 414\r
       Top = 49\r
       Width = 57\r
       Height = 22\r
@@ -414,7 +414,7 @@ object NetworkDlg: TNetworkDlg
       Value = 1234\r
     end\r
     object SpinEditCSPort: TCSpinEdit\r
-      Left = 416\r
+      Left = 414\r
       Top = 77\r
       Width = 57\r
       Height = 22\r
@@ -429,10 +429,10 @@ object NetworkDlg: TNetworkDlg
   end\r
   object ButtonOK: TButton\r
     Tag = 3\r
-    Left = 48\r
-    Top = 163\r
-    Width = 177\r
-    Height = 25\r
+    Left = 330\r
+    Top = 160\r
+    Width = 75\r
+    Height = 23\r
     Caption = 'OK'\r
     Default = True\r
     ModalResult = 1\r
@@ -441,10 +441,10 @@ object NetworkDlg: TNetworkDlg
   end\r
   object ButtonCancel: TButton\r
     Tag = 3\r
-    Left = 272\r
-    Top = 163\r
-    Width = 177\r
-    Height = 25\r
+    Left = 413\r
+    Top = 160\r
+    Width = 75\r
+    Height = 23\r
     Anchors = [akTop, akRight]\r
     Cancel = True\r
     Caption = 'Cancel'\r

diff --git a/modules/gui/win32/preferences.cpp b/modules/gui/win32/preferences.cpp
index c80972d98a01356fbe68b037ab0b6cab553e952f..19ac0572f0f59dad475a3268f01088d337ca4378 100644 (file)
--- a/modules/gui/win32/preferences.cpp
+++ b/modules/gui/win32/preferences.cpp
@@ -186,7 +186,7 @@ TCSpinEdit * __fastcall TPanelPref::CreateSpinEdit( TWinControl *Parent,
 #define LIBWIN32_PREFSIZE_BUTTON_WIDTH        150\r
 #define LIBWIN32_PREFSIZE_SPINEDIT_WIDTH      100\r
 #define LIBWIN32_PREFSIZE_RIGHT               (LIBWIN32_PREFSIZE_LEFT+LIBWIN32_PREFSIZE_WIDTH)\r
-#define LIBWIN32_PREFSIZE_BUTTON_HEIGHT       25\r
+#define LIBWIN32_PREFSIZE_BUTTON_HEIGHT       23\r
 #define LIBWIN32_PREFSIZE_LABEL_HEIGHT        26\r
 #define LIBWIN32_PREFSIZE_CHECKLISTBOX_HEIGHT 120\r
 #define LIBWIN32_PREFSIZE_EDIT_HEIGHT         21\r

diff --git a/modules/gui/win32/preferences.dfm b/modules/gui/win32/preferences.dfm
index 47987bd30b10f61231a841e652fd85c9c5d44687..16a56ad59959af1471dab63a369f8e1226763906 100644 (file)
--- a/modules/gui/win32/preferences.dfm
+++ b/modules/gui/win32/preferences.dfm
@@ -3,7 +3,7 @@ object PreferencesDlg: TPreferencesDlg
   Left = 310\r
   Top = 125\r
   Width = 458\r
-  Height = 594\r
+  Height = 588\r
   Anchors = [akTop, akRight]\r
   Caption = 'Preferences'\r
   Color = clBtnFace\r
@@ -252,17 +252,17 @@ object PreferencesDlg: TPreferencesDlg
     Left = 8\r
     Top = 8\r
     Width = 433\r
-    Height = 511\r
+    Height = 512\r
     Anchors = [akLeft, akTop, akRight, akBottom]\r
     MultiLine = True\r
     TabOrder = 0\r
   end\r
   object ButtonApply: TButton\r
     Tag = 3\r
-    Left = 266\r
-    Top = 530\r
-    Width = 82\r
-    Height = 25\r
+    Left = 284\r
+    Top = 528\r
+    Width = 75\r
+    Height = 23\r
     Anchors = [akRight, akBottom]\r
     Caption = 'Apply'\r
     TabOrder = 3\r
@@ -270,10 +270,10 @@ object PreferencesDlg: TPreferencesDlg
   end\r
   object ButtonSave: TButton\r
     Tag = 3\r
-    Left = 359\r
-    Top = 530\r
-    Width = 82\r
-    Height = 25\r
+    Left = 367\r
+    Top = 528\r
+    Width = 75\r
+    Height = 23\r
     Anchors = [akRight, akBottom]\r
     Caption = 'Save'\r
     TabOrder = 4\r
@@ -281,10 +281,10 @@ object PreferencesDlg: TPreferencesDlg
   end\r
   object ButtonOK: TButton\r
     Tag = 3\r
-    Left = 81\r
-    Top = 530\r
-    Width = 82\r
-    Height = 25\r
+    Left = 118\r
+    Top = 528\r
+    Width = 75\r
+    Height = 23\r
     Anchors = [akRight, akBottom]\r
     Caption = 'OK'\r
     Default = True\r
@@ -294,10 +294,10 @@ object PreferencesDlg: TPreferencesDlg
   end\r
   object ButtonCancel: TButton\r
     Tag = 3\r
-    Left = 174\r
-    Top = 530\r
-    Width = 82\r
-    Height = 25\r
+    Left = 201\r
+    Top = 528\r
+    Width = 75\r
+    Height = 23\r
     Anchors = [akRight, akBottom]\r
     Cancel = True\r
     Caption = 'Cancel'\r

diff --git a/modules/gui/win32/sout.dfm b/modules/gui/win32/sout.dfm
index 72820808476df4c8a2555854fe212d0e6341dfce..f15497ec26c14bd74378bc0e4ce42790408578cc 100644 (file)
--- a/modules/gui/win32/sout.dfm
+++ b/modules/gui/win32/sout.dfm
@@ -2,8 +2,8 @@ object SoutDlg: TSoutDlg
   Tag = 3\r
   Left = 454\r
   Top = 369\r
-  Width = 394\r
-  Height = 238\r
+  Width = 392\r
+  Height = 244\r
   Caption = 'Stream output'\r
   Color = clBtnFace\r
   Font.Charset = DEFAULT_CHARSET\r
@@ -18,14 +18,14 @@ object SoutDlg: TSoutDlg
     Tag = 3\r
     Left = 8\r
     Top = 8\r
-    Width = 369\r
-    Height = 161\r
+    Width = 368\r
+    Height = 168\r
     Anchors = [akLeft, akTop, akRight]\r
     Caption = 'Stream output MRL (Media Resource Locator)'\r
     TabOrder = 0\r
     object LabelPort: TLabel\r
       Tag = 3\r
-      Left = 264\r
+      Left = 263\r
       Top = 98\r
       Width = 22\r
       Height = 13\r
@@ -45,7 +45,7 @@ object SoutDlg: TSoutDlg
     object EditMrl: TEdit\r
       Left = 16\r
       Top = 24\r
-      Width = 337\r
+      Width = 336\r
       Height = 21\r
       Anchors = [akLeft, akTop, akRight]\r
       TabOrder = 0\r
@@ -92,7 +92,7 @@ object SoutDlg: TSoutDlg
     end\r
     object ButtonBrowse: TButton\r
       Tag = 3\r
-      Left = 278\r
+      Left = 277\r
       Top = 60\r
       Width = 75\r
       Height = 25\r
@@ -104,14 +104,14 @@ object SoutDlg: TSoutDlg
     object EditFile: TEdit\r
       Left = 96\r
       Top = 62\r
-      Width = 177\r
+      Width = 176\r
       Height = 21\r
       Anchors = [akLeft, akTop, akRight]\r
       TabOrder = 2\r
       OnChange = CustomEditChange\r
     end\r
     object SpinEditPort: TCSpinEdit\r
-      Left = 296\r
+      Left = 295\r
       Top = 93\r
       Width = 57\r
       Height = 22\r
@@ -128,7 +128,7 @@ object SoutDlg: TSoutDlg
     object EditAddress: TEdit\r
       Left = 144\r
       Top = 94\r
-      Width = 113\r
+      Width = 112\r
       Height = 21\r
       Anchors = [akLeft, akTop, akRight]\r
       Enabled = False\r
@@ -139,7 +139,7 @@ object SoutDlg: TSoutDlg
     object PanelMux: TPanel\r
       Left = 184\r
       Top = 124\r
-      Width = 89\r
+      Width = 88\r
       Height = 25\r
       Anchors = [akLeft, akTop, akRight]\r
       TabOrder = 6\r
@@ -156,7 +156,7 @@ object SoutDlg: TSoutDlg
       end\r
       object RadioButtonTS: TRadioButton\r
         Tag = 3\r
-        Left = 40\r
+        Left = 39\r
         Top = 4\r
         Width = 41\r
         Height = 17\r
@@ -171,10 +171,10 @@ object SoutDlg: TSoutDlg
   end\r
   object ButtonOK: TButton\r
     Tag = 3\r
-    Left = 56\r
-    Top = 176\r
-    Width = 97\r
-    Height = 25\r
+    Left = 218\r
+    Top = 184\r
+    Width = 75\r
+    Height = 23\r
     Caption = 'OK'\r
     Default = True\r
     ModalResult = 1\r
@@ -183,10 +183,10 @@ object SoutDlg: TSoutDlg
   end\r
   object ButtonCancel: TButton\r
     Tag = 3\r
-    Left = 232\r
-    Top = 176\r
-    Width = 97\r
-    Height = 25\r
+    Left = 301\r
+    Top = 184\r
+    Width = 75\r
+    Height = 23\r
     Cancel = True\r
     Caption = 'Cancel'\r
     ModalResult = 2\r

diff --git a/modules/gui/win32/subtitles.dfm b/modules/gui/win32/subtitles.dfm
index 3fa191665e6c1a37677b239ae572bc8a3ac254ae..0e2ddd4d72b320f9ab0e111a8712a826c461f2fb 100644 (file)
--- a/modules/gui/win32/subtitles.dfm
+++ b/modules/gui/win32/subtitles.dfm
@@ -3,7 +3,7 @@ object SubtitlesDlg: TSubtitlesDlg
   Left = 520\r
   Top = 185\r
   Width = 338\r
-  Height = 173\r
+  Height = 172\r
   Caption = 'Add subtitles'\r
   Color = clBtnFace\r
   Font.Charset = DEFAULT_CHARSET\r
@@ -85,10 +85,10 @@ object SubtitlesDlg: TSubtitlesDlg
   end\r
   object ButtonOK: TButton\r
     Tag = 3\r
-    Left = 39\r
+    Left = 164\r
     Top = 112\r
-    Width = 98\r
-    Height = 25\r
+    Width = 75\r
+    Height = 23\r
     Caption = 'OK'\r
     Default = True\r
     ModalResult = 1\r
@@ -97,10 +97,10 @@ object SubtitlesDlg: TSubtitlesDlg
   end\r
   object ButtonCancel: TButton\r
     Tag = 3\r
-    Left = 192\r
+    Left = 247\r
     Top = 112\r
-    Width = 98\r
-    Height = 25\r
+    Width = 75\r
+    Height = 23\r
     Cancel = True\r
     Caption = 'Cancel'\r
     ModalResult = 2\r