* ./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.

diff --git a/AUTHORS b/AUTHORS
index 8b040dd8207e6dc21746e578e6c49b30c98857de..97d02fcb873e2db5863d7dec7467ab6cee605c3c 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -276,3 +276,8 @@ N: Peter Surda
 E: shurdeek@panorama.sth.ac.at
 D: rc plugin for vlc control through /dev/stdin
 
+N: Olivier Teulière
+E: ipkiss@via.ecp.fr
+C: ipkiss
+D: WIN32 interface
+

diff --git a/ChangeLog b/ChangeLog
index d64421d82e24092ea98529959c8c1851c07a2426..10982af3f10fa533281aa58d2326373747950da7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@
 
 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:
     replaced the outdated author list with a "VideoLAN Team" entry.
   * ./debian/rules, ./debian/control: deactivated the vlc-kde package because
@@ -21,6 +26,7 @@ HEAD
   * ./configure.in: added (hopefully) explicit messages on how to get
     libdvdcss and link vlc with it.
   * ./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
     contributor is currently working on.
   * ALL: removed libdvdcss from the vlc tree.

diff --git a/plugins/win32/about.cpp b/plugins/win32/about.cpp
index d815adf2e11d91f758c023a68db3a83243818707..e3b9bfc659e20e988a1ccccc5e1903204f9f8858 100644 (file)
--- a/plugins/win32/about.cpp
+++ b/plugins/win32/about.cpp
@@ -34,10 +34,13 @@
 //#pragma package(smart_init)\r
 #pragma resource "*.dfm"\r
 \r
+extern  struct intf_thread_s *p_intfGlobal;\r
+\r
 //---------------------------------------------------------------------------\r
 __fastcall TAboutDlg::TAboutDlg( TComponent* Owner )\r
         : TForm( Owner )\r
 {\r
+    Image1->Picture->Icon = p_intfGlobal->p_sys->p_window->Icon;\r
 }\r
 //---------------------------------------------------------------------------\r
 \r

diff --git a/plugins/win32/about.dfm b/plugins/win32/about.dfm
index b76ed6e811149a0780a69996d07ed4bbc0d3a15a..8d1d3d4ddc0475a0e6014510d57ff16144d12570 100644 (file)
--- a/plugins/win32/about.dfm
+++ b/plugins/win32/about.dfm
@@ -1,10 +1,10 @@
 object AboutDlg: TAboutDlg\r
-  Left = 422\r
-  Top = 159\r
+  Left = 442\r
+  Top = 281\r
   BorderStyle = bsDialog\r
   Caption = 'About'\r
-  ClientHeight = 509\r
-  ClientWidth = 360\r
+  ClientHeight = 204\r
+  ClientWidth = 286\r
   Color = clBtnFace\r
   Font.Charset = DEFAULT_CHARSET\r
   Font.Color = clWindowText\r
@@ -246,24 +246,28 @@ object AboutDlg: TAboutDlg
   PixelsPerInch = 96\r
   TextHeight = 13\r
   object Label1: TLabel\r
-    Left = 141\r
-    Top = 8\r
-    Width = 77\r
-    Height = 13\r
+    Left = 114\r
+    Top = 18\r
+    Width = 132\r
+    Height = 20\r
     Caption = 'VideoLAN Client'\r
+    Font.Charset = DEFAULT_CHARSET\r
+    Font.Color = clWindowText\r
+    Font.Height = -16\r
+    Font.Name = 'MS Sans Serif'\r
+    Font.Style = [fsBold]\r
+    ParentFont = False\r
   end\r
   object Label2: TLabel\r
-    Left = 5\r
-    Top = 40\r
-    Width = 346\r
+    Left = 10\r
+    Top = 64\r
+    Width = 267\r
     Height = 13\r
-    Caption = \r
-      '(C) Copyright 1996, 1997, 1998, 1999, 2000, 2001 - The VideoLAN ' +\r
-      'Team'\r
+    Caption = '(C) Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002'\r
   end\r
-  object Label21: TLabel\r
-    Left = 52\r
-    Top = 424\r
+  object Label4: TLabel\r
+    Left = 15\r
+    Top = 115\r
     Width = 255\r
     Height = 39\r
     Caption = \r
@@ -271,148 +275,27 @@ object AboutDlg: TAboutDlg
       'MPEG and MPEG 2 files from a file or from a network source.'\r
     WordWrap = True\r
   end\r
