Qt4 - Codec Information direct access from menu.

diff --git a/include/vlc_intf_strings.h b/include/vlc_intf_strings.h
index 7236864c97ee2afa96ae89c1898abdbf244eb567..c113f72bbe59a7104518ecda0de05e20c99e5704 100644 (file)
--- a/include/vlc_intf_strings.h
+++ b/include/vlc_intf_strings.h
@@ -39,6 +39,7 @@
 /******************* Menus *****************/
 
 #define I_MENU_INFO  N_("Information...")
+#define I_MENU_CODECINFO  N_("Codec Information...")
 #define I_MENU_MSG   N_("Messages...")
 #define I_MENU_EXT   N_("Extended settings...")
 

diff --git a/modules/gui/qt4/dialogs/mediainfo.cpp b/modules/gui/qt4/dialogs/mediainfo.cpp
index a5fcf0cce28dc2f48b5bad98994626f5201c9bc9..1492ed3e0f898aac1e9efc5e2b6add9877ed02e9 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.cpp
+++ b/modules/gui/qt4/dialogs/mediainfo.cpp
@@ -69,6 +69,12 @@ MediaInfoDialog::~MediaInfoDialog()
     writeSettings( "mediainfo" );
 }
 
+void MediaInfoDialog::showTab(int i_tab=0)
+{
+    this->show();
+    IT->setCurrentIndex(i_tab);
+}
+
 static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
                         vlc_value_t oldval, vlc_value_t newval, void *param )
 {

diff --git a/modules/gui/qt4/dialogs/mediainfo.hpp b/modules/gui/qt4/dialogs/mediainfo.hpp
index b04fb04d748d01657a346f2a3885e34f50017830..0884ff44ae0a07d3999a16a21076702ab96d9435 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.hpp
+++ b/modules/gui/qt4/dialogs/mediainfo.hpp
@@ -48,6 +48,8 @@ public:
         instance= NULL;
     }
     virtual ~MediaInfoDialog();
+
+    void showTab( int );
     bool need_update;
     void setInput( input_item_t * );
 private:

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index 4d0e4330b449640b5be602d1d15b09cb9ae2f6fd..0d519a790304d8e26fd83f339dba7f10be91cbb8 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -94,7 +94,6 @@ OpenDialog::~OpenDialog()
 
 void OpenDialog::showTab(int i_tab=0)
 {
-    printf ( "%i" , i_tab);
     this->show();
     ui.Tab->setCurrentIndex(i_tab);
 }

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 84984e4631a436e46304150e8b1849a22794e583..85b85b52b957dd002152ee0b1888e6106b669288 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -149,6 +149,11 @@ void DialogsProvider::mediaInfoDialog()
     MediaInfoDialog::getInstance( p_intf )->toggleVisible();
 }
 
+void DialogsProvider::mediaCodecDialog()
+{
+    MediaInfoDialog::getInstance( p_intf )->showTab( 1 );
+}
+
 void DialogsProvider::bookmarksDialog()
 {
 }
@@ -179,7 +184,7 @@ void DialogsProvider::openCaptureDialog()
 }
 void DialogsProvider::openDialog( int i_tab )
 {
-    OpenDialog::getInstance( p_intf->p_sys->p_mi  , p_intf )->showTab( i_tab );
+    OpenDialog::getInstance( p_intf->p_sys->p_mi , p_intf )->showTab( i_tab );
 }
 
 void DialogsProvider::PLAppendDialog()
@@ -189,7 +194,6 @@ void DialogsProvider::MLAppendDialog()
 {
 }
 
-
 /**** Simple open ****/
 
 QStringList DialogsProvider::showSimpleOpen(QString help, bool all,

diff --git a/modules/gui/qt4/dialogs_provider.hpp b/modules/gui/qt4/dialogs_provider.hpp
index 6afbefff97cafefc4b9180bf956e292b7843ec16..8f6d2b8d52bf557cb228f7cfa8b3bc3c7bcfe580 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.hpp
+++ b/modules/gui/qt4/dialogs_provider.hpp
@@ -104,6 +104,7 @@ public slots:
     void playlistDialog();
     void bookmarksDialog();
     void mediaInfoDialog();
+    void mediaCodecDialog();
     void prefsDialog();
     void extendedDialog();
     void messagesDialog();

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 132e74a6f79afc8053ae7f10d1a6f6876eea7d13..a2ca760c40cb97d3954c360491d455b74f1c9ded 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -181,6 +181,7 @@ QMenu *QVLCMenu::ToolsMenu( intf_thread_t *p_intf, MainInterface *mi,
     }
     DP_SADD( qtr(I_MENU_MSG), "", "", messagesDialog() );
     DP_SADD( qtr(I_MENU_INFO) , "", "", mediaInfoDialog() );
+    DP_SADD( qtr(I_MENU_CODECINFO) , "", "", mediaCodecDialog() );
     DP_SADD( qtr(I_MENU_EXT), "","",extendedDialog() );
     if( mi )
     {