- disc.* : a few enhancements in the design of the "open disc" dialog

  box, including the ability to select dvd menus instead of a particular
  title and chapter
- preferences.dfm : multiline tabs

diff --git a/modules/gui/win32/disc.cpp b/modules/gui/win32/disc.cpp
index bb174a20a71339a907e1a5858ec1666c578a7f6b..4a289be23aa6f6f65b2ee7e6149bbdf1c37e5870 100644 (file)
--- a/modules/gui/win32/disc.cpp
+++ b/modules/gui/win32/disc.cpp
@@ -55,12 +55,12 @@ void __fastcall TDiscDlg::FormHide( TObject *Sender )
     p_intf->p_sys->p_window->OpenDiscAction->Checked = false;\r
 }\r
 //---------------------------------------------------------------------------\r
-void __fastcall TDiscDlg::BitBtnCancelClick( TObject *Sender )\r
+void __fastcall TDiscDlg::ButtonCancelClick( TObject *Sender )\r
 {\r
     Hide();\r
 }\r
 //---------------------------------------------------------------------------\r
-void __fastcall TDiscDlg::BitBtnOkClick( TObject *Sender )\r
+void __fastcall TDiscDlg::ButtonOkClick( TObject *Sender )\r
 {\r
     AnsiString  Device, Source, Method, Title, Chapter;\r
 \r
@@ -79,7 +79,14 @@ void __fastcall TDiscDlg::BitBtnOkClick( TObject *Sender )
     Chapter.sprintf( "%d", SpinEditChapter->Value );\r
 \r
     /* Build source name and add it to playlist */\r
-    Source = Method + ":" + Device + "@" + Title + "," + Chapter;\r
+    if ( CheckBoxMenus->Checked )\r
+    {\r
+        Source = Method + ":" + Device;\r
+    }\r
+    else\r
+    {\r
+        Source = Method + ":" + Device + "@" + Title + "," + Chapter;\r
+    }\r
 \r
     p_intf->p_sys->p_playwin->Add( Source, PLAYLIST_APPEND\r
             | ( p_intf->p_sys->b_play_when_adding ? PLAYLIST_GO : 0 ),\r
@@ -94,10 +101,14 @@ void __fastcall TDiscDlg::RadioGroupTypeClick( TObject *Sender )
     if( RadioGroupType->ItemIndex == 0 )\r
     {\r
         psz_device = config_GetPsz( p_intf, "dvd" );\r
+        CheckBoxMenus->Enabled = true;\r
+        CheckBoxMenus->Checked = true;\r
     }\r
     else\r
     {\r
         psz_device = config_GetPsz( p_intf, "vcd" );\r
+        CheckBoxMenus->Checked = false;\r
+        CheckBoxMenus->Enabled = false;\r
     }\r
 \r
     if( psz_device )\r
@@ -108,3 +119,26 @@ void __fastcall TDiscDlg::RadioGroupTypeClick( TObject *Sender )
 }\r
 //---------------------------------------------------------------------------\r
 \r
+void __fastcall TDiscDlg::CheckBoxMenusClick(TObject *Sender)\r
+{\r
+    if ( CheckBoxMenus->Checked )\r
+    {\r
+        LabelTitle->Enabled = false;\r
+        LabelChapter->Enabled = false;\r
+        SpinEditTitle->Enabled = false;\r
+        SpinEditTitle->Color = clBtnFace;\r
+        SpinEditChapter->Enabled = false;\r
+        SpinEditChapter->Color = clBtnFace;\r
+    }\r
+    else\r
+    {\r
+        LabelTitle->Enabled = true;\r
+        LabelChapter->Enabled = true;\r
+        SpinEditTitle->Enabled = true;\r
+        SpinEditTitle->Color = clWindow;\r
+        SpinEditChapter->Enabled = true;\r
+        SpinEditChapter->Color = clWindow;\r
+    }\r
+}\r
+//---------------------------------------------------------------------------\r
+\r

diff --git a/modules/gui/win32/disc.dfm b/modules/gui/win32/disc.dfm
index 58983a971525d81f3381ab2d9c284bce20820c1b..df12da972c2ecf553ec960a6b3df52d8ac3d2ffd 100644 (file)
--- a/modules/gui/win32/disc.dfm
+++ b/modules/gui/win32/disc.dfm
@@ -1,247 +1,17 @@
 object DiscDlg: TDiscDlg\r
-  Left = 503\r
-  Top = 366\r
+  Left = 502\r
+  Top = 336\r
+  BorderIcons = [biSystemMenu, biMinimize]\r
   BorderStyle = bsDialog\r
   Caption = 'Open disc'\r
-  ClientHeight = 170\r
-  ClientWidth = 258\r
+  ClientHeight = 138\r
+  ClientWidth = 338\r
   Color = clBtnFace\r
   Font.Charset = DEFAULT_CHARSET\r
   Font.Color = clWindowText\r
   Font.Height = -11\r
   Font.Name = 'MS Sans Serif'\r
   Font.Style = []\r
-  Icon.Data = {\r
-    0000010001003030000001001800A81C00001600000028000000300000006000\r
-    00000100180000000000001B0000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000069375900000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000120E0A4011253E0F18000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000F0B\r
-    084143CA08070016430F08040800000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    00000000000000003127291203174647E8464AE808010840E54039E6390B0C06\r
-    0E0A1C0000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0070CD0079DD0079DD0070CD0000000000000000000C1008261D6E4647E54547\r
-    E64748E105040039E6393AE53939E63936D33308030100000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    000000000070CD0079DD0079DE007DE40088F9008CFF008CFF0088F9007CE302\r
-    6EC70B09124641DC4444DF4546E34446E54847E003040040E6403AEA3A3EE33E\r
-    3CE33C39E639080F010801050000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    00000000000000000070CD0079DD0077D90070CB0078D8007BDC007BDC007BDC\r
-    007BDC007BDC007BDD007EE32E232D0804084553F14250F34252ED4449DB4844\r
-    DC4645E208010540E5401C78150D18053CE63C3AE63A39EA393CD83C241A2006\r
-    0402000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000070CD0079DD007ADF007BDE007BDC0072\r
-    CC005188004877004876004876004876034976054A760B4D7731434221175B42\r
-    54EC4253EE4252F60B05104250F44252EB4546DA08010539E6392BAA2B080105\r
-    3CE63C39E7393AE63A39E93939E839081208181C080000000000000000000000\r
-    000000000000000000000000000000000000000070CD0079DD0079DD007CE300\r
-    88F90089F90075D2005188004877005188008CFF008CFF008CFF008CFF008CFF\r
-    1092FF2099FF31A0FF1408294840DB4550E1464EEA0C060B0B05084654F64653\r
-    F64453EF080E033AE63A2BAA2B03030339E33939DF3939E639080F083DDB3D24\r
-    9C24434B3B000000000000000000000000000000000000000000000000000000\r
-    0063B60085F3008BFE0088F9007FE90088F90080E8005CA0008CFF008CFF008C\r
-    FF008CFF008CFF008CFF008CFF048DFF1594FF259BFF35A2FF0C04103F38C754\r
-    5AF7505BF10C08100801084352F64652F44253F30813053AE63A39E639030403\r
-    1C521826A1250812010807032454131558150000000000000000000000000000\r
-    000000000000000000000000000000000000000070CD007CE30079DD00000000\r
-    7CE30089FA008CFF0089FA008CFF008CFF008CFF008CFF008CFF008CFF098FFF\r
-    1996FF2A9DFF3AA4FF0804103A2AA34E58F74E58F40B0B120803054652F34548\r
-    E64451F305130532CA323AE23A03070308070307040008040139E63939E43931\r
-    B42F5E1347000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000061B10000000079DD008CFF008CFF008CFF008CFF008C\r
-    FF008CFF008CFF008CFF008CFF0E91FF1E98FF2E9FFF3FA6FF040408382BAF4D\r
-    5AEF555AF70F12250501050F04160804074250F3121A123AE93A39E239080803\r
-    0D2F08010401268C2539E7393DE63D3FE23E0804100000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    79DD008CFF008CFF008CFF008CFF008CFF008CFF008CFF008CFF028CFF1293FF\r
-    239AFF33A1FF43A8FF0802083A2AA3565BF7555AF71714330501050104000801\r
-    07424FF12828203AEA3A39E639030703182F1008340801040139E7393DE83D39\r
-    E939080400000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000070CD0088F9008CFF008CFF008CFF008C\r
-    FF008CFF008CFF008CFF078EFF1795FF279CFF38A3FF48AAFF0808005151F155\r
-    5AF30804030804000504050800082E358E0E0C1F1D192439E53940E640080400\r
-    2AA12739E63908020708010539E8393BE93B0804080000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000007CE3008CFF008CFF008CFF058EFD1D96F92398F8269AFA31A0FC42A8FF\r
-    4FAEFF5CB3FF65B7FF0C08084F5AF14E57F50B04080804043639A54647E81C13\r
-    49363AA70804080F120835953439E7393EE63E39DF3939EA39081105308A2B3F\r
-    E73F080601000000000000000000000000000000000000000000000000000000\r
-    000000000000000000000000000000000000047BDB1D96F92398F82498F83BA0\r
-    F399C1E1B1C9DDBCD4E7CBE0F3D9EDFFDCEEFFDEEFFFCDE8FF080808575BF750\r
-    58F624125A5057F34845DF4A41E0150E30C55734E3723EC56E33A23D27050105\r
-    39E43939E63939E6393CE63C14420C3BE03B192A090000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000004\r
-    04042D88D399C1E1B1C9DDB1C9DCB7CBDBCFD3D7D5D5D6E2E2E3F0F0F1FEFEFF\r
-    FEFEFFFEFEFFF9FCFF0C08085D61F15B61EF555AF64A4FE13937BB0E0A12DE74\r
-    39E1733CDE713CDF753AE67541C36B342C231F17141B3AE63A39E7393DE83D39\r
-    E93939DE39000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000001818186893B8C3CCD2D5D5D6D5D5D6D5D5\r
-    D6D6D6D6D6D6D6E3E3E3F1F1F1FFFFFFFFFFFFFFFFFFFFFFFF140C145C5EF668\r
-    63F75555EA10061CC3673FDF713A0C1104080403080105080007070407D56F36\r
-    DE743EDE72401C200C29452939E63939E73939EA390000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000343434A2B4C2D5D5D6D6D6D6D6D6D6D6D6D6D5D5D6E2E2E3F0F0F1FEFEFF\r
-    FEFEFFFEFEFFFEFEFF20161C5C5EF6373EAE0E0413E2713DE1763CCD6A3C2A0D\r
-    08A44B2CDE743EBD612F080401030403E1713CDE7239DE713AE1723C22201139\r
-    C13341E641000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000001B1B1B99AEBED5D5D6D5D5D6D5D5\r
-    D6CFD3D7B8CBDBBFD5E7CEE2F3DCEFFFDFF0FFE2F1FFE9F4FF10100C3639A46E\r
-    4540DE7239DE713DE1713C07000784261CDE7639E3743E0812001F0407D86E36\r
-    E3753EE57540E57541DE763CDE733DD26637493C387E2F7B0000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    00001B1B1B99AEBFCED3D7B7CBDBB1C9DD99C1E140A2F339A2FA49AAFC59B2FF\r
-    66B8FF74BEFF92CBFFD9ECFF0F0402C66531DE7139E2733D854B1E0A01084D11\r
-    0DE3733EE1723CDF713ADF753AE1763C1D0A08290708E57140E1763CDE733DC7\r
-    6B34080408000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000001818187FA5C399C1E13BA0F32498\r
-    F81D96F91091FD1C97FF2C9EFF3CA5FF4DACFF5DB3FF71BBFF8DC8FF9FD0FF08\r
-    0400080406B95C2EDE7239070B070803014D1615DE723CDE7540E5714030090D\r
-    0504003A120FE67541DE75390808044A0C290000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    00000707071778C81C92F3058EFD008CFF008CFF1092FF2099FF31A0FF41A7FF\r
-    51AEFF62B5FF72BCFF7BBFFF7BBBF96E9FCD0808080806041D0508E571403E22\r
-    0C200708080405070407070007080303B05F31DE723967301908010500000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    000000000000000000000000000000000000000000000000007CE3008CFF008C\r
-    FF048DFF1594FF259BFF35A2FF46A9FF56B0FF66B7FF77BEFF7BBFFF6DAAE300\r
-    0000000000000000000000080401200C088D4024E17141E57140DF713ADE713E\r
-    DE76390801070000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    00000000000000000079DD008CFF008CFF098FFF1996FF2A9DFF3AA4FF4AABFF\r
-    5BB2FF6BB9FF7BBFFF7BBFFF6AA5DD0000000000000000000000000000001D1A\r
-    0C1A0F08110903441912E57140623B1E08020300000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000079DD008CFF008C\r
-    FF0E91FF1E98FF2E9FFF3FA6FF4FADFF5FB4FF70BBFF7BBFFF78BAF96299CD00\r
-    00000000000000000000000000000000000000003914100000005A2411000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    00000000000000000070CD0088F9078EFD2C9CF940A3F850ACFA60B4FC70BCFF\r
-    7DC2FF87C6FF7EC0FF6DAAE30000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000707071A85DD40A2\r
-    F3A0C3E1B7CBDDC6D8E7D4E5F3E2F1FFE5F2FFD9ECFF9FD0FF7AACDD05050500\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    00000000000000001818187FA5C3B8CBDBD0D4D7D5D5D6E2E2E3F0F0F1FEFEFF\r
-    FEFEFFFAFCFFE2EDF99FB7CD1C1C1C0000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000001B1B1B99AEBFD4D5\r
-    D6D6D6D6D6D6D6E3E3E3F1F1F1FFFFFFFFFFFFFEFEFFD1DAE33E3E3E00000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    00000000000000001D1D1D7B9BB4CACED1D6D6D6D5D5D6E2E2E3F0F0F1FEFEFF\r
-    FEFEFFFEFEFFC9D2DD2121210000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    000000000000000000000000000000000000000000000000000000343434A5B5\r
-    C2CFD3D7BFCEDBC9D9E7D7E6F3E6F3FFECF5FFF0F4F9AEBDCD23232300000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    000000000000000000000018181887A8C3A6C6E169B3F367B6FA77BEFC88C6FF\r
-    9FD0FFB4CBE33939390000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    000000000000000000000000000000000000000000000000000000040404338C\r
-    D749A8F947A9FD54AFFF64B6FF74BDFF7EC0FF76ABDD05050500000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    00000000000000000000000000001F7DCD369FF948AAFF58B1FF69B8FF79BFFF\r
-    78BAF96299CD0000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    003592E34DACFF5DB3FF6DBAFF7BBFFF6DAAE300000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    00000000000000000000000000000000003890DD51AEFF62B5FF72BCFF7BBFFF\r
-    6AA5DD0000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    003B8FD84C9CE3589FDE69A9E375B6F46299CD00000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    00000000000000000000000000000000003376B00000000000000000005788B6\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    00000000006CC61A83DD247FCC00000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000006DC71A83DD2686D71F6EB1\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    0000000000000000000000000000000000000000000000000000000000000000\r
-    000000000000000000000000000000000000000000000000000000000000FFFF\r
-    FFFFFFFF0000FFFFFFFFFFFF0000FFFFFE1FDFFF0000FFFFE0078FFF0000FFFE\r
-    000007FF0000FFF0000001FF0000FF80000000FF0000FF000000003F0000FF00\r
-    0000000F0000FE00000000070000F800000000070000F8000000000F0000FC00\r
-    000000070000FE00000000070000FF80000000070000FFC0000000070000FFE0\r
-    000000070000FFE0000000070000FFE0000000070000FFE0000000070000FFF0\r
-    000000070000FFF0000000030000FFF0000000070000FFF00000000F0000FFF0\r
-    0000003F0000FFF8000E00FF0000FFF8000F01FF0000FFF8000FD7FF0000FFF8\r
-    001FFFFF0000FFFC001FFFFF0000FFFC001FFFFF0000FFFC003FFFFF0000FFFC\r
-    003FFFFF0000FFFE003FFFFF0000FFFE007FFFFF0000FFFE007FFFFF0000FFFE\r
-    007FFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF00FFFFFF0000FFFF\r
-    01FFFFFF0000FFFF01FFFFFF0000FFFF81FFFFFF0000FFFFC3FFFFFF0000FFFF\r
-    FFFFFFFF0000FFFFFFFFFFFF0000FFFFFFFFFFFF0000FFFFFFFFFFFF0000}\r
   OldCreateOrder = False\r
   OnHide = FormHide\r
   OnShow = FormShow\r
@@ -250,102 +20,133 @@ object DiscDlg: TDiscDlg
   object LabelDevice: TLabel\r
     Tag = 3\r
     Left = 8\r
-    Top = 105\r
-    Width = 63\r
+    Top = 113\r
+    Width = 66\r
     Height = 13\r
-    Caption = 'Device name'\r
+    Caption = 'Device &name:'\r
+  end\r
+  object Bevel1: TBevel\r
+    Left = 240\r
+    Top = 0\r
+    Width = 9\r
+    Height = 137\r
+    Shape = bsLeftLine\r
   end\r
   object GroupBoxPosition: TGroupBox\r
     Tag = 3\r
     Left = 96\r
     Top = 8\r
-    Width = 153\r
-    Height = 81\r
+    Width = 137\r
+    Height = 97\r
     Caption = 'Starting position'\r
     TabOrder = 1\r
     object LabelTitle: TLabel\r
       Tag = 3\r
-      Left = 16\r
-      Top = 24\r
-      Width = 20\r
+      Left = 8\r
+      Top = 44\r
+      Width = 23\r
       Height = 13\r
-      Caption = 'Title'\r
+      Caption = '&Title:'\r
+      Enabled = False\r
     end\r
     object LabelChapter: TLabel\r
       Tag = 3\r
-      Left = 16\r
-      Top = 52\r
-      Width = 37\r
+      Left = 8\r
+      Top = 72\r
+      Width = 40\r
       Height = 13\r
-      Caption = 'Chapter'\r
+      Caption = '&Chapter:'\r
+      Enabled = False\r
     end\r
     object SpinEditTitle: TCSpinEdit\r
-      Left = 64\r
-      Top = 19\r
+      Left = 56\r
+      Top = 39\r
       Width = 73\r
       Height = 22\r
       TabStop = True\r
+      Color = clBtnFace\r
+      Enabled = False\r
+      Font.Charset = DEFAULT_CHARSET\r
+      Font.Color = clWindowText\r
+      Font.Height = -11\r
+      Font.Name = 'MS Sans Serif'\r
+      Font.Style = []\r
       MaxValue = 65535\r
       MinValue = 1\r
       ParentColor = False\r
-      TabOrder = 0\r
+      ParentFont = False\r
+      TabOrder = 1\r
       Value = 1\r
     end\r
     object SpinEditChapter: TCSpinEdit\r
-      Left = 64\r
-      Top = 47\r
+      Left = 56\r
+      Top = 67\r
       Width = 73\r
       Height = 22\r
       TabStop = True\r
+      Color = clBtnFace\r
+      Enabled = False\r
       MaxValue = 65535\r
       MinValue = 1\r
       ParentColor = False\r
-      TabOrder = 1\r
+      TabOrder = 2\r
       Value = 1\r
     end\r
+    object CheckBoxMenus: TCheckBox\r
+      Left = 8\r
+      Top = 16\r
+      Width = 97\r
+      Height = 17\r
+      Caption = '&Menus'\r
+      Checked = True\r
+      State = cbChecked\r
+      TabOrder = 0\r
+      OnClick = CheckBoxMenusClick\r
+    end\r
   end\r
   object RadioGroupType: TRadioGroup\r
     Tag = 3\r
     Left = 8\r
     Top = 8\r
     Width = 81\r
-    Height = 81\r
+    Height = 97\r
     Caption = 'Disc type'\r
     ItemIndex = 0\r
     Items.Strings = (\r
-      'DVD'\r
-      'VCD')\r
+      '&DVD'\r
+      '&VCD')\r
     TabOrder = 0\r
     OnClick = RadioGroupTypeClick\r
   end\r