-  object GroupBoxAuthors: TGroupBox\r
-    Left = 6\r
-    Top = 64\r
-    Width = 345\r
-    Height = 353\r
-    Caption = 'Authors'\r
-    TabOrder = 0\r
-    object Label3: TLabel\r
-      Left = 24\r
-      Top = 14\r
-      Width = 171\r
-      Height = 13\r
-      Caption = 'Régis Duchesne <regis@via.ecp.fr>'\r
-    end\r
-    object Label4: TLabel\r
-      Left = 24\r
-      Top = 32\r
-      Width = 181\r
-      Height = 13\r
-      Caption = 'Michel Lespinasse <walken@zoy.org>'\r
-    end\r
-    object Label5: TLabel\r
-      Left = 24\r
-      Top = 51\r
-      Width = 159\r
-      Height = 13\r
-      Caption = 'Olivier Pomel <pomel@via.ecp.fr>'\r
-    end\r
-    object Label6: TLabel\r
-      Left = 24\r
-      Top = 69\r
-      Width = 133\r
-      Height = 13\r
-      Caption = 'Pierre Baillet <oct@zoy.org>'\r
-    end\r
-    object Label7: TLabel\r
-      Left = 24\r
-      Top = 87\r
-      Width = 207\r
-      Height = 13\r
-      Caption = 'Jean-Philippe Grimaldi <jeanphi@via.ecp.fr>'\r
-    end\r
-    object Label8: TLabel\r
-      Left = 24\r
-      Top = 106\r
-      Width = 149\r
-      Height = 13\r
-      Caption = 'Andres Krapf <dae@via.ecp.fr>'\r
-    end\r
-    object Label9: TLabel\r
-      Left = 24\r
-      Top = 124\r
-      Width = 194\r
-      Height = 13\r
-      Caption = 'Christophe Massiot <massiot@via.ecp.fr>'\r
-    end\r
-    object Label10: TLabel\r
-      Left = 24\r
-      Top = 142\r
-      Width = 173\r
-      Height = 13\r
-      Caption = 'Vincent Seguin <seguin@via.ecp.fr>'\r
-    end\r
-    object Label11: TLabel\r
-      Left = 24\r
-      Top = 161\r
-      Width = 165\r
-      Height = 13\r
-      Caption = 'Benoit Steiner <benny@via.ecp.fr>'\r
-    end\r
-    object Label12: TLabel\r
-      Left = 24\r
-      Top = 179\r
-      Width = 241\r
-      Height = 13\r
-      Caption = 'Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr>'\r
-    end\r
-    object Label13: TLabel\r
-      Left = 24\r
-      Top = 198\r
-      Width = 186\r
-      Height = 13\r
-      Caption = 'Jean-Marc Dressler <polux@via.ecp.fr>'\r
-    end\r
-    object Label14: TLabel\r
-      Left = 24\r
-      Top = 216\r
-      Width = 171\r
-      Height = 13\r
-      Caption = 'Gaël Hendryckx <jimmy@via.ecp.fr>'\r
-    end\r
-    object Label15: TLabel\r
-      Left = 24\r
-      Top = 234\r
-      Width = 158\r
-      Height = 13\r
-      Caption = 'Samuel Hocevar <sam@zoy.org>'\r
-    end\r
-    object Label16: TLabel\r
-      Left = 24\r
-      Top = 253\r
-      Width = 178\r
-      Height = 13\r
-      Caption = 'Brieuc Jeunhomme <bbp@via.ecp.fr>'\r
-    end\r
-    object Label17: TLabel\r
-      Left = 24\r
-      Top = 271\r
-      Width = 164\r
-      Height = 13\r
-      Caption = 'Michel Kaempf <maxx@via.ecp.fr>'\r
-    end\r
-    object Label18: TLabel\r
-      Left = 24\r
-      Top = 289\r
-      Width = 160\r
-      Height = 13\r
-      Caption = 'Stéphane Borel <stef@via.ecp.fr>'\r
-    end\r
-    object Label19: TLabel\r
-      Left = 24\r
-      Top = 308\r
-      Width = 163\r
-      Height = 13\r
-      Caption = 'Renaud Dartus <reno@via.ecp.fr>'\r
-    end\r
-    object Label20: TLabel\r
-      Left = 24\r
-      Top = 326\r
-      Width = 149\r
-      Height = 13\r
-      Caption = 'Henri Fallon <henri@via.ecp.fr>'\r
-    end\r
+  object Label3: TLabel\r
+    Left = 38\r
+    Top = 80\r
+    Width = 227\r
+    Height = 13\r
+    Caption = 'The VideoLAN Team  <videolan@videolan.org>'\r
+  end\r
+  object Image1: TImage\r
+    Left = 32\r
+    Top = 8\r
+    Width = 49\r
+    Height = 49\r
   end\r
   object BitBtnOk: TBitBtn\r
-    Left = 7\r
-    Top = 471\r
-    Width = 345\r
+    Left = 64\r
+    Top = 170\r
+    Width = 145\r
     Height = 25\r
     Caption = 'OK'\r
     Default = True\r
     ModalResult = 1\r
-    TabOrder = 1\r
+    TabOrder = 0\r
   end\r
 end\r

diff --git a/plugins/win32/about.h b/plugins/win32/about.h
index f4141c5e3ba56a6beede16a820376569c0788126..43cef14ec9f72f9bc212fce13cb3623f882d993b 100644 (file)
--- a/plugins/win32/about.h
+++ b/plugins/win32/about.h
@@ -28,33 +28,18 @@
 #include <StdCtrls.hpp>\r
 #include <Forms.hpp>\r
 #include <Buttons.hpp>\r
