* changed OSGraphics constructor (needed for X11)

[vlc] / modules / gui / win32 / mainframe.dfm

diff --git a/modules/gui/win32/mainframe.dfm b/modules/gui/win32/mainframe.dfm
index 1748d6d0c566c77dece669ecf67bd8f0cb5f43b7..3c8e0d13c384fa3fef86d27fbd2cb4913cf81a6d 100644 (file)
--- a/modules/gui/win32/mainframe.dfm
+++ b/modules/gui/win32/mainframe.dfm
@@ -1,10 +1,11 @@
 object MainFrameDlg: TMainFrameDlg\r
+  Tag = 3\r
   Left = 356\r
   Top = 227\r
-  Width = 541\r
+  Width = 462\r
   Height = 306\r
   BorderIcons = [biSystemMenu, biMinimize]\r
-  Caption = 'VideoLAN Client'\r
+  Caption = 'VLC media player'\r
   Color = clBtnFace\r
   Font.Charset = DEFAULT_CHARSET\r
   Font.Color = clWindowText\r
@@ -140,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
@@ -176,80 +176,68 @@ 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 ToolButton1: TToolButton\r
-      Left = 320\r
+    object ToolButtonSep2: TToolButton\r
+      Left = 242\r
       Top = 0\r
       Width = 8\r
-      Caption = 'ToolButton1'\r
+      Caption = 'ToolButtonSep2'\r
       ImageIndex = 13\r
       Style = tbsSeparator\r
     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 ToolButtonSep2: TToolButton\r
-      Left = 406\r
+    object ToolButtonSep3: TToolButton\r
+      Left = 328\r
       Top = 0\r
       Width = 8\r
-      Caption = 'ToolButtonSep2'\r
+      Caption = 'ToolButtonSep3'\r
       ImageIndex = 9\r
       Style = tbsSeparator\r
     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
@@ -257,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
@@ -267,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
@@ -277,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
@@ -286,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
@@ -304,7 +292,7 @@ object MainFrameDlg: TMainFrameDlg
       Tag = 3\r
       Left = 64\r
       Top = 16\r
-      Width = 49\r
+      Width = 46\r
       Height = 13\r
       Caption = 'No server'\r
     end\r
@@ -331,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
@@ -415,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
@@ -425,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
@@ -460,9 +448,23 @@ object MainFrameDlg: TMainFrameDlg
         Action = NetworkStreamAction\r
         Caption = '&Network stream...'\r
       end\r
+      object MenuAddSubtitles: TMenuItem\r
+        Tag = 3\r
+        Action = AddSubtitlesAction\r
+      end\r
+      object MenuStreamOuput: TMenuItem\r
+        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
@@ -472,6 +474,14 @@ object MainFrameDlg: TMainFrameDlg
     object MenuView: TMenuItem\r
       Tag = 3\r
       Caption = '&View'\r
+      object MenuFullscreen: TMenuItem\r
+        Tag = 3\r
+        Action = FullscreenAction\r
+      end\r
+      object MenuOnTop: TMenuItem\r
+        Tag = 3\r
+        Action = OnTopAction\r
+      end\r
       object MenuHideinterface: TMenuItem\r
         Tag = 3\r
         Caption = '&Hide interface'\r
@@ -494,6 +504,14 @@ object MainFrameDlg: TMainFrameDlg
         Tag = 3\r
         Action = PreferencesAction\r
       end\r
+      object N4: TMenuItem\r
+        Caption = '-'\r
+      end\r
+      object MenuAddInterface: TMenuItem\r
+        Tag = 3\r
+        Caption = '&Add interface'\r
+        Hint = 'Spawn a new interface'\r
+      end\r
     end\r
     object MenuControls: TMenuItem\r
       Tag = 3\r
@@ -512,6 +530,7 @@ object MainFrameDlg: TMainFrameDlg
         Action = VolumeDownAction\r
       end\r
       object MenuMute: TMenuItem\r
+        Tag = 3\r
         Action = MuteAction\r
       end\r
       object MenuChannel: TMenuItem\r
@@ -520,18 +539,11 @@ object MainFrameDlg: TMainFrameDlg
         Enabled = False\r
         Hint = 'Select audio channel'\r
       end\r
