- 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

- 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
0da5a70e · Boris Dorès · 89ee60c1 · 0da5a70e · 0da5a70e · 0da5a70e
Commit 0da5a70e authored Dec 16, 2002 by Boris Dorès
4 changed files
--- 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;
 }
 //---------------------------------------------------------------------------
-void __fastcall TDiscDlg::BitBtnCancelClick( TObject *Sender )
+void __fastcall TDiscDlg::ButtonCancelClick( TObject *Sender )
 {
    Hide();
 }
 //---------------------------------------------------------------------------
-void __fastcall TDiscDlg::BitBtnOkClick( TObject *Sender )
+void __fastcall TDiscDlg::ButtonOkClick( TObject *Sender )
 {
    AnsiString  Device, Source, Method, Title, Chapter;

@@ -79,7 +79,14 @@ void __fastcall TDiscDlg::BitBtnOkClick( TObject *Sender )
    Chapter.sprintf( "%d", SpinEditChapter->Value );

    /* Build source name and add it to playlist */
+    if ( CheckBoxMenus->Checked )
+    {
+        Source = Method + ":" + Device;
+    }
+    else
+    {
        Source = Method + ":" + Device + "@" + Title + "," + Chapter;
+    }

    p_intf->p_sys->p_playwin->Add( Source, PLAYLIST_APPEND
            | ( p_intf->p_sys->b_play_when_adding ? PLAYLIST_GO : 0 ),
@@ -94,10 +101,14 @@ void __fastcall TDiscDlg::RadioGroupTypeClick( TObject *Sender )
    if( RadioGroupType->ItemIndex == 0 )
    {
        psz_device = config_GetPsz( p_intf, "dvd" );
+        CheckBoxMenus->Enabled = true;
+        CheckBoxMenus->Checked = true;
    }
    else
    {
        psz_device = config_GetPsz( p_intf, "vcd" );
+        CheckBoxMenus->Checked = false;
+        CheckBoxMenus->Enabled = false;
    }

    if( psz_device )
@@ -108,3 +119,26 @@ void __fastcall TDiscDlg::RadioGroupTypeClick( TObject *Sender )
 }
 //---------------------------------------------------------------------------

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

--- a/modules/gui/win32/disc.h
+++ b/modules/gui/win32/disc.h
@@ -40,16 +40,19 @@ __published:	// IDE-managed Components
    TLabel *LabelTitle;
    TLabel *LabelChapter;
    TRadioGroup *RadioGroupType;
-    TBitBtn *BitBtnOk;
-    TBitBtn *BitBtnCancel;
+    TButton *ButtonOk;
+    TButton *ButtonCancel;
    TEdit *EditDevice;
    TCSpinEdit *SpinEditTitle;
    TCSpinEdit *SpinEditChapter;
+    TCheckBox *CheckBoxMenus;
+    TBevel *Bevel1;
    void __fastcall FormShow( TObject *Sender );
    void __fastcall FormHide( TObject *Sender );
-    void __fastcall BitBtnCancelClick( TObject *Sender );
-    void __fastcall BitBtnOkClick( TObject *Sender);
+    void __fastcall ButtonCancelClick( TObject *Sender );
+    void __fastcall ButtonOkClick( TObject *Sender);
    void __fastcall RadioGroupTypeClick( TObject *Sender );
+    void __fastcall CheckBoxMenusClick(TObject *Sender);
 private:	// User declarations
    intf_thread_t *p_intf;
 public:		// User declarations

--- a/modules/gui/win32/preferences.dfm
+++ b/modules/gui/win32/preferences.dfm
@@ -253,6 +253,7 @@ object PreferencesDlg: TPreferencesDlg
    Width = 433
    Height = 511
    Anchors = [akLeft, akTop, akRight, akBottom]
+    MultiLine = True
    TabOrder = 0
  end
  object ButtonApply: TButton