sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-05-02 00:05:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove unused message log viewer flag (follows up followup followup 957f1ac)

Browse Source
This commit is contained in:
Juergen E. Fischer 2015-02-16 01:15:46 +01:00
parent ca86be7855
commit bca1560e9f
4 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
python/gui/qgsmessagelogviewer.sip
View File

@ -1,5 +1,5 @@
/** \ingroup gui /** \ingroup gui
* A generic message for displaying QGIS log messages. * A generic dialog widget for displaying QGIS log messages.
*/ */
class QgsMessageLogViewer: QDialog class QgsMessageLogViewer: QDialog
{ {
@ -11,15 +11,6 @@ class QgsMessageLogViewer: QDialog
QgsMessageLogViewer( QStatusBar *statusBar = 0, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags ); QgsMessageLogViewer( QStatusBar *statusBar = 0, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
~QgsMessageLogViewer(); ~QgsMessageLogViewer();
//! @note added in 2.4
void setShowToolTips( bool enabled );
//! @note added in 2.4
bool showToolTips() const;
public slots: public slots:
void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level ); void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level );
private:
void showEvent( QShowEvent * );
void hideEvent( QHideEvent * );
}; };

6
src/app/qgisapp.cpp
View File

@ -651,7 +651,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
mLastMapToolMessage = 0; mLastMapToolMessage = 0;
mLogViewer = new QgsMessageLogViewer( statusBar(), this ); mLogViewer = new QgsMessageLogViewer( statusBar(), this );
mLogViewer->setShowToolTips( false );
mLogDock = new QDockWidget( tr( "Log Messages" ), this ); mLogDock = new QDockWidget( tr( "Log Messages" ), this );
mLogDock->setObjectName( "MessageLog" ); mLogDock->setObjectName( "MessageLog" );
@ -838,8 +837,6 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
#ifdef ANDROID #ifdef ANDROID
toggleFullScreen(); toggleFullScreen();
#endif #endif
mLogViewer->setShowToolTips( true );
} // QgisApp ctor } // QgisApp ctor
QgisApp::QgisApp() QgisApp::QgisApp()
@ -1855,7 +1852,8 @@ void QgisApp::createStatusBar()
mMessageButton = new QToolButton( statusBar() ); mMessageButton = new QToolButton( statusBar() );
mMessageButton->setAutoRaise( true ); mMessageButton->setAutoRaise( true );
mMessageButton->setIcon( QgsApplication::getThemeIcon( "bubble.svg" ) ); mMessageButton->setIcon( QgsApplication::getThemeIcon( "bubble.svg" ) );
mMessageButton->setText( tr( "Messages" ) ); mMessageButton->setToolTip( tr( "Messages" ) );
mMessageButton->setWhatsThis( tr( "Messages" ) );
mMessageButton->setToolButtonStyle( Qt::ToolButtonTextBesideIcon ); mMessageButton->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
mMessageButton->setObjectName( "mMessageLogViewerButton" ); mMessageButton->setObjectName( "mMessageLogViewerButton" );
mMessageButton->setMaximumHeight( mScaleLabel->height() ); mMessageButton->setMaximumHeight( mScaleLabel->height() );

1
src/gui/qgsmessagelogviewer.cpp
View File

@ -32,7 +32,6 @@
QgsMessageLogViewer::QgsMessageLogViewer( QStatusBar *statusBar, QWidget *parent, Qt::WindowFlags fl ) QgsMessageLogViewer::QgsMessageLogViewer( QStatusBar *statusBar, QWidget *parent, Qt::WindowFlags fl )
: QDialog( parent, fl ) : QDialog( parent, fl )
, mShowToolTips( true )
{ {
Q_UNUSED( statusBar ) Q_UNUSED( statusBar )
setupUi( this ); setupUi( this );

8
src/gui/qgsmessagelogviewer.h
View File

@ -38,17 +38,9 @@ class GUI_EXPORT QgsMessageLogViewer: public QDialog, private Ui::QgsMessageLogV
QgsMessageLogViewer( QStatusBar *statusBar = 0, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags ); QgsMessageLogViewer( QStatusBar *statusBar = 0, QWidget *parent = 0, Qt::WindowFlags fl = QgisGui::ModalDialogFlags );
~QgsMessageLogViewer(); ~QgsMessageLogViewer();
//! @note added in 2.4
void setShowToolTips( bool enabled ) { mShowToolTips = enabled; }
//! @note added in 2.4
bool showToolTips() const { return mShowToolTips; }
public slots: public slots:
void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level ); void logMessage( QString message, QString tag, QgsMessageLog::MessageLevel level );
private:
bool mShowToolTips;
private slots: private slots:
void closeTab( int index ); void closeTab( int index );
}; };