Skip to content

Commit

Permalink
remove pngs which are available as svg
Browse files Browse the repository at this point in the history
(cherry picked from commit 1cbb842)
  • Loading branch information
jef-n committed Sep 11, 2016
1 parent 648b779 commit 6b8130d
Show file tree
Hide file tree
Showing 77 changed files with 289 additions and 235 deletions.
3 changes: 1 addition & 2 deletions i18n/qgis_de.ts
Expand Up @@ -62753,8 +62753,7 @@ Ausführliche Fehlerinformation:
<message>
<location filename="../src/ui/qgsnewspatialitelayerdialogbase.ui" line="252"/>
<source>Create an autoincrementing primary key</source>
<translation>automatisch inkrementierenden
Primärschlüssel erzeugen</translation>
<translation>automatisch inkrementierenden Primärschlüssel erzeugen</translation>
</message>
<message>
<location filename="../src/ui/qgsnewspatialitelayerdialogbase.ui" line="262"/>
Expand Down
105 changes: 5 additions & 100 deletions images/images.qrc

Large diffs are not rendered by default.

Binary file removed images/themes/default/extents.png
Binary file not shown.
Binary file removed images/themes/default/histogram.png
Binary file not shown.
Binary file removed images/themes/default/mActionAddBasicShape.png
Binary file not shown.
Binary file removed images/themes/default/mActionCalculateField.png
Binary file not shown.
Binary file removed images/themes/default/mActionCaptureLine.png
Binary file not shown.
Binary file removed images/themes/default/mActionDeleteAttribute.png
Binary file not shown.
Binary file removed images/themes/default/mActionFilter.png
Binary file not shown.
Binary file removed images/themes/default/mActionNewAttribute.png
Binary file not shown.
Binary file removed images/themes/default/mActionRotateLabel.png
Binary file not shown.
Binary file removed images/themes/default/mActionToggleEditing.png
Binary file not shown.
Binary file removed images/themes/default/mIconClear.png
Binary file not shown.
Binary file removed images/themes/default/mIconClose.png
Binary file not shown.
Binary file removed images/themes/default/mIconWarn.png
Binary file not shown.
Binary file removed images/themes/default/symbologyAdd.png
Binary file not shown.
Binary file removed images/themes/default/symbologyDown.png
Binary file not shown.
Binary file removed images/themes/default/symbologyRemove.png
Binary file not shown.
Binary file removed images/themes/default/transformed.png
Binary file not shown.
155 changes: 155 additions & 0 deletions images/themes/default/transformed.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions python/console/console.py
Expand Up @@ -212,7 +212,7 @@ def __init__(self, parent=None):
self.cutEditorButton = QAction(self)
self.cutEditorButton.setCheckable(False)
self.cutEditorButton.setEnabled(True)
self.cutEditorButton.setIcon(QgsApplication.getThemeIcon("mActionEditCut.png"))
self.cutEditorButton.setIcon(QgsApplication.getThemeIcon("mActionEditCut.svg"))
self.cutEditorButton.setMenuRole(QAction.PreferencesRole)
self.cutEditorButton.setIconVisibleInMenu(True)
self.cutEditorButton.setToolTip(cutEditorBt)
Expand All @@ -222,7 +222,7 @@ def __init__(self, parent=None):
self.copyEditorButton = QAction(self)
self.copyEditorButton.setCheckable(False)
self.copyEditorButton.setEnabled(True)
self.copyEditorButton.setIcon(QgsApplication.getThemeIcon("mActionEditCopy.png"))
self.copyEditorButton.setIcon(QgsApplication.getThemeIcon("mActionEditCopy.svg"))
self.copyEditorButton.setMenuRole(QAction.PreferencesRole)
self.copyEditorButton.setIconVisibleInMenu(True)
self.copyEditorButton.setToolTip(copyEditorBt)
Expand All @@ -232,7 +232,7 @@ def __init__(self, parent=None):
self.pasteEditorButton = QAction(self)
self.pasteEditorButton.setCheckable(False)
self.pasteEditorButton.setEnabled(True)
self.pasteEditorButton.setIcon(QgsApplication.getThemeIcon("mActionEditPaste.png"))
self.pasteEditorButton.setIcon(QgsApplication.getThemeIcon("mActionEditPaste.svg"))
self.pasteEditorButton.setMenuRole(QAction.PreferencesRole)
self.pasteEditorButton.setIconVisibleInMenu(True)
self.pasteEditorButton.setToolTip(pasteEditorBt)
Expand Down
8 changes: 4 additions & 4 deletions python/console/console_editor.py
Expand Up @@ -294,9 +294,9 @@ def contextMenuEvent(self, e):
iconFind = QgsApplication.getThemeIcon("console/iconSearchEditorConsole.png")
iconSyntaxCk = QgsApplication.getThemeIcon("console/iconSyntaxErrorConsole.png")
iconObjInsp = QgsApplication.getThemeIcon("console/iconClassBrowserConsole.png")
iconCut = QgsApplication.getThemeIcon("mActionEditCut.png")
iconCopy = QgsApplication.getThemeIcon("mActionEditCopy.png")
iconPaste = QgsApplication.getThemeIcon("mActionEditPaste.png")
iconCut = QgsApplication.getThemeIcon("mActionEditCut.svg")
iconCopy = QgsApplication.getThemeIcon("mActionEditCopy.svg")
iconPaste = QgsApplication.getThemeIcon("mActionEditPaste.svg")
menu.addAction(
QCoreApplication.translate("PythonConsole", "Hide Editor"),
self.hideEditor)
Expand Down Expand Up @@ -899,7 +899,7 @@ def __init__(self, parent):
toolTipClose = QCoreApplication.translate("PythonConsole",
"Close")
self.clButton.setToolTip(toolTipClose)
self.clButton.setIcon(QgsApplication.getThemeIcon("mIconClose.png"))
self.clButton.setIcon(QgsApplication.getThemeIcon("/mIconClose.svg"))
self.clButton.setIconSize(QSize(18, 18))
self.clButton.setCursor(Qt.PointingHandCursor)
self.clButton.setStyleSheet('QToolButton:hover{border: none } \
Expand Down

5 comments on commit 6b8130d

@nirvn
Copy link
Contributor

@nirvn nirvn commented on 6b8130d Sep 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jef-n thanks, that would have been on my to do list if I had one ;) next step is to vectorize the ones that don't have a svg version yet.

@nirvn
Copy link
Contributor

@nirvn nirvn commented on 6b8130d Sep 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jef-n , just saw the commit in master_2 too; for the record, reason why those were left behind in previous 2.x dev cycles was to avoid breaking plugins that would rely on the .png files.

@3nids
Copy link
Member

@3nids 3nids commented on 6b8130d Sep 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

would it be worth removing all PNGs that are not used in the code?

@nyalldawson
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd go one step further and remove the unused svgs too

@jef-n
Copy link
Member Author

@jef-n jef-n commented on 6b8130d Sep 12, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd leave that to whoever does the SVGs for the remaining PNGs ;)

Please sign in to comment.