- about.dfm: the layout of the "About" dialog box is slightly different

 - misc.cpp: toolbar buttons are translated too
 - mainframe.dfm: removed the "Back" and "Eject" toolbar buttons, which
   were rather useless, and added an "Eject disc" menu entry
   Also hid the caption for all the toolbar buttons
 - win32.cpp: Added a config option to display or not these captions
 - preferences.cpp: small modification to support non-advanced mode

diff --git a/modules/gui/win32/about.dfm b/modules/gui/win32/about.dfm
index 722f6f2e7d9a0dc58ba431b227e6d543569d541b..d0caf28f147bf36054152311c6f103113364ee2c 100644 (file)
--- a/modules/gui/win32/about.dfm
+++ b/modules/gui/win32/about.dfm
@@ -4,8 +4,8 @@ object AboutDlg: TAboutDlg
   Top = 281\r
   BorderStyle = bsDialog\r
   Caption = 'About'\r
-  ClientHeight = 214\r
-  ClientWidth = 286\r
+  ClientHeight = 222\r
+  ClientWidth = 282\r
   Color = clBtnFace\r
   Font.Charset = DEFAULT_CHARSET\r
   Font.Color = clWindowText\r
@@ -248,9 +248,9 @@ object AboutDlg: TAboutDlg
   TextHeight = 13\r
   object Label1: TLabel\r
     Tag = 3\r
-    Left = 114\r
-    Top = 18\r
-    Width = 132\r
+    Left = 82\r
+    Top = 13\r
+    Width = 141\r
     Height = 20\r
     Caption = 'VLC media player'\r
     Font.Charset = DEFAULT_CHARSET\r
@@ -262,16 +262,16 @@ object AboutDlg: TAboutDlg
   end\r
   object Label2: TLabel\r
     Tag = 3\r
-    Left = 10\r
+    Left = 14\r
     Top = 64\r
-    Width = 172\r
+    Width = 161\r
     Height = 13\r
     Caption = '(c) 1996-2003 the VideoLAN team'\r
   end\r
   object Label4: TLabel\r
     Tag = 3\r
-    Left = 15\r
-    Top = 123\r
+    Left = 14\r
+    Top = 131\r
     Width = 253\r
     Height = 39\r
     Caption = \r
@@ -281,40 +281,41 @@ object AboutDlg: TAboutDlg
   end\r
   object Label3: TLabel\r
     Tag = 3\r
-    Left = 30\r
-    Top = 80\r
-    Width = 227\r
+    Left = 14\r
+    Top = 88\r
+    Width = 216\r
     Height = 13\r
     Caption = 'the VideoLAN team <videolan@videolan.org>'\r
   end\r
   object Image1: TImage\r
-    Left = 32\r
+    Left = 16\r
     Top = 8\r
     Width = 49\r
     Height = 49\r
   end\r
   object Label5: TLabel\r
     Tag = 3\r
-    Left = 83\r
-    Top = 96\r
+    Left = 14\r
+    Top = 104\r
     Width = 121\r
     Height = 13\r
     Caption = 'http://www.videolan.org/'\r
   end\r
   object LabelVersion: TLabel\r
     Tag = 3\r
-    Left = 114\r
-    Top = 40\r
+    Left = 82\r
+    Top = 35\r
     Width = 59\r
     Height = 13\r
     Caption = 'Version x.y.z'\r
   end\r
   object ButtonOK: TButton\r
     Tag = 3\r
-    Left = 70\r
-    Top = 178\r
+    Left = 69\r
+    Top = 188\r
     Width = 145\r
-    Height = 25\r
+    Height = 24\r
+    Anchors = [akLeft, akBottom]\r
     Caption = 'OK'\r
     Default = True\r
     ModalResult = 1\r

