Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[python console] update toolbar icon and action position
(harmonize position with the processing script editor)
  • Loading branch information
nirvn committed May 20, 2018
1 parent 2ad74b9 commit b0e93a1
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 deletions.
10 changes: 5 additions & 5 deletions python/console/console.py
Expand Up @@ -193,7 +193,7 @@ def __init__(self, parent=None):
self.saveFileButton = QAction(self)
self.saveFileButton.setCheckable(False)
self.saveFileButton.setEnabled(False)
self.saveFileButton.setIcon(QgsApplication.getThemeIcon("console/iconSaveConsole.svg"))
self.saveFileButton.setIcon(QgsApplication.getThemeIcon("mActionFileSave.svg"))
self.saveFileButton.setMenuRole(QAction.PreferencesRole)
self.saveFileButton.setIconVisibleInMenu(True)
self.saveFileButton.setToolTip(saveFileBt)
Expand All @@ -203,7 +203,7 @@ def __init__(self, parent=None):
self.saveAsFileButton = QAction(self)
self.saveAsFileButton.setCheckable(False)
self.saveAsFileButton.setEnabled(True)
self.saveAsFileButton.setIcon(QgsApplication.getThemeIcon("console/iconSaveAsConsole.svg"))
self.saveAsFileButton.setIcon(QgsApplication.getThemeIcon("mActionFileSaveAs.svg"))
self.saveAsFileButton.setMenuRole(QAction.PreferencesRole)
self.saveAsFileButton.setIconVisibleInMenu(True)
self.saveAsFileButton.setToolTip(saveAsFileBt)
Expand Down Expand Up @@ -243,7 +243,7 @@ def __init__(self, parent=None):
self.runScriptEditorButton = QAction(self)
self.runScriptEditorButton.setCheckable(False)
self.runScriptEditorButton.setEnabled(True)
self.runScriptEditorButton.setIcon(QgsApplication.getThemeIcon("console/iconRunScriptConsole.svg"))
self.runScriptEditorButton.setIcon(QgsApplication.getThemeIcon("mActionStart.svg"))
self.runScriptEditorButton.setMenuRole(QAction.PreferencesRole)
self.runScriptEditorButton.setIconVisibleInMenu(True)
self.runScriptEditorButton.setToolTip(runScriptEditorBt)
Expand Down Expand Up @@ -375,12 +375,12 @@ def __init__(self, parent=None):
self.toolBarEditor.addSeparator()
self.toolBarEditor.addAction(self.runScriptEditorButton)
self.toolBarEditor.addSeparator()
self.toolBarEditor.addAction(self.findTextButton)
self.toolBarEditor.addSeparator()
self.toolBarEditor.addAction(self.cutEditorButton)
self.toolBarEditor.addAction(self.copyEditorButton)
self.toolBarEditor.addAction(self.pasteEditorButton)
self.toolBarEditor.addSeparator()
self.toolBarEditor.addAction(self.findTextButton)
self.toolBarEditor.addSeparator()
self.toolBarEditor.addAction(self.commentEditorButton)
self.toolBarEditor.addAction(self.uncommentEditorButton)
self.toolBarEditor.addSeparator()
Expand Down
16 changes: 9 additions & 7 deletions python/console/console_editor.py
Expand Up @@ -283,7 +283,9 @@ def get_end_pos(self):
def contextMenuEvent(self, e):
menu = QMenu(self)
iconRun = QgsApplication.getThemeIcon("console/mIconRunConsole.svg")
iconRunScript = QgsApplication.getThemeIcon("console/iconRunScriptConsole.svg")
iconRunScript = QgsApplication.getThemeIcon("mActionStart.svg")
iconUndo = QgsApplication.getThemeIcon("mActionUndo.svg")
iconRedo = QgsApplication.getThemeIcon("mActionRedo.svg")
iconCodePad = QgsApplication.getThemeIcon("console/iconCodepadConsole.svg")
iconCommentEditor = QgsApplication.getThemeIcon("console/iconCommentEditorConsole.svg")
iconUncommentEditor = QgsApplication.getThemeIcon("console/iconUncommentEditorConsole.svg")
Expand All @@ -308,12 +310,12 @@ def contextMenuEvent(self, e):
QCoreApplication.translate("PythonConsole", "Run Script"),
self.runScriptCode, 'Shift+Ctrl+E')
menu.addSeparator()
undoAction = menu.addAction(
QCoreApplication.translate("PythonConsole", "Undo"),
self.undo, QKeySequence.Undo)
redoAction = menu.addAction(
QCoreApplication.translate("PythonConsole", "Redo"),
self.redo, 'Ctrl+Shift+Z')
undoAction = menu.addAction(iconUndo,
QCoreApplication.translate("PythonConsole", "Undo"),
self.undo, QKeySequence.Undo)
redoAction = menu.addAction(iconRedo,
QCoreApplication.translate("PythonConsole", "Redo"),
self.redo, 'Ctrl+Shift+Z')
menu.addSeparator()
menu.addAction(iconFind,
QCoreApplication.translate("PythonConsole", "Find Text"),
Expand Down

0 comments on commit b0e93a1

Please sign in to comment.