-  object BitBtnOk: TBitBtn\r
+  object ButtonOk: TButton\r
     Tag = 3\r
-    Left = 8\r
-    Top = 136\r
-    Width = 113\r
+    Left = 248\r
+    Top = 8\r
+    Width = 81\r
     Height = 25\r
     Caption = 'OK'\r
     Default = True\r
     ModalResult = 1\r
     TabOrder = 3\r
-    OnClick = BitBtnOkClick\r
+    OnClick = ButtonOkClick\r
   end\r
-  object BitBtnCancel: TBitBtn\r
+  object ButtonCancel: TButton\r
     Tag = 3\r
-    Left = 136\r
-    Top = 136\r
-    Width = 113\r
+    Left = 248\r
+    Top = 40\r
+    Width = 81\r
     Height = 25\r
+    Cancel = True\r
     Caption = 'Cancel'\r
     ModalResult = 2\r
     TabOrder = 4\r
-    OnClick = BitBtnCancelClick\r
+    OnClick = ButtonCancelClick\r
   end\r
   object EditDevice: TEdit\r
     Tag = 5\r
-    Left = 88\r
-    Top = 101\r
-    Width = 161\r
+    Left = 96\r
+    Top = 109\r
+    Width = 137\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 a794495ec4f22d282c0902525d47baf4a6f1a215..64ff2d3b5d1052cd3f99ee15ab5101927c1290f3 100644 (file)
--- a/modules/gui/win32/disc.h
+++ b/modules/gui/win32/disc.h
@@ -40,16 +40,19 @@ __published:        // IDE-managed Components
     TLabel *LabelTitle;\r
     TLabel *LabelChapter;\r
     TRadioGroup *RadioGroupType;\r