diff --git a/modules/gui/win32/mainframe.cpp b/modules/gui/win32/mainframe.cpp
index 4e841dd8b2234356e60a9c93f27f6bd34634d648..467308cfdefefaba97dbb8c9c3b1d59f6c116ccd 100644 (file)
--- a/modules/gui/win32/mainframe.cpp
+++ b/modules/gui/win32/mainframe.cpp
@@ -68,6 +68,14 @@ __fastcall TMainFrameDlg::TMainFrameDlg(
 \r
     TrackBar->Max = SLIDER_MAX_VALUE;\r
 \r
+    /* do we need to show the captions of the toolbuttons? */\r
+    if( config_GetInt( p_intf, "intfwin-show-captions" ) )\r
+    {\r
+        ToolBar->ShowCaptions = true;\r
+        /* Add enough room for the text */\r
+        ToolBar->Height += 9;\r
+    }\r
+\r
     /* default height and caption */\r
     ClientHeight = 37 + ToolBar->Height;\r
     Caption = VOUT_TITLE " (Win32 interface)";\r
@@ -678,8 +686,7 @@ void __fastcall TMainFrameDlg::ModeManage()
     this->Height = i_Height;\r
 \r
     /* set control items */\r
-    ToolButtonBack->Enabled = false;\r
-    ToolButtonEject->Enabled = !b_control;\r
+    EjectAction->Enabled = !b_control;\r
     StopAction->Enabled = true;\r
     PauseAction->Enabled = b_control;\r
     SlowAction->Enabled = b_control;\r

diff --git a/modules/gui/win32/mainframe.dfm b/modules/gui/win32/mainframe.dfm
index b2ac2e1ceb817352f077b3d48755bcab65e15510..3c8e0d13c384fa3fef86d27fbd2cb4913cf81a6d 100644 (file)
--- a/modules/gui/win32/mainframe.dfm
+++ b/modules/gui/win32/mainframe.dfm
@@ -2,7 +2,7 @@ object MainFrameDlg: TMainFrameDlg
   Tag = 3\r
   Left = 356\r
   Top = 227\r
-  Width = 541\r
+  Width = 462\r
   Height = 306\r
   BorderIcons = [biSystemMenu, biMinimize]\r
   Caption = 'VLC media player'\r
@@ -141,15 +141,14 @@ object MainFrameDlg: TMainFrameDlg
   object ToolBar: TToolBar\r
     Left = 0\r
     Top = 0\r
-    Width = 533\r
-    Height = 50\r
-    ButtonHeight = 46\r
+    Width = 454\r
+    Height = 41\r
+    ButtonHeight = 37\r
     ButtonWidth = 39\r
     Caption = 'ToolBar'\r
     EdgeBorders = [ebTop, ebBottom]\r
     Flat = True\r
     Images = ImageListToolbar\r
-    ShowCaptions = True\r
     TabOrder = 0\r
     object ToolButtonFile: TToolButton\r
       Tag = 3\r
@@ -177,38 +176,26 @@ object MainFrameDlg: TMainFrameDlg
       ImageIndex = 3\r
       Style = tbsSeparator\r
     end\r
-    object ToolButtonBack: TToolButton\r
-      Tag = 3\r
-      Left = 125\r
-      Top = 0\r
-      Action = BackAction\r
-    end\r
     object ToolButtonPlay: TToolButton\r
       Tag = 3\r
-      Left = 164\r
+      Left = 125\r
       Top = 0\r
       Action = PlayAction\r
     end\r
     object ToolButtonPause: TToolButton\r
       Tag = 3\r
-      Left = 203\r
+      Left = 164\r
       Top = 0\r
       Action = PauseAction\r
     end\r
     object ToolButtonStop: TToolButton\r
       Tag = 3\r
-      Left = 242\r
+      Left = 203\r
       Top = 0\r
       Action = StopAction\r
     end\r
-    object ToolButtonEject: TToolButton\r
-      Tag = 3\r
-      Left = 281\r
-      Top = 0\r
-      Action = EjectAction\r
-    end\r
     object ToolButtonSep2: TToolButton\r
-      Left = 320\r
+      Left = 242\r
       Top = 0\r
       Width = 8\r
       Caption = 'ToolButtonSep2'\r
@@ -217,18 +204,18 @@ object MainFrameDlg: TMainFrameDlg
     end\r
     object ToolButtonSlow: TToolButton\r
       Tag = 3\r
-      Left = 328\r
+      Left = 250\r
       Top = 0\r
       Action = SlowAction\r
     end\r
     object ToolButtonFast: TToolButton\r
       Tag = 3\r
-      Left = 367\r
+      Left = 289\r
       Top = 0\r
       Action = FastAction\r
     end\r
     object ToolButtonSep3: TToolButton\r
-      Left = 406\r
+      Left = 328\r
       Top = 0\r
       Width = 8\r
       Caption = 'ToolButtonSep3'\r
@@ -237,20 +224,20 @@ object MainFrameDlg: TMainFrameDlg
     end\r
     object ToolButtonPlaylist: TToolButton\r
       Tag = 3\r
-      Left = 414\r
+      Left = 336\r
       Top = 0\r
       Action = PlaylistAction\r
       Style = tbsCheck\r
     end\r
     object ToolButtonPrev: TToolButton\r
       Tag = 3\r
-      Left = 453\r
+      Left = 375\r
       Top = 0\r
       Action = PreviousAction\r
     end\r
     object ToolButtonNext: TToolButton\r
       Tag = 3\r
-      Left = 492\r
+      Left = 414\r
       Top = 0\r
       Action = NextAction\r
     end\r
@@ -258,7 +245,7 @@ object MainFrameDlg: TMainFrameDlg
   object StatusBar: TStatusBar\r
     Left = 0\r
     Top = 241\r
-    Width = 533\r
+    Width = 454\r
     Height = 19\r
     Panels = <>\r
     ParentShowHint = False\r
@@ -268,8 +255,8 @@ object MainFrameDlg: TMainFrameDlg
   object GroupBoxFile: TGroupBox\r
     Tag = 3\r
     Left = 0\r
-    Top = 90\r
-    Width = 533\r
+    Top = 81\r
+    Width = 454\r
     Height = 32\r
     Align = alTop\r
     TabOrder = 2\r
@@ -278,7 +265,7 @@ object MainFrameDlg: TMainFrameDlg
       Tag = 3\r
       Left = 2\r
       Top = 15\r
-      Width = 529\r
+      Width = 450\r
       Height = 15\r
       Align = alClient\r
       Alignment = taCenter\r
@@ -287,8 +274,8 @@ object MainFrameDlg: TMainFrameDlg
   end\r
   object GroupBoxNetwork: TGroupBox\r
     Left = 0\r
-    Top = 154\r
-    Width = 533\r
+    Top = 145\r
+    Width = 454\r
     Height = 40\r
     Align = alTop\r
     TabOrder = 3\r
@@ -332,15 +319,15 @@ object MainFrameDlg: TMainFrameDlg
   end\r
   object GroupBoxDisc: TGroupBox\r
     Left = 0\r
-    Top = 122\r
-    Width = 533\r
+    Top = 113\r
+    Width = 454\r
     Height = 32\r
     Align = alTop\r
     TabOrder = 4\r
     Visible = False\r
     object LabelDisc: TLabel\r
       Tag = 3\r
-      Left = 32\r
+      Left = 24\r
       Top = 11\r
       Width = 21\r
       Height = 13\r
@@ -416,8 +403,8 @@ object MainFrameDlg: TMainFrameDlg
   object GroupBoxSlider: TGroupBox\r
     Tag = 3\r
     Left = 0\r
-    Top = 50\r
-    Width = 533\r
+    Top = 41\r
+    Width = 454\r
     Height = 40\r
     Align = alTop\r
     Caption = '0:00:00'\r
@@ -426,7 +413,7 @@ object MainFrameDlg: TMainFrameDlg
     object TrackBar: TTrackBar\r
       Left = 2\r
       Top = 15\r
-      Width = 529\r
+      Width = 450\r
       Height = 21\r
       Align = alTop\r
       Orientation = trHorizontal\r
@@ -469,9 +456,15 @@ object MainFrameDlg: TMainFrameDlg
         Tag = 3\r
         Action = StreamOutputAction\r
       end\r
+      object N2: TMenuItem\r
+        Caption = '-'\r
+      end\r
+      object MenuEjectDisc: TMenuItem\r
+        Tag = 3\r
+        Action = EjectAction\r
+      end\r
       object N8: TMenuItem\r
         Caption = '-'\r
-        Visible = False\r
       end\r
       object MenuExit: TMenuItem\r
         Tag = 3\r
@@ -2572,7 +2565,7 @@ object MainFrameDlg: TMainFrameDlg
     object EjectAction: TAction\r
       Tag = 3\r
       Category = 'Control'\r
-      Caption = 'Eject'\r
+      Caption = 'Eject disc'\r
       Enabled = False\r
       Hint = 'Eject disc'\r
       ImageIndex = 7\r

diff --git a/modules/gui/win32/mainframe.h b/modules/gui/win32/mainframe.h
index c6ca53a5dd2da6d799f58ed4e72bd3633e87915a..07fc0e1b1cb9444fdc68b746defebc3c79004105 100644 (file)
--- a/modules/gui/win32/mainframe.h
+++ b/modules/gui/win32/mainframe.h
@@ -54,9 +54,7 @@ __published:  // IDE-managed Components
     TToolButton *ToolButtonDisc;\r
     TToolButton *ToolButtonNet;\r
     TToolButton *ToolButtonSep1;\r
-    TToolButton *ToolButtonBack;\r
     TToolButton *ToolButtonStop;\r
-    TToolButton *ToolButtonEject;\r
     TToolButton *ToolButtonPlay;\r
     TToolButton *ToolButtonPause;\r
     TToolButton *ToolButtonSep2;\r
@@ -192,6 +190,8 @@ __published:        // IDE-managed Components
     TMenuItem *PopupFullscreen;\r
     TMenuItem *Videosettings1;\r
     TMenuItem *PopupOnTop;\r
+    TMenuItem *N2;\r
+    TMenuItem *MenuEjectDisc;\r
     void __fastcall TimerManageTimer( TObject *Sender );\r
     void __fastcall TrackBarChange( TObject *Sender );\r
     void __fastcall FormClose( TObject *Sender, TCloseAction &Action );\r

diff --git a/modules/gui/win32/misc.cpp b/modules/gui/win32/misc.cpp
index 00cd7b6feced4856a3dcd28f05978f029a3100e6..6eb63809d8fe74c6e09f5506fdfe9dd8dcd53fb0 100644 (file)
--- a/modules/gui/win32/misc.cpp
+++ b/modules/gui/win32/misc.cpp
@@ -135,7 +135,6 @@ void __fastcall Translate( TForm *Form )
                         Object->Caption = _( Object->Caption.c_str() );\r
                     }\r
                 }\r
