Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Use svg version of python console icon, courtesy of @pkinglinz (#6016)
  • Loading branch information
nyalldawson authored and nirvn committed Jan 9, 2018
1 parent 0d8c5f4 commit 0f79bfb
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion images/images.qrc
Expand Up @@ -85,7 +85,7 @@
<file>themes/default/console/iconOpenConsole.png</file>
<file>themes/default/console/iconQtCoreConsole.png</file>
<file>themes/default/console/iconQtGuiConsole.png</file>
<file>themes/default/console/iconRunConsole.png</file>
<file>themes/default/console/mIconRunConsole.svg</file>
<file>themes/default/console/iconSaveConsole.png</file>
<file>themes/default/console/iconSettingsConsole.png</file>
<file>themes/default/console/iconProcessingConsole.png</file>
Expand Down
Binary file removed images/themes/default/console/iconRunConsole.png
Binary file not shown.
1 change: 1 addition & 0 deletions images/themes/default/console/mIconRunConsole.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion python/console/console.py
Expand Up @@ -326,7 +326,7 @@ def __init__(self, parent=None):
self.runButton = QAction(self)
self.runButton.setCheckable(False)
self.runButton.setEnabled(True)
self.runButton.setIcon(QgsApplication.getThemeIcon("console/iconRunConsole.png"))
self.runButton.setIcon(QgsApplication.getThemeIcon("console/mIconRunConsole.svg"))
self.runButton.setMenuRole(QAction.PreferencesRole)
self.runButton.setIconVisibleInMenu(True)
self.runButton.setToolTip(runBt)
Expand Down
2 changes: 1 addition & 1 deletion python/console/console_editor.py
Expand Up @@ -282,7 +282,7 @@ def get_end_pos(self):

def contextMenuEvent(self, e):
menu = QMenu(self)
iconRun = QgsApplication.getThemeIcon("console/iconRunConsole.png")
iconRun = QgsApplication.getThemeIcon("console/mIconRunConsole.svg")
iconRunScript = QgsApplication.getThemeIcon("console/iconRunScriptConsole.png")
iconCodePad = QgsApplication.getThemeIcon("console/iconCodepadConsole.png")
iconCommentEditor = QgsApplication.getThemeIcon("console/iconCommentEditorConsole.png")
Expand Down
2 changes: 1 addition & 1 deletion python/console/console_output.py
Expand Up @@ -203,7 +203,7 @@ def clearConsole(self):

def contextMenuEvent(self, e):
menu = QMenu(self)
iconRun = QgsApplication.getThemeIcon("console/iconRunConsole.png")
iconRun = QgsApplication.getThemeIcon("console/mIconRunConsole.svg")
iconClear = QgsApplication.getThemeIcon("console/iconClearConsole.png")
iconHideTool = QgsApplication.getThemeIcon("console/iconHideToolConsole.png")
iconSettings = QgsApplication.getThemeIcon("console/iconSettingsConsole.png")
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgisapp.cpp
Expand Up @@ -3024,7 +3024,7 @@ void QgisApp::setTheme( const QString &themeName )
mActionToggleFullScreen->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionToggleFullScreen.png" ) ) );
mActionProjectProperties->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionProjectProperties.png" ) ) );
mActionManagePlugins->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionShowPluginManager.svg" ) ) );
mActionShowPythonDialog->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "console/iconRunConsole.png" ) ) );
mActionShowPythonDialog->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "console/mIconRunConsole.svg" ) ) );
mActionCheckQgisVersion->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mIconSuccess.svg" ) ) );
mActionOptions->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionOptions.svg" ) ) );
mActionConfigureShortcuts->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionKeyboardShortcuts.svg" ) ) );
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgisapp.ui
Expand Up @@ -1827,7 +1827,7 @@ Ctrl (Cmd) increments by 15 deg.</string>
<action name="mActionShowPythonDialog">
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/console/iconRunConsole.png</normaloff>:/images/themes/default/console/iconRunConsole.png</iconset>
<normaloff>:/images/themes/default/console/mIconRunConsole.svg</normaloff>:/images/themes/default/console/mIconRunConsole.svg</iconset>
</property>
<property name="text">
<string>Python Console</string>
Expand Down

0 comments on commit 0f79bfb

Please sign in to comment.