Skip to content

Commit

Permalink
Use new GUI icons that fit the recent platform styles.
Browse files Browse the repository at this point in the history
Switched to a new flat color icon set on Windows/Mac and platform provided
icon themes (e.g. Breeze) on Linux with a fallback to the Papirus theme. All
the GUI icons are now SVG.
  • Loading branch information
tumic0 committed Oct 27, 2023
1 parent 6c50402 commit 043a27d
Show file tree
Hide file tree
Showing 112 changed files with 1,258 additions and 294 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ for translations.
GPXSee is licensed under GPL-3.0 (only). However, some 3rd party parts are using
different, GPL compatible, licenses:

* [Oxygen icons](icons/GUI) - LGPLv3
* [Icons8 Flat Color Icons](icons/GUI/FlatColor) - MIT
* [Papirus icons](icons/GUI/Papirus) - GPLv3
* [Mapbox Maki icons](icons/map/POI) - CC0
* [Map Icons Collection](icons/symbols) - CC BY SA 3.0
* [RTree implementation](src/common/rtree.h) - Public domain
Expand Down
10 changes: 8 additions & 2 deletions gpxsee.pro
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,8 @@ TRANSLATIONS = lang/gpxsee_en.ts \
lang/gpxsee_ko.ts

macx {
RESOURCES += theme-default.qrc

ICON = icons/app/gpxsee.icns
QMAKE_INFO_PLIST = pkg/mac/Info.plist
locale.path = Contents/Resources/translations
Expand All @@ -502,11 +504,12 @@ macx {
icons.files = $$files(icons/formats/*.icns)
lproj.path = Contents/Resources
lproj.files = $$files(pkg/mac/lproj/*)

QMAKE_BUNDLE_DATA += locale maps symbols icons crs lproj
}

win32 {
RESOURCES += theme-default.qrc

QMAKE_TARGET_DESCRIPTION = GPXSee
QMAKE_TARGET_COPYRIGHT = Copyright (c) 2023 Martin Tuma
RC_ICONS = icons/app/gpxsee.ico \
Expand Down Expand Up @@ -549,8 +552,9 @@ win32 {
}

unix:!macx:!android {
isEmpty(PREFIX):PREFIX = /usr/local
RESOURCES += theme-unix.qrc

isEmpty(PREFIX):PREFIX = /usr/local
maps.files = $$files(data/maps/*)
maps.path = $$PREFIX/share/gpxsee/maps
crs.files = $$files(data/CRS/*)
Expand All @@ -572,6 +576,8 @@ unix:!macx:!android {
}

android {
RESOURCES += theme-default.qrc

HEADERS += src/GUI/navigationwidget.h
SOURCES += src/GUI/navigationwidget.cpp

Expand Down
53 changes: 1 addition & 52 deletions gpxsee.qrc
Original file line number Diff line number Diff line change
@@ -1,58 +1,7 @@
<RCC>
<!-- GUI icons -->
<qresource prefix="/">
<file alias="gpxsee.png">icons/app/gpxsee.png</file>
<file alias="[email protected]">icons/app/[email protected]</file>
<file alias="dialog-close.png">icons/GUI/dialog-close.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="document-open.png">icons/GUI/document-open.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="document-print.png">icons/GUI/document-print.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="document-export.png">icons/GUI/document-export.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="flag.png">icons/GUI/flag.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="application-exit.png">icons/GUI/application-exit.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="applications-internet.png">icons/GUI/applications-internet.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="view-refresh.png">icons/GUI/view-refresh.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="arrow-left.png">icons/GUI/arrow-left.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="arrow-right.png">icons/GUI/arrow-right.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="arrow-left-double.png">icons/GUI/arrow-left-double.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="arrow-right-double.png">icons/GUI/arrow-right-double.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="view-fullscreen.png">icons/GUI/view-fullscreen.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="office-chart-line.png">icons/GUI/office-chart-line.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="format-stroke-color.png">icons/GUI/format-stroke-color.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="flag_32.png">icons/GUI/flag_32.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="preferences-system.png">icons/GUI/preferences-system.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="document-print_32.png">icons/GUI/document-print_32.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="view-filter.png">icons/GUI/view-filter.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="applications-internet_32.png">icons/GUI/applications-internet_32.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="view-grid.png">icons/GUI/view-grid.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="document-decrypt.png">icons/GUI/document-decrypt.png</file>
<file alias="[email protected]">icons/GUI/document-decrypt.png</file>
<file alias="document-encrypt.png">icons/GUI/document-encrypt.png</file>
<file alias="[email protected]">icons/GUI/document-encrypt.png</file>
<file alias="transform-move.png">icons/GUI/transform-move.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="transform-move_32.png">icons/GUI/transform-move_32.png</file>
<file alias="[email protected]">icons/GUI/[email protected]</file>
<file alias="gpxsee.svg">icons/app/hicolor/scalable/apps/gpxsee.svg</file>
</qresource>

<!-- Common map stuff -->
Expand Down
3 changes: 3 additions & 0 deletions icons/GUI/FlatColor/actions/22x22/application-exit.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions icons/GUI/FlatColor/actions/22x22/document-close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions icons/GUI/FlatColor/actions/22x22/document-export.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions icons/GUI/FlatColor/actions/22x22/document-open-folder.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions icons/GUI/FlatColor/actions/22x22/document-open.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions icons/GUI/FlatColor/actions/22x22/document-print.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions icons/GUI/FlatColor/actions/22x22/flag.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions icons/GUI/FlatColor/actions/22x22/go-first.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions icons/GUI/FlatColor/actions/22x22/go-last.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions icons/GUI/FlatColor/actions/22x22/go-next.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions icons/GUI/FlatColor/actions/22x22/go-previous.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions icons/GUI/FlatColor/actions/22x22/hint.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions icons/GUI/FlatColor/actions/22x22/map-globe.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 043a27d

Please sign in to comment.