/*****************************************************************************
* interface.cpp : wxWidgets plugin for vlc
*****************************************************************************
- * Copyright (C) 2000-2005 the VideoLAN team
+ * Copyright (C) 2000-2006 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@videolan.org>
*
* 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <vlc/aout.h>
#include "charset.h"
+#include <vlc_interaction.h>
+
+#include <wx/splitter.h>
+
/* include the toolbar graphics */
#include "bitmaps/play.xpm"
#include "bitmaps/pause.xpm"
#include "../../../share/vlc16x16.xpm"
#endif
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static int InteractCallback( vlc_object_t *, const char *, vlc_value_t,
+ vlc_value_t, void *);
+
/*****************************************************************************
* Local class declarations.
*****************************************************************************/
EVT_LEFT_UP(VLCVolCtrl::OnChange)
END_EVENT_TABLE()
+class Splitter : public wxSplitterWindow
+{
+public:
+ Splitter( wxWindow *p_parent, intf_thread_t *_p_intf )
+ : wxSplitterWindow( p_parent, -1, wxDefaultPosition, wxSize(0,0),
+#if defined( __WXMSW__ )
+ wxCLIP_CHILDREN ),
+#else
+ wxCLIP_CHILDREN | wxSP_3DSASH ),
+#endif
+ p_intf(_p_intf), b_video(0), i_delay(0)
+ {
+ SetSashSize( 0 );
+
+ wxSize size = wxSize(-1, 150);
+ wxPoint p = wxPoint(0,0);
+ bool b_dummy;
+ WindowSettings *ws = p_intf->p_sys->p_window_settings;
+ ws->GetSettings( WindowSettings::ID_SMALL_PLAYLIST, b_dummy, p, size );
+
+ i_width = size.GetWidth();
+ i_sash_position = size.GetHeight();
+ b_show_on_start = !!p.x;
+ }
+
+ virtual ~Splitter()
+ {
+ WindowSettings *ws = p_intf->p_sys->p_window_settings;
+ ws->SetSettings( WindowSettings::ID_SMALL_PLAYLIST, true,
+ wxPoint(!!GetWindow2(),0),
+ wxSize(i_width, i_sash_position) );
+ };
+
+ virtual bool Split( wxWindow* window1, wxWindow* window2 )
+ {
+ SetSashSize( 0 );
+ wxSize size = wxSize( i_width, i_sash_position );
+ if( window2->GetSizer() ) window2->GetSizer()->SetMinSize( size );
+
+ return wxSplitterWindow::SplitHorizontally( window1, window2,
+ -i_sash_position );
+ }
+
+ virtual bool Unsplit( wxWindow* window )
+ {
+ SetSashSize( 0 );
+ return wxSplitterWindow::Unsplit( window );
+ }
+
+ bool ShowOnStart() { return b_show_on_start; }
+
+private:
+ DECLARE_EVENT_TABLE()
+
+ void OnSize( wxSizeEvent &event )
+ {
+ /* If we display video, then resize the video window */
+ if( GetWindow2() &&
+ p_intf->p_sys->p_video_window && p_intf->p_sys->p_video_sizer &&
+ p_intf->p_sys->p_video_sizer->GetMinSize() != wxSize(0,0) )
+ {
+ if( !b_video ) i_delay = mdate() + 1000000;
+ b_video = VLC_TRUE;
+
+ SetSashSize( -1 );
+
+#if defined( __WXMSW__ )
+ SetSashPosition( event.GetSize().GetHeight() - i_sash_position );
+#else
+ SetSashPosition( event.GetSize().GetHeight() -
+ i_sash_position - GetSashSize() );
+#endif
+ }
+ else if( GetWindow2() && GetWindow1() && GetWindow1()->GetSizer() )
+ {
+ wxSize size = GetWindow1()->GetSizer()->GetMinSize();
+
+ if( b_video ) i_delay = mdate() + 1000000;
+ b_video = VLC_FALSE;
+
+ if( event.GetSize().GetHeight() - size.GetHeight() )
+ {
+ SetSashSize( 0 );
+
+ SetSashPosition( size.GetHeight() ? size.GetHeight() : 1 );
+
+ if( i_delay < mdate() )
+ {
+ i_sash_position = event.GetSize().GetHeight() -
+ size.GetHeight();
+ i_width = event.GetSize().GetWidth();
+
+ size = wxSize( i_width, i_sash_position );
+ if( GetWindow2()->GetSizer() )
+ GetWindow2()->GetSizer()->SetMinSize( size );
+ }
+ }
+ }
+
+ event.Skip();
+ }
+
+ void OnSashPosChanged( wxSplitterEvent &event )
+ {
+ if( !GetSize().GetHeight() ){ event.Skip(); return; }
+
+ if( i_delay < mdate() )
+ {
+ i_sash_position = GetSize().GetHeight() - event.GetSashPosition();
+
+ wxSize size = wxSize( i_width, i_sash_position );
+ if( GetWindow2()->GetSizer() )
+ GetWindow2()->GetSizer()->SetMinSize( size );
+ }
+ event.Skip();
+ }
+
+ intf_thread_t *p_intf;
+ int i_sash_position;
+ int i_width;
+ vlc_bool_t b_video;
+ mtime_t i_delay;
+ vlc_bool_t b_show_on_start;
+};
+
+BEGIN_EVENT_TABLE(Splitter, wxSplitterWindow)
+ EVT_SIZE( Splitter::OnSize )
+ EVT_SPLITTER_SASH_POS_CHANGED(-1, Splitter::OnSashPosChanged)
+END_EVENT_TABLE()
+
/*****************************************************************************
* Event Table.
*****************************************************************************/
UpdateVLC_Event,
VLM_Event,
- Iconize_Event
+ Iconize_Event,
};
+DEFINE_LOCAL_EVENT_TYPE( wxEVT_INTERACTION );
+
BEGIN_EVENT_TABLE(Interface, wxFrame)
/* Menu events */
EVT_MENU(Exit_Event, Interface::OnExit)
/* Custom events */
EVT_COMMAND(0, wxEVT_INTF, Interface::OnControlEvent)
EVT_COMMAND(1, wxEVT_INTF, Interface::OnControlEvent)
+
+ EVT_COMMAND( -1, wxEVT_INTERACTION, Interface::OnInteraction )
END_EVENT_TABLE()
/*****************************************************************************
p_intf = _p_intf;
b_extra = VLC_FALSE;
extra_frame = 0;
- b_playlist_manager = VLC_FALSE;
playlist_manager = 0;
+ i_update_counter = 0;
+
/* Give our interface a nice little icon */
SetIcon( wxIcon( vlc_xpm ) );
- /* Create a main panel that will fill in the interface window */
+ /* Create a splitter window that will fill in the interface window.
+ * We need a splitter bar in order to make the embedded playlist
+ * resizable. */
+ splitter = new Splitter( this, p_intf );
main_sizer = new wxBoxSizer( wxVERTICAL );
+ main_sizer->Add( splitter, 1, wxEXPAND );
SetSizer( main_sizer );
- main_panel = new wxPanel( this, -1, wxPoint(0,0), wxSize(0,0),
+
+ /* Create a main panel that will fill in the interface window */
+ main_panel = new wxPanel( splitter, -1, wxPoint(0,0), wxSize(0,0),
wxCLIP_CHILDREN );
- main_sizer->Add( main_panel, 1, wxEXPAND );
main_panel->SetFocus();
#if defined(__WXGTK20__) && wxCHECK_VERSION(2,5,6)
panel_sizer = new wxBoxSizer( wxVERTICAL );
main_panel->SetSizer( panel_sizer );
+ /* Put this in the splitter */
+ splitter->Initialize( main_panel );
+
+/* wxCocoa pretends to support this, but at least 2.6.x doesn't */
+#ifndef __APPLE__
#ifdef wxHAS_TASK_BAR_ICON
/* Systray integration */
p_systray = NULL;
{
p_systray = new Systray( this, p_intf );
}
+#endif
#endif
/* Creation of the menu bar */
/* Creation of the status bar
* Helptext for menu items and toolbar tools will automatically get
* displayed here. */
- int i_status_width[3] = {-6, -2, -9};
+ int i_status_width[3] = {100, 40, -1};
statusbar = CreateStatusBar( 3 ); /* 2 fields */
statusbar->SetStatusWidths( 3, i_status_width );
statusbar->SetStatusText( wxString::Format(wxT("x%.2f"), 1.0), 1 );
/* Get minimum window size to prevent user from glitching it */
- main_panel->SetSizeHints( wxSize(-1,0) );
+ splitter->SetSizeHints( -1, 0 );
panel_sizer->Layout(); panel_sizer->Fit( main_panel );
main_sizer->Layout(); main_sizer->Fit( this );
main_min_size = GetSize();
- main_panel->SetSizeHints( wxSize(-1,-1) );
+ /* FIXME HACK as far as i understan (i.e. not a lot) the toolbar
+ * doesn't take the labels into account when it returns its size */
+
+ if( config_GetInt(p_intf, "wx-labels") )
+ {
+ main_min_size.SetWidth(800);
+ }
+ splitter->SetSizeHints( -1, -1 );
/* Video window */
video_window = 0;
panel_sizer->Add( input_manager, 0, wxEXPAND , 0 );
/* Layout everything */
- main_panel->SetSizeHints( wxSize(-1,0) );
+ splitter->SetSizeHints( -1, 0 );
panel_sizer->Layout(); panel_sizer->Fit( main_panel );
main_sizer->Layout(); main_sizer->Fit( this );
- main_panel->SetSizeHints( wxSize(-1,-1) );
+ splitter->SetSizeHints( -1, -1 );
#if wxUSE_DRAG_AND_DROP
/* Associate drop targets with the main interface */
if( config_GetInt( p_intf, "wx-extended" ) ) OnExtended( dummy );
SetIntfMinSize();
+
+ var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
+ var_AddCallback( p_intf, "interaction", InteractCallback, this );
+ p_intf->b_interaction = VLC_TRUE;
+
+ /* Show embedded playlist if requested */
+ if( splitter->ShowOnStart() ) OnSmallPlaylist( dummy );
}
Interface::~Interface()
if( video_window ) delete video_window;
+/* wxCocoa pretends to support this, but at least 2.6.x doesn't */
+#ifndef __APPLE__
#ifdef wxHAS_TASK_BAR_ICON
if( p_systray ) delete p_systray;
#endif
+#endif
+
+ p_intf->b_interaction = VLC_FALSE;
+ var_DelCallback( p_intf, "interaction", InteractCallback, this );
if( p_intf->p_sys->p_wxwindow ) delete p_intf->p_sys->p_wxwindow;
+
/* Clean up */
delete timer;
}
void Interface::Update()
{
/* Misc updates */
- ((VLCVolCtrl *)volctrl)->UpdateVolume();
+ if( !(i_update_counter % 10) ) ((VLCVolCtrl *)volctrl)->UpdateVolume();
if( playlist_manager ) playlist_manager->Update();
+
+ i_update_counter++;
}
void Interface::OnControlEvent( wxCommandEvent& event )
}
view_menu->Append( Logs_Event, wxU(_("&Messages...\tCtrl-M")) );
view_menu->Append( FileInfo_Event,
- wxU(_("Stream and Media &info...\tCtrl-I")) );
+ wxU(_("Stream and Media &Info...\tCtrl-I")) );
view_menu->Append( VLM_Event,
wxU(_("VLM Control...\tCtrl-V")) );
/* Create the "Help" menu */
wxMenu *help_menu = new wxMenu;
- help_menu->Append( About_Event, wxU(_("About VLC media player")) );
+ help_menu->Append( About_Event, wxU(_("About...")) );
help_menu->AppendSeparator();
- help_menu->Append( UpdateVLC_Event, wxU(_("Check for updates ...")) );
+ help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) );
/* Append the freshly created menus to the menu bar... */
wxMenuBar *menubar = new wxMenuBar();
#define HELP_PLAY N_("Play")
#define HELP_PAUSE N_("Pause")
#define HELP_PLO N_("Playlist")
-#define HELP_SPLO N_("Small playlist")
+#define HELP_SPLO N_("Embedded playlist")
#define HELP_PLP N_("Previous playlist item")
#define HELP_PLN N_("Next playlist item")
#define HELP_SLOW N_("Play slower")
#define HELP_FAST N_("Play faster")
+#define LABEL_OPEN N_("Open")
+#define LABEL_STOP N_("Stop")
+#define LABEL_PLAY N_("Play")
+#define LABEL_PAUSE N_("Pause")
+#define LABEL_PLO N_("Playlist")
+#define LABEL_SPLO N_("Embedded playlist")
+#define LABEL_PLP N_("Previous")
+#define LABEL_PLN N_("Next")
+#define LABEL_SLOW N_("Slower")
+#define LABEL_FAST N_("Faster")
int minimal = config_GetInt( p_intf, "wx-minimal" );
+ bool label = config_GetInt( p_intf, "wx-labels" );
wxLogNull LogDummy; /* Hack to suppress annoying log message on the win32
* version because we don't include wx.rc */
wxToolBar *toolbar =
- CreateToolBar( wxTB_HORIZONTAL | wxTB_FLAT );
+ CreateToolBar( label?wxTB_HORIZONTAL | wxTB_FLAT |wxTB_TEXT:
+ wxTB_HORIZONTAL | wxTB_FLAT );
toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) );
if (!minimal)
{
- toolbar->AddTool( OpenFile_Event, wxT(""),
+ toolbar->AddTool( OpenFile_Event, wxU(LABEL_OPEN),
wxBitmap( eject_xpm ), wxU(_(HELP_OPEN)) );
toolbar->AddSeparator();
}
- wxToolBarToolBase *p_tool = toolbar->AddTool( PlayStream_Event, wxT(""),
+ wxToolBarToolBase *p_tool = toolbar->AddTool( PlayStream_Event, wxU(LABEL_PLAY),
wxBitmap( play_xpm ), wxU(_(HELP_PLAY)), wxITEM_CHECK );
p_tool->SetClientData( p_tool );
if (!minimal)
{
- toolbar->AddTool( StopStream_Event, wxT(""), wxBitmap( stop_xpm ),
+ toolbar->AddTool( StopStream_Event, wxU(LABEL_STOP), wxBitmap( stop_xpm ),
wxU(_(HELP_STOP)) );
toolbar->AddSeparator();
- toolbar->AddTool( PrevStream_Event, wxT(""),
+ toolbar->AddTool( PrevStream_Event, wxU(LABEL_PLP),
wxBitmap( prev_xpm ), wxU(_(HELP_PLP)) );
- toolbar->AddTool( SlowStream_Event, wxT(""),
+ toolbar->AddTool( SlowStream_Event, wxU(LABEL_SLOW),
wxBitmap( slow_xpm ), wxU(_(HELP_SLOW)) );
- toolbar->AddTool( FastStream_Event, wxT(""),
+ toolbar->AddTool( FastStream_Event, wxU(LABEL_FAST),
wxBitmap( fast_xpm ), wxU(_(HELP_FAST)) );
- toolbar->AddTool( NextStream_Event, wxT(""), wxBitmap( next_xpm ),
+ toolbar->AddTool( NextStream_Event, wxU(LABEL_PLN), wxBitmap( next_xpm ),
wxU(_(HELP_PLN)) );
toolbar->AddSeparator();
- toolbar->AddTool( Playlist_Event, wxT(""), wxBitmap( playlist_xpm ),
- wxU(_(HELP_PLO)) );
- toolbar->AddTool( PlaylistSmall_Event, wxT(""),
- wxBitmap( playlist_small_xpm ), wxU(_(HELP_SPLO)) );
+ if( config_GetInt( p_intf, "wx-playlist-view" ) != 1 )
+ toolbar->AddTool( Playlist_Event, wxU(LABEL_PLO),
+ wxBitmap( playlist_xpm ), wxU(_(HELP_PLO)) );
+ if( config_GetInt( p_intf, "wx-playlist-view" ) >= 1 )
+ toolbar->AddTool( PlaylistSmall_Event, wxU(LABEL_SPLO),
+ wxBitmap( playlist_small_xpm ), wxU(_(HELP_SPLO)) );
}
wxControl *p_dummy_ctrl =
ms.SetWidth( ext_min_size.GetWidth() );
}
- if( playlist_manager && playlist_manager->IsShown() )
- {
- ms.SetHeight( ms.GetHeight() + playlist_min_size.GetHeight() );
- if( playlist_min_size.GetWidth() > ms.GetWidth() )
- ms.SetWidth( playlist_min_size.GetWidth() );
- }
-
- SetSizeHints( ms );
+ SetSizeHints( ms.GetWidth(), ms.GetHeight() );
}
/*****************************************************************************
wxString msg;
msg.Printf( wxString(wxT("VLC media player " PACKAGE_VERSION)) +
wxU(_(" (wxWidgets interface)\n\n")) +
- wxU(_("(c) 1996-2005 - the VideoLAN Team\n\n")) +
+ wxU(_("(c) 1996-2006 - the VideoLAN Team\n\n")) +
wxU(_("Compiled by "))+ wxU(VLC_CompileBy())+ wxU("@") +
wxU(VLC_CompileHost())+ wxT(".")+ wxU(VLC_CompileDomain())+ wxT(".\n") +
wxU(_("Compiler: "))+ wxU(VLC_Compiler())+wxT( ".\n") +
+#ifndef HAVE_SHARED_LIBVLC
wxU(_("Based on SVN revision: "))+wxU(VLC_Changeset())+wxT(".\n\n") +
+#endif
#ifdef __WXMSW__
- wxU( vlc_wraptext(LICENSE_MSG,WRAPCOUNT,VLC_TRUE) ) + wxT("\n\n") +
+ wxU( vlc_wraptext(LICENSE_MSG,WRAPCOUNT) ) + wxT("\n\n") +
#else
wxU( LICENSE_MSG ) + wxT("\n\n") +
#endif
if( !playlist_manager )
{
/* Create the extra panel */
- playlist_manager = new PlaylistManager( p_intf, main_panel );
- panel_sizer->Add( playlist_manager, 0, wxEXPAND , 0 );
- playlist_min_size = playlist_manager->GetBestSize();
+ playlist_manager = new PlaylistManager( p_intf, splitter );
}
- b_playlist_manager = !b_playlist_manager;
- panel_sizer->Show( playlist_manager, b_playlist_manager );
+ if( !splitter->IsSplit() ) splitter->Split( main_panel, playlist_manager );
+ else splitter->Unsplit( playlist_manager );
SetIntfMinSize();
main_sizer->Layout();
/* If the playlist is empty, open a file requester instead */
vlc_object_release( p_playlist );
OnShowDialog( dummy );
+ GetToolBar()->ToggleTool( PlayStream_Event, false );
}
}
GetToolBar()->ToggleTool( PlayStream_Event, false );
}
+void Interface::OnInteraction( wxCommandEvent& event )
+{
+ interaction_dialog_t *p_dialog = (interaction_dialog_t *)
+ event.GetClientData();
+
+ intf_dialog_args_t *p_arg = new intf_dialog_args_t;
+ p_arg->p_dialog = p_dialog;
+ p_arg->p_intf = p_intf;
+
+ if( p_dialog->i_type == INTERACT_PROGRESS )
+ {
+ /// \todo Handle progress in the interface
+ }
+ else
+ {
+ p_intf->p_sys->pf_show_dialog( p_intf, INTF_DIALOG_INTERACTION,
+ 0, p_arg );
+ }
+}
+
+static int InteractCallback( vlc_object_t *p_this,
+ const char *psz_var, vlc_value_t old_val,
+ vlc_value_t new_val, void *param )
+{
+ Interface *p_interface = (Interface*)param;
+ /*interaction_dialog_t *p_dialog = (interaction_dialog_t*)(new_val.p_address);*/
+
+ wxCommandEvent event( wxEVT_INTERACTION, -1 );
+ event.SetClientData( new_val.p_address );
+ p_interface->AddPendingEvent( event );
+ return VLC_SUCCESS;
+}
+
#if wxUSE_DRAG_AND_DROP
/*****************************************************************************
* Definition of DragAndDrop class.
return FALSE;
}
+ /* If we drag & drop a subtitle file, add it on the fly */
+ if( filenames.GetCount() == 1 )
+ {
+ char *psz_utf8 = wxDnDFromLocale( filenames[0] );
+ input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_intf,
+ VLC_OBJECT_INPUT, FIND_ANYWHERE );
+ if( p_input )
+ {
+ if( input_AddSubtitles( p_input, psz_utf8, VLC_TRUE ) )
+ {
+ vlc_object_release( p_input );
+ wxDnDLocaleFree( psz_utf8 );
+ vlc_object_release( p_playlist );
+ return TRUE;
+ }
+ vlc_object_release( p_input );
+ }
+ wxDnDLocaleFree( psz_utf8 );
+ }
+
for( size_t i = 0; i < filenames.GetCount(); i++ )
{
- char *psz_utf8 = wxFromLocale( filenames[i] );
+ char *psz_utf8 = wxDnDFromLocale( filenames[i] );
- playlist_Add( p_playlist, psz_utf8, psz_utf8,
+ playlist_PlaylistAdd( p_playlist, psz_utf8, psz_utf8,
PLAYLIST_APPEND | ((i | b_enqueue) ? 0 : PLAYLIST_GO),
PLAYLIST_END );
- wxLocaleFree( psz_utf8 );
+
+ wxDnDLocaleFree( psz_utf8 );
}
vlc_object_release( p_playlist );
* Systray class.
*****************************************************************************/
+/* wxCocoa pretends to support this, but at least 2.6.x doesn't */
+#ifndef __APPLE__
#ifdef wxHAS_TASK_BAR_ICON
BEGIN_EVENT_TABLE(Systray, wxTaskBarIcon)
systray_menu->Append( StopStream_Event, wxU(_("Stop")) );
}
systray_menu->AppendSeparator();
- systray_menu->Append( Iconize_Event, wxU(_("Show/Hide interface")) );
+ systray_menu->Append( Iconize_Event, wxU(_("Show/Hide Interface")) );
return systray_menu;
}
SetIcon( wxIcon( vlc16x16_xpm ), tooltip );
}
#endif
+#endif