/*****************************************************************************
* wxwindows.h: private wxWindows interface description
*****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
- * $Id: wxwindows.h,v 1.77 2003/12/10 21:54:17 courmisch Exp $
+ * Copyright (C) 1999-2004 VideoLAN
+ * $Id$
*
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
+ * Authors: Gildas Bazin <gbazin@videolan.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <wx/checkbox.h>
#include "vlc_keys.h"
-DECLARE_LOCAL_EVENT_TYPE( wxEVT_DIALOG, 0 );
+/* Hmmm, work-around for newest wxWin */
+#ifdef wxStaticCastEvent
+# undef wxStaticCastEvent
+# define wxStaticCastEvent(type, val) ((type)(val))
+#endif
-class OpenDialog;
-class Playlist;
-class Messages;
-class FileInfo;
+DECLARE_LOCAL_EVENT_TYPE( wxEVT_DIALOG, 0 );
+DECLARE_LOCAL_EVENT_TYPE( wxEVT_INTF, 1 );
#define SLIDER_MAX_POS 10000
/* wxU is used to convert ansi/utf8 strings to unicode strings (wchar_t) */
-#if defined( ENABLE_NLS ) && defined( HAVE_GETTEXT ) && \
- defined( WIN32 ) && !defined( HAVE_INCLUDED_GETTEXT )
+#if defined( ENABLE_NLS ) && defined( ENABLE_UTF8 )
#if wxUSE_UNICODE
# define wxU(utf8) wxString(utf8, wxConvUTF8)
#else
#endif
#define ISUTF8 1
-#else // ENABLE_NLS && HAVE_GETTEXT && WIN32 && !HAVE_INCLUDED_GETTEXT
+#else // ENABLE_NLS && ENABLE_UTF8
#if wxUSE_UNICODE
# define wxU(ansi) wxString(ansi, *wxConvCurrent)
#else
#endif
+/* wxL2U (locale to unicode) is used to convert ansi strings to unicode
+ * strings (wchar_t) */
+#if wxUSE_UNICODE
+# define wxL2U(ansi) wxString(ansi, *wxConvCurrent)
+#else
+# define wxL2U(ansi) ansi
+#endif
+
#define WRAPCOUNT 80
#define OPEN_NORMAL 0
#define MODE_AUTHOR 2
#define MODE_TITLE 3
-wxArrayString SeparateEntries( wxString );
+class PrefsTreeCtrl;
+class AutoBuiltPanel;
+class VideoWindow;
/*****************************************************************************
* intf_sys_t: description and status of wxwindows interface
/* Popup menu */
wxMenu *p_popup_menu;
+ VideoWindow *p_video_window;
+ wxBoxSizer *p_video_sizer;
};
/*****************************************************************************
* Prototypes
*****************************************************************************/
+wxArrayString SeparateEntries( wxString );
+wxWindow *VideoWindow( intf_thread_t *p_intf, wxWindow *p_parent );
+wxWindow *BookmarksDialog( intf_thread_t *p_intf, wxWindow *p_parent );
+
+namespace wxvlc
+{
+class Interface;
+class OpenDialog;
+class V4LDialog;
+class SoutDialog;
+class SubsFileDialog;
+class Playlist;
+class Messages;
+class FileInfo;
+class StreamDialog;
+class ItemInfoDialog;
+class NewGroup;
+class ExportPlaylist;
/*****************************************************************************
* Classes declarations.
*****************************************************************************/
-class Interface;
-
/* Timer */
class Timer: public wxTimer
{
virtual ~Interface();
void TogglePlayButton( int i_playing_status );
-// wxFlexGridSizer *frame_sizer;
wxBoxSizer *frame_sizer;
wxStatusBar *statusbar;
wxSlider *contrast_slider;
wxSlider *saturation_slider;
wxSlider *hue_slider;
+ wxSlider *gamma_slider;
wxStaticBox *other_box;
wxComboBox *ratio_combo;
void UpdateAcceleratorTable();
void CreateOurMenuBar();
void CreateOurToolBar();
- void CreateOurExtraPanel();
+ void CreateOurExtendedPanel();
void CreateOurSlider();
void Open( int i_access_method );
void OnOpenNet( wxCommandEvent& event );
void OnOpenSat( wxCommandEvent& event );
void OnOpenV4L( wxCommandEvent& event );
- void OnStream( wxCommandEvent& event );
- void OnExtra( wxCommandEvent& event );
+ void OnExtended( wxCommandEvent& event );
+ void OnBookmarks( wxCommandEvent& event );
void OnShowDialog( wxCommandEvent& event );
void OnPlayStream( wxCommandEvent& event );
void OnStopStream( wxCommandEvent& event );
void OnContrastUpdate( wxScrollEvent& event );
void OnBrightnessUpdate( wxScrollEvent& event );
void OnSaturationUpdate( wxScrollEvent& event );
+ void OnGammaUpdate( wxScrollEvent& event );
void OnRatio( wxCommandEvent& event );
void OnEnableVisual( wxCommandEvent& event );
#endif
void OnContextMenu(wxMouseEvent& event);
+ void UpdateSizeEvent( wxCommandEvent& event );
+
DECLARE_EVENT_TABLE();
Timer *timer;
vlc_bool_t b_navig_menu;
};
-class StreamDialog;
-
/* Dialogs Provider */
class DialogsProvider: public wxFrame
{
void OnMessages( wxCommandEvent& event );
void OnFileInfo( wxCommandEvent& event );
void OnPreferences( wxCommandEvent& event );
- void OnStreamDialog( wxCommandEvent& event );
+ void OnStreamWizardDialog( wxCommandEvent& event );
+ void OnBookmarks( wxCommandEvent& event );
void OnOpenFileGeneric( wxCommandEvent& event );
void OnOpenFileSimple( wxCommandEvent& event );
Playlist *p_playlist_dialog;
Messages *p_messages_dialog;
FileInfo *p_fileinfo_dialog;
- StreamDialog *p_stream_dialog;
+ StreamDialog *p_streamwizard_dialog;
wxFrame *p_prefs_dialog;
+ wxWindow *p_bookmarks_dialog;
wxFileDialog *p_file_generic_dialog;
};
/* Open Dialog */
-class AutoBuiltPanel;
WX_DEFINE_ARRAY(AutoBuiltPanel *, ArrayOfAutoBuiltPanel);
-class V4LDialog;
-class SoutDialog;
-class SubsFileDialog;
class OpenDialog: public wxFrame
{
public:
intf_thread_t *p_intf;
wxWindow *p_parent;
int i_current_access_method;
+ int i_disc_type_selection;
int i_method; /* Normal or for the stream dialog ? */
+ int i_open_arg;
+
wxComboBox *mrl_combo;
wxNotebook *notebook;
wxTextCtrl *disc_device;
wxSpinCtrl *disc_title;
wxSpinCtrl *disc_chapter;
+
+ /* The media equivalent name for a DVD names. For example,
+ "Title", is "Track" for a CD-DA */
+ wxStaticText *disc_title_label;
+ wxStaticText *disc_chapter_label;
/* Indicates if the disc device control was modified */
bool b_disc_device_changed;
PS_ENCAPSULATION,
MPEG1_ENCAPSULATION,
OGG_ENCAPSULATION,
+ RAW_ENCAPSULATION,
ASF_ENCAPSULATION,
AVI_ENCAPSULATION,
MP4_ENCAPSULATION,
wxComboBox *video_bitrate_combo;
wxComboBox *audio_bitrate_combo;
wxComboBox *audio_channels_combo;
+ wxComboBox *video_scale_combo;
};
/* Subtitles File Dialog */
/* Preferences Dialog */
-class PrefsTreeCtrl;
class PrefsDialog: public wxFrame
{
public:
};
/* Playlist */
-class ItemInfoDialog;
-class NewGroup;
class Playlist: public wxFrame
{
public:
void UpdatePlaylist();
void ShowPlaylist( bool show );
+ void UpdateItem( int );
bool b_need_update;
- vlc_mutex_t lock;
private:
void DeleteItem( int item );
+ void ShowInfos( int item );
/* Event handlers (these functions should _not_ be virtual) */
void OnAddFile( wxCommandEvent& event );
void OnKeyDown( wxListEvent& event );
void OnNewGroup( wxCommandEvent& event );
+ /* Popup functions */
+ void OnPopup( wxListEvent& event );
+ void OnPopupPlay( wxMenuEvent& event );
+ void OnPopupDel( wxMenuEvent& event );
+ void OnPopupEna( wxMenuEvent& event );
+ void OnPopupInfo( wxMenuEvent& event );
void Rebuild();
+ /* Custom events */
+ void OnPlaylistEvent( wxCommandEvent& event );
+
wxTextCtrl *search_text;
wxButton *search_button;
DECLARE_EVENT_TABLE();
+ wxMenu *popup_menu;
ItemInfoDialog *iteminfo_dialog;
int i_update_counter;
int i_sort_mode;
+ int i_popup_item;
+
int i_title_sorted;
int i_author_sorted;
int i_group_sorted;
+ int i_duration_sorted;
};
-
class NewGroup: public wxDialog
{
public:
char *psz_name;
};
-
/* ItemInfo Dialog */
class ItemInfoDialog: public wxDialog
{
void OnCancel( wxCommandEvent& event );
void OnNewGroup( wxCommandEvent& event );
+ void UpdateInfo();
+
DECLARE_EVENT_TABLE();
intf_thread_t *p_intf;
wxTextCtrl *name_text;
wxTextCtrl *author_text;
+ wxTreeCtrl *info_tree;
+ wxTreeItemId info_root;
+
wxCheckBox *enabled_checkbox;
wxComboBox *group_combo;
int ids_array[100];
vlc_bool_t b_enqueue;
};
#endif
+} // end of wxvlc namespace
/* Menus */
void PopupMenu( intf_thread_t *_p_intf, wxWindow *p_parent,
wxMenu *VideoMenu( intf_thread_t *_p_intf, wxWindow *p_parent );
wxMenu *NavigMenu( intf_thread_t *_p_intf, wxWindow *p_parent );
+namespace wxvlc
+{
class MenuEvtHandler : public wxEvtHandler
{
public:
wxMenu *Menu::CreateDummyMenu();
void Menu::CreateMenuItem( wxMenu *, char *, vlc_object_t * );
- wxMenu *Menu::CreateChoicesMenu( char *, vlc_object_t * );
+ wxMenu *Menu::CreateChoicesMenu( char *, vlc_object_t *, bool );
DECLARE_EVENT_TABLE();
int i_item_id;
};
+} // end of wxvlc namespace
+using namespace wxvlc;
+
static inline int ConvertHotkeyModifiers( int i_hotkey )
{
int i_accel_flags = 0;