* changed the playlist icon in the wxwin interface (thanks to bigben)

* added an open button

diff --git a/modules/gui/wxwindows/Modules.am b/modules/gui/wxwindows/Modules.am
index b3130bfa274235eb4c79fa9f10a2d10d5985cb36..15a68195e1edaa3d539cd22b7cebe6824f8ef387 100644 (file)
--- a/modules/gui/wxwindows/Modules.am
+++ b/modules/gui/wxwindows/Modules.am
@@ -30,4 +30,5 @@ EXTRA_DIST += \
        bitmaps/next.xpm \
        bitmaps/slow.xpm \
        bitmaps/fast.xpm \
+       bitmaps/playlist.xpm \
        bitmaps/speaker.xpm

diff --git a/modules/gui/wxwindows/bitmaps/playlist.xpm b/modules/gui/wxwindows/bitmaps/playlist.xpm
new file mode 100644 (file)
index 0000000..d15b98f
--- /dev/null
+++ b/modules/gui/wxwindows/bitmaps/playlist.xpm
@@ -0,0 +1,36 @@
+/* XPM */
+static char * playlist_xpm[] = {
+"16 16 17 1",
+"*     c None",
+".     c #000000",
+"+     c #800000",
+"@     c #008000",
+"#     c #808000",
+"$     c #000080",
+"%     c #800080",
+"&     c #008080",
+"      c #C0C0C0",
+"=     c #808080",
+"-     c #FF0000",
+";     c #00FF00",
+">     c #FFFF00",
+",     c #0000FF",
+"'     c #FF00FF",
+")     c #00FFFF",
+"!     c #FFFFFF",
+"****************",
+"****************",
+"****************",
+"**..**........**",
+"**..**........**",
+"****************",
+"****************",
+"**..**........**",
+"**..**........**",
+"****************",
+"****************",
+"**..**........**",
+"**..**........**",
+"****************",
+"****************",
+"****************"};

diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp
index fc49da1bca206b0cac14d1188a8eff765dbd4ad8..42c3b6542db8940f5899303d8d2efd241c2dcee3 100644 (file)
--- a/modules/gui/wxwindows/interface.cpp
+++ b/modules/gui/wxwindows/interface.cpp
@@ -41,6 +41,7 @@
 #include "bitmaps/eject.xpm"
 #include "bitmaps/slow.xpm"
 #include "bitmaps/fast.xpm"
+#include "bitmaps/playlist.xpm"
 #include "bitmaps/speaker.xpm"
 
 #define TOOLBAR_BMP_WIDTH 16
@@ -435,6 +436,7 @@ void VLCVolCtrl::OnPaint( wxPaintEvent &evt )
 
 void Interface::CreateOurToolBar()
 {
+#define HELP_OPEN N_("Open")
 #define HELP_STOP N_("Stop")
 #define HELP_PLAY N_("Play")
 #define HELP_PAUSE N_("Pause")
@@ -452,6 +454,9 @@ void Interface::CreateOurToolBar()
 
     toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) );
 
+    toolbar->AddTool( OpenFile_Event, wxT(""),
+                      wxBitmap( eject_xpm ), wxU(_(HELP_OPEN)) );
+    toolbar->AddSeparator();
     toolbar->AddTool( PlayStream_Event, wxT(""), wxBitmap( play_xpm ),
                       wxU(_(HELP_PLAY)) );
 #if 0
@@ -470,12 +475,12 @@ void Interface::CreateOurToolBar()
     toolbar->AddTool( NextStream_Event, wxT(""), wxBitmap( next_xpm ),
                       wxU(_(HELP_PLN)) );
     toolbar->AddSeparator();
-    toolbar->AddTool( Playlist_Event, wxT(""), wxBitmap( eject_xpm ),
+    toolbar->AddTool( Playlist_Event, wxT(""), wxBitmap( playlist_xpm ),
                       wxU(_(HELP_PLO)) );
 
     wxControl *p_dummy_ctrl =
         new wxControl( toolbar, -1, wxDefaultPosition,
-                       wxSize(64, 16 ), wxBORDER_NONE );
+                       wxSize(35, 16 ), wxBORDER_NONE );
 
     toolbar->AddControl( p_dummy_ctrl );
 
@@ -1344,13 +1349,13 @@ void Interface::TogglePlayButton( int i_playing_status )
 
     if( i_playing_status == PLAYING_S )
     {
-        GetToolBar()->InsertTool( 0, PlayStream_Event, wxU(_("Pause")),
+        GetToolBar()->InsertTool( 2, PlayStream_Event, wxU(_("Pause")),
                                   wxBitmap( pause_xpm ), wxNullBitmap,
                                   wxITEM_NORMAL, wxU(_(HELP_PAUSE)) );
     }
     else
     {
-        GetToolBar()->InsertTool( 0, PlayStream_Event, wxU(_("Play")),
+        GetToolBar()->InsertTool( 2, PlayStream_Event, wxU(_("Play")),
                                   wxBitmap( play_xpm ), wxNullBitmap,
                                   wxITEM_NORMAL, wxU(_(HELP_PLAY)) );
     }