Skip to content

Commit a10c890

Browse files
committedMar 4, 2017
More QgsSettings updates:
* revives WMS * QgsSettings::clear() added * section added to QgsSettings::contains() * type parameter added to sip binding of QgsSettings.value() * TODO: customization & evis
1 parent 96c31a1 commit a10c890

File tree

371 files changed

+1697
-1677
lines changed

Some content is hidden

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

371 files changed

+1697
-1677
lines changed
 

‎python/console/console.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from builtins import range
2323
import os
2424

25-
from qgis.PyQt.QtCore import Qt, QTimer, QSettings, QCoreApplication, QSize, QByteArray, QFileInfo, QUrl, QDir
25+
from qgis.PyQt.QtCore import Qt, QTimer, QCoreApplication, QSize, QByteArray, QFileInfo, QUrl, QDir
2626
from qgis.PyQt.QtWidgets import QDockWidget, QToolBar, QToolButton, QWidget, QSplitter, QTreeWidget, QAction, QFileDialog, QCheckBox, QSizePolicy, QMenu, QGridLayout, QApplication, QShortcut
2727
from qgis.PyQt.QtGui import QDesktopServices, QKeySequence
2828
from qgis.PyQt.QtWidgets import QVBoxLayout
@@ -31,7 +31,7 @@
3131
from .console_output import ShellOutputScintilla
3232
from .console_editor import EditorTabWidget
3333
from .console_settings import optionsDialog
34-
from qgis.core import QgsApplication, QgsContextHelp
34+
from qgis.core import QgsApplication, QgsContextHelp, QgsSettings
3535
from qgis.gui import QgsFilterLineEdit
3636
from functools import partial
3737

@@ -55,8 +55,9 @@ def show_console():
5555
# set focus to the console so the user can start typing
5656
if _console.isVisible():
5757
_console.activate()
58-
## Shows help on first launch of the console
59-
settings = QSettings()
58+
59+
# Shows help on first launch of the console
60+
settings = QgsSettings()
6061
if settings.value('pythonConsole/contextHelpOnFirstLaunch', True, type=bool):
6162
QgsContextHelp.run("PythonConsole")
6263
settings.setValue('pythonConsole/contextHelpOnFirstLaunch', False)
@@ -106,7 +107,7 @@ def __init__(self, parent=None):
106107
QWidget.__init__(self, parent)
107108
self.setWindowTitle(QCoreApplication.translate("PythonConsole", "Python Console"))
108109

109-
self.settings = QSettings()
110+
self.settings = QgsSettings()
110111

111112
self.shell = ShellScintilla(self)
112113
self.setFocusProxy(self.shell)

‎python/console/console_editor.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
from __future__ import print_function
2222
from builtins import str
2323
from builtins import range
24-
from qgis.PyQt.QtCore import Qt, QObject, QEvent, QSettings, QCoreApplication, QFileInfo, QSize
24+
from qgis.PyQt.QtCore import Qt, QObject, QEvent, QCoreApplication, QFileInfo, QSize
2525
from qgis.PyQt.QtGui import QFont, QFontMetrics, QColor, QKeySequence, QCursor
2626
from qgis.PyQt.QtWidgets import QShortcut, QMenu, QApplication, QWidget, QGridLayout, QSpacerItem, QSizePolicy, QFileDialog, QTabWidget, QTreeWidgetItem, QFrame, QLabel, QToolButton, QMessageBox
2727
from qgis.PyQt.Qsci import QsciScintilla, QsciLexerPython, QsciAPIs, QsciStyle
28-
from qgis.core import QgsApplication
28+
from qgis.core import QgsApplication, QgsSettings
2929
from qgis.gui import QgsMessageBar
3030
import sys
3131
import os
@@ -88,10 +88,10 @@ def __init__(self, parent=None):
8888
self.opening = ['(', '{', '[', "'", '"']
8989
self.closing = [')', '}', ']', "'", '"']
9090

91-
## List of marker line to be deleted from check syntax
91+
# List of marker line to be deleted from check syntax
9292
self.bufferMarkerLine = []
9393

94-
self.settings = QSettings()
94+
self.settings = QgsSettings()
9595

9696
# Enable non-ascii chars for editor
9797
self.setUtf8(True)
@@ -869,7 +869,7 @@ def __init__(self, parent):
869869
QTabWidget.__init__(self, parent=None)
870870
self.parent = parent
871871

872-
self.settings = QSettings()
872+
self.settings = QgsSettings()
873873

874874
self.idx = -1
875875
# Layout for top frame (restore tabs)

0 commit comments

Comments
 (0)