Skip to content

Commit 3205c96

Browse files
3nids3nids
authored
Merge pull request #6275 from 3nids/messagelevel
unite QgsMessageLog::Level and QgsMessageBar::MessageLevel in Qgis::MessageLevel
2 parents 8f2c857 + 3dc3d9d commit 3205c96

File tree

142 files changed

+610
-603
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+610
-603
lines changed

‎doc/api_break.dox

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1605,9 +1605,16 @@ QgsMarkerSymbolLayer {#qgis_api_break_3_0_QgsMarkerSymbolLayer}
16051605
- bounds() is now pure virtual and must be implemented in all subclasses.
16061606

16071607

1608+
QgsMessageBar {#qgis_api_break_3_0_QgsMessageBar}
1609+
---------------------------
1610+
1611+
- MessageLevel has been removed. Use Qgis::MessageLevel instead
1612+
1613+
16081614
QgsMessageLog {#qgis_api_break_3_0_QgsMessageLog}
16091615
---------------------------
16101616

1617+
- MessageLevel has been removed. Use Qgis::MessageLevel instead
16111618
- This class is no longer a singleton and instance() has been removed. Instead use QgsApplication::messageLog() to access an application-wide log.
16121619

16131620
QgsMessageLogViewer {#qgis_api_break_3_0_QgsMessageLogViewer}

‎external/libdxfrw/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
INCLUDE_DIRECTORIES(
2-
${CMAKE_SOURCE_DIR}/src/core
3-
${CMAKE_BINARY_DIR}/src/core
2+
${CMAKE_SOURCE_DIR}/src/core
3+
${CMAKE_SOURCE_DIR}/src/core/geometry
4+
5+
${CMAKE_BINARY_DIR}/src/core
6+
${CMAKE_BINARY_DIR}/src/core/geometry
7+
48
${Qt5Core_INCLUDE_DIRS}
59
)
610

‎python/console/console_editor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from qgis.PyQt.QtGui import QFont, QFontMetrics, QColor, QKeySequence, QCursor, QFontDatabase
2323
from qgis.PyQt.QtWidgets import QShortcut, QMenu, QApplication, QWidget, QGridLayout, QSpacerItem, QSizePolicy, QFileDialog, QTabWidget, QTreeWidgetItem, QFrame, QLabel, QToolButton, QMessageBox
2424
from qgis.PyQt.Qsci import QsciScintilla, QsciLexerPython, QsciAPIs, QsciStyle
25-
from qgis.core import QgsApplication, QgsSettings
25+
from qgis.core import Qgis, QgsApplication, QgsSettings
2626
from qgis.gui import QgsMessageBar
2727
from qgis.utils import OverrideCursor
2828
import sys
@@ -1265,7 +1265,7 @@ def changeLastDirPath(self, tab):
12651265
self.settings.setValue("pythonConsole/lastDirPath", tabWidget.path)
12661266

12671267
def widgetMessageBar(self, iface, text, level, timed=True):
1268-
messageLevel = [QgsMessageBar.INFO, QgsMessageBar.WARNING, QgsMessageBar.CRITICAL]
1268+
messageLevel = [Qgis.Info, Qgis.Warning, Qgis.Critical]
12691269
if timed:
12701270
timeout = iface.messageTimeout()
12711271
else:

‎python/console/console_output.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from qgis.PyQt.QtGui import QColor, QFont, QKeySequence, QFontDatabase
2626
from qgis.PyQt.QtWidgets import QGridLayout, QSpacerItem, QSizePolicy, QShortcut, QMenu, QApplication
2727
from qgis.PyQt.Qsci import QsciScintilla, QsciLexerPython
28-
from qgis.core import QgsApplication, QgsSettings
28+
from qgis.core import Qgis, QgsApplication, QgsSettings
2929
from qgis.gui import QgsMessageBar
3030
import sys
3131

@@ -293,4 +293,4 @@ def keyPressEvent(self, e):
293293

294294
def widgetMessageBar(self, iface, text):
295295
timeout = iface.messageTimeout()
296-
self.infoBar.pushMessage(text, QgsMessageBar.INFO, timeout)
296+
self.infoBar.pushMessage(text, Qgis.Info, timeout)

‎python/core/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ def referencedColumns(self, node):
139139
msg = QCoreApplication.translate("UserExpressions",
140140
"The user expression {0} already exists and could not be unregistered.").format(
141141
name)
142-
QgsMessageLog.logMessage(msg + "\n", msgtitle, QgsMessageLog.WARNING)
142+
QgsMessageLog.logMessage(msg + "\n", msgtitle, Qgis.Warning)
143143
return None
144144

145145
function.__name__ = name

‎python/core/qgis.sip.in

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,15 @@ The Qgis class provides global constants for use throughout the application.
3535
static const char *QGIS_DEV_VERSION;
3636

3737

38+
enum MessageLevel
39+
{
40+
Info,
41+
Warning,
42+
Critical,
43+
Success,
44+
None
45+
};
46+
3847
enum DataType
3948
{
4049
UnknownDataType,

‎python/core/qgsmessagelog.sip.in

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,27 +29,18 @@ QgsMessageLog is not usually directly created, but rather accessed through
2929
%End
3030
public:
3131

32-
enum MessageLevel
33-
{
34-
ALL,
35-
INFO,
36-
WARNING,
37-
CRITICAL,
38-
NONE
39-
};
40-
4132
QgsMessageLog();
4233
%Docstring
4334
Constructor for QgsMessageLog.
4435
%End
4536

46-
static void logMessage( const QString &message, const QString &tag = QString(), MessageLevel level = QgsMessageLog::WARNING );
37+
static void logMessage( const QString &message, const QString &tag = QString(), Qgis::MessageLevel level = Qgis::Warning );
4738
%Docstring
4839
add a message to the instance (and create it if necessary)
4940
%End
5041

5142
signals:
52-
void messageReceived( const QString &message, const QString &tag, QgsMessageLog::MessageLevel level );
43+
void messageReceived( const QString &message, const QString &tag, Qgis::MessageLevel level );
5344

5445
void messageReceived( bool received );
5546

@@ -71,7 +62,7 @@ be the right choice for apps without GUI.
7162
QgsMessageLogConsole();
7263

7364
public slots:
74-
void logMessage( const QString &message, const QString &tag, QgsMessageLog::MessageLevel level );
65+
void logMessage( const QString &message, const QString &tag, Qgis::MessageLevel level );
7566
};
7667

7768
/************************************************************************

‎python/gui/qgsmapcanvas.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ Emitted when the canvas has been assigned a different map theme.
930930
.. versionadded:: 3.0
931931
%End
932932

933-
void messageEmitted( const QString &title, const QString &message, QgsMessageBar::MessageLevel = QgsMessageBar::INFO );
933+
void messageEmitted( const QString &title, const QString &message, Qgis::MessageLevel = Qgis::Info );
934934
%Docstring
935935
emit a message (usually to be displayed in a message bar)
936936
%End

‎python/gui/qgsmaptool.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ The values is calculated from searchRadiusMM().
187187
%End
188188

189189
signals:
190-
void messageEmitted( const QString &message, QgsMessageBar::MessageLevel = QgsMessageBar::INFO );
190+
void messageEmitted( const QString &message, Qgis::MessageLevel = Qgis::Info );
191191
%Docstring
192192
emit a message
193193
%End

‎python/gui/qgsmessagebar.sip.in

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ A bar for displaying non-blocking messages to the user.
2121
#include "qgsmessagebar.h"
2222
%End
2323
public:
24-
enum MessageLevel
25-
{
26-
INFO,
27-
WARNING,
28-
CRITICAL,
29-
SUCCESS
30-
};
3124

3225
QgsMessageBar( QWidget *parent /TransferThis/ = 0 );
3326
%Docstring
@@ -43,13 +36,13 @@ The message bar will take ownership of the item.
4336
:param item: Item to display
4437
%End
4538

46-
QgsMessageBarItem *pushWidget( QWidget *widget /Transfer/, MessageLevel level = INFO, int duration = 0 );
39+
QgsMessageBarItem *pushWidget( QWidget *widget /Transfer/, Qgis::MessageLevel level = Qgis::Info, int duration = 0 );
4740
%Docstring
4841
Display a widget as a message on the bar after hiding the currently visible one
4942
and putting it in a stack.
5043

5144
:param widget: message widget to display
52-
:param level: is QgsMessageBar.INFO, WARNING, CRITICAL or SUCCESS
45+
:param level: is Qgis.Info, Warning, Critical or Success
5346
:param duration: timeout duration of message in seconds, 0 value indicates no timeout
5447
%End
5548

@@ -76,11 +69,11 @@ make out a widget containing title and message to be displayed on the bar
7669
make out a widget containing title and message to be displayed on the bar
7770
%End
7871

79-
void pushMessage( const QString &text, MessageLevel level = INFO, int duration = 5 );
72+
void pushMessage( const QString &text, Qgis::MessageLevel level = Qgis::Info, int duration = 5 );
8073
%Docstring
8174
convenience method for pushing a message to the bar
8275
%End
83-
void pushMessage( const QString &title, const QString &text, MessageLevel level = INFO, int duration = 5 );
76+
void pushMessage( const QString &title, const QString &text, Qgis::MessageLevel level = Qgis::Info, int duration = 5 );
8477
%Docstring
8578
convenience method for pushing a message with title to the bar
8679
%End

‎python/gui/qgsmessagebaritem.sip.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ class QgsMessageBarItem : QWidget
1717
#include "qgsmessagebaritem.h"
1818
%End
1919
public:
20-
QgsMessageBarItem( const QString &text, QgsMessageBar::MessageLevel level = QgsMessageBar::INFO, int duration = 0, QWidget *parent /TransferThis/ = 0 );
20+
QgsMessageBarItem( const QString &text, Qgis::MessageLevel level = Qgis::Info, int duration = 0, QWidget *parent /TransferThis/ = 0 );
2121
%Docstring
2222
make out a widget containing a message to be displayed on the bar
2323
%End
2424

25-
QgsMessageBarItem( const QString &title, const QString &text, QgsMessageBar::MessageLevel level = QgsMessageBar::INFO, int duration = 0, QWidget *parent /TransferThis/ = 0 );
25+
QgsMessageBarItem( const QString &title, const QString &text, Qgis::MessageLevel level = Qgis::Info, int duration = 0, QWidget *parent /TransferThis/ = 0 );
2626
%Docstring
2727
make out a widget containing title and message to be displayed on the bar
2828
%End
2929

30-
QgsMessageBarItem( const QString &title, const QString &text, QWidget *widget, QgsMessageBar::MessageLevel level = QgsMessageBar::INFO, int duration = 0, QWidget *parent /TransferThis/ = 0 );
30+
QgsMessageBarItem( const QString &title, const QString &text, QWidget *widget, Qgis::MessageLevel level = Qgis::Info, int duration = 0, QWidget *parent /TransferThis/ = 0 );
3131
%Docstring
3232
make out a widget containing title, message and widget to be displayed on the bar
3333
%End
3434

35-
QgsMessageBarItem( QWidget *widget, QgsMessageBar::MessageLevel level = QgsMessageBar::INFO, int duration = 0, QWidget *parent /TransferThis/ = 0 );
35+
QgsMessageBarItem( QWidget *widget, Qgis::MessageLevel level = Qgis::Info, int duration = 0, QWidget *parent /TransferThis/ = 0 );
3636
%Docstring
3737
make out a widget containing a widget to be displayed on the bar
3838
%End
@@ -51,9 +51,9 @@ Returns the text for the message.
5151
Returns the title for the message.
5252
%End
5353

54-
QgsMessageBarItem *setLevel( QgsMessageBar::MessageLevel level );
54+
QgsMessageBarItem *setLevel( Qgis::MessageLevel level );
5555

56-
QgsMessageBar::MessageLevel level() const;
56+
Qgis::MessageLevel level() const;
5757
%Docstring
5858
Returns the message level for the message.
5959
%End

‎python/gui/qgsmessagelogviewer.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ QgsApplication.messageLog() instance.
2929

3030
public slots:
3131

32-
void logMessage( const QString &message, const QString &tag, QgsMessageLog::MessageLevel level );
32+
void logMessage( const QString &message, const QString &tag, Qgis::MessageLevel level );
3333
%Docstring
3434
Logs a ``message`` to the viewer.
3535
%End

‎python/gui/qgspluginmanagerinterface.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ add repository to the repository listWidget
5656
show the Plugin Manager window and optionally open tab tabIndex
5757
%End
5858

59-
virtual void pushMessage( const QString &text, QgsMessageBar::MessageLevel level = QgsMessageBar::INFO, int duration = -1 ) = 0;
59+
virtual void pushMessage( const QString &text, Qgis::MessageLevel level = Qgis::Info, int duration = -1 ) = 0;
6060
%Docstring
6161
show the given message in the Plugin Manager internal message bar
6262
%End

‎python/plugins/db_manager/db_manager.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from qgis.PyQt.QtGui import QIcon, QKeySequence
3030

3131
from qgis.gui import QgsMessageBar
32-
from qgis.core import QgsSettings, QgsMapLayer
32+
from qgis.core import Qgis, QgsSettings, QgsMapLayer
3333
from qgis.utils import OverrideCursor
3434

3535
from .info_viewer import InfoViewer
@@ -146,7 +146,7 @@ def importActionSlot(self):
146146
db = self.tree.currentDatabase()
147147
if db is None:
148148
self.infoBar.pushMessage(self.tr("No database selected or you are not connected to it."),
149-
QgsMessageBar.INFO, self.iface.messageTimeout())
149+
Qgis.Info, self.iface.messageTimeout())
150150
return
151151

152152
outUri = db.uri()
@@ -162,15 +162,15 @@ def importActionSlot(self):
162162
def exportActionSlot(self):
163163
table = self.tree.currentTable()
164164
if table is None:
165-
self.infoBar.pushMessage(self.tr("Select the table you want export to file."), QgsMessageBar.INFO,
165+
self.infoBar.pushMessage(self.tr("Select the table you want export to file."), Qgis.Info,
166166
self.iface.messageTimeout())
167167
return
168168

169169
inLayer = table.toMapLayer()
170170
if inLayer.type() != QgsMapLayer.VectorLayer:
171171
self.infoBar.pushMessage(
172172
self.tr("Select a vector or a tabular layer you want export."),
173-
QgsMessageBar.WARNING, self.iface.messageTimeout())
173+
Qgis.Warning, self.iface.messageTimeout())
174174
return
175175

176176
from .dlg_export_vector import DlgExportVector
@@ -184,7 +184,7 @@ def runSqlWindow(self):
184184
db = self.tree.currentDatabase()
185185
if db is None:
186186
self.infoBar.pushMessage(self.tr("No database selected or you are not connected to it."),
187-
QgsMessageBar.INFO, self.iface.messageTimeout())
187+
Qgis.Info, self.iface.messageTimeout())
188188
# force displaying of the message, it appears on the first tab (i.e. Info)
189189
self.tabs.setCurrentIndex(0)
190190
return

‎python/plugins/db_manager/db_plugins/gpkg/plugin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from qgis.PyQt.QtCore import Qt, QFileInfo
2828
from qgis.PyQt.QtGui import QIcon
2929
from qgis.PyQt.QtWidgets import QApplication, QAction, QFileDialog
30-
from qgis.core import QgsDataSourceUri, QgsSettings
30+
from qgis.core import Qgis, QgsDataSourceUri, QgsSettings
3131
from qgis.gui import QgsMessageBar
3232

3333
from ..plugin import DBPlugin, Database, Table, VectorTable, RasterTable, TableField, TableIndex, TableTrigger, \
@@ -143,7 +143,7 @@ def runVacuumActionSlot(self, item, action, parent):
143143
try:
144144
if not isinstance(item, (DBPlugin, Table)) or item.database() is None:
145145
parent.infoBar.pushMessage(self.tr("No database selected or you are not connected to it."),
146-
QgsMessageBar.INFO, parent.iface.messageTimeout())
146+
Qgis.Info, parent.iface.messageTimeout())
147147
return
148148
finally:
149149
QApplication.setOverrideCursor(Qt.WaitCursor)

‎python/plugins/db_manager/db_plugins/plugin.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from qgis.PyQt.QtGui import QKeySequence, QIcon
2828

2929
from qgis.gui import QgsMessageBar
30-
from qgis.core import QgsSettings
30+
from qgis.core import Qgis, QgsSettings
3131
from ..db_plugins import createDbPlugin
3232

3333

@@ -357,7 +357,7 @@ def deleteActionSlot(self, item, action, parent):
357357
else:
358358
QApplication.restoreOverrideCursor()
359359
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Cannot delete the selected item."),
360-
QgsMessageBar.INFO, parent.iface.messageTimeout())
360+
Qgis.Info, parent.iface.messageTimeout())
361361
QApplication.setOverrideCursor(Qt.WaitCursor)
362362

363363
def createSchemaActionSlot(self, item, action, parent):
@@ -366,7 +366,7 @@ def createSchemaActionSlot(self, item, action, parent):
366366
if not isinstance(item, (DBPlugin, Schema, Table)) or item.database() is None:
367367
parent.infoBar.pushMessage(
368368
QApplication.translate("DBManagerPlugin", "No database selected or you are not connected to it."),
369-
QgsMessageBar.INFO, parent.iface.messageTimeout())
369+
Qgis.Info, parent.iface.messageTimeout())
370370
return
371371
(schema, ok) = QInputDialog.getText(parent, QApplication.translate("DBManagerPlugin", "New schema"),
372372
QApplication.translate("DBManagerPlugin", "Enter new schema name"))
@@ -383,7 +383,7 @@ def deleteSchemaActionSlot(self, item, action, parent):
383383
if not isinstance(item, Schema):
384384
parent.infoBar.pushMessage(
385385
QApplication.translate("DBManagerPlugin", "Select an empty schema for deletion."),
386-
QgsMessageBar.INFO, parent.iface.messageTimeout())
386+
Qgis.Info, parent.iface.messageTimeout())
387387
return
388388
res = QMessageBox.question(parent, QApplication.translate("DBManagerPlugin", "hey!"),
389389
QApplication.translate("DBManagerPlugin",
@@ -414,7 +414,7 @@ def createTableActionSlot(self, item, action, parent):
414414
if not hasattr(item, 'database') or item.database() is None:
415415
parent.infoBar.pushMessage(
416416
QApplication.translate("DBManagerPlugin", "No database selected or you are not connected to it."),
417-
QgsMessageBar.INFO, parent.iface.messageTimeout())
417+
Qgis.Info, parent.iface.messageTimeout())
418418
return
419419
from ..dlg_create_table import DlgCreateTable
420420

@@ -426,7 +426,7 @@ def editTableActionSlot(self, item, action, parent):
426426
try:
427427
if not isinstance(item, Table) or item.isView:
428428
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Select a table to edit."),
429-
QgsMessageBar.INFO, parent.iface.messageTimeout())
429+
Qgis.Info, parent.iface.messageTimeout())
430430
return
431431
from ..dlg_table_properties import DlgTableProperties
432432

@@ -440,7 +440,7 @@ def deleteTableActionSlot(self, item, action, parent):
440440
if not isinstance(item, Table):
441441
parent.infoBar.pushMessage(
442442
QApplication.translate("DBManagerPlugin", "Select a table/view for deletion."),
443-
QgsMessageBar.INFO, parent.iface.messageTimeout())
443+
Qgis.Info, parent.iface.messageTimeout())
444444
return
445445
res = QMessageBox.question(parent, QApplication.translate("DBManagerPlugin", "hey!"),
446446
QApplication.translate("DBManagerPlugin",
@@ -458,7 +458,7 @@ def emptyTableActionSlot(self, item, action, parent):
458458
try:
459459
if not isinstance(item, Table) or item.isView:
460460
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Select a table to empty it."),
461-
QgsMessageBar.INFO, parent.iface.messageTimeout())
461+
Qgis.Info, parent.iface.messageTimeout())
462462
return
463463
res = QMessageBox.question(parent, QApplication.translate("DBManagerPlugin", "hey!"),
464464
QApplication.translate("DBManagerPlugin",
@@ -485,7 +485,7 @@ def moveTableToSchemaActionSlot(self, item, action, parent, new_schema):
485485
try:
486486
if not isinstance(item, Table):
487487
parent.infoBar.pushMessage(QApplication.translate("DBManagerPlugin", "Select a table/view."),
488-
QgsMessageBar.INFO, parent.iface.messageTimeout())
488+
Qgis.Info, parent.iface.messageTimeout())
489489
return
490490
finally:
491491
QApplication.setOverrideCursor(Qt.WaitCursor)

0 commit comments

Comments
 (0)