Skip to content

Commit

Permalink
Merge pull request #4 from thorpelawrence/reicon
Browse files Browse the repository at this point in the history
Change project icon
  • Loading branch information
thorpelawrence authored Jun 3, 2017
2 parents b927d2d + 4408391 commit 042c870
Show file tree
Hide file tree
Showing 11 changed files with 401 additions and 6 deletions.
2 changes: 1 addition & 1 deletion mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</property>
<property name="windowIcon">
<iconset resource="resources.qrc">
<normaloff>:/spectrum_sorted.ico</normaloff>:/spectrum_sorted.ico</iconset>
<normaloff>:/resources/pixsrt.png</normaloff>:/resources/pixsrt.png</iconset>
</property>
<widget class="QWidget" name="centralWidget">
<layout class="QVBoxLayout" name="verticalLayout">
Expand Down
6 changes: 3 additions & 3 deletions pixsrt.pro
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ DEFINES += TAG=\\\"$$TAG\\\"

VERSION = $$TAG

win32:RC_ICONS += "spectrum_sorted.ico"
win32:RC_ICONS += "resources/pixsrt.ico"

# The following define makes your compiler emit warnings if you use
# any feature of Qt which as been marked as deprecated (the exact warnings
Expand Down Expand Up @@ -61,9 +61,9 @@ unix {

target.path = $$PREFIX/bin

shortcutfiles.files = pixsrt.desktop
shortcutfiles.files = resources/pixsrt.desktop
shortcutfiles.path = $$PREFIX/share/applications/
data.files += spectrum_sorted.png
data.files += resources/pixsrt.png
data.path = $$PREFIX/share/pixmaps

INSTALLS += shortcutfiles
Expand Down
2 changes: 1 addition & 1 deletion resources.qrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<RCC>
<qresource prefix="/">
<file>spectrum_sorted.ico</file>
<file>resources/pixsrt.png</file>
</qresource>
</RCC>
2 changes: 1 addition & 1 deletion pixsrt.desktop → resources/pixsrt.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Encoding=UTF-8
Name=Pixsrt
Comment=Pixel sorter
Exec=pixsrt
Icon=spectrum_sorted
Icon=pixsrt
Terminal=False
Binary file added resources/pixsrt.ico
Binary file not shown.
Binary file added resources/pixsrt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
340 changes: 340 additions & 0 deletions resources/pixsrt.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 042c870

Please sign in to comment.