Skip to content

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

  * ./AUTHORS: added myself :)
  * ./plugins/win32/mainframe.cpp: disabled the "hide interface" menu
    item, not yet implemented.
  * ./plugins/win32/about.dfm: replaced the outdated author list with a
    "VideoLAN Team" entry.
parent 71b4ea0b
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 177 deletions
AUTHORS
View file @ d94ba355
...@@ -276,3 +276,8 @@ N: Peter Surda ...@@ -276,3 +276,8 @@ N: Peter Surda
E: shurdeek@panorama.sth.ac.at E: shurdeek@panorama.sth.ac.at
D: rc plugin for vlc control through /dev/stdin D: rc plugin for vlc control through /dev/stdin
N: Olivier Teulire
E: ipkiss@via.ecp.fr
C: ipkiss
D: WIN32 interface
ChangeLog
View file @ d94ba355
...@@ -4,6 +4,11 @@ ...@@ -4,6 +4,11 @@
HEAD HEAD
* ./AUTHORS: added ipkiss.
* ./plugins/win32/mainframe.cpp: disabled the "hide interface" menu
item, not yet implemented.
* ./plugins/win32/about.dfm: replaced the outdated author list with a
"VideoLAN Team" entry.
* ./plugins/gtk/gtk.glade, plugins/gtk/gnome.glade, ./plugins/kde/kde.cpp: * ./plugins/gtk/gtk.glade, plugins/gtk/gnome.glade, ./plugins/kde/kde.cpp:
replaced the outdated author list with a "VideoLAN Team" entry. replaced the outdated author list with a "VideoLAN Team" entry.
* ./debian/rules, ./debian/control: deactivated the vlc-kde package because * ./debian/rules, ./debian/control: deactivated the vlc-kde package because
...@@ -21,6 +26,7 @@ HEAD ...@@ -21,6 +26,7 @@ HEAD
* ./configure.in: added (hopefully) explicit messages on how to get * ./configure.in: added (hopefully) explicit messages on how to get
libdvdcss and link vlc with it. libdvdcss and link vlc with it.
* ./plugins/dvdread/input_dvdread.c: removed inclusion of dvd_udf.h. * ./plugins/dvdread/input_dvdread.c: removed inclusion of dvd_udf.h.
* ./plugins/win32/*: Added management for secondary config dialogs
* ./plugins/ogg/*: added preliminary files for an Ogg/Vorbis decoder a * ./plugins/ogg/*: added preliminary files for an Ogg/Vorbis decoder a
contributor is currently working on. contributor is currently working on.
* ALL: removed libdvdcss from the vlc tree. * ALL: removed libdvdcss from the vlc tree.
......
plugins/win32/about.cpp
View file @ d94ba355
...@@ -34,10 +34,13 @@ ...@@ -34,10 +34,13 @@
//#pragma package(smart_init) //#pragma package(smart_init)
#pragma resource "*.dfm" #pragma resource "*.dfm"
extern struct intf_thread_s *p_intfGlobal;
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
__fastcall TAboutDlg::TAboutDlg( TComponent* Owner ) __fastcall TAboutDlg::TAboutDlg( TComponent* Owner )
: TForm( Owner ) : TForm( Owner )
{ {
Image1->Picture->Icon = p_intfGlobal->p_sys->p_window->Icon;
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
......
plugins/win32/about.dfm
View file @ d94ba355
object AboutDlg: TAboutDlg object AboutDlg: TAboutDlg
Left = 422 Left = 442
Top = 159 Top = 281
BorderStyle = bsDialog BorderStyle = bsDialog
Caption = 'About' Caption = 'About'
ClientHeight = 509 ClientHeight = 204
ClientWidth = 360 ClientWidth = 286
Color = clBtnFace Color = clBtnFace
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
...@@ -246,24 +246,28 @@ object AboutDlg: TAboutDlg ...@@ -246,24 +246,28 @@ object AboutDlg: TAboutDlg
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
object Label1: TLabel object Label1: TLabel
Left = 141 Left = 114
Top = 8 Top = 18
Width = 77 Width = 132
Height = 13 Height = 20
Caption = 'VideoLAN Client' Caption = 'VideoLAN Client'
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -16
Font.Name = 'MS Sans Serif'
Font.Style = [fsBold]
ParentFont = False
end end
object Label2: TLabel object Label2: TLabel
Left = 5 Left = 10
Top = 40 Top = 64
Width = 346 Width = 267
Height = 13 Height = 13
Caption = Caption = '(C) Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002'
'(C) Copyright 1996, 1997, 1998, 1999, 2000, 2001 - The VideoLAN ' +
'Team'
end end
object Label21: TLabel object Label4: TLabel
Left = 52 Left = 15
Top = 424 Top = 115
Width = 255 Width = 255
Height = 39 Height = 39
Caption = Caption =
...@@ -271,148 +275,27 @@ object AboutDlg: TAboutDlg ...@@ -271,148 +275,27 @@ object AboutDlg: TAboutDlg
'MPEG and MPEG 2 files from a file or from a network source.' 'MPEG and MPEG 2 files from a file or from a network source.'
WordWrap = True WordWrap = True
end end
object GroupBoxAuthors: TGroupBox object Label3: TLabel
Left = 6 Left = 38
Top = 64 Top = 80
Width = 345 Width = 227
Height = 353 Height = 13
Caption = 'Authors' Caption = 'The VideoLAN Team <videolan@videolan.org>'
TabOrder = 0 end
object Label3: TLabel object Image1: TImage
Left = 24 Left = 32
Top = 14 Top = 8
Width = 171 Width = 49
Height = 13 Height = 49
Caption = 'Rgis Duchesne <regis@via.ecp.fr>'
end
object Label4: TLabel
Left = 24
Top = 32
Width = 181
Height = 13
Caption = 'Michel Lespinasse <walken@zoy.org>'
end
object Label5: TLabel
Left = 24
Top = 51
Width = 159
Height = 13
Caption = 'Olivier Pomel <pomel@via.ecp.fr>'
end
object Label6: TLabel
Left = 24
Top = 69
Width = 133
Height = 13
Caption = 'Pierre Baillet <oct@zoy.org>'
end
object Label7: TLabel
Left = 24
Top = 87
Width = 207
Height = 13
Caption = 'Jean-Philippe Grimaldi <jeanphi@via.ecp.fr>'
end
object Label8: TLabel
Left = 24
Top = 106
Width = 149
Height = 13
Caption = 'Andres Krapf <dae@via.ecp.fr>'
end
object Label9: TLabel
Left = 24
Top = 124
Width = 194
Height = 13
Caption = 'Christophe Massiot <massiot@via.ecp.fr>'
end
object Label10: TLabel
Left = 24
Top = 142
Width = 173
Height = 13
Caption = 'Vincent Seguin <seguin@via.ecp.fr>'
end
object Label11: TLabel
Left = 24
Top = 161
Width = 165
Height = 13
Caption = 'Benoit Steiner <benny@via.ecp.fr>'
end
object Label12: TLabel
Left = 24
Top = 179
Width = 241
Height = 13
Caption = 'Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>'
end
object Label13: TLabel
Left = 24
Top = 198
Width = 186
Height = 13
Caption = 'Jean-Marc Dressler <polux@via.ecp.fr>'
end
object Label14: TLabel
Left = 24
Top = 216
Width = 171
Height = 13
Caption = 'Gal Hendryckx <jimmy@via.ecp.fr>'
end
object Label15: TLabel
Left = 24
Top = 234
Width = 158
Height = 13
Caption = 'Samuel Hocevar <sam@zoy.org>'
end
object Label16: TLabel
Left = 24
Top = 253
Width = 178
Height = 13
Caption = 'Brieuc Jeunhomme <bbp@via.ecp.fr>'
end
object Label17: TLabel
Left = 24
Top = 271
Width = 164
Height = 13
Caption = 'Michel Kaempf <maxx@via.ecp.fr>'
end
object Label18: TLabel
Left = 24
Top = 289
Width = 160
Height = 13
Caption = 'Stphane Borel <stef@via.ecp.fr>'
end
object Label19: TLabel
Left = 24
Top = 308
Width = 163
Height = 13
Caption = 'Renaud Dartus <reno@via.ecp.fr>'
end
object Label20: TLabel
Left = 24
Top = 326
Width = 149
Height = 13
Caption = 'Henri Fallon <henri@via.ecp.fr>'
end
end end
object BitBtnOk: TBitBtn object BitBtnOk: TBitBtn
Left = 7 Left = 64
Top = 471 Top = 170
Width = 345 Width = 145
Height = 25 Height = 25
Caption = 'OK' Caption = 'OK'
Default = True Default = True
ModalResult = 1 ModalResult = 1
TabOrder = 1 TabOrder = 0
end end
end end
plugins/win32/about.h
View file @ d94ba355
...@@ -28,33 +28,18 @@ ...@@ -28,33 +28,18 @@
#include <StdCtrls.hpp> #include <StdCtrls.hpp>
#include <Forms.hpp> #include <Forms.hpp>
#include <Buttons.hpp> #include <Buttons.hpp>
#include <ExtCtrls.hpp>
#include <Graphics.hpp>
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
class TAboutDlg : public TForm class TAboutDlg : public TForm
{ {
__published: // IDE-managed Components __published: // IDE-managed Components
TLabel *Label1; TLabel *Label1;
TLabel *Label2; TLabel *Label2;
TLabel *Label21;
TGroupBox *GroupBoxAuthors;
TLabel *Label3;
TLabel *Label4; TLabel *Label4;
TLabel *Label5;
TLabel *Label6;
TLabel *Label7;
TLabel *Label8;
TLabel *Label9;
TLabel *Label10;
TLabel *Label11;
TLabel *Label12;
TLabel *Label13;
TLabel *Label14;
TLabel *Label15;
TLabel *Label16;
TLabel *Label17;
TLabel *Label18;
TLabel *Label19;
TLabel *Label20;
TBitBtn *BitBtnOk; TBitBtn *BitBtnOk;
TLabel *Label3;
TImage *Image1;
private: // User declarations private: // User declarations
public: // User declarations public: // User declarations
__fastcall TAboutDlg( TComponent* Owner ); __fastcall TAboutDlg( TComponent* Owner );
......
plugins/win32/mainframe.cpp
View file @ d94ba355
...@@ -292,7 +292,7 @@ void __fastcall TMainFrameDlg::ToolButtonNextClick( TObject *Sender ) ...@@ -292,7 +292,7 @@ void __fastcall TMainFrameDlg::ToolButtonNextClick( TObject *Sender )
p_intfGlobal->p_sys->p_playlist->Next(); p_intfGlobal->p_sys->p_playlist->Next();
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void __fastcall TMainFrameDlg::ToolButtonEjecttempClick( TObject *Sender ) void __fastcall TMainFrameDlg::ToolButtonEjectClick( TObject *Sender )
{ {
AnsiString Device = ""; AnsiString Device = "";
...@@ -724,4 +724,3 @@ void __fastcall TMainFrameDlg::CreatePreferences( AnsiString Name ) ...@@ -724,4 +724,3 @@ void __fastcall TMainFrameDlg::CreatePreferences( AnsiString Name )
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
plugins/win32/mainframe.dfm
View file @ d94ba355
...@@ -203,7 +203,7 @@ object MainFrameDlg: TMainFrameDlg ...@@ -203,7 +203,7 @@ object MainFrameDlg: TMainFrameDlg
Hint = 'Play stream' Hint = 'Play stream'
Caption = 'Eject' Caption = 'Eject'
ImageIndex = 5 ImageIndex = 5
OnClick = ToolButtonEjecttempClick OnClick = ToolButtonEjectClick
end end
object ToolButtonPlay: TToolButton object ToolButtonPlay: TToolButton
Left = 242 Left = 242
...@@ -495,6 +495,7 @@ object MainFrameDlg: TMainFrameDlg ...@@ -495,6 +495,7 @@ object MainFrameDlg: TMainFrameDlg
Caption = '&Eject Disc' Caption = '&Eject Disc'
Hint = 'Eject disc' Hint = 'Eject disc'
Visible = False Visible = False
OnClick = ToolButtonEjectClick
end end
object N1: TMenuItem object N1: TMenuItem
Caption = '-' Caption = '-'
...@@ -510,6 +511,7 @@ object MainFrameDlg: TMainFrameDlg ...@@ -510,6 +511,7 @@ object MainFrameDlg: TMainFrameDlg
Caption = '&View' Caption = '&View'
object MenuHideinterface: TMenuItem object MenuHideinterface: TMenuItem
Caption = '&Hide interface' Caption = '&Hide interface'
Enabled = False
Hint = 'Hide the main interface window' Hint = 'Hide the main interface window'
end end
object MenuFullscreen: TMenuItem object MenuFullscreen: TMenuItem
......
plugins/win32/mainframe.h
View file @ d94ba355
...@@ -159,7 +159,7 @@ __published: // IDE-managed Components ...@@ -159,7 +159,7 @@ __published: // IDE-managed Components
void __fastcall ToolButtonFastClick( TObject *Sender ); void __fastcall ToolButtonFastClick( TObject *Sender );
void __fastcall ToolButtonPrevClick( TObject *Sender ); void __fastcall ToolButtonPrevClick( TObject *Sender );
void __fastcall ToolButtonNextClick( TObject *Sender ); void __fastcall ToolButtonNextClick( TObject *Sender );
void __fastcall ToolButtonEjecttempClick( TObject *Sender ); void __fastcall ToolButtonEjectClick( TObject *Sender );
void __fastcall PopupCloseClick( TObject *Sender ); void __fastcall PopupCloseClick( TObject *Sender );
void __fastcall PopupPlayClick( TObject *Sender ); void __fastcall PopupPlayClick( TObject *Sender );
void __fastcall PopupPauseClick( TObject *Sender ); void __fastcall PopupPauseClick( TObject *Sender );
......
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