-#if 0\r
                 else if( Component->InheritsFrom( __classid( TToolButton ) ) )\r
                 {\r
                     TToolButton *Object = (TToolButton *) Component;\r
@@ -144,7 +143,6 @@ void __fastcall Translate( TForm *Form )
                         Object->Caption = _( Object->Caption.c_str() );\r
                     }\r
                 }\r
-#endif\r
                 else if( Component->InheritsFrom( __classid( TListView ) ) )\r
                 {\r
                     TListView *ListView = (TListView *) Component;\r

diff --git a/modules/gui/win32/preferences.cpp b/modules/gui/win32/preferences.cpp
index e3eb2f3001fa3ff1857c6c1706668f0a9e14b86d..dc830ecbec0e3f4ac12b179e6f1b59f0150ec966 100644 (file)
--- a/modules/gui/win32/preferences.cpp
+++ b/modules/gui/win32/preferences.cpp
@@ -663,6 +663,11 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
     p_item = p_parser->p_config;\r
     if( p_item ) do\r
     {\r
+        if( p_item->b_advanced && !config_GetInt( p_intf, "advanced" ) )\r
+        {\r
+            continue;\r
+        }\r
+\r
         switch( p_item->i_type )\r
         {\r
         case CONFIG_HINT_CATEGORY:\r
@@ -759,10 +764,8 @@ void __fastcall TPreferencesDlg::CreateConfigDialog( char *psz_module_name )
             msg_Warn( p_intf, "unknown config type: %i", p_item->i_type );\r
             break;\r
         }\r
-\r
-        p_item++;\r
     }\r
-    while( p_item->i_type != CONFIG_HINT_END );\r
+    while( p_item->i_type != CONFIG_HINT_END && p_item++ );\r
 \r
     /* Reorder panels inside the tabsheets */\r
     for( i_pages = 0; i_pages < PageControlPref->PageCount; i_pages++ )\r

diff --git a/modules/gui/win32/win32.cpp b/modules/gui/win32/win32.cpp
index 388ab80c8a8ca9be3ad256a478f8e5fdbeef1591..c4209a13e37b2d6fac32ae025636edb65c0e2024 100644 (file)
--- a/modules/gui/win32/win32.cpp
+++ b/modules/gui/win32/win32.cpp
@@ -2,7 +2,7 @@
  * win32.cpp : Win32 interface plugin for vlc\r
  *****************************************************************************\r
  * Copyright (C) 2002-2003 VideoLAN\r
- * $Id: win32.cpp,v 1.16 2003/02/20 01:52:46 sigmunau Exp $\r
+ * $Id: win32.cpp,v 1.17 2003/03/01 21:32:49 ipkiss Exp $\r
  *\r
  * Authors: Olivier Teulière <ipkiss@via.ecp.fr>\r
  *\r
@@ -299,14 +299,21 @@ int Win32Manage( intf_thread_t *p_intf )
  * Module descriptor\r
  *****************************************************************************/\r
 \r
-#define MAX_LINES_TEXT N_("maximum number of lines in the log window")\r
+#define MAX_LINES_TEXT N_( "maximum number of lines in the log window" )\r
 #define MAX_LINES_LONGTEXT N_( \\r
     "You can set the maximum number of lines that the log window will display."\\r
     " Enter -1 if you want to keep all messages." )\r
+#define SHOW_CAPTIONS_TEXT N_( "display text under images in the toolbar" )\r
+#define SHOW_CAPTIONS_LONGTEXT N_( \\r
+    "Check this option if you want to display the caption of the buttons in " \\r
+    "the toolbar. Beware, the display may be messed up" )\r
 \r
 vlc_module_begin();\r
     add_category_hint( N_("Miscellaneous"), NULL, VLC_TRUE );\r
-    add_integer( "intfwin-max-lines", 500, NULL, MAX_LINES_TEXT, MAX_LINES_LONGTEXT, VLC_TRUE );\r
+    add_integer( "intfwin-max-lines", 500, NULL, MAX_LINES_TEXT,\r
+                 MAX_LINES_LONGTEXT, VLC_TRUE );\r
+    add_bool( "intfwin-show-captions", 0, NULL, SHOW_CAPTIONS_TEXT,\r
+              SHOW_CAPTIONS_LONGTEXT, VLC_FALSE );\r
     set_description( _("Native Windows interface module") );\r
     set_capability( "interface", 100 );\r
     set_callbacks( E_(Open), E_(Close) );\r