-    TBitBtn *BitBtnOk;\r
-    TBitBtn *BitBtnCancel;\r
+    TButton *ButtonOk;\r
+    TButton *ButtonCancel;\r
     TEdit *EditDevice;\r
     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 BitBtnCancelClick( TObject *Sender );\r
-    void __fastcall BitBtnOkClick( TObject *Sender);\r
+    void __fastcall ButtonCancelClick( TObject *Sender );\r
+    void __fastcall ButtonOkClick( TObject *Sender);\r
     void __fastcall RadioGroupTypeClick( TObject *Sender );\r
+    void __fastcall CheckBoxMenusClick(TObject *Sender);\r
 private:       // User declarations\r
     intf_thread_t *p_intf;\r
 public:                // User declarations\r

diff --git a/modules/gui/win32/preferences.dfm b/modules/gui/win32/preferences.dfm
index 4404d9f80a6a8a2fc61f967a57b9d24080295775..e782d50418cc55d8783a36466a4d78abb02b2e95 100644 (file)
--- a/modules/gui/win32/preferences.dfm
+++ b/modules/gui/win32/preferences.dfm
@@ -253,6 +253,7 @@ object PreferencesDlg: TPreferencesDlg
     Width = 433\r
     Height = 511\r
     Anchors = [akLeft, akTop, akRight, akBottom]\r
+    MultiLine = True\r
     TabOrder = 0\r
   end\r
   object ButtonApply: TButton\r