Enable verbosity setting

diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
index be14c98cdb0451c5425a46d2c58d125265604468..1ae22b0b163f20f56c1ca8200858e0f0a5ebd1ff 100644 (file)
--- a/modules/gui/qt4/dialogs/messages.cpp
+++ b/modules/gui/qt4/dialogs/messages.cpp
@@ -21,16 +21,22 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "input_manager.hpp"
 #include "dialogs/messages.hpp"
 #include "dialogs_provider.hpp"
 #include "util/qvlcframe.hpp"
 #include "qt4.hpp"
+#include <QSpacerItem>
+#include <QSpinBox>
+#include <QLabel>
+#include <QTextEdit>
+#include <QTextCursor>
+#include <QFileDialog>
+#include <QTextStream>
+#include <QMessageBox>
 
 MessagesDialog *MessagesDialog::instance = NULL;
 
-MessagesDialog::MessagesDialog( intf_thread_t *_p_intf, bool _main_input ) :
-                              QVLCFrame( _p_intf ), main_input( _main_input )
+MessagesDialog::MessagesDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
 {
     setWindowTitle( _("Messages" ) );
     resize(600, 400);
@@ -39,10 +45,11 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf, bool _main_input ) :
     QPushButton *closeButton = new QPushButton(qtr("&Close"));
     QPushButton *clearButton = new QPushButton(qtr("&Clear"));
     QPushButton *saveLogButton = new QPushButton(qtr("&Save as..."));
-    QSpinBox *verbosityBox = new QSpinBox();
+    verbosityBox = new QSpinBox();
     verbosityBox->setRange(0, 2);
     verbosityBox->setValue(config_GetInt(p_intf, "verbose"));
     verbosityBox->setWrapping(true);
+    verbosityBox->setMaximumWidth( 50 );
     QLabel *verbosityLabel = new QLabel(qtr("Verbosity Level"));
     messages = new QTextEdit();
     messages->setReadOnly(true);
@@ -50,11 +57,12 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf, bool _main_input ) :
     messages->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
 
     layout->addWidget(messages, 0, 0, 1, 0);
-    layout->addWidget(verbosityLabel, 1, 0, 1, 1);
-    layout->addWidget(verbosityBox, 1, 2);
-    layout->addWidget(saveLogButton, 2, 0);
-    layout->addWidget(clearButton, 2, 1);
-    layout->addWidget(closeButton, 2, 2);
+    layout->addWidget(verbosityLabel, 1, 0, 1,1 );
+    layout->addWidget(verbosityBox, 1, 1 );
+    layout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding ), 1,2 );
+    layout->addWidget(saveLogButton, 1, 3 );
+    layout->addWidget(clearButton, 1, 4 );
+    layout->addWidget(closeButton, 1, 5 );
 
     connect( closeButton, SIGNAL( clicked() ) ,
            this, SLOT( onCloseButton()));
@@ -62,12 +70,8 @@ MessagesDialog::MessagesDialog( intf_thread_t *_p_intf, bool _main_input ) :
            this, SLOT( onClearButton()));
     connect( saveLogButton, SIGNAL( clicked() ) ,
            this, SLOT( onSaveButton()));
-    connect( verbosityBox, SIGNAL( valueChanged(int) ),
-           this, SLOT( onVerbosityChanged(int)));
     connect( DialogsProvider::getInstance(NULL)->fixed_timer,
              SIGNAL( timeout() ), this, SLOT(updateLog() ) );
-
-    p_input = NULL;
 }
 
 MessagesDialog::~MessagesDialog()
@@ -100,10 +104,19 @@ void MessagesDialog::updateLog()
 
             /* Append all messages to log window */
 
-
-            messages->setFontItalic(true);
-            messages->setTextColor("darkBlue");
-            messages->insertPlainText(p_sub->p_msg[i_start].psz_module);
+            if( p_sub->p_msg[i_start].i_type == VLC_MSG_INFO ||
+                p_sub->p_msg[i_start].i_type == VLC_MSG_ERR ||
+                p_sub->p_msg[i_start].i_type == VLC_MSG_WARN &&
+                    verbosityBox->value() >= 1 ||
+                p_sub->p_msg[i_start].i_type == VLC_MSG_DBG &&
+                    verbosityBox->value() >= 2 )
+            {
+                messages->setFontItalic(true);
+                messages->setTextColor("darkBlue");
+                messages->insertPlainText(p_sub->p_msg[i_start].psz_module);
+            }
+            else
+                continue;
 
             switch( p_sub->p_msg[i_start].i_type )
             {
@@ -176,12 +189,3 @@ bool MessagesDialog::onSaveButton()
     }
     return false;
 }
-
-void MessagesDialog::onVerbosityChanged(int verbosityLevel)
-{
-    //FIXME: Does not seems to work.
-    vlc_value_t  val;
-    val.i_int = verbosityLevel - 1;
-    var_Set( p_intf->p_vlc, "verbose", val );
-}
-

diff --git a/modules/gui/qt4/dialogs/messages.hpp b/modules/gui/qt4/dialogs/messages.hpp
index ce13c24c0b7128458c804ac9ecd11c3a62fe0b76..5425324bc606dd7afab58f0aa019efa92011f25a 100644 (file)
--- a/modules/gui/qt4/dialogs/messages.hpp
+++ b/modules/gui/qt4/dialogs/messages.hpp
@@ -24,13 +24,6 @@
 #define _MESSAGES_DIALOG_H_
 
 #include "util/qvlcframe.hpp"
-#include <QSpinBox>
-#include <QLabel>
-#include <QTextEdit>
-#include <QTextCursor>
-#include <QFileDialog>
-#include <QTextStream>
-#include <QMessageBox>
 
 class QPushButton;
 class QSpinBox;
@@ -42,28 +35,24 @@ class MessagesDialog : public QVLCFrame
 {
     Q_OBJECT;
 public:
-    static MessagesDialog * getInstance( intf_thread_t *p_intf, bool a )
+    static MessagesDialog * getInstance( intf_thread_t *p_intf )
     {
         if( !instance)
-            instance = new MessagesDialog( p_intf, a );
+            instance = new MessagesDialog( p_intf);
         return instance;
     }
     virtual ~MessagesDialog();
 
 private:
-    MessagesDialog( intf_thread_t *,  bool );
-    input_thread_t *p_input;
-    bool main_input;
+    MessagesDialog( intf_thread_t *);
     static MessagesDialog *instance;
-
+    QSpinBox *verbosityBox;
     QTextEdit *messages;
-
 public slots:
     void updateLog();
     void onCloseButton();
     void onClearButton();
     bool onSaveButton();
-    void onVerbosityChanged(int verbosityLevel);
 };
 
 #endif

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 247049f78c9bfce40f56bf5a23fd593544acd59b..91d3399c7730974332061b62ffae6ca698a517bc 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -31,6 +31,7 @@
 #include <QSignalMapper>
 #include "menus.hpp"
 #include <vlc_intf_strings.h>
+#include <QFileDialog>
 
 DialogsProvider* DialogsProvider::instance = NULL;
 
@@ -164,7 +165,7 @@ void DialogsProvider::prefsDialog()
 
 void DialogsProvider::messagesDialog()
 {
-    MessagesDialog::getInstance( p_intf, true )->toggleVisible();
+    MessagesDialog::getInstance( p_intf )->toggleVisible();
 }
 
 void DialogsProvider::menuAction( QObject *data )