-      object N2: TMenuItem\r
-        Caption = '-'\r
-      end\r
       object MenuVDevice: TMenuItem\r
         Tag = 3\r
         Caption = 'Sc&reen'\r
         Enabled = False\r
       end\r
-      object MenuFullscreen: TMenuItem\r
-        Tag = 3\r
-        Action = FullscreenAction\r
-      end\r
       object N11: TMenuItem\r
         Caption = '-'\r
       end\r
@@ -2375,15 +2387,9 @@ object MainFrameDlg: TMainFrameDlg
       object PopupJump: TMenuItem\r
         Tag = 3\r
         Caption = '&Jump...'\r
+        Enabled = False\r
         OnClick = PopupJumpClick\r
       end\r
-      object N6: TMenuItem\r
-        Caption = '-'\r
-      end\r
-      object PopupFullscreen: TMenuItem\r
-        Tag = 3\r
-        Action = FullscreenAction\r
-      end\r
     end\r
     object PopupAudioSettings: TMenuItem\r
       Tag = 3\r
@@ -2411,9 +2417,22 @@ object MainFrameDlg: TMainFrameDlg
         Enabled = False\r
       end\r
     end\r
-    object PopupVDevice: TMenuItem\r
-      Caption = 'Screen'\r
-      Enabled = False\r
+    object Videosettings1: TMenuItem\r
+      Tag = 3\r
+      Caption = 'Video settings'\r
+      object PopupFullscreen: TMenuItem\r
+        Tag = 3\r
+        Action = FullscreenAction\r
+      end\r
+      object PopupOnTop: TMenuItem\r
+        Tag = 3\r
+        Action = OnTopAction\r
+      end\r
+      object PopupVDevice: TMenuItem\r
+        Tag = 3\r
+        Caption = 'Screen'\r
+        Enabled = False\r
+      end\r
     end\r
     object N1: TMenuItem\r
       Caption = '-'\r
@@ -2531,6 +2550,7 @@ object MainFrameDlg: TMainFrameDlg
       Enabled = False\r
       Hint = 'Pause stream'\r
       ImageIndex = 6\r
+      ShortCut = 32\r
       OnExecute = PauseActionExecute\r
     end\r
     object StopAction: TAction\r
@@ -2545,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
@@ -2585,6 +2605,20 @@ object MainFrameDlg: TMainFrameDlg
       ImageIndex = 12\r
       OnExecute = NextActionExecute\r
     end\r
+    object StreamOutputAction: TAction\r
+      Tag = 3\r
+      Category = 'Menu'\r
+      Caption = '&Stream output...'\r
+      Hint = 'Open the stream output'\r
+      OnExecute = StreamOutputActionExecute\r
+    end\r
+    object AddSubtitlesAction: TAction\r
+      Tag = 3\r
+      Category = 'Menu'\r
+      Caption = '&Add subtitles...'\r
+      Hint = 'Add a subtitle file'\r
+      OnExecute = AddSubtitlesActionsExecute\r
+    end\r
     object PlaylistAction: TAction\r
       Tag = 3\r
       Category = 'Menu'\r
@@ -2622,7 +2656,7 @@ object MainFrameDlg: TMainFrameDlg
       Category = 'Menu'\r
       Caption = 'Messages...'\r
       Hint = 'Open the messages window'\r
-      ShortCut = 16461\r
+      ShortCut = 16460\r
       OnExecute = MessagesActionExecute\r
     end\r
     object AboutAction: TAction\r
@@ -2681,7 +2715,16 @@ object MainFrameDlg: TMainFrameDlg
       Category = 'Control'\r
       Caption = '&Mute'\r
       Hint = 'Toggle mute'\r
+      ShortCut = 16461\r
       OnExecute = MuteActionExecute\r
     end\r
+    object OnTopAction: TAction\r
+      Tag = 3\r
+      Category = 'Menu'\r
+      Caption = 'Always on top...'\r
+      Hint = 'Set the window on top'\r
+      ShortCut = 16468\r
+      OnExecute = OnTopActionExecute\r
+    end\r
   end\r
 end\r