#include "bitmaps/fast.xpm"
#include "bitmaps/playlist.xpm"
#include "bitmaps/speaker.xpm"
+#include "bitmaps/speaker_mute.xpm"
#define TOOLBAR_BMP_WIDTH 16
#define TOOLBAR_BMP_HEIGHT 16
};
-class wxVolCtrl: public wxGauge
+class wxVolCtrl;
+class VLCVolCtrl : public wxControl
{
public:
- /* Constructor */
- wxVolCtrl( intf_thread_t *_p_intf, wxWindow* parent, wxWindowID id,
- wxPoint = wxDefaultPosition, wxSize = wxSize( 20, -1 ) );
- virtual ~wxVolCtrl() {};
+ VLCVolCtrl( intf_thread_t *p_intf, wxWindow *p_parent );
+ virtual ~VLCVolCtrl() {};
+ virtual void OnPaint( wxPaintEvent &event );
+ void OnChange( wxMouseEvent& event );
void UpdateVolume();
- void OnChange( wxMouseEvent& event );
+ private:
+ DECLARE_EVENT_TABLE()
-private:
+ wxVolCtrl *gauge;
+ int i_y_offset;
+ vlc_bool_t b_mute;
intf_thread_t *p_intf;
-
- DECLARE_EVENT_TABLE();
};
-BEGIN_EVENT_TABLE(wxVolCtrl, wxWindow)
+BEGIN_EVENT_TABLE(VLCVolCtrl, wxControl)
+ EVT_PAINT(VLCVolCtrl::OnPaint)
+
/* Mouse events */
- EVT_LEFT_DOWN(wxVolCtrl::OnChange)
- EVT_MOTION(wxVolCtrl::OnChange)
+ EVT_LEFT_UP(VLCVolCtrl::OnChange)
END_EVENT_TABLE()
-/* Systray integration */
-#ifdef wxHAS_TASK_BAR_ICON
-class Systray: public wxTaskBarIcon
-{
-public:
- Systray( Interface* p_main_interface );
- virtual ~Systray() {};
- wxMenu* CreatePopupMenu();
-
-private:
- void OnLeftClick( wxTaskBarIconEvent& event );
- void OnPlayStream ( wxCommandEvent& event );
- void OnStopStream ( wxCommandEvent& event );
- void OnPrevStream ( wxCommandEvent& event );
- void OnNextStream ( wxCommandEvent& event );
- void OnExit( wxCommandEvent& event );
- Interface* p_main_interface;
- DECLARE_EVENT_TABLE()
-};
-#endif
-
/*****************************************************************************
* Event Table.
*****************************************************************************/
OpenFileSimple_Event,
OpenAdv_Event,
OpenFile_Event,
+ OpenDir_Event,
OpenDisc_Event,
OpenNet_Event,
OpenCapture_Event,
EVT_MENU(OpenFileSimple_Event, Interface::OnShowDialog)
EVT_MENU(OpenAdv_Event, Interface::OnShowDialog)
EVT_MENU(OpenFile_Event, Interface::OnShowDialog)
+ EVT_MENU(OpenDir_Event, Interface::OnShowDialog)
EVT_MENU(OpenDisc_Event, Interface::OnShowDialog)
EVT_MENU(OpenNet_Event, Interface::OnShowDialog)
EVT_MENU(OpenCapture_Event, Interface::OnShowDialog)
EVT_COMMAND(0, wxEVT_INTF, Interface::OnControlEvent)
EVT_COMMAND(1, wxEVT_INTF, Interface::OnControlEvent)
+ EVT_TIMER(ID_CONTROLS_TIMER, Interface::OnControlsTimer)
+ EVT_TIMER(ID_SLIDER_TIMER, Interface::OnSliderTimer)
END_EVENT_TABLE()
-#ifdef wxHAS_TASK_BAR_ICON
-BEGIN_EVENT_TABLE(Systray, wxTaskBarIcon)
- /* Mouse events */
- EVT_TASKBAR_LEFT_DOWN(Systray::OnLeftClick)
- /* Menu events */
- EVT_MENU(Iconize_Event, Systray::OnLeftClick)
- EVT_MENU(Exit_Event, Systray::OnExit)
- EVT_MENU(PlayStream_Event, Systray::OnPlayStream)
- EVT_MENU(NextStream_Event, Systray::OnNextStream)
- EVT_MENU(PrevStream_Event, Systray::OnPrevStream)
- EVT_MENU(StopStream_Event, Systray::OnStopStream)
-END_EVENT_TABLE()
-#endif
-
/*****************************************************************************
* Constructor.
*****************************************************************************/
b_extra = VLC_FALSE;
// b_undock = VLC_FALSE;
+
extra_window = NULL;
/* Give our interface a nice little icon */
p_systray = NULL;
if ( config_GetInt( p_intf, "wxwin-systray" ) )
{
- p_systray = new Systray(this);
+ p_systray = new Systray(this, p_intf);
p_systray->SetIcon( wxIcon( vlc16x16_xpm ), wxT("VLC media player") );
if ( (! p_systray->IsOk()) || (! p_systray->IsIconInstalled()) )
{
SetupHotkeys();
+ m_controls_timer.SetOwner(this, ID_CONTROLS_TIMER);
+ m_slider_timer.SetOwner(this, ID_SLIDER_TIMER);
+
/* Start timer */
timer = new Timer( p_intf, this );
+
+ /* */
+ WindowSettings *ws = p_intf->p_sys->p_window_settings;
+ wxPoint p;
+ wxSize s;
+ bool b_shown;
+
+ ws->SetScreen( wxSystemSettings::GetMetric( wxSYS_SCREEN_X ),
+ wxSystemSettings::GetMetric( wxSYS_SCREEN_Y ) );
+
+ if( ws->GetSettings( WindowSettings::ID_MAIN, b_shown, p, s ) )
+ Move( p );
}
Interface::~Interface()
{
+ WindowSettings *ws = p_intf->p_sys->p_window_settings;
+
+ ws->SetSettings( WindowSettings::ID_MAIN, true,
+ GetPosition(), GetSize() );
+
#ifdef wxHAS_TASK_BAR_ICON
if( p_systray )
{
void Interface::Update()
{
/* Misc updates */
- ((wxVolCtrl *)volctrl)->UpdateVolume();
+ ((VLCVolCtrl *)volctrl)->UpdateVolume();
}
void Interface::OnControlEvent( wxCommandEvent& event )
switch( event.GetId() )
{
case 0:
+ {
+ if( p_intf->p_sys->b_video_autosize )
+ {
frame_sizer->Layout();
frame_sizer->Fit(this);
+ }
+ }
break;
case 1:
*****************************************************************************/
void Interface::CreateOurMenuBar()
{
+ int minimal = config_GetInt( p_intf, "wxwin-minimal" );
+
/* Create the "File" menu */
wxMenu *file_menu = new wxMenu;
+
+ if (!minimal)
+ {
file_menu->Append( OpenFileSimple_Event,
wxU(_("Quick &Open File...\tCtrl-O")) );
file_menu->AppendSeparator();
file_menu->Append( OpenFile_Event, wxU(_("Open &File...\tCtrl-F")) );
+ file_menu->Append( OpenDir_Event, wxU(_("Open D&irectory...\tCtrl-I")) );
file_menu->Append( OpenDisc_Event, wxU(_("Open &Disc...\tCtrl-D")) );
file_menu->Append( OpenNet_Event,
wxU(_("Open &Network Stream...\tCtrl-N")) );
file_menu->AppendSeparator();
file_menu->Append( Wizard_Event, wxU(_("&Wizard...\tCtrl-W")) );
file_menu->AppendSeparator();
+ }
file_menu->Append( Exit_Event, wxU(_("E&xit\tCtrl-X")) );
/* Create the "View" menu */
wxMenu *view_menu = new wxMenu;
+ if (!minimal)
+ {
view_menu->Append( Playlist_Event, wxU(_("&Playlist...\tCtrl-P")) );
+ }
view_menu->Append( Logs_Event, wxU(_("&Messages...\tCtrl-M")) );
view_menu->Append( FileInfo_Event,
wxU(_("Stream and Media &info...\tCtrl-I")) );
#endif
}
-class VLCVolCtrl : public wxControl
-{
-public:
- VLCVolCtrl( intf_thread_t *p_intf, wxWindow *p_parent, wxGauge ** );
- virtual ~VLCVolCtrl() {};
-
- virtual void OnPaint( wxPaintEvent &event );
-
- private:
- DECLARE_EVENT_TABLE()
- int i_y_offset;
-};
-
-BEGIN_EVENT_TABLE(VLCVolCtrl, wxControl)
- EVT_PAINT(VLCVolCtrl::OnPaint)
-END_EVENT_TABLE()
-
-#if defined(__WXGTK__)
-#define VLCVOL_HEIGHT p_parent->GetSize().GetHeight()
-#else
-#define VLCVOL_HEIGHT TOOLBAR_BMP_HEIGHT
-#endif
-VLCVolCtrl::VLCVolCtrl( intf_thread_t *p_intf, wxWindow *p_parent,
- wxGauge **pp_volctrl )
- :wxControl( p_parent, -1, wxDefaultPosition, wxSize(64, VLCVOL_HEIGHT ),
- wxBORDER_NONE ),
- i_y_offset((VLCVOL_HEIGHT - TOOLBAR_BMP_HEIGHT) / 2)
-{
- *pp_volctrl = new wxVolCtrl( p_intf, this, -1, wxPoint( 18, i_y_offset ),
- wxSize( 44, TOOLBAR_BMP_HEIGHT ) );
-}
-
-void VLCVolCtrl::OnPaint( wxPaintEvent &evt )
-{
- wxPaintDC dc( this );
- wxBitmap mPlayBitmap( speaker_xpm );
- dc.DrawBitmap( mPlayBitmap, 0, i_y_offset, TRUE );
-}
-
void Interface::CreateOurToolBar()
{
#define HELP_OPEN N_("Open")
#define HELP_SLOW N_("Play slower")
#define HELP_FAST N_("Play faster")
+ int minimal = config_GetInt( p_intf, "wxwin-minimal" );
+
wxLogNull LogDummy; /* Hack to suppress annoying log message on the win32
* version because we don't include wx.rc */
toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) );
+ if (!minimal)
+ {
toolbar->AddTool( OpenFile_Event, wxT(""),
wxBitmap( eject_xpm ), wxU(_(HELP_OPEN)) );
toolbar->AddSeparator();
+ }
wxToolBarToolBase *p_tool = toolbar->AddTool( PlayStream_Event, wxT(""),
wxBitmap( play_xpm ), wxU(_(HELP_PLAY)) );
p_tool->SetClientData( p_tool );
+ if (!minimal)
+ {
toolbar->AddTool( StopStream_Event, wxT(""), wxBitmap( stop_xpm ),
wxU(_(HELP_STOP)) );
toolbar->AddSeparator();
+
toolbar->AddTool( PrevStream_Event, wxT(""),
wxBitmap( prev_xpm ), wxU(_(HELP_PLP)) );
toolbar->AddTool( SlowStream_Event, wxT(""),
toolbar->AddSeparator();
toolbar->AddTool( Playlist_Event, wxT(""), wxBitmap( playlist_xpm ),
wxU(_(HELP_PLO)) );
+ }
wxControl *p_dummy_ctrl =
new wxControl( toolbar, -1, wxDefaultPosition,
toolbar->AddControl( p_dummy_ctrl );
- VLCVolCtrl *sound_control = new VLCVolCtrl( p_intf, toolbar, &volctrl );
- toolbar->AddControl( sound_control );
+ volctrl = new VLCVolCtrl( p_intf, toolbar );
+ toolbar->AddControl( volctrl );
toolbar->Realize();
delete [] p_entries;
}
+void Interface::HideSlider(bool layout)
+{
+ ShowSlider(false, layout);
+}
+
+void Interface::ShowSlider(bool show, bool layout)
+{
+ if (show)
+ {
+ //prevent the hide timers from hiding it now
+ m_slider_timer.Stop();
+ m_controls_timer.Stop();
+
+ //prevent continuous layout
+ if (slider_frame->IsShown())
+ {
+ return;
+ }
+
+ slider_frame->Show();
+ frame_sizer->Show( slider_frame );
+ }
+ else
+ {
+
+ //prevent continuous layout
+ if (!slider_frame->IsShown())
+ {
+ return;
+ }
+
+ slider_frame->Hide();
+ frame_sizer->Hide( slider_frame );
+ }
+
+ if (layout)
+ {
+ frame_sizer->Layout();
+ if ( p_intf->p_sys->b_video_autosize )
+ {
+ frame_sizer->Fit( this );
+ }
+ }
+}
+
+void Interface::HideDiscFrame(bool layout)
+{
+ ShowDiscFrame(false, layout);
+}
+
+void Interface::ShowDiscFrame(bool show, bool layout)
+{
+ if (show)
+ {
+ //prevent the hide timer from hiding it now
+ m_controls_timer.Stop();
+
+ //prevent continuous layout
+ if (disc_frame->IsShown())
+ {
+ return;
+ }
+
+ disc_frame->Show();
+ slider_sizer->Show( disc_frame );
+ }
+ else
+ {
+
+ //prevent continuous layout
+ if (!disc_frame->IsShown())
+ {
+ return;
+ }
+
+ disc_frame->Hide();
+ slider_sizer->Hide( disc_frame );
+ }
+
+ if (layout)
+ {
+ slider_sizer->Layout();
+ if ( p_intf->p_sys->b_video_autosize )
+ {
+ slider_sizer->Fit( slider_frame );
+ }
+ }
+}
+
/*****************************************************************************
* Event Handlers.
*****************************************************************************/
+void Interface::OnControlsTimer(wxTimerEvent& WXUNUSED(event))
+{
+ /* Hide slider and Disc Buttons */
+ //postpone layout, we'll do it ourselves
+ HideDiscFrame(false);
+ HideSlider(false);
+
+ slider_sizer->Layout();
+ if ( p_intf->p_sys->b_video_autosize )
+ {
+ slider_sizer->Fit( slider_frame );
+ frame_sizer->Fit( this );
+ }
+}
+
+void Interface::OnSliderTimer(wxTimerEvent& WXUNUSED(event))
+ {
+ HideSlider();
+}
+
void Interface::OnMenuOpen(wxMenuEvent& event)
{
#if defined( __WXMSW__ )
case OpenFile_Event:
i_id = INTF_DIALOG_FILE;
break;
+ case OpenDir_Event:
+ i_id = INTF_DIALOG_DIRECTORY;
+ break;
case OpenDisc_Event:
i_id = INTF_DIALOG_DISC;
break;
fprintf(stderr,"Creating window\n");
extra_frame->Hide();
frame_sizer->Hide( extra_frame );
+#if (wxCHECK_VERSION(2,5,0))
frame_sizer->Detach( extra_frame );
+#else
+ frame_sizer->Remove( extra_frame );
+#endif
frame_sizer->Layout();
frame_sizer->Fit(this);
extra_window = new ExtraWindow( p_intf, this, extra_frame );
fprintf(stderr,"Creating window\n");
extra_frame->Hide();
frame_sizer->Hide( extra_frame );
+#if (wxCHECK_VERSION(2,5,0))
frame_sizer->Detach( extra_frame );
+#else
+ frame_sizer->Remove( extra_frame );
+#endif
frame_sizer->Layout();
frame_sizer->Fit(this);
extra_window = new ExtraWindow( p_intf, this, extra_frame );
/*****************************************************************************
* Definition of VolCtrl class.
*****************************************************************************/
+class wxVolCtrl: public wxGauge
+{
+public:
+ /* Constructor */
+ wxVolCtrl( intf_thread_t *_p_intf, wxWindow* parent, wxWindowID id,
+ wxPoint = wxDefaultPosition, wxSize = wxSize( 20, -1 ) );
+ virtual ~wxVolCtrl() {};
+
+ void UpdateVolume();
+
+ void OnChange( wxMouseEvent& event );
+
+private:
+ intf_thread_t *p_intf;
+
+ DECLARE_EVENT_TABLE();
+};
+
+BEGIN_EVENT_TABLE(wxVolCtrl, wxWindow)
+ /* Mouse events */
+ EVT_LEFT_DOWN(wxVolCtrl::OnChange)
+ EVT_MOTION(wxVolCtrl::OnChange)
+END_EVENT_TABLE()
+
wxVolCtrl::wxVolCtrl( intf_thread_t *_p_intf, wxWindow* parent, wxWindowID id,
wxPoint point, wxSize size )
: wxGauge( parent, id, 200, point, size, wxGA_HORIZONTAL | wxGA_SMOOTH )
i_gauge_volume / 2 ) );
}
+#if defined(__WXGTK__)
+#define VLCVOL_HEIGHT p_parent->GetSize().GetHeight()
+#else
+#define VLCVOL_HEIGHT TOOLBAR_BMP_HEIGHT
+#endif
+VLCVolCtrl::VLCVolCtrl( intf_thread_t *_p_intf, wxWindow *p_parent )
+ :wxControl( p_parent, -1, wxDefaultPosition, wxSize(64, VLCVOL_HEIGHT ),
+ wxBORDER_NONE ),
+ i_y_offset((VLCVOL_HEIGHT - TOOLBAR_BMP_HEIGHT) / 2),
+ b_mute(0), p_intf(_p_intf)
+{
+ gauge = new wxVolCtrl( p_intf, this, -1, wxPoint( 18, i_y_offset ),
+ wxSize( 44, TOOLBAR_BMP_HEIGHT ) );
+}
+
+void VLCVolCtrl::OnPaint( wxPaintEvent &evt )
+{
+ wxPaintDC dc( this );
+ wxBitmap mPlayBitmap( b_mute ? speaker_mute_xpm : speaker_xpm );
+ dc.DrawBitmap( mPlayBitmap, 0, i_y_offset, TRUE );
+}
+
+void VLCVolCtrl::OnChange( wxMouseEvent& event )
+{
+ if( event.GetX() < TOOLBAR_BMP_WIDTH )
+ {
+ int i_volume;
+ aout_VolumeMute( p_intf, (audio_volume_t *)&i_volume );
+
+ b_mute = !b_mute;
+ Refresh();
+ }
+}
+
+void VLCVolCtrl::UpdateVolume()
+{
+ gauge->UpdateVolume();
+}
+
/*****************************************************************************
- * Definition of Systray class.
+ * Systray class.
*****************************************************************************/
#ifdef wxHAS_TASK_BAR_ICON
-Systray::Systray( Interface *_p_main_interface )
+
+BEGIN_EVENT_TABLE(Systray, wxTaskBarIcon)
+ /* Mouse events */
+#ifdef WIN32
+ EVT_TASKBAR_LEFT_DCLICK(Systray::OnLeftClick)
+#else
+ EVT_TASKBAR_LEFT_DOWN(Systray::OnLeftClick)
+#endif
+ /* Menu events */
+ EVT_MENU(Iconize_Event, Systray::OnMenuIconize)
+ EVT_MENU(Exit_Event, Systray::OnExit)
+ EVT_MENU(PlayStream_Event, Systray::OnPlayStream)
+ EVT_MENU(NextStream_Event, Systray::OnNextStream)
+ EVT_MENU(PrevStream_Event, Systray::OnPrevStream)
+ EVT_MENU(StopStream_Event, Systray::OnStopStream)
+END_EVENT_TABLE()
+
+Systray::Systray( Interface *_p_main_interface, intf_thread_t *_p_intf )
{
p_main_interface = _p_main_interface;
+ p_intf = _p_intf;
}
/* Event handlers */
-void Systray::OnLeftClick( wxTaskBarIconEvent& event )
+void Systray::OnMenuIconize( wxCommandEvent& event )
{
p_main_interface->Show( ! p_main_interface->IsShown() );
+ if ( p_main_interface->IsShown() ) p_main_interface->Raise();
+}
+
+void Systray::OnLeftClick( wxTaskBarIconEvent& event )
+{
+ wxCommandEvent cevent;
+ OnMenuIconize(cevent);
}
void Systray::OnExit( wxCommandEvent& event )
/* Systray popup menu */
wxMenu* Systray::CreatePopupMenu()
{
+ int minimal = config_GetInt( p_intf, "wxwin-minimal" );
+
wxMenu* systray_menu = new wxMenu;
systray_menu->Append( Exit_Event, wxU(_("Quit VLC")) );
systray_menu->AppendSeparator();
systray_menu->Append( PlayStream_Event, wxU(_("Play/Pause")) );
+
+ if (!minimal)
+ {
systray_menu->Append( PrevStream_Event, wxU(_("Previous")) );
systray_menu->Append( NextStream_Event, wxU(_("Next")) );
systray_menu->Append( StopStream_Event, wxU(_("Stop")) );
+ }
systray_menu->AppendSeparator();
systray_menu->Append( Iconize_Event, wxU(_("Show/Hide interface")) );
return systray_menu;
}
-#endif
+void Systray::UpdateTooltip( const wxChar* tooltip )
+{
+ SetIcon( wxIcon( vlc16x16_xpm ), tooltip );
+}
+#endif
projects / vlc / blobdiff