#include "video.hpp"
#include <vlc_keys.h>
-#include "charset.h"
+#include "vlc_charset.h"
-#include <vlc/aout.h>
-#include "charset.h"
+#include <vlc_aout.h>
+#include "vlc_charset.h"
-#include <vlc_interaction.h>
+#include <vlc_interface.h>
#include <wx/splitter.h>
+#include <wx/utils.h> /* wxLaunchDefaultBrowser() */
+
/* include the toolbar graphics */
#include "bitmaps/play.xpm"
#include "bitmaps/pause.xpm"
* this standard value as otherwise it won't be handled properly under Mac
* (where it is special and put into the "Apple" menu) */
About_Event = wxID_ABOUT,
+ OnWebLink_Event,
+ OnWebHelp_Event,
+#ifdef UPDATE_CHECK
UpdateVLC_Event,
- VLM_Event,
+#endif
+ //VLM_Event,
Iconize_Event,
};
/* Menu events */
EVT_MENU(Exit_Event, Interface::OnExit)
EVT_MENU(About_Event, Interface::OnAbout)
+ EVT_MENU(OnWebLink_Event, Interface::OnWebLink)
+ EVT_MENU(OnWebHelp_Event, Interface::OnWebHelp)
+#ifdef UPDATE_CHECK
EVT_MENU(UpdateVLC_Event, Interface::OnShowDialog)
- EVT_MENU(VLM_Event, Interface::OnShowDialog)
+#endif
+ //EVT_MENU(VLM_Event, Interface::OnShowDialog)
EVT_MENU(Playlist_Event, Interface::OnShowDialog)
EVT_MENU(PlaylistSmall_Event, Interface::OnSmallPlaylist)
b_extra = VLC_FALSE;
extra_frame = 0;
playlist_manager = 0;
+ i_update_counter = 0;
/* Give our interface a nice little icon */
- SetIcon( wxIcon( vlc_xpm ) );
+ SetIcon( wxIcon( (const char**) vlc_xpm ) );
/* Create a splitter window that will fill in the interface window.
* We need a splitter bar in order to make the embedded playlist
/* 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] = {100, 40, -1};
+ int i_status_width[3] = {150, 55, -1};
statusbar = CreateStatusBar( 3 ); /* 2 fields */
statusbar->SetStatusWidths( 3, i_status_width );
statusbar->SetStatusText( wxString::Format(wxT("x%.2f"), 1.0), 1 );
panel_sizer->Layout(); panel_sizer->Fit( main_panel );
main_sizer->Layout(); main_sizer->Fit( this );
main_min_size = GetSize();
+ /* 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 */
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;
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")) );
+#if 0
view_menu->Append( VLM_Event,
wxU(_("VLM Control...\tCtrl-V")) );
+#endif
/* Create the "Auto-generated" menus */
p_settings_menu = SettingsMenu( p_intf, this );
/* Create the "Help" menu */
wxMenu *help_menu = new wxMenu;
- help_menu->Append( About_Event, wxU(_("About VLC media player")) );
+ help_menu->Append( OnWebLink_Event, wxU(_("VideoLAN's Website")) );
+ help_menu->Append( OnWebHelp_Event, wxU(_("Online Help")) );
help_menu->AppendSeparator();
- help_menu->Append( UpdateVLC_Event, wxU(_("Check for updates ...")) );
+ help_menu->Append( About_Event, wxU(_("About...")) );
+#ifdef UPDATE_CHECK
+ help_menu->AppendSeparator();
+ help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) );
+#endif
/* Append the freshly created menus to the menu bar... */
wxMenuBar *menubar = new wxMenuBar();
menubar->Append( file_menu, wxU(_("&File")) );
- menubar->Append( view_menu, wxU(_("&View")) );
+ menubar->Append( view_menu, wxU(_("V&iew")) );
menubar->Append( p_settings_menu, wxU(_("&Settings")) );
menubar->Append( p_audio_menu, wxU(_("&Audio")) );
menubar->Append( p_video_menu, wxU(_("&Video")) );
#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 =
void Interface::SetupHotkeys()
{
- struct vlc_t::hotkey *p_hotkeys = p_intf->p_vlc->p_hotkeys;
+ struct libvlc_int_t::hotkey *p_hotkeys = p_intf->p_libvlc->p_hotkeys;
int i_hotkeys;
/* Count number of hoteys */
wxU(_("Compiler: "))+ wxU(VLC_Compiler())+wxT( ".\n") +
wxU(_("Based on SVN revision: "))+wxU(VLC_Changeset())+wxT(".\n\n") +
#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
wxU(_("The VideoLAN team <videolan@videolan.org>\n"
"http://www.videolan.org/\n\n")) );
-
wxMessageBox( msg, wxString::Format(wxU(_("About %s")),
wxT("VLC media player")), wxOK | wxICON_INFORMATION, this );
}
+void Interface::OnWebLink( wxCommandEvent& WXUNUSED(event) )
+{
+ wxLaunchDefaultBrowser( wxU("http://videolan.org/") );
+}
+
+void Interface::OnWebHelp( wxCommandEvent& WXUNUSED(event) )
+{
+ wxLaunchDefaultBrowser( wxU("http://videolan.org/doc/") );
+}
+
void Interface::OnShowDialog( wxCommandEvent& event )
{
if( p_intf->p_sys->pf_show_dialog )
case Bookmarks_Event:
i_id = INTF_DIALOG_BOOKMARKS;
break;
+#ifdef UPDATE_CHECK
case UpdateVLC_Event:
i_id = INTF_DIALOG_UPDATEVLC;
break;
+#endif
+#if 0
case VLM_Event:
i_id = INTF_DIALOG_VLM;
break;
+#endif
default:
i_id = INTF_DIALOG_FILE;
break;
FIND_ANYWHERE );
if( p_playlist == NULL ) return;
- if( p_playlist->i_size && p_playlist->i_enabled )
+ if( !playlist_IsEmpty(p_playlist) && p_playlist->i_enabled )
{
vlc_value_t state;
/* If the playlist is empty, open a file requester instead */
vlc_object_release( p_playlist );
OnShowDialog( dummy );
+ GetToolBar()->ToggleTool( PlayStream_Event, false );
}
}
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,
+ p_intf->p_sys->pf_show_dialog( p_intf, INTF_DIALOG_INTERACTION,
0, p_arg );
- }
+
}
static int InteractCallback( vlc_object_t *p_this,
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++ )
{
-#ifdef wxUSE_UNICODE
- /*
- * FIXME: this is yet another awful and ugly bug-to-bug work-around
- * for the painfully broken and brain-dead wxWidgets character
- * encoding internals. Maybe, one day the wxWidgets team will find out
- * and we will have to remove (phew) this kludge or autodetect whether
- * to trigger it (damn).
- *
- * In Unicode mode, wxWidgets will encode file names in the locale
- * encoding with each **bytes** (rather than characters) represented
- * by a 32 bits unsigned integer. If you are lucky enough to be using
- * ISO-8859-1 as your local character encoding, that lame encoding
- * scheme happens to be identical to UTF-32 with your arch native
- * byte-endianess. If you are using anything else, including not only
- * UTF-8 but also Windows-1252(!) and ISO-8859-15(!) or any
- * non-western encoding, it obviously fails.
- */
- unsigned len = 1;
- const wxChar *stupid = filenames[i];
-
- for (const wxChar *braindead = stupid; *braindead; braindead++)
- len++;
- char *psz_local = (char *)malloc (len);
- do
- psz_local[len] = (char)stupid[len];
- while (len--);
-
- char *psz_utf8 = FromLocale( psz_local );
-#else
- char *psz_utf8 = wxFromLocale( filenames[i] );
-#endif
+ char *psz_utf8 = wxDnDFromLocale( filenames[i] );
- playlist_Add( p_playlist, psz_utf8, psz_utf8,
+ playlist_Add( p_playlist, psz_utf8, NULL,
PLAYLIST_APPEND | ((i | b_enqueue) ? 0 : PLAYLIST_GO),
- PLAYLIST_END );
-#ifdef wxUSE_UNICODE
- LocaleFree( psz_utf8 );
- free( psz_local );
-#else
- wxLocaleFree( psz_utf8 );
-#endif
+ PLAYLIST_END, VLC_TRUE, VLC_FALSE );
+
+ wxDnDLocaleFree( psz_utf8 );
}
vlc_object_release( p_playlist );
p_main_interface = _p_main_interface;
p_intf = _p_intf;
- SetIcon( wxIcon( vlc16x16_xpm ), wxT("VLC media player") );
+ SetIcon( wxIcon( (const char**) vlc16x16_xpm ), wxT("VLC media player") );
if( !IsOk() || !IsIconInstalled() )
{
msg_Warn(p_intf, "cannot set systray icon, weird things may happen");
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;
}
void Systray::UpdateTooltip( const wxChar* tooltip )
{
- SetIcon( wxIcon( vlc16x16_xpm ), tooltip );
+ SetIcon( wxIcon( (const char**) vlc16x16_xpm ), tooltip );
}
#endif
#endif
projects / vlc / blobdiff