Skip to content

GitLab

W
web-ui-redesign
Commit b3c41d79 authored by Olivier Teulière's avatar Olivier Teulière
Browse files
Options

The win32 interface is preparing for the internationalization.

parent 5e1d56ae
Hide whitespace changes
Inline Side-by-side
Showing with 398 additions and 67 deletions
modules/gui/win32/Makefile
View file @ b3c41d79
......@@ -6,7 +6,7 @@ win32_CUSTOM = yes
win32.so: Makefile
rm -f win32.mak
$(BCBUILDER)/Bin/bpr2mak win32.bpr -s | sed 's#^LIBPATH = .*#&;$$(RELEASELIBPATH)# ; s#^USERDEFINES = .*#& -DWIN32 -D__PLUGIN__ -D__VLC__ -DMODULE_NAME_IS_win32 -DMODULE_NAME=win32 -DMODULE_PATH=modules_gui_win32_win32#' > win32.mak
$(BCBUILDER)/Bin/bpr2mak win32.bpr -s | sed 's#^LIBPATH = .*#&;$$(RELEASELIBPATH)# ; s#^USERDEFINES = .*#& -DMODULE_NAME=win32 -DMODULE_PATH=modules_gui_win32_win32#' > win32.mak
$(BCBUILDER)/Bin/make -f win32.mak -b
modules/gui/win32/about.cpp
View file @ b3c41d79
/*****************************************************************************
* about.cpp: The "About" dialog box
*****************************************************************************
* Copyright (C) 2002 VideoLAN
*
* Authors: Olivier Teuliere <ipkiss@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#include <vcl.h>
#pragma hdrstop
#include <vlc/vlc.h>
#include <vlc/intf.h>
#include "about.h"
#include "win32_common.h"
//---------------------------------------------------------------------------
//#pragma package(smart_init)
#pragma resource "*.dfm"
extern intf_thread_t *p_intfGlobal;
//---------------------------------------------------------------------------
__fastcall TAboutDlg::TAboutDlg( TComponent* Owner )
: TForm( Owner )
{
Image1->Picture->Icon = p_intfGlobal->p_sys->p_window->Icon;
LabelVersion->Caption = "Version " VERSION;
}
//---------------------------------------------------------------------------
/*****************************************************************************
* about.cpp: The "About" dialog box
*****************************************************************************
* Copyright (C) 2002 VideoLAN
*
* Authors: Olivier Teuliere <ipkiss@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
#include <vcl.h>
#pragma hdrstop
#include <vlc/vlc.h>
#include <vlc/intf.h>
#include "about.h"
#include "misc.h"
#include "win32_common.h"
//---------------------------------------------------------------------------
//#pragma package(smart_init)
#pragma resource "*.dfm"
extern intf_thread_t *p_intfGlobal;
//---------------------------------------------------------------------------
__fastcall TAboutDlg::TAboutDlg( TComponent* Owner )
: TForm( Owner )
{
Image1->Picture->Icon = p_intfGlobal->p_sys->p_window->Icon;
LabelVersion->Caption = "Version " VERSION;
Translate( this );
}
//---------------------------------------------------------------------------
modules/gui/win32/about.dfm
View file @ b3c41d79
......@@ -246,6 +246,7 @@ object AboutDlg: TAboutDlg
PixelsPerInch = 96
TextHeight = 13
object Label1: TLabel
Tag = 3
Left = 114
Top = 18
Width = 132
......@@ -259,6 +260,7 @@ object AboutDlg: TAboutDlg
ParentFont = False
end
object Label2: TLabel
Tag = 3
Left = 10
Top = 64
Width = 267
......@@ -266,6 +268,7 @@ object AboutDlg: TAboutDlg
Caption = '(C) Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002'
end
object Label4: TLabel
Tag = 3
Left = 15
Top = 123
Width = 253
......@@ -277,6 +280,7 @@ object AboutDlg: TAboutDlg
WordWrap = True
end
object Label3: TLabel
Tag = 3
Left = 30
Top = 80
Width = 227
......@@ -290,6 +294,7 @@ object AboutDlg: TAboutDlg
Height = 49
end
object Label5: TLabel
Tag = 3
Left = 83
Top = 96
Width = 121
......@@ -297,6 +302,7 @@ object AboutDlg: TAboutDlg
Caption = 'http://www.videolan.org/'
end
object LabelVersion: TLabel
Tag = 3
Left = 114
Top = 40
Width = 59
......@@ -304,6 +310,7 @@ object AboutDlg: TAboutDlg
Caption = 'Version x.y.z'
end
object BitBtnOk: TBitBtn
Tag = 3
Left = 64
Top = 178
Width = 145
......
modules/gui/win32/disc.cpp
View file @ b3c41d79
......@@ -27,6 +27,7 @@
#include <vlc/intf.h>
#include "disc.h"
#include "misc.h";
#include "win32_common.h"
//---------------------------------------------------------------------------
......@@ -42,6 +43,7 @@ __fastcall TDiscDlg::TDiscDlg( TComponent* Owner )
{
/* Simulate a click to get the correct device name */
RadioGroupTypeClick( RadioGroupType );
Translate( this );
}
//---------------------------------------------------------------------------
void __fastcall TDiscDlg::FormShow( TObject *Sender )
......
modules/gui/win32/disc.dfm
View file @ b3c41d79
......@@ -248,6 +248,7 @@ object DiscDlg: TDiscDlg
PixelsPerInch = 96
TextHeight = 13
object LabelDevice: TLabel
Tag = 3
Left = 8
Top = 105
Width = 63
......@@ -255,6 +256,7 @@ object DiscDlg: TDiscDlg
Caption = 'Device name'
end
object GroupBoxPosition: TGroupBox
Tag = 3
Left = 96
Top = 8
Width = 153
......@@ -262,6 +264,7 @@ object DiscDlg: TDiscDlg
Caption = 'Starting position'
TabOrder = 1
object LabelTitle: TLabel
Tag = 3
Left = 16
Top = 24
Width = 20
......@@ -269,6 +272,7 @@ object DiscDlg: TDiscDlg
Caption = 'Title'
end
object LabelChapter: TLabel
Tag = 3
Left = 16
Top = 52
Width = 37
......@@ -301,6 +305,7 @@ object DiscDlg: TDiscDlg
end
end
object RadioGroupType: TRadioGroup
Tag = 3
Left = 8
Top = 8
Width = 81
......@@ -314,6 +319,7 @@ object DiscDlg: TDiscDlg
OnClick = RadioGroupTypeClick
end
object BitBtnOk: TBitBtn
Tag = 3
Left = 8
Top = 136
Width = 113
......@@ -325,6 +331,7 @@ object DiscDlg: TDiscDlg
OnClick = BitBtnOkClick
end
object BitBtnCancel: TBitBtn
Tag = 3
Left = 136
Top = 136
Width = 113
......@@ -335,6 +342,7 @@ object DiscDlg: TDiscDlg
OnClick = BitBtnCancelClick
end
object EditDevice: TEdit
Tag = 5
Left = 88
Top = 101
Width = 161
......
modules/gui/win32/mainframe.cpp
View file @ b3c41d79
......@@ -36,6 +36,7 @@
#include "preferences.h"
#include "messages.h"
#include "playlist.h"
#include "misc.h"
#include "win32_common.h"
#include "netutils.h"
......@@ -64,6 +65,8 @@ __fastcall TMainFrameDlg::TMainFrameDlg( TComponent* Owner )
Caption = VOUT_TITLE " (Win32 interface)";
StringListPref = new TStringList();
Translate( this );
}
//---------------------------------------------------------------------------
__fastcall TMainFrameDlg::~TMainFrameDlg()
......
modules/gui/win32/mainframe.dfm
View file @ b3c41d79
object MainFrameDlg: TMainFrameDlg
Left = 179
Top = 442
Left = 285
Top = 170
Width = 541
Height = 306
BorderIcons = [biSystemMenu, biMinimize]
......@@ -151,16 +151,19 @@ object MainFrameDlg: TMainFrameDlg
ShowCaptions = True
TabOrder = 0
object ToolButtonFile: TToolButton
Tag = 3
Left = 0
Top = 0
Action = OpenFileAction
end
object ToolButtonDisc: TToolButton
Tag = 3
Left = 39
Top = 0
Action = OpenDiscAction
end
object ToolButtonNet: TToolButton
Tag = 3
Left = 78
Top = 0
Action = NetworkStreamAction
......@@ -174,26 +177,31 @@ object MainFrameDlg: TMainFrameDlg
Style = tbsSeparator
end
object ToolButtonBack: TToolButton
Tag = 3
Left = 125
Top = 0
Action = BackAction
end
object ToolButtonPlay: TToolButton
Tag = 3
Left = 164
Top = 0
Action = PlayAction
end
object ToolButtonPause: TToolButton
Tag = 3
Left = 203
Top = 0
Action = PauseAction
end
object ToolButtonStop: TToolButton
Tag = 3
Left = 242
Top = 0
Action = StopAction
end
object ToolButtonEject: TToolButton
Tag = 3
Left = 281
Top = 0
Action = EjectAction
......@@ -207,11 +215,13 @@ object MainFrameDlg: TMainFrameDlg
Style = tbsSeparator
end
object ToolButtonSlow: TToolButton
Tag = 3
Left = 328
Top = 0
Action = SlowAction
end
object ToolButtonFast: TToolButton
Tag = 3
Left = 367
Top = 0
Action = FastAction
......@@ -225,17 +235,20 @@ object MainFrameDlg: TMainFrameDlg
Style = tbsSeparator
end
object ToolButtonPlaylist: TToolButton
Tag = 3
Left = 414
Top = 0
Action = PlaylistAction
Style = tbsCheck
end
object ToolButtonPrev: TToolButton
Tag = 3
Left = 453
Top = 0
Action = PreviousAction
end
object ToolButtonNext: TToolButton
Tag = 3
Left = 492
Top = 0
Action = NextAction
......@@ -252,6 +265,7 @@ object MainFrameDlg: TMainFrameDlg
SimplePanel = True
end
object GroupBoxFile: TGroupBox
Tag = 3
Left = 0
Top = 90
Width = 533
......@@ -260,6 +274,7 @@ object MainFrameDlg: TMainFrameDlg
TabOrder = 2
Visible = False
object LabelFileName: TLabel
Tag = 3
Left = 2
Top = 15
Width = 529
......@@ -278,6 +293,7 @@ object MainFrameDlg: TMainFrameDlg
TabOrder = 3
Visible = False
object LabelChannel: TLabel
Tag = 3
Left = 288
Top = 16
Width = 42
......@@ -285,6 +301,7 @@ object MainFrameDlg: TMainFrameDlg
Caption = 'Channel:'
end
object LabelServer: TLabel
Tag = 3
Left = 64
Top = 16
Width = 49
......@@ -292,6 +309,7 @@ object MainFrameDlg: TMainFrameDlg
Caption = 'No server!'
end
object ButtonGo: TButton
Tag = 3
Left = 384
Top = 10
Width = 25
......@@ -320,6 +338,7 @@ object MainFrameDlg: TMainFrameDlg
TabOrder = 4
Visible = False
object LabelDisc: TLabel
Tag = 3
Left = 32
Top = 11
Width = 21
......@@ -327,6 +346,7 @@ object MainFrameDlg: TMainFrameDlg
Caption = 'Disc'
end
object LabelTitle: TLabel
Tag = 3
Left = 96
Top = 11
Width = 23
......@@ -334,6 +354,7 @@ object MainFrameDlg: TMainFrameDlg
Caption = 'Title:'
end
object LabelChapter: TLabel
Tag = 3
Left = 296
Top = 11
Width = 40
......@@ -355,6 +376,7 @@ object MainFrameDlg: TMainFrameDlg
Caption = '---'
end
object ButtonTitlePrev: TButton
Tag = 3
Left = 152
Top = 8
Width = 33
......@@ -363,6 +385,7 @@ object MainFrameDlg: TMainFrameDlg
TabOrder = 0
end
object ButtonTitleNext: TButton
Tag = 3
Left = 184
Top = 8
Width = 33
......@@ -371,6 +394,7 @@ object MainFrameDlg: TMainFrameDlg
TabOrder = 1
end
object ButtonChapterPrev: TButton
Tag = 3
Left = 368
Top = 8
Width = 33
......@@ -379,6 +403,7 @@ object MainFrameDlg: TMainFrameDlg
TabOrder = 2
end
object ButtonChapterNext: TButton
Tag = 3
Left = 400
Top = 8
Width = 33
......@@ -388,6 +413,7 @@ object MainFrameDlg: TMainFrameDlg
end
end
object GroupBoxSlider: TGroupBox
Tag = 3
Left = 0
Top = 50
Width = 533
......@@ -417,16 +443,20 @@ object MainFrameDlg: TMainFrameDlg
Left = 40
Top = 208
object MenuFile: TMenuItem
Tag = 3
Caption = '&File'
object MenuOpenFile: TMenuItem
Tag = 3
Action = OpenFileAction
Caption = 'Open &file...'
end
object MenuOpenDisc: TMenuItem
Tag = 3
Action = OpenDiscAction
Caption = 'Open &disc...'
end
object MenuNetworkStream: TMenuItem
Tag = 3
Action = NetworkStreamAction
Caption = '&Network stream...'
end
......@@ -435,6 +465,7 @@ object MainFrameDlg: TMainFrameDlg
Visible = False
end
object MenuEjectDisc: TMenuItem
Tag = 3
Action = EjectAction
Caption = '&Eject disc'
end
......@@ -442,38 +473,46 @@ object MainFrameDlg: TMainFrameDlg
Caption = '-'
end
object MenuExit: TMenuItem
Tag = 3
Action = ExitAction
end
end
object MenuView: TMenuItem
Tag = 3
Caption = '&View'
object MenuHideinterface: TMenuItem
Tag = 3
Caption = '&Hide interface'
Hint = 'Hide the main interface window'
OnClick = MenuHideinterfaceClick
end
object MenuFullscreen: TMenuItem
Tag = 3
Action = FullscreenAction
end
object N2: TMenuItem
Caption = '-'
end
object MenuProgram: TMenuItem
Tag = 3
Caption = 'Progr&am'
Enabled = False
Hint = 'Select program'
end
object MenuTitle: TMenuItem
Tag = 3
Caption = '&Title'
Enabled = False
Hint = 'Select title'
end
object MenuChapter: TMenuItem
Tag = 3
Caption = '&Chapter'
Enabled = False
Hint = 'Select chapter'
end
object MenuAngle: TMenuItem
Tag = 3
Caption = 'An&gle'
Enabled = False
Hint = 'Select angle'
......@@ -482,21 +521,26 @@ object MainFrameDlg: TMainFrameDlg
Caption = '-'
end
object MenuPlaylist: TMenuItem
Tag = 3
Action = PlaylistAction
Caption = '&Playlist...'
end
object MenuMessages: TMenuItem
Tag = 3
Action = MessagesAction
end
end
object MenuSettings: TMenuItem
Tag = 3
Caption = '&Settings'
object MenuAudio: TMenuItem
Tag = 3
Caption = '&Audio'
Enabled = False
Hint = 'Select audio language'
end
object MenuSubtitles: TMenuItem
Tag = 3
Caption = '&Subtitles'
Enabled = False
Hint = 'Select subtitles language'
......@@ -505,12 +549,15 @@ object MainFrameDlg: TMainFrameDlg
Caption = '-'
end
object MenuPreferences: TMenuItem
Tag = 3
Action = PreferencesAction
end
end
object MenuHelp: TMenuItem
Tag = 3
Caption = '&Help'
object MenuAbout: TMenuItem
Tag = 3
Action = AboutAction
end
end
......@@ -2254,10 +2301,12 @@ object MainFrameDlg: TMainFrameDlg
Left = 72
Top = 208
object PopupClose: TMenuItem
Tag = 3
Caption = '&Close this popup'
OnClick = PopupCloseClick
end
object PopupToggleInterface: TMenuItem
Tag = 3
Caption = '&Toggle interface'
OnClick = PopupToggleInterfaceClick
end
......@@ -2265,35 +2314,45 @@ object MainFrameDlg: TMainFrameDlg
Caption = '-'
end
object Control1: TMenuItem
Tag = 3
Caption = 'Control'
object PopupBack: TMenuItem
Tag = 3
Action = BackAction
end
object PopupPlay: TMenuItem
Tag = 3
Action = PlayAction
end
object PopupPause: TMenuItem
Tag = 3
Action = PauseAction
end
object PopupStop: TMenuItem
Tag = 3
Action = StopAction
end
object PopupSlow: TMenuItem
Tag = 3
Action = SlowAction
end
object PopupFast: TMenuItem
Tag = 3
Action = FastAction
end
object N5: TMenuItem
Caption = '-'
end
object PopupPrev: TMenuItem
Tag = 3
Action = PreviousAction
end
object PopupNext: TMenuItem
Tag = 3
Action = NextAction
end
object PopupJump: TMenuItem
Tag = 3
Caption = '&Jump...'
OnClick = PopupJumpClick
end
......@@ -2301,43 +2360,54 @@ object MainFrameDlg: TMainFrameDlg
Caption = '-'
end
object PopupFullscreen: TMenuItem
Tag = 3
Action = FullscreenAction
ShortCut = 70
end
end
object PopupNavigation: TMenuItem
Tag = 3
Caption = 'Navigation'
end
object PopupProgram: TMenuItem
Tag = 3
Caption = 'Program'
end
object PopupAudio: TMenuItem
Tag = 3
Caption = 'Audio'
end
object PopupSubtitles: TMenuItem
Tag = 3
Caption = 'Subtitles'
end
object N10: TMenuItem
Caption = '-'
end
object PopupPlaylist: TMenuItem
Tag = 3
Action = PlaylistAction
Caption = 'Playlist...'
end
object PopupPreferences: TMenuItem
Tag = 3
Action = PreferencesAction
end
object PopupFile: TMenuItem
Tag = 3
Caption = 'New stream'
object PopupOpenFile: TMenuItem
Tag = 3
Action = OpenFileAction
Caption = 'Open file...'
end
object PopupOpenDisc: TMenuItem
Tag = 3
Action = OpenDiscAction
Caption = 'Open disc...'
end
object PopupNetworkStream: TMenuItem
Tag = 3
Action = NetworkStreamAction
Caption = 'Network stream...'
end
......@@ -2346,6 +2416,7 @@ object MainFrameDlg: TMainFrameDlg
Caption = '-'
end
object PopupExit: TMenuItem
Tag = 3
Action = ExitAction
end
end
......@@ -2358,6 +2429,7 @@ object MainFrameDlg: TMainFrameDlg
Left = 168
Top = 208
object OpenFileAction: TAction
Tag = 3
Category = 'Menu'
Caption = 'File'
Hint = 'Open a file'
......@@ -2366,6 +2438,7 @@ object MainFrameDlg: TMainFrameDlg
OnExecute = OpenFileActionExecute
end
object OpenDiscAction: TAction