Do not show tooltips from message log viewer during QGIS startup.

Showing them leads to disturbing effects while loading the GUI
qgis · Jun 17, 2014 · 1e94fd5 · 1e94fd5
1 parent a745127
commit 1e94fd5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/python/gui/qgsmessagelogviewer.sip b/python/gui/qgsmessagelogviewer.sip
@@ -12,6 +12,11 @@ class QgsMessageLogViewer: QDialog
     QgsMessageLogViewer( QStatusBar *statusBar = 0, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
     ~QgsMessageLogViewer();
 
+    //! @note added in 2.4
+    void setShowToolTips( bool enabled );
+    //! @note added in 2.4
+    bool showToolTips() const;
+
   public slots:
     void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level );
 

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -653,6 +653,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
   mLastMapToolMessage = 0;
 
   mLogViewer = new QgsMessageLogViewer( statusBar(), this );
+  mLogViewer->setShowToolTips( false );
 
   mLogDock = new QDockWidget( tr( "Log Messages" ), this );
   mLogDock->setObjectName( "MessageLog" );
@@ -853,6 +854,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
   toggleFullScreen();
 #endif
 
+  mLogViewer->setShowToolTips( true );
 } // QgisApp ctor
 
 QgisApp::QgisApp( )

diff --git a/src/gui/qgsmessagelogviewer.cpp b/src/gui/qgsmessagelogviewer.cpp
@@ -43,6 +43,7 @@ QgsMessageLogViewer::QgsMessageLogViewer( QStatusBar *statusBar, QWidget *parent
     : QDialog( parent, fl )
     , mButton( 0 )
     , mCount( 0 )
+    , mShowToolTips( true )
 {
   setupUi( this );
 
@@ -119,7 +120,8 @@ void QgsMessageLogViewer::logMessage( QString message, QString tag, QgsMessageLo
   if ( !isVisible() && level > QgsMessageLog::INFO )
   {
     mButton->show();
-    QToolTip::showText( mButton->mapToGlobal( QPoint( 0, 0 ) ), mButton->toolTip() );
+    if ( mShowToolTips )
+      QToolTip::showText( mButton->mapToGlobal( QPoint( 0, 0 ) ), mButton->toolTip() );
   }
 
   if ( tag.isNull() )

diff --git a/src/gui/qgsmessagelogviewer.h b/src/gui/qgsmessagelogviewer.h
@@ -39,6 +39,11 @@ class GUI_EXPORT QgsMessageLogViewer: public QDialog, private Ui::QgsMessageLogV
     QgsMessageLogViewer( QStatusBar *statusBar = 0, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
     ~QgsMessageLogViewer();
 
+    //! @note added in 2.4
+    void setShowToolTips( bool enabled ) { mShowToolTips = enabled; }
+    //! @note added in 2.4
+    bool showToolTips() const { return mShowToolTips; }
+
   public slots:
     void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level );
 
@@ -49,6 +54,7 @@ class GUI_EXPORT QgsMessageLogViewer: public QDialog, private Ui::QgsMessageLogV
   private:
     QToolButton *mButton;
     int mCount;
+    bool mShowToolTips;
 
   private slots:
     void closeTab( int index );