Skip to content

Commit bca1560

Browse files
committed
remove unused message log viewer flag (follows up followup followup 957f1ac)
1 parent ca86be7 commit bca1560

File tree

4 files changed

+3
-23
lines changed

4 files changed

+3
-23
lines changed

python/gui/qgsmessagelogviewer.sip

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/** \ingroup gui
2-
* A generic message for displaying QGIS log messages.
2+
* A generic dialog widget for displaying QGIS log messages.
33
*/
44
class QgsMessageLogViewer: QDialog
55
{
@@ -11,15 +11,6 @@ class QgsMessageLogViewer: QDialog
1111
QgsMessageLogViewer( QStatusBar *statusBar = 0, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
1212
~QgsMessageLogViewer();
1313

14-
//! @note added in 2.4
15-
void setShowToolTips( bool enabled );
16-
//! @note added in 2.4
17-
bool showToolTips() const;
18-
1914
public slots:
2015
void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level );
21-
22-
private:
23-
void showEvent( QShowEvent * );
24-
void hideEvent( QHideEvent * );
2516
};

src/app/qgisapp.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
651651
mLastMapToolMessage = 0;
652652

653653
mLogViewer = new QgsMessageLogViewer( statusBar(), this );
654-
mLogViewer->setShowToolTips( false );
655654

656655
mLogDock = new QDockWidget( tr( "Log Messages" ), this );
657656
mLogDock->setObjectName( "MessageLog" );
@@ -838,8 +837,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
838837
#ifdef ANDROID
839838
toggleFullScreen();
840839
#endif
841-
842-
mLogViewer->setShowToolTips( true );
843840
} // QgisApp ctor
844841

845842
QgisApp::QgisApp()
@@ -1855,7 +1852,8 @@ void QgisApp::createStatusBar()
18551852
mMessageButton = new QToolButton( statusBar() );
18561853
mMessageButton->setAutoRaise( true );
18571854
mMessageButton->setIcon( QgsApplication::getThemeIcon( "bubble.svg" ) );
1858-
mMessageButton->setText( tr( "Messages" ) );
1855+
mMessageButton->setToolTip( tr( "Messages" ) );
1856+
mMessageButton->setWhatsThis( tr( "Messages" ) );
18591857
mMessageButton->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
18601858
mMessageButton->setObjectName( "mMessageLogViewerButton" );
18611859
mMessageButton->setMaximumHeight( mScaleLabel->height() );

src/gui/qgsmessagelogviewer.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
QgsMessageLogViewer::QgsMessageLogViewer( QStatusBar *statusBar, QWidget *parent, Qt::WindowFlags fl )
3434
: QDialog( parent, fl )
35-
, mShowToolTips( true )
3635
{
3736
Q_UNUSED( statusBar )
3837
setupUi( this );

src/gui/qgsmessagelogviewer.h

-8
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,9 @@ class GUI_EXPORT QgsMessageLogViewer: public QDialog, private Ui::QgsMessageLogV
3838
QgsMessageLogViewer( QStatusBar *statusBar = 0, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
3939
~QgsMessageLogViewer();
4040

41-
//! @note added in 2.4
42-
void setShowToolTips( bool enabled ) { mShowToolTips = enabled; }
43-
//! @note added in 2.4
44-
bool showToolTips() const { return mShowToolTips; }
45-
4641
public slots:
4742
void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level );
4843

49-
private:
50-
bool mShowToolTips;
51-
5244
private slots:
5345
void closeTab( int index );
5446
};

0 commit comments

Comments
 (0)