Skip to content

Commit 1e94fd5

Browse files
committed
Do not show tooltips from message log viewer during QGIS startup.
Showing them leads to disturbing effects while loading the GUI
1 parent a745127 commit 1e94fd5

File tree

4 files changed

+16
-1
lines changed

4 files changed

+16
-1
lines changed

python/gui/qgsmessagelogviewer.sip

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ class QgsMessageLogViewer: QDialog
1212
QgsMessageLogViewer( QStatusBar *statusBar = 0, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
1313
~QgsMessageLogViewer();
1414

15+
//! @note added in 2.4
16+
void setShowToolTips( bool enabled );
17+
//! @note added in 2.4
18+
bool showToolTips() const;
19+
1520
public slots:
1621
void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level );
1722

src/app/qgisapp.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
653653
mLastMapToolMessage = 0;
654654

655655
mLogViewer = new QgsMessageLogViewer( statusBar(), this );
656+
mLogViewer->setShowToolTips( false );
656657

657658
mLogDock = new QDockWidget( tr( "Log Messages" ), this );
658659
mLogDock->setObjectName( "MessageLog" );
@@ -853,6 +854,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
853854
toggleFullScreen();
854855
#endif
855856

857+
mLogViewer->setShowToolTips( true );
856858
} // QgisApp ctor
857859

858860
QgisApp::QgisApp( )

src/gui/qgsmessagelogviewer.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ QgsMessageLogViewer::QgsMessageLogViewer( QStatusBar *statusBar, QWidget *parent
4343
: QDialog( parent, fl )
4444
, mButton( 0 )
4545
, mCount( 0 )
46+
, mShowToolTips( true )
4647
{
4748
setupUi( this );
4849

@@ -119,7 +120,8 @@ void QgsMessageLogViewer::logMessage( QString message, QString tag, QgsMessageLo
119120
if ( !isVisible() && level > QgsMessageLog::INFO )
120121
{
121122
mButton->show();
122-
QToolTip::showText( mButton->mapToGlobal( QPoint( 0, 0 ) ), mButton->toolTip() );
123+
if ( mShowToolTips )
124+
QToolTip::showText( mButton->mapToGlobal( QPoint( 0, 0 ) ), mButton->toolTip() );
123125
}
124126

125127
if ( tag.isNull() )

src/gui/qgsmessagelogviewer.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,11 @@ class GUI_EXPORT QgsMessageLogViewer: public QDialog, private Ui::QgsMessageLogV
3939
QgsMessageLogViewer( QStatusBar *statusBar = 0, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
4040
~QgsMessageLogViewer();
4141

42+
//! @note added in 2.4
43+
void setShowToolTips( bool enabled ) { mShowToolTips = enabled; }
44+
//! @note added in 2.4
45+
bool showToolTips() const { return mShowToolTips; }
46+
4247
public slots:
4348
void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level );
4449

@@ -49,6 +54,7 @@ class GUI_EXPORT QgsMessageLogViewer: public QDialog, private Ui::QgsMessageLogV
4954
private:
5055
QToolButton *mButton;
5156
int mCount;
57+
bool mShowToolTips;
5258

5359
private slots:
5460
void closeTab( int index );

0 commit comments

Comments
 (0)