Skip to content

V
vlc-1.1
Commit 474a83cf authored by Olivier Teulière's avatar Olivier Teulière
Browse files
Options

* added preferences, file info and stream output dialogs to the skins

parent e81da7d5
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 34 deletions
modules/gui/skins/Modules.am
View file @ 474a83cf
......@@ -98,8 +98,11 @@ SOURCES_skins = \
modules/gui/skins/gtk2/gtk2_window.cpp \
modules/gui/skins/gtk2/gtk2_window.h \
\
modules/gui/wxwindows/fileinfo.cpp \
modules/gui/wxwindows/messages.cpp \
modules/gui/wxwindows/open.cpp \
modules/gui/wxwindows/preferences.cpp \
modules/gui/wxwindows/streamout.cpp \
$(NULL)
EXTRA_DIST += \
......
modules/gui/skins/gtk2/gtk2_run.cpp
View file @ 474a83cf
......@@ -2,7 +2,7 @@
* gtk2_run.cpp:
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: gtk2_run.cpp,v 1.14 2003/04/20 23:09:31 asmax Exp $
* $Id: gtk2_run.cpp,v 1.15 2003/04/21 00:54:26 ipkiss Exp $
*
* Authors: Cyril Deguet <asmax@videolan.org>
*
......@@ -230,6 +230,9 @@ bool Instance::OnInit()
p_intf->p_sys->p_icon = new wxIcon( vlc_xpm );
p_intf->p_sys->OpenDlg = new OpenDialog( p_intf, NULL, FILE_ACCESS );
p_intf->p_sys->MessagesDlg = new Messages( p_intf, NULL );
p_intf->p_sys->SoutDlg = new SoutDialog( p_intf, NULL );
p_intf->p_sys->PrefsDlg = new PrefsDialog( p_intf, NULL );
p_intf->p_sys->InfoDlg = new FileInfo( p_intf, NULL );
return TRUE;
}
......
modules/gui/skins/src/banks.cpp
View file @ 474a83cf
......@@ -2,7 +2,7 @@
* banks.cpp: Bitmap bank, Event, bank, Font bank and OffSet bank
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: banks.cpp,v 1.3 2003/04/16 21:40:07 ipkiss Exp $
* $Id: banks.cpp,v 1.4 2003/04/21 00:54:26 ipkiss Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -169,10 +169,12 @@ EventBank::EventBank( intf_thread_t *_p_intf )
Add( "volume_down", "VLC_VOLUME_CHANGE(DOWN)", "none" );
Add( "volume_refresh", "VLC_VOLUME_CHANGE(SET)", "none" );
// Log events
// Dialogs events
Add( "show_log", "VLC_LOG_SHOW(TRUE)", "none" );
Add( "hide_log", "VLC_LOG_SHOW(FALSE)", "none" );
Add( "clear_log", "VLC_LOG_CLEAR", "none" );
Add( "show_prefs", "VLC_PREFS_SHOW", "none" );
Add( "show_info", "VLC_INFO_SHOW", "none" );
Add( "quit", "VLC_HIDE(VLC_QUIT)", "CTRL+C" );
Add( "open", "VLC_OPEN", "CTRL+O" );
......
modules/gui/skins/src/event.cpp
View file @ 474a83cf
......@@ -2,7 +2,7 @@
* event.cpp: Event class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: event.cpp,v 1.11 2003/04/16 21:40:07 ipkiss Exp $
* $Id: event.cpp,v 1.12 2003/04/21 00:54:26 ipkiss Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -159,11 +159,15 @@ unsigned int Event::GetMessageType( string Desc )
else if( Desc == "VLC_VOLUME_SET" )
return VLC_VOLUME_SET;
// Logs
// Dialogs
else if( Desc == "VLC_LOG_SHOW" )
return VLC_LOG_SHOW;
else if( Desc == "VLC_LOG_CLEAR" )
return VLC_LOG_CLEAR;
else if( Desc == "VLC_PREFS_SHOW" )
return VLC_PREFS_SHOW;
else if( Desc == "VLC_INFO_SHOW" )
return VLC_INFO_SHOW;
// Playlist events
else if( Desc == "VLC_PLAYLIST_ADD_FILE" )
......
modules/gui/skins/src/event.h
View file @ 474a83cf
......@@ -2,7 +2,7 @@
* event.h: Event class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: event.h,v 1.6 2003/04/14 10:00:38 karibu Exp $
* $Id: event.h,v 1.7 2003/04/21 00:54:26 ipkiss Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -62,6 +62,8 @@ using namespace std;
#define VLC_LOG_SHOW (VLC_MESSAGE + 20)
#define VLC_LOG_CLEAR (VLC_MESSAGE + 22)
#define VLC_PREFS_SHOW (VLC_MESSAGE + 23)
#define VLC_INFO_SHOW (VLC_MESSAGE + 24)
#define VLC_INTF_REFRESH (VLC_MESSAGE + 30)
#define VLC_CHANGE_TRAY (VLC_MESSAGE + 31)
......
modules/gui/skins/src/skin_common.h
View file @ 474a83cf
......@@ -2,7 +2,7 @@
* skin_common.h: Private Skin interface description
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: skin_common.h,v 1.2 2003/04/20 20:28:39 ipkiss Exp $
* $Id: skin_common.h,v 1.3 2003/04/21 00:54:26 ipkiss Exp $
*
* Authors: Olivier Teulière <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -35,6 +35,9 @@ class Theme;
class wxIcon;
class OpenDialog;
class Messages;
class SoutDialog;
class PrefsDialog;
class FileInfo;
//---------------------------------------------------------------------------
// intf_sys_t: description and status of skin interface
......@@ -65,12 +68,13 @@ struct intf_sys_t
wxIcon *p_icon;
// Dialogs
OpenDialog *OpenDlg;
Messages *MessagesDlg;
OpenDialog *OpenDlg;
Messages *MessagesDlg;
SoutDialog *SoutDlg;
PrefsDialog *PrefsDlg;
FileInfo *InfoDlg;
};
#endif
modules/gui/skins/src/skin_main.cpp
View file @ 474a83cf
......@@ -2,7 +2,7 @@
* skin-main.cpp: skins plugin for VLC
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: skin_main.cpp,v 1.12 2003/04/20 20:28:39 ipkiss Exp $
* $Id: skin_main.cpp,v 1.13 2003/04/21 00:54:26 ipkiss Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -282,6 +282,9 @@ int SkinManage( intf_thread_t *p_intf )
// Update the log window
p_intf->p_sys->MessagesDlg->UpdateLog();
// Update the file info window
p_intf->p_sys->InfoDlg->UpdateFileInfo();
//-------------------------------------------------------------------------
if( p_intf->p_sys->p_input != NULL && !p_intf->p_sys->p_input->b_die )
{
......
modules/gui/skins/src/vlcproc.cpp
View file @ 474a83cf
......@@ -2,7 +2,7 @@
* vlcproc.cpp: VlcProc class
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: vlcproc.cpp,v 1.11 2003/04/21 00:18:37 asmax Exp $
* $Id: vlcproc.cpp,v 1.12 2003/04/21 00:54:26 ipkiss Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -131,13 +131,21 @@ bool VlcProc::EventProc( Event *evt )
return true;
case VLC_LOG_SHOW:
// p_intf->p_sys->p_theme->ShowLog( evt->GetParam2() );
p_intf->p_sys->MessagesDlg->Show(
!p_intf->p_sys->MessagesDlg->IsShown() );
return true;
case VLC_LOG_CLEAR:
// p_intf->p_sys->p_theme->ClearLog();
return true;
case VLC_PREFS_SHOW:
p_intf->p_sys->PrefsDlg->Show(
!p_intf->p_sys->PrefsDlg->IsShown() );
return true;
case VLC_INFO_SHOW:
p_intf->p_sys->InfoDlg->Show(
!p_intf->p_sys->InfoDlg->IsShown() );
return true;
case VLC_INTF_REFRESH:
......
modules/gui/skins/win32/win32_run.cpp
View file @ 474a83cf
......@@ -2,7 +2,7 @@
* win32_run.cpp:
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: win32_run.cpp,v 1.6 2003/04/20 20:28:39 ipkiss Exp $
* $Id: win32_run.cpp,v 1.7 2003/04/21 00:54:26 ipkiss Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* Emmanuel Puig <karibu@via.ecp.fr>
......@@ -92,6 +92,9 @@ bool Instance::OnInit()
p_intf->p_sys->p_icon = new wxIcon( vlc_xpm );
p_intf->p_sys->OpenDlg = new OpenDialog( p_intf, NULL, FILE_ACCESS );
p_intf->p_sys->MessagesDlg = new Messages( p_intf, NULL );
p_intf->p_sys->SoutDlg = new SoutDialog( p_intf, NULL );
p_intf->p_sys->PrefsDlg = new PrefsDialog( p_intf, NULL );
p_intf->p_sys->InfoDlg = new FileInfo( p_intf, NULL );
return TRUE;
}
......
modules/gui/wxwindows/fileinfo.cpp
View file @ 474a83cf
......@@ -2,7 +2,7 @@
* fileinfo.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: fileinfo.cpp,v 1.8 2003/04/17 14:00:44 anil Exp $
* $Id: fileinfo.cpp,v 1.9 2003/04/21 00:54:26 ipkiss Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
......@@ -45,7 +45,13 @@
#include <vlc/intf.h>
#include "wxwindows.h"
#if defined MODULE_NAME_IS_skins
# include "../skins/src/skin_common.h"
# include "../skins/src/wxdialogs.h"
#else
# include "wxwindows.h"
#endif
/*****************************************************************************
* Event Table.
......@@ -76,7 +82,7 @@ FileInfo::FileInfo( intf_thread_t *_p_intf, Interface *_p_main_interface ):
/* Initializations */
p_intf = _p_intf;
SetIcon( *p_intf->p_sys->p_icon );
SetAutoLayout(TRUE);
SetAutoLayout( TRUE );
/* Create a panel to put everything in */
wxPanel *panel = new wxPanel( this, -1 );
......@@ -104,23 +110,23 @@ FileInfo::FileInfo( intf_thread_t *_p_intf, Interface *_p_main_interface ):
main_sizer->Layout();
SetSizerAndFit( main_sizer );
UpdateFileInfo();
UpdateFileInfo();
}
void FileInfo::UpdateFileInfo()
{
if( !p_intf->p_sys->p_input || p_intf->p_sys->p_input->b_dead )
input_thread_t *p_input = p_intf->p_sys->p_input;
if( !p_input || p_input->b_dead )
{
if( fileinfo_root )
{
fileinfo_tree->SetItemText ( fileinfo_root , "");
fileinfo_tree->SetItemText ( fileinfo_root , "" );
fileinfo_tree->DeleteChildren ( fileinfo_root );
}
}
return;
}
input_thread_t *p_input = p_intf->p_sys->p_input;
if( !fileinfo_root )
{
fileinfo_root = fileinfo_tree->AddRoot( p_input->psz_name );
......@@ -133,7 +139,7 @@ void FileInfo::UpdateFileInfo()
fileinfo_tree->DeleteChildren( fileinfo_root );
vlc_mutex_lock( &p_input->stream.stream_lock );
fileinfo_tree->SetItemText( fileinfo_root , p_input->psz_name );
input_info_category_t *p_cat = p_input->stream.p_info;
......@@ -145,7 +151,7 @@ void FileInfo::UpdateFileInfo()
while ( p_info )
{
fileinfo_tree->AppendItem( cat, wxString(p_info->psz_name) + ": "
+ p_info->psz_value );
+ p_info->psz_value );
p_info = p_info->p_next;
}
p_cat = p_cat->p_next;
......
modules/gui/wxwindows/open.cpp
View file @ 474a83cf
......@@ -2,7 +2,7 @@
* open.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: open.cpp,v 1.14 2003/04/20 20:28:40 ipkiss Exp $
* $Id: open.cpp,v 1.15 2003/04/21 00:54:26 ipkiss Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -677,14 +677,12 @@ void OpenDialog::OnSoutEnable( wxCommandEvent& event )
void OpenDialog::OnSoutSettings( wxCommandEvent& WXUNUSED(event) )
{
/* Show/hide the open dialog */
#if !defined MODULE_NAME_IS_skins
SoutDialog dialog( p_intf, p_main_interface );
if( dialog.ShowModal() == wxID_OK )
{
config_PutPsz( p_intf, "sout", (char *)dialog.mrl.c_str() );
}
#endif
}
/*****************************************************************************
......
modules/gui/wxwindows/preferences.cpp
View file @ 474a83cf
......@@ -2,7 +2,7 @@
* preferences.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: preferences.cpp,v 1.10 2003/04/01 16:11:43 gbazin Exp $
* $Id: preferences.cpp,v 1.11 2003/04/21 00:54:26 ipkiss Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -53,7 +53,13 @@
#include <vlc/intf.h>
#include "wxwindows.h"
#if defined MODULE_NAME_IS_skins
# include "../skins/src/skin_common.h"
# include "../skins/src/wxdialogs.h"
#else
# include "wxwindows.h"
#endif
#ifndef wxRB_SINGLE
# define wxRB_SINGLE 0
......
modules/gui/wxwindows/streamout.cpp
View file @ 474a83cf
......@@ -2,7 +2,7 @@
* streamout.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: streamout.cpp,v 1.5 2003/04/01 16:11:43 gbazin Exp $
* $Id: streamout.cpp,v 1.6 2003/04/21 00:54:26 ipkiss Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -49,7 +49,13 @@
#include <vlc/intf.h>
#include "wxwindows.h"
#if defined MODULE_NAME_IS_skins
# include "../skins/src/skin_common.h"
# include "../skins/src/wxdialogs.h"
#else
# include "wxwindows.h"
#endif
#ifndef wxRB_SINGLE
# define wxRB_SINGLE 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment