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

[pyqgis-console] converts all newlines to "\n" in order to fix the "Enter selected command" from the editor

Browse Source 
- fixes background color for toolbar editor on Windows
- minor fixes
This commit is contained in:
Salvatore Larosa 2013-04-21 23:24:41 +02:00
parent 956e18d28f
commit 269a419b25
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/console/console.py
View File

@ -354,9 +354,16 @@ class PythonConsoleWidget(QWidget):
self.toolBar.addAction(self.optionsButton) self.toolBar.addAction(self.optionsButton)
self.toolBar.addAction(self.helpButton) self.toolBar.addAction(self.helpButton)
if sys.platform.startswith('win'):
bkgrcolor = ['170', '170', '170']
bordercl = ['125', '125', '125']
else:
bkgrcolor = ['200', '200', '200']
bordercl = ['155', '155', '155']
self.toolBarEditor = QToolBar() self.toolBarEditor = QToolBar()
self.toolBarEditor.setStyleSheet('QToolBar{background-color: rgb(200, 200, 200);\ self.toolBarEditor.setStyleSheet('QToolBar{background-color: rgb(%s, %s, %s' % tuple(bkgrcolor) + ');\
border-right: 1px solid rgb(155, 155, 155);}') border-right: 1px solid rgb(%s, %s, %s' % tuple(bordercl) + ');}')
self.toolBarEditor.setEnabled(False) self.toolBarEditor.setEnabled(False)
self.toolBarEditor.setFocusPolicy(Qt.NoFocus) self.toolBarEditor.setFocusPolicy(Qt.NoFocus)
self.toolBarEditor.setContextMenuPolicy(Qt.DefaultContextMenu) self.toolBarEditor.setContextMenuPolicy(Qt.DefaultContextMenu)
@ -604,6 +611,7 @@ class PythonConsoleWidget(QWidget):
self.tabEditorWidget.widgetMessageBar(iface, text) self.tabEditorWidget.widgetMessageBar(iface, text)
def updateTabListScript(self, script, action=None): def updateTabListScript(self, script, action=None):
if script != '':
settings = QSettings() settings = QSettings()
if script == 'empty': if script == 'empty':
self.tabListScript = [] self.tabListScript = []

3
python/console/console_editor.py
View File

@ -477,7 +477,7 @@ class EditorTab(QWidget):
self.newEditor.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded) self.newEditor.setHorizontalScrollBarPolicy(Qt.ScrollBarAsNeeded)
self.newEditor.modificationChanged.connect(self.modified) self.newEditor.modificationChanged.connect(self.modified)
if filename: if filename:
self.newEditor.setText(open(filename, "r").read()) self.newEditor.setText(open(filename, "rt").read())
self.newEditor.setModified(False) self.newEditor.setModified(False)
self.path = filename self.path = filename
@ -763,7 +763,6 @@ class EditorTabWidget(QTabWidget):
#print sys.modules[module] #print sys.modules[module]
if pathFile not in sys.path: if pathFile not in sys.path:
sys.path.append(pathFile) sys.path.append(pathFile)
try: try:
reload(pyclbr) reload(pyclbr)
dictObject = {} dictObject = {}