Skip to content

V
vlc-1.1
Commit 7a3a7029 authored by Olivier Teulière's avatar Olivier Teulière
Browse files
Options

* modules/gui/win32: replaced BitBtns with Buttons everywhere, and 

   put "OK" and "Cancel" buttons in an horizontal layout.
   Also updated a few properties here and there.
parent 64c48e9c
Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 124 deletions
modules/gui/win32/about.dfm
View file @ 7a3a7029
object AboutDlg: TAboutDlg object AboutDlg: TAboutDlg
Tag = 3
Left = 442 Left = 442
Top = 281 Top = 281
BorderStyle = bsDialog BorderStyle = bsDialog
...@@ -263,7 +264,7 @@ object AboutDlg: TAboutDlg ...@@ -263,7 +264,7 @@ object AboutDlg: TAboutDlg
Tag = 3 Tag = 3
Left = 10 Left = 10
Top = 64 Top = 64
Width = 267 Width = 172
Height = 13 Height = 13
Caption = '(C) 1996-2003 - the VideoLAN Team' Caption = '(C) 1996-2003 - the VideoLAN Team'
end end
...@@ -308,9 +309,9 @@ object AboutDlg: TAboutDlg ...@@ -308,9 +309,9 @@ object AboutDlg: TAboutDlg
Height = 13 Height = 13
Caption = 'Version x.y.z' Caption = 'Version x.y.z'
end end
object BitBtnOk: TBitBtn object ButtonOK: TButton
Tag = 3 Tag = 3
Left = 64 Left = 70
Top = 178 Top = 178
Width = 145 Width = 145
Height = 25 Height = 25
......
modules/gui/win32/about.h
View file @ 7a3a7029
...@@ -37,11 +37,11 @@ __published: // IDE-managed Components ...@@ -37,11 +37,11 @@ __published: // IDE-managed Components
TLabel *Label1; TLabel *Label1;
TLabel *Label2; TLabel *Label2;
TLabel *Label4; TLabel *Label4;
TBitBtn *BitBtnOk;
TLabel *Label3; TLabel *Label3;
TImage *Image1; TImage *Image1;
TLabel *Label5; TLabel *Label5;
TLabel *LabelVersion; TLabel *LabelVersion;
TButton *ButtonOK;
private: // User declarations private: // User declarations
intf_thread_t *p_intf; intf_thread_t *p_intf;
public: // User declarations public: // User declarations
......
modules/gui/win32/disc.dfm
View file @ 7a3a7029
object DiscDlg: TDiscDlg object DiscDlg: TDiscDlg
Left = 390 Tag = 3
Top = 320 Left = 465
Top = 337
BorderIcons = [biSystemMenu, biMinimize] BorderIcons = [biSystemMenu, biMinimize]
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'Open Disc' Caption = 'Open Disc'
ClientHeight = 138 ClientHeight = 178
ClientWidth = 338 ClientWidth = 242
Color = clBtnFace Color = clBtnFace
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
...@@ -26,11 +27,11 @@ object DiscDlg: TDiscDlg ...@@ -26,11 +27,11 @@ object DiscDlg: TDiscDlg
Caption = 'Device &name:' Caption = 'Device &name:'
end end
object Bevel1: TBevel object Bevel1: TBevel
Left = 240 Left = 8
Top = 0 Top = 136
Width = 9 Width = 225
Height = 137 Height = 2
Shape = bsLeftLine Anchors = [akLeft, akTop, akRight]
end end
object GroupBoxPosition: TGroupBox object GroupBoxPosition: TGroupBox
Tag = 3 Tag = 3
...@@ -112,8 +113,8 @@ object DiscDlg: TDiscDlg ...@@ -112,8 +113,8 @@ object DiscDlg: TDiscDlg
end end
object ButtonOk: TButton object ButtonOk: TButton
Tag = 3 Tag = 3
Left = 248 Left = 24
Top = 8 Top = 144
Width = 81 Width = 81
Height = 25 Height = 25
Caption = 'OK' Caption = 'OK'
...@@ -124,8 +125,8 @@ object DiscDlg: TDiscDlg ...@@ -124,8 +125,8 @@ object DiscDlg: TDiscDlg
end end
object ButtonCancel: TButton object ButtonCancel: TButton
Tag = 3 Tag = 3
Left = 248 Left = 136
Top = 40 Top = 144
Width = 81 Width = 81
Height = 25 Height = 25
Cancel = True Cancel = True
......
modules/gui/win32/mainframe.dfm
View file @ 7a3a7029
object MainFrameDlg: TMainFrameDlg object MainFrameDlg: TMainFrameDlg
Tag = 3
Left = 356 Left = 356
Top = 227 Top = 227
Width = 541 Width = 541
......
modules/gui/win32/messages.dfm
View file @ 7a3a7029
object MessagesDlg: TMessagesDlg object MessagesDlg: TMessagesDlg
Tag = 3
Left = 325 Left = 325
Top = 160 Top = 160
Width = 440 Width = 440
...@@ -41,6 +42,8 @@ object MessagesDlg: TMessagesDlg ...@@ -41,6 +42,8 @@ object MessagesDlg: TMessagesDlg
Height = 25 Height = 25
Anchors = [akBottom] Anchors = [akBottom]
Caption = 'OK' Caption = 'OK'
Default = True
ModalResult = 1
TabOrder = 1 TabOrder = 1
OnClick = ButtonOKClick OnClick = ButtonOKClick
end end
......
modules/gui/win32/network.cpp
View file @ 7a3a7029
...@@ -79,12 +79,12 @@ void __fastcall TNetworkDlg::FormHide( TObject *Sender ) ...@@ -79,12 +79,12 @@ void __fastcall TNetworkDlg::FormHide( TObject *Sender )
p_intf->p_sys->p_window->NetworkStreamAction->Checked = false; p_intf->p_sys->p_window->NetworkStreamAction->Checked = false;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void __fastcall TNetworkDlg::BitBtnCancelClick( TObject *Sender ) void __fastcall TNetworkDlg::ButtonCancelClick( TObject *Sender )
{ {
Hide(); Hide();
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void __fastcall TNetworkDlg::BitBtnOkClick( TObject *Sender ) void __fastcall TNetworkDlg::ButtonOkClick( TObject *Sender )
{ {
AnsiString Source, Address; AnsiString Source, Address;
AnsiString Channel = ComboBoxCSAddress->Text; AnsiString Channel = ComboBoxCSAddress->Text;
...@@ -223,3 +223,4 @@ void __fastcall TNetworkDlg::RadioButtonHTTPEnter( TObject *Sender ) ...@@ -223,3 +223,4 @@ void __fastcall TNetworkDlg::RadioButtonHTTPEnter( TObject *Sender )
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
modules/gui/win32/network.dfm
View file @ 7a3a7029
object NetworkDlg: TNetworkDlg object NetworkDlg: TNetworkDlg
Left = 329 Tag = 3
Top = 253 Left = 507
Top = 259
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'Open network' Caption = 'Open network'
ClientHeight = 206 ClientHeight = 198
ClientWidth = 497 ClientWidth = 497
Color = clBtnFace Color = clBtnFace
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
...@@ -247,34 +248,15 @@ object NetworkDlg: TNetworkDlg ...@@ -247,34 +248,15 @@ object NetworkDlg: TNetworkDlg
OnShow = FormShow OnShow = FormShow
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
object BitBtnOk: TBitBtn
Tag = 3
Left = 52
Top = 168
Width = 177
Height = 25
TabOrder = 0
OnClick = BitBtnOkClick
Kind = bkOK
end
object BitBtnCancel: TBitBtn
Tag = 3
Left = 268
Top = 168
Width = 177
Height = 25
TabOrder = 1
OnClick = BitBtnCancelClick
Kind = bkCancel
end
object GroupBoxMode: TGroupBox object GroupBoxMode: TGroupBox
Tag = 3 Tag = 3
Left = 8 Left = 8
Top = 8 Top = 8
Width = 481 Width = 481
Height = 145 Height = 145
Anchors = [akLeft, akTop, akRight]
Caption = 'Network mode' Caption = 'Network mode'
TabOrder = 2 TabOrder = 0
object LabelUDPPort: TLabel object LabelUDPPort: TLabel
Tag = 3 Tag = 3
Left = 172 Left = 172
...@@ -289,6 +271,7 @@ object NetworkDlg: TNetworkDlg ...@@ -289,6 +271,7 @@ object NetworkDlg: TNetworkDlg
Top = 54 Top = 54
Width = 22 Width = 22
Height = 13 Height = 13
Anchors = [akTop, akRight]
Caption = 'Port:' Caption = 'Port:'
Enabled = False Enabled = False
end end
...@@ -298,6 +281,7 @@ object NetworkDlg: TNetworkDlg ...@@ -298,6 +281,7 @@ object NetworkDlg: TNetworkDlg
Top = 82 Top = 82
Width = 22 Width = 22
Height = 13 Height = 13
Anchors = [akTop, akRight]
Caption = 'Port:' Caption = 'Port:'
Enabled = False Enabled = False
end end
...@@ -376,6 +360,7 @@ object NetworkDlg: TNetworkDlg ...@@ -376,6 +360,7 @@ object NetworkDlg: TNetworkDlg
Top = 50 Top = 50
Width = 161 Width = 161
Height = 21 Height = 21
Anchors = [akLeft, akTop, akRight]
Enabled = False Enabled = False
ItemHeight = 13 ItemHeight = 13
TabOrder = 5 TabOrder = 5
...@@ -386,6 +371,7 @@ object NetworkDlg: TNetworkDlg ...@@ -386,6 +371,7 @@ object NetworkDlg: TNetworkDlg
Top = 78 Top = 78
Width = 161 Width = 161
Height = 21 Height = 21
Anchors = [akLeft, akTop, akRight]
Enabled = False Enabled = False
ItemHeight = 13 ItemHeight = 13
TabOrder = 7 TabOrder = 7
...@@ -399,6 +385,7 @@ object NetworkDlg: TNetworkDlg ...@@ -399,6 +385,7 @@ object NetworkDlg: TNetworkDlg
Top = 106 Top = 106
Width = 265 Width = 265
Height = 21 Height = 21
Anchors = [akLeft, akTop, akRight]
Enabled = False Enabled = False
TabOrder = 9 TabOrder = 9
end end
...@@ -419,6 +406,7 @@ object NetworkDlg: TNetworkDlg ...@@ -419,6 +406,7 @@ object NetworkDlg: TNetworkDlg
Width = 57 Width = 57
Height = 22 Height = 22
TabStop = True TabStop = True
Anchors = [akTop, akRight]
Enabled = False Enabled = False
MaxValue = 65535 MaxValue = 65535
ParentColor = False ParentColor = False
...@@ -431,6 +419,7 @@ object NetworkDlg: TNetworkDlg ...@@ -431,6 +419,7 @@ object NetworkDlg: TNetworkDlg
Width = 57 Width = 57
Height = 22 Height = 22
TabStop = True TabStop = True
Anchors = [akTop, akRight]
Enabled = False Enabled = False
MaxValue = 65535 MaxValue = 65535
ParentColor = False ParentColor = False
...@@ -438,4 +427,30 @@ object NetworkDlg: TNetworkDlg ...@@ -438,4 +427,30 @@ object NetworkDlg: TNetworkDlg
Value = 6010 Value = 6010
end end
end end
object ButtonOK: TButton
Tag = 3
Left = 48
Top = 163
Width = 177
Height = 25
Caption = 'OK'
Default = True
ModalResult = 1
TabOrder = 1
OnClick = ButtonOkClick
end
object ButtonCancel: TButton
Tag = 3
Left = 272
Top = 163
Width = 177
Height = 25
Anchors = [akTop, akRight]
Cancel = True
Caption = 'Cancel'
Default = True
ModalResult = 2
TabOrder = 2
OnClick = ButtonCancelClick
end
end end
modules/gui/win32/network.h
View file @ 7a3a7029
...@@ -38,8 +38,6 @@ ...@@ -38,8 +38,6 @@
class TNetworkDlg : public TForm class TNetworkDlg : public TForm
{ {
__published: // IDE-managed Components __published: // IDE-managed Components
TBitBtn *BitBtnOk;
TBitBtn *BitBtnCancel;
TGroupBox *GroupBoxMode; TGroupBox *GroupBoxMode;
TRadioButton *RadioButtonUDP; TRadioButton *RadioButtonUDP;
TRadioButton *RadioButtonMulticast; TRadioButton *RadioButtonMulticast;
...@@ -57,10 +55,12 @@ __published: // IDE-managed Components ...@@ -57,10 +55,12 @@ __published: // IDE-managed Components
TCSpinEdit *SpinEditUDPPort; TCSpinEdit *SpinEditUDPPort;
TCSpinEdit *SpinEditMulticastPort; TCSpinEdit *SpinEditMulticastPort;
TCSpinEdit *SpinEditCSPort; TCSpinEdit *SpinEditCSPort;
TButton *ButtonOK;
TButton *ButtonCancel;
void __fastcall FormShow( TObject *Sender ); void __fastcall FormShow( TObject *Sender );
void __fastcall FormHide( TObject *Sender ); void __fastcall FormHide( TObject *Sender );
void __fastcall BitBtnCancelClick( TObject *Sender ); void __fastcall ButtonCancelClick( TObject *Sender );
void __fastcall BitBtnOkClick( TObject *Sender ); void __fastcall ButtonOkClick( TObject *Sender );
void __fastcall RadioButtonUDPEnter( TObject *Sender ); void __fastcall RadioButtonUDPEnter( TObject *Sender );
void __fastcall RadioButtonMulticastEnter( TObject *Sender ); void __fastcall RadioButtonMulticastEnter( TObject *Sender );
void __fastcall RadioButtonCSEnter( TObject *Sender ); void __fastcall RadioButtonCSEnter( TObject *Sender );
......
modules/gui/win32/playlist.cpp
View file @ 7a3a7029
...@@ -118,7 +118,7 @@ void __fastcall TPlaylistDlg::FormHide( TObject *Sender ) ...@@ -118,7 +118,7 @@ void __fastcall TPlaylistDlg::FormHide( TObject *Sender )
p_intf->p_sys->p_window->PlaylistAction->Checked = false; p_intf->p_sys->p_window->PlaylistAction->Checked = false;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void __fastcall TPlaylistDlg::BitBtnOkClick( TObject *Sender ) void __fastcall TPlaylistDlg::ButtonOkClick( TObject *Sender )
{ {
Hide(); Hide();
} }
......
modules/gui/win32/playlist.dfm
View file @ 7a3a7029
object PlaylistDlg: TPlaylistDlg object PlaylistDlg: TPlaylistDlg
Left = 433 Tag = 3
Top = 308 Left = 470
Top = 197
Width = 335 Width = 335
Height = 436 Height = 435
Caption = 'Playlist' Caption = 'Playlist'
Color = clBtnFace Color = clBtnFace
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
...@@ -16,24 +17,12 @@ object PlaylistDlg: TPlaylistDlg ...@@ -16,24 +17,12 @@ object PlaylistDlg: TPlaylistDlg
OnShow = FormShow OnShow = FormShow
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
object BitBtnOk: TBitBtn
Tag = 3
Left = 76
Top = 356
Width = 176
Height = 25
Anchors = [akBottom]
Caption = 'OK'
ModalResult = 1
TabOrder = 0
OnClick = BitBtnOkClick
end
object ListViewPlaylist: TListView object ListViewPlaylist: TListView
Tag = 3 Tag = 3
Left = 11 Left = 11
Top = 10 Top = 10
Width = 305 Width = 305
Height = 331 Height = 330
Anchors = [akLeft, akTop, akRight, akBottom] Anchors = [akLeft, akTop, akRight, akBottom]
Columns = < Columns = <
item item
...@@ -56,6 +45,19 @@ object PlaylistDlg: TPlaylistDlg ...@@ -56,6 +45,19 @@ object PlaylistDlg: TPlaylistDlg
OnDblClick = PlayStreamActionExecute OnDblClick = PlayStreamActionExecute
OnKeyDown = ListViewPlaylistKeyDown OnKeyDown = ListViewPlaylistKeyDown
end end
object ButtonOK: TButton
Tag = 3
Left = 75
Top = 352
Width = 177
Height = 25
Anchors = [akLeft, akRight, akBottom]
Caption = 'OK'
Default = True
ModalResult = 1
TabOrder = 0
OnClick = ButtonOkClick
end
object MainMenuPlaylist: TMainMenu object MainMenuPlaylist: TMainMenu
Left = 8 Left = 8
Top = 8 Top = 8
......
modules/gui/win32/playlist.h
View file @ 7a3a7029
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
class TPlaylistDlg : public TForm class TPlaylistDlg : public TForm
{ {
__published: // IDE-managed Components __published: // IDE-managed Components
TBitBtn *BitBtnOk;
TMainMenu *MainMenuPlaylist; TMainMenu *MainMenuPlaylist;
TMenuItem *MenuAdd; TMenuItem *MenuAdd;
TMenuItem *MenuAddFile; TMenuItem *MenuAddFile;
...@@ -75,9 +74,10 @@ __published: // IDE-managed Components ...@@ -75,9 +74,10 @@ __published: // IDE-managed Components
TAction *PlayStreamAction; TAction *PlayStreamAction;
TOpenDialog *PlaylistOpenDlg; TOpenDialog *PlaylistOpenDlg;
TSaveDialog *PlaylistSaveDlg; TSaveDialog *PlaylistSaveDlg;
TButton *ButtonOK;
void __fastcall FormShow( TObject *Sender ); void __fastcall FormShow( TObject *Sender );
void __fastcall FormHide( TObject *Sender ); void __fastcall FormHide( TObject *Sender );
void __fastcall BitBtnOkClick( TObject *Sender ); void __fastcall ButtonOkClick( TObject *Sender );
void __fastcall ListViewPlaylistKeyDown( TObject *Sender, WORD &Key, void __fastcall ListViewPlaylistKeyDown( TObject *Sender, WORD &Key,
TShiftState Shift ); TShiftState Shift );
void __fastcall ListViewPlaylistCustomDrawItem( TCustomListView *Sender, void __fastcall ListViewPlaylistCustomDrawItem( TCustomListView *Sender,
......
modules/gui/win32/preferences.dfm
View file @ 7a3a7029
object PreferencesDlg: TPreferencesDlg object PreferencesDlg: TPreferencesDlg
Tag = 3
Left = 310 Left = 310
Top = 125 Top = 125
Width = 458 Width = 458
...@@ -257,6 +258,7 @@ object PreferencesDlg: TPreferencesDlg ...@@ -257,6 +258,7 @@ object PreferencesDlg: TPreferencesDlg
TabOrder = 0 TabOrder = 0
end end
object ButtonApply: TButton object ButtonApply: TButton
Tag = 3
Left = 266 Left = 266
Top = 530 Top = 530
Width = 82 Width = 82
...@@ -267,6 +269,7 @@ object PreferencesDlg: TPreferencesDlg ...@@ -267,6 +269,7 @@ object PreferencesDlg: TPreferencesDlg
OnClick = ButtonApplyClick OnClick = ButtonApplyClick
end end
object ButtonSave: TButton object ButtonSave: TButton
Tag = 3
Left = 359 Left = 359
Top = 530 Top = 530
Width = 82 Width = 82
...@@ -277,6 +280,7 @@ object PreferencesDlg: TPreferencesDlg ...@@ -277,6 +280,7 @@ object PreferencesDlg: TPreferencesDlg
OnClick = ButtonSaveClick OnClick = ButtonSaveClick
end end
object ButtonOK: TButton object ButtonOK: TButton
Tag = 3
Left = 81 Left = 81
Top = 530 Top = 530
Width = 82 Width = 82
...@@ -284,16 +288,20 @@ object PreferencesDlg: TPreferencesDlg ...@@ -284,16 +288,20 @@ object PreferencesDlg: TPreferencesDlg
Anchors = [akRight, akBottom] Anchors = [akRight, akBottom]
Caption = 'OK' Caption = 'OK'
Default = True Default = True
ModalResult = 1
TabOrder = 1 TabOrder = 1
OnClick = ButtonOkClick OnClick = ButtonOkClick
end end
object ButtonCancel: TButton object ButtonCancel: TButton
Tag = 3
Left = 174 Left = 174
Top = 530 Top = 530
Width = 82 Width = 82
Height = 25 Height = 25
Anchors = [akRight, akBottom] Anchors = [akRight, akBottom]
Cancel = True
Caption = 'Cancel' Caption = 'Cancel'
ModalResult = 2
TabOrder = 2 TabOrder = 2
OnClick = ButtonCancelClick OnClick = ButtonCancelClick
end end
......
modules/gui/win32/sout.cpp
View file @ 7a3a7029
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* sout.cpp: the stream ouput dialog box * sout.cpp: the stream ouput dialog box
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * Copyright (C) 2002-2003 VideoLAN
* $Id: sout.cpp,v 1.3 2003/01/23 03:33:34 ipkiss Exp $ * $Id: sout.cpp,v 1.4 2003/01/26 03:55:36 ipkiss Exp $
* *
* Authors: Olivier Teuliere <ipkiss@via.ecp.fr> * Authors: Olivier Teuliere <ipkiss@via.ecp.fr>
* *
...@@ -85,7 +85,7 @@ void __fastcall TSoutDlg::RadioButtonAccessClick( TObject *Sender ) ...@@ -85,7 +85,7 @@ void __fastcall TSoutDlg::RadioButtonAccessClick( TObject *Sender )
RebuildMrl(); RebuildMrl();
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void __fastcall TSoutDlg::BitBtnOKClick( TObject *Sender ) void __fastcall TSoutDlg::ButtonOKClick( TObject *Sender )
{ {
config_PutPsz( p_intf, "sout", EditMrl->Text.c_str() ); config_PutPsz( p_intf, "sout", EditMrl->Text.c_str() );
} }
......
modules/gui/win32/sout.dfm
View file @ 7a3a7029
object SoutDlg: TSoutDlg object SoutDlg: TSoutDlg
Left = 500 Tag = 3
Top = 325 Left = 454
Top = 369
Width = 394 Width = 394
Height = 244 Height = 238
Caption = 'Stream output' Caption = 'Stream output'
Color = clBtnFace Color = clBtnFace
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
...@@ -14,6 +15,7 @@ object SoutDlg: TSoutDlg ...@@ -14,6 +15,7 @@ object SoutDlg: TSoutDlg
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
object GroupBoxStreamOut: TGroupBox object GroupBoxStreamOut: TGroupBox
Tag = 3
Left = 8 Left = 8
Top = 8 Top = 8
Width = 369 Width = 369
...@@ -22,6 +24,7 @@ object SoutDlg: TSoutDlg ...@@ -22,6 +24,7 @@ object SoutDlg: TSoutDlg
Caption = 'Stream output MRL (Media Resource Locator)' Caption = 'Stream output MRL (Media Resource Locator)'
TabOrder = 0 TabOrder = 0
object LabelPort: TLabel object LabelPort: TLabel
Tag = 3
Left = 264 Left = 264
Top = 98 Top = 98
Width = 22 Width = 22
...@@ -31,6 +34,7 @@ object SoutDlg: TSoutDlg ...@@ -31,6 +34,7 @@ object SoutDlg: TSoutDlg
Enabled = False Enabled = False
end end
object LabelAddress: TLabel object LabelAddress: TLabel
Tag = 3
Left = 96 Left = 96
Top = 98 Top = 98
Width = 41 Width = 41
...@@ -54,6 +58,7 @@ object SoutDlg: TSoutDlg ...@@ -54,6 +58,7 @@ object SoutDlg: TSoutDlg
Height = 97 Height = 97
TabOrder = 1 TabOrder = 1
object RadioButtonFile: TRadioButton object RadioButtonFile: TRadioButton
Tag = 3
Left = 8 Left = 8
Top = 8 Top = 8
Width = 49 Width = 49
...@@ -65,6 +70,7 @@ object SoutDlg: TSoutDlg ...@@ -65,6 +70,7 @@ object SoutDlg: TSoutDlg
OnClick = RadioButtonAccessClick OnClick = RadioButtonAccessClick
end end
object RadioButtonUDP: TRadioButton object RadioButtonUDP: TRadioButton
Tag = 3
Left = 8 Left = 8
Top = 40 Top = 40
Width = 49 Width = 49
...@@ -74,6 +80,7 @@ object SoutDlg: TSoutDlg ...@@ -74,6 +80,7 @@ object SoutDlg: TSoutDlg
OnClick = RadioButtonAccessClick OnClick = RadioButtonAccessClick
end end
object RadioButtonRTP: TRadioButton object RadioButtonRTP: TRadioButton
Tag = 3
Left = 8 Left = 8
Top = 72 Top = 72
Width = 49 Width = 49
...@@ -84,13 +91,14 @@ object SoutDlg: TSoutDlg ...@@ -84,13 +91,14 @@ object SoutDlg: TSoutDlg
end end
end end
object ButtonBrowse: TButton object ButtonBrowse: TButton
Tag = 3
Left = 278 Left = 278
Top = 60 Top = 60
Width = 75 Width = 75
Height = 25 Height = 25
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
Caption = 'Browse...' Caption = 'Browse...'
TabOrder = 2 TabOrder = 3
OnClick = ButtonBrowseClick OnClick = ButtonBrowseClick
end end
object EditFile: TEdit object EditFile: TEdit
...@@ -99,7 +107,7 @@ object SoutDlg: TSoutDlg ...@@ -99,7 +107,7 @@ object SoutDlg: TSoutDlg
Width = 177 Width = 177
Height = 21 Height = 21
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
TabOrder = 3 TabOrder = 2
OnChange = CustomEditChange OnChange = CustomEditChange
end end
object SpinEditPort: TCSpinEdit object SpinEditPort: TCSpinEdit
...@@ -112,7 +120,7 @@ object SoutDlg: TSoutDlg ...@@ -112,7 +120,7 @@ object SoutDlg: TSoutDlg
Enabled = False Enabled = False
MaxValue = 100000 MaxValue = 100000
ParentColor = False ParentColor = False
TabOrder = 4 TabOrder = 5
Value = 1234 Value = 1234
OnChange = CustomEditChange OnChange = CustomEditChange
OnClick = CustomEditChange OnClick = CustomEditChange
...@@ -124,7 +132,7 @@ object SoutDlg: TSoutDlg ...@@ -124,7 +132,7 @@ object SoutDlg: TSoutDlg
Height = 21 Height = 21
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
Enabled = False Enabled = False
TabOrder = 5 TabOrder = 4
Text = '239.239.0.1' Text = '239.239.0.1'
OnChange = CustomEditChange OnChange = CustomEditChange
end end
...@@ -136,6 +144,7 @@ object SoutDlg: TSoutDlg ...@@ -136,6 +144,7 @@ object SoutDlg: TSoutDlg
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
TabOrder = 6 TabOrder = 6
object RadioButtonPS: TRadioButton object RadioButtonPS: TRadioButton
Tag = 3
Left = 3 Left = 3
Top = 4 Top = 4
Width = 41 Width = 41
...@@ -146,6 +155,7 @@ object SoutDlg: TSoutDlg ...@@ -146,6 +155,7 @@ object SoutDlg: TSoutDlg
OnClick = RadioButtonMuxClick OnClick = RadioButtonMuxClick
end end
object RadioButtonTS: TRadioButton object RadioButtonTS: TRadioButton
Tag = 3
Left = 40 Left = 40
Top = 4 Top = 4
Width = 41 Width = 41
...@@ -159,22 +169,28 @@ object SoutDlg: TSoutDlg ...@@ -159,22 +169,28 @@ object SoutDlg: TSoutDlg
end end
end end
end end
object BitBtnOK: TBitBtn object ButtonOK: TButton
Left = 31 Tag = 3
Top = 184 Left = 56
Width = 138 Top = 176
Width = 97
Height = 25 Height = 25
Caption = 'OK'
Default = True
ModalResult = 1
TabOrder = 1 TabOrder = 1
OnClick = BitBtnOKClick OnClick = ButtonOKClick
Kind = bkOK
end end
object BitBtnCancel: TBitBtn object ButtonCancel: TButton
Left = 216 Tag = 3
Top = 184 Left = 232
Width = 136 Top = 176
Width = 97
Height = 25 Height = 25
Cancel = True
Caption = 'Cancel'
ModalResult = 2
TabOrder = 2 TabOrder = 2
Kind = bkCancel
end end
object OpenDialog1: TOpenDialog object OpenDialog1: TOpenDialog
Left = 120 Left = 120
......
modules/gui/win32/sout.h
View file @ 7a3a7029
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* sout.h: the stream ouput dialog box * sout.h: the stream ouput dialog box
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * Copyright (C) 2002-2003 VideoLAN
* $Id: sout.h,v 1.2 2003/01/22 21:42:51 ipkiss Exp $ * $Id: sout.h,v 1.3 2003/01/26 03:55:36 ipkiss Exp $
* *
* Authors: Olivier Teuliere <ipkiss@via.ecp.fr> * Authors: Olivier Teuliere <ipkiss@via.ecp.fr>
* *
...@@ -49,16 +49,16 @@ __published: // IDE-managed Components ...@@ -49,16 +49,16 @@ __published: // IDE-managed Components
TEdit *EditAddress; TEdit *EditAddress;
TLabel *LabelPort; TLabel *LabelPort;
TLabel *LabelAddress; TLabel *LabelAddress;
TBitBtn *BitBtnOK;
TBitBtn *BitBtnCancel;
TPanel *PanelMux; TPanel *PanelMux;
TRadioButton *RadioButtonPS; TRadioButton *RadioButtonPS;
TRadioButton *RadioButtonTS; TRadioButton *RadioButtonTS;
TButton *ButtonOK;
TButton *ButtonCancel;
void __fastcall ButtonBrowseClick( TObject *Sender ); void __fastcall ButtonBrowseClick( TObject *Sender );
void __fastcall CustomEditChange( TObject *Sender ); void __fastcall CustomEditChange( TObject *Sender );
void __fastcall RadioButtonMuxClick( TObject *Sender ); void __fastcall RadioButtonMuxClick( TObject *Sender );
void __fastcall RadioButtonAccessClick( TObject *Sender ); void __fastcall RadioButtonAccessClick( TObject *Sender );
void __fastcall BitBtnOKClick( TObject *Sender ); void __fastcall ButtonOKClick( TObject *Sender );
private: // User declarations private: // User declarations
void __fastcall RebuildMrl(); void __fastcall RebuildMrl();
intf_thread_t *p_intf; intf_thread_t *p_intf;
......
modules/gui/win32/subtitles.cpp
View file @ 7a3a7029
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* subtitles.cpp: Dialog box for divx subtitle selection * subtitles.cpp: Dialog box for divx subtitle selection
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * Copyright (C) 2002-2003 VideoLAN
* $Id: subtitles.cpp,v 1.1 2003/01/22 21:42:51 ipkiss Exp $ * $Id: subtitles.cpp,v 1.2 2003/01/26 03:55:36 ipkiss Exp $
* *
* Authors: Olivier Teuliere <ipkiss@via.ecp.fr> * Authors: Olivier Teuliere <ipkiss@via.ecp.fr>
* *
...@@ -53,7 +53,7 @@ void __fastcall TSubtitlesDlg::ButtonBrowseClick( TObject *Sender ) ...@@ -53,7 +53,7 @@ void __fastcall TSubtitlesDlg::ButtonBrowseClick( TObject *Sender )
} }
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void __fastcall TSubtitlesDlg::BitBtnOKClick( TObject *Sender ) void __fastcall TSubtitlesDlg::ButtonOKClick( TObject *Sender )
{ {
int delay = (int) (10 * atof( EditDelay->Text.c_str() )); int delay = (int) (10 * atof( EditDelay->Text.c_str() ));
float fps = atof( EditFPS->Text.c_str() ); float fps = atof( EditFPS->Text.c_str() );
......
modules/gui/win32/subtitles.dfm
View file @ 7a3a7029
object SubtitlesDlg: TSubtitlesDlg object SubtitlesDlg: TSubtitlesDlg
Left = 397 Tag = 3
Top = 333 Left = 520
Width = 432 Top = 185
Height = 134 Width = 338
Height = 173
Caption = 'Add subtitles' Caption = 'Add subtitles'
Color = clBtnFace Color = clBtnFace
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
...@@ -14,14 +15,16 @@ object SubtitlesDlg: TSubtitlesDlg ...@@ -14,14 +15,16 @@ object SubtitlesDlg: TSubtitlesDlg
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
object GroupBoxSubtitles: TGroupBox object GroupBoxSubtitles: TGroupBox
Tag = 3
Left = 8 Left = 8
Top = 8 Top = 8
Width = 310 Width = 314
Height = 91 Height = 96
Anchors = [akLeft, akTop, akRight, akBottom] Anchors = [akLeft, akTop, akRight]
Caption = 'Select a subtitles file' Caption = 'Select a subtitles file'
TabOrder = 0 TabOrder = 0
object LabelDelay: TLabel object LabelDelay: TLabel
Tag = 3
Left = 48 Left = 48
Top = 64 Top = 64
Width = 30 Width = 30
...@@ -29,7 +32,8 @@ object SubtitlesDlg: TSubtitlesDlg ...@@ -29,7 +32,8 @@ object SubtitlesDlg: TSubtitlesDlg
Caption = 'Delay:' Caption = 'Delay:'
end end
object LabelFPS: TLabel object LabelFPS: TLabel
Left = 173 Tag = 3
Left = 177
Top = 64 Top = 64
Width = 23 Width = 23
Height = 13 Height = 13
...@@ -44,11 +48,11 @@ object SubtitlesDlg: TSubtitlesDlg ...@@ -44,11 +48,11 @@ object SubtitlesDlg: TSubtitlesDlg
Hint = 'Set the delay (in seconds)' Hint = 'Set the delay (in seconds)'
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
TabOrder = 0 TabOrder = 2
Text = '0.0' Text = '0.0'
end end
object EditFPS: TEdit object EditFPS: TEdit
Left = 205 Left = 209
Top = 60 Top = 60
Width = 57 Width = 57
Height = 21 Height = 21
...@@ -56,46 +60,52 @@ object SubtitlesDlg: TSubtitlesDlg ...@@ -56,46 +60,52 @@ object SubtitlesDlg: TSubtitlesDlg
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
ParentShowHint = False ParentShowHint = False
ShowHint = True ShowHint = True
TabOrder = 1 TabOrder = 3
Text = '0.0' Text = '0.0'
end end
object EditFile: TEdit object EditFile: TEdit
Left = 16 Left = 16
Top = 24 Top = 24
Width = 190 Width = 194
Height = 21 Height = 21
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
TabOrder = 2 TabOrder = 0
end end
object ButtonBrowse: TButton object ButtonBrowse: TButton
Left = 219 Tag = 3
Left = 223
Top = 22 Top = 22
Width = 75 Width = 75
Height = 25 Height = 25
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
Caption = 'Browse...' Caption = 'Browse...'
TabOrder = 3 TabOrder = 1
OnClick = ButtonBrowseClick OnClick = ButtonBrowseClick
end end
end end
object BitBtnOK: TBitBtn object ButtonOK: TButton
Left = 333 Tag = 3
Top = 22 Left = 39
Width = 81 Top = 112
Width = 98
Height = 25 Height = 25
Anchors = [akRight] Caption = 'OK'
Default = True
ModalResult = 1
TabOrder = 1 TabOrder = 1
OnClick = BitBtnOKClick OnClick = ButtonOKClick
Kind = bkOK
end end
object BitBtnCancel: TBitBtn object ButtonCancel: TButton
Left = 333 Tag = 3
Top = 60 Left = 192
Width = 81 Top = 112
Width = 98
Height = 25 Height = 25
Anchors = [akRight] Cancel = True
Caption = 'Cancel'
ModalResult = 2
TabOrder = 2 TabOrder = 2
Kind = bkCancel OnClick = ButtonOKClick
end end
object OpenDialog1: TOpenDialog object OpenDialog1: TOpenDialog
Filter = Filter =
......
modules/gui/win32/subtitles.h
View file @ 7a3a7029
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* subtitles.h: Dialog box for divx subtitle selection * subtitles.h: Dialog box for divx subtitle selection
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * Copyright (C) 2002-2003 VideoLAN
* $Id: subtitles.h,v 1.1 2003/01/22 21:42:51 ipkiss Exp $ * $Id: subtitles.h,v 1.2 2003/01/26 03:55:36 ipkiss Exp $
* *
* Authors: Olivier Teuliere <ipkiss@via.ecp.fr> * Authors: Olivier Teuliere <ipkiss@via.ecp.fr>
* *
...@@ -40,12 +40,12 @@ __published: // IDE-managed Components ...@@ -40,12 +40,12 @@ __published: // IDE-managed Components
TEdit *EditFPS; TEdit *EditFPS;
TEdit *EditFile; TEdit *EditFile;
TButton *ButtonBrowse; TButton *ButtonBrowse;
TBitBtn *BitBtnOK;
TBitBtn *BitBtnCancel;
TLabel *LabelDelay; TLabel *LabelDelay;
TLabel *LabelFPS; TLabel *LabelFPS;
TButton *ButtonOK;
TButton *ButtonCancel;
void __fastcall ButtonBrowseClick( TObject *Sender ); void __fastcall ButtonBrowseClick( TObject *Sender );
void __fastcall BitBtnOKClick( TObject *Sender ); void __fastcall ButtonOKClick( TObject *Sender );
private: // User declarations private: // User declarations
intf_thread_t *p_intf; intf_thread_t *p_intf;
public: // User declarations public: // User declarations
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment