[vlc-devel] commit: Qt: some people seem to have difficulties to access to the synchronisation tab ... Ease it for them. (Jean-Baptiste Kempf )
git version control
git at videolan.org
Thu Mar 5 13:19:32 CET 2009
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Mar 5 13:18:59 2009 +0100| [d57af90a5b46bbaa3c13e11a39ac58a4f117a5b2] | committer: Jean-Baptiste Kempf
Qt: some people seem to have difficulties to access to the synchronisation tab... Ease it for them.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d57af90a5b46bbaa3c13e11a39ac58a4f117a5b2
---
modules/gui/qt4/dialogs/extended.cpp | 8 +++++++-
modules/gui/qt4/dialogs/extended.hpp | 5 +++++
modules/gui/qt4/dialogs_provider.cpp | 5 +++++
modules/gui/qt4/dialogs_provider.hpp | 1 +
modules/gui/qt4/menus.cpp | 5 ++++-
5 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/modules/gui/qt4/dialogs/extended.cpp b/modules/gui/qt4/dialogs/extended.cpp
index 364c205..26b2a10 100644
--- a/modules/gui/qt4/dialogs/extended.cpp
+++ b/modules/gui/qt4/dialogs/extended.cpp
@@ -45,7 +45,7 @@ ExtendedDialog::ExtendedDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
layout->setLayoutMargins( 0, 2, 0, 1, 1 );
layout->setSpacing( 3 );
- QTabWidget *mainTabW = new QTabWidget( this );
+ mainTabW = new QTabWidget( this );
/* AUDIO effects */
QWidget *audioWidget = new QWidget;
@@ -107,6 +107,12 @@ ExtendedDialog::~ExtendedDialog()
writeSettings( "EPanel" );
}
+void ExtendedDialog::showTab( int i )
+{
+ mainTabW->setCurrentIndex( i );
+ show();
+}
+
void ExtendedDialog::changedItem( int i_status )
{
if( i_status != END_S ) return;
diff --git a/modules/gui/qt4/dialogs/extended.hpp b/modules/gui/qt4/dialogs/extended.hpp
index d57aaa2..f884214 100644
--- a/modules/gui/qt4/dialogs/extended.hpp
+++ b/modules/gui/qt4/dialogs/extended.hpp
@@ -28,6 +28,8 @@
#include "components/extended_panels.hpp"
+class QTabWidget;
+
class ExtendedDialog : public QVLCFrame
{
Q_OBJECT;
@@ -44,12 +46,15 @@ public:
instance = NULL;
}
virtual ~ExtendedDialog();
+ void showTab( int i );
private:
ExtendedDialog( intf_thread_t * );
static ExtendedDialog *instance;
+
SyncControls *syncW;
ExtVideo *videoEffect;
Equalizer *equal;
+ QTabWidget *mainTabW;
private slots:
void changedItem( int );
};
diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index a2ef3b4..99da2f3 100644
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -183,6 +183,11 @@ void DialogsProvider::extendedDialog()
ExtendedDialog::getInstance( p_intf )->toggleVisible();
}
+void DialogsProvider::synchroDialog()
+{
+ ExtendedDialog::getInstance( p_intf )->showTab( 2 );
+}
+
void DialogsProvider::messagesDialog()
{
MessagesDialog::getInstance( p_intf )->toggleVisible();
diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index c08a6a5..1d213e5 100644
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -142,6 +142,7 @@ public slots:
void mediaCodecDialog();
void prefsDialog();
void extendedDialog();
+ void synchroDialog();
void messagesDialog();
#ifdef ENABLE_VLM
void vlmDialog();
diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 348a68a..039c082 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -342,9 +342,12 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent )
**/
QMenu *QVLCMenu::ToolsMenu( QMenu *menu )
{
- addDPStaticEntry( menu, qtr( I_MENU_EXT ), ":/settings",
+ addDPStaticEntry( menu, qtr( "&Effects and Filters"), ":/settings",
SLOT( extendedDialog() ), "Ctrl+E" );
+ addDPStaticEntry( menu, qtr( "&Tracks Synchronisation"), ":/settings",
+ SLOT( synchroDialog() ), "" );
+
addDPStaticEntry( menu, qtr( I_MENU_INFO ) , ":/info",
SLOT( mediaInfoDialog() ), "Ctrl+I" );
addDPStaticEntry( menu, qtr( I_MENU_CODECINFO ) ,
More information about the vlc-devel
mailing list