+#include <ExtCtrls.hpp>\r
+#include <Graphics.hpp>\r
 //---------------------------------------------------------------------------\r
 class TAboutDlg : public TForm\r
 {\r
 __published:   // IDE-managed Components\r
     TLabel *Label1;\r
     TLabel *Label2;\r
-    TLabel *Label21;\r
-    TGroupBox *GroupBoxAuthors;\r
-    TLabel *Label3;\r
     TLabel *Label4;\r
-    TLabel *Label5;\r
-    TLabel *Label6;\r
-    TLabel *Label7;\r
-    TLabel *Label8;\r
-    TLabel *Label9;\r
-    TLabel *Label10;\r
-    TLabel *Label11;\r
-    TLabel *Label12;\r
-    TLabel *Label13;\r
-    TLabel *Label14;\r
-    TLabel *Label15;\r
-    TLabel *Label16;\r
-    TLabel *Label17;\r
-    TLabel *Label18;\r
-    TLabel *Label19;\r
-    TLabel *Label20;\r
     TBitBtn *BitBtnOk;\r
+    TLabel *Label3;\r
+    TImage *Image1;\r
 private:       // User declarations\r
 public:                // User declarations\r
     __fastcall TAboutDlg( TComponent* Owner );\r

diff --git a/plugins/win32/mainframe.cpp b/plugins/win32/mainframe.cpp
index c0a1b5d5ed2465d8facc144e25b5fd06204b3fff..3b46775d3c1027b79fb8670b141a3920da139d64 100644 (file)
--- a/plugins/win32/mainframe.cpp
+++ b/plugins/win32/mainframe.cpp
@@ -292,7 +292,7 @@ void __fastcall TMainFrameDlg::ToolButtonNextClick( TObject *Sender )
     p_intfGlobal->p_sys->p_playlist->Next();\r
 }\r
 //---------------------------------------------------------------------------\r
-void __fastcall TMainFrameDlg::ToolButtonEjecttempClick( TObject *Sender )\r
+void __fastcall TMainFrameDlg::ToolButtonEjectClick( TObject *Sender )\r
 {\r
     AnsiString Device = "";\r
 \r
@@ -724,4 +724,3 @@ void __fastcall TMainFrameDlg::CreatePreferences( AnsiString Name )
 }\r
 //---------------------------------------------------------------------------\r
 \r
-\r

diff --git a/plugins/win32/mainframe.dfm b/plugins/win32/mainframe.dfm
index 161420d40387c53ab424b99734a5a58c5d083ed7..ddbabd1bdcece6f09c2ee42f37ec19f00f1d5c01 100644 (file)
--- a/plugins/win32/mainframe.dfm
+++ b/plugins/win32/mainframe.dfm
@@ -203,7 +203,7 @@ object MainFrameDlg: TMainFrameDlg
       Hint = 'Play stream'\r
       Caption = 'Eject'\r
       ImageIndex = 5\r
-      OnClick = ToolButtonEjecttempClick\r
+      OnClick = ToolButtonEjectClick\r
     end\r
     object ToolButtonPlay: TToolButton\r
       Left = 242\r
@@ -495,6 +495,7 @@ object MainFrameDlg: TMainFrameDlg
         Caption = '&Eject Disc'\r
         Hint = 'Eject disc'\r
         Visible = False\r
+        OnClick = ToolButtonEjectClick\r
       end\r
       object N1: TMenuItem\r
         Caption = '-'\r
@@ -510,6 +511,7 @@ object MainFrameDlg: TMainFrameDlg
       Caption = '&View'\r
       object MenuHideinterface: TMenuItem\r
         Caption = '&Hide interface'\r
+        Enabled = False\r
         Hint = 'Hide the main interface window'\r
       end\r
       object MenuFullscreen: TMenuItem\r

diff --git a/plugins/win32/mainframe.h b/plugins/win32/mainframe.h
index b46dc425abdc4019ad5990c12157f44fc08c61c2..61a7ac351d59baf509427c0e69d6d34eb6142094 100644 (file)
--- a/plugins/win32/mainframe.h
+++ b/plugins/win32/mainframe.h
@@ -159,7 +159,7 @@ __published:        // IDE-managed Components
     void __fastcall ToolButtonFastClick( TObject *Sender );\r
     void __fastcall ToolButtonPrevClick( TObject *Sender );\r
     void __fastcall ToolButtonNextClick( TObject *Sender );\r
-    void __fastcall ToolButtonEjecttempClick( TObject *Sender );\r
+    void __fastcall ToolButtonEjectClick( TObject *Sender );\r
     void __fastcall PopupCloseClick( TObject *Sender );\r
     void __fastcall PopupPlayClick( TObject *Sender );\r
     void __fastcall PopupPauseClick( TObject *Sender );\r