diff --git a/README.md b/README.md index 8af3d60d..c4388127 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/gpxsee.pro b/gpxsee.pro index f4a16b92..22661a87 100644 --- a/gpxsee.pro +++ b/gpxsee.pro @@ -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 @@ -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 \ @@ -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/*) @@ -572,6 +576,8 @@ unix:!macx:!android { } android { + RESOURCES += theme-default.qrc + HEADERS += src/GUI/navigationwidget.h SOURCES += src/GUI/navigationwidget.cpp diff --git a/gpxsee.qrc b/gpxsee.qrc index d060d2fb..2a8f3e9c 100644 --- a/gpxsee.qrc +++ b/gpxsee.qrc @@ -1,58 +1,7 @@ - icons/app/gpxsee.png - icons/app/gpxsee@2x.png - icons/GUI/dialog-close.png - icons/GUI/dialog-close@2x.png - icons/GUI/document-open.png - icons/GUI/document-open@2x.png - icons/GUI/document-print.png - icons/GUI/document-print@2x.png - icons/GUI/document-export.png - icons/GUI/document-export@2x.png - icons/GUI/flag.png - icons/GUI/flag@2x.png - icons/GUI/application-exit.png - icons/GUI/application-exit@2x.png - icons/GUI/applications-internet.png - icons/GUI/applications-internet@2x.png - icons/GUI/view-refresh.png - icons/GUI/view-refresh@2x.png - icons/GUI/arrow-left.png - icons/GUI/arrow-left@2x.png - icons/GUI/arrow-right.png - icons/GUI/arrow-right@2x.png - icons/GUI/arrow-left-double.png - icons/GUI/arrow-left-double@2x.png - icons/GUI/arrow-right-double.png - icons/GUI/arrow-right-double@2x.png - icons/GUI/view-fullscreen.png - icons/GUI/view-fullscreen@2x.png - icons/GUI/office-chart-line.png - icons/GUI/office-chart-line@2x.png - icons/GUI/format-stroke-color.png - icons/GUI/format-stroke-color@2x.png - icons/GUI/flag_32.png - icons/GUI/flag_32@2x.png - icons/GUI/preferences-system.png - icons/GUI/preferences-system@2x.png - icons/GUI/document-print_32.png - icons/GUI/document-print_32@2x.png - icons/GUI/view-filter.png - icons/GUI/view-filter@2x.png - icons/GUI/applications-internet_32.png - icons/GUI/applications-internet_32@2x.png - icons/GUI/view-grid.png - icons/GUI/view-grid@2x.png - icons/GUI/document-decrypt.png - icons/GUI/document-decrypt.png - icons/GUI/document-encrypt.png - icons/GUI/document-encrypt.png - icons/GUI/transform-move.png - icons/GUI/transform-move@2x.png - icons/GUI/transform-move_32.png - icons/GUI/transform-move_32@2x.png + icons/app/hicolor/scalable/apps/gpxsee.svg diff --git a/icons/GUI/FlatColor/actions/22x22/application-exit.svg b/icons/GUI/FlatColor/actions/22x22/application-exit.svg new file mode 100644 index 00000000..77c33212 --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/application-exit.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/GUI/FlatColor/actions/22x22/document-close.svg b/icons/GUI/FlatColor/actions/22x22/document-close.svg new file mode 100644 index 00000000..cec357a6 --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/document-close.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/GUI/FlatColor/actions/22x22/document-export.svg b/icons/GUI/FlatColor/actions/22x22/document-export.svg new file mode 100644 index 00000000..9b6fe5a5 --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/document-export.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icons/GUI/FlatColor/actions/22x22/document-open-folder.svg b/icons/GUI/FlatColor/actions/22x22/document-open-folder.svg new file mode 100644 index 00000000..648f5cad --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/document-open-folder.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/GUI/FlatColor/actions/22x22/document-open.svg b/icons/GUI/FlatColor/actions/22x22/document-open.svg new file mode 100644 index 00000000..648f5cad --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/document-open.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/GUI/FlatColor/actions/22x22/document-print.svg b/icons/GUI/FlatColor/actions/22x22/document-print.svg new file mode 100644 index 00000000..4f7d2881 --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/document-print.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/icons/GUI/FlatColor/actions/22x22/flag.svg b/icons/GUI/FlatColor/actions/22x22/flag.svg new file mode 100644 index 00000000..95e1c7c3 --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/flag.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/GUI/FlatColor/actions/22x22/go-first.svg b/icons/GUI/FlatColor/actions/22x22/go-first.svg new file mode 100644 index 00000000..d32e3e1a --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/go-first.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/icons/GUI/FlatColor/actions/22x22/go-last.svg b/icons/GUI/FlatColor/actions/22x22/go-last.svg new file mode 100644 index 00000000..a0f5f280 --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/go-last.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/icons/GUI/FlatColor/actions/22x22/go-next.svg b/icons/GUI/FlatColor/actions/22x22/go-next.svg new file mode 100644 index 00000000..e049ff1b --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/go-next.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/GUI/FlatColor/actions/22x22/go-previous.svg b/icons/GUI/FlatColor/actions/22x22/go-previous.svg new file mode 100644 index 00000000..6f470ffb --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/go-previous.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/GUI/FlatColor/actions/22x22/hint.svg b/icons/GUI/FlatColor/actions/22x22/hint.svg new file mode 100644 index 00000000..a791d770 --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/hint.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/icons/GUI/FlatColor/actions/22x22/map-globe.svg b/icons/GUI/FlatColor/actions/22x22/map-globe.svg new file mode 100644 index 00000000..b0bfe882 --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/map-globe.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/GUI/FlatColor/actions/22x22/office-chart-area-stacked.svg b/icons/GUI/FlatColor/actions/22x22/office-chart-area-stacked.svg new file mode 100644 index 00000000..9caa4cfe --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/office-chart-area-stacked.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/GUI/FlatColor/actions/22x22/show-hidden.svg b/icons/GUI/FlatColor/actions/22x22/show-hidden.svg new file mode 100644 index 00000000..3a1d9c87 --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/show-hidden.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/icons/GUI/FlatColor/actions/22x22/transform-move.svg b/icons/GUI/FlatColor/actions/22x22/transform-move.svg new file mode 100644 index 00000000..8e979cbc --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/transform-move.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/icons/GUI/FlatColor/actions/22x22/view-fullscreen.svg b/icons/GUI/FlatColor/actions/22x22/view-fullscreen.svg new file mode 100644 index 00000000..0d1d8488 --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/view-fullscreen.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/GUI/FlatColor/actions/22x22/view-refresh.svg b/icons/GUI/FlatColor/actions/22x22/view-refresh.svg new file mode 100644 index 00000000..c2168dcb --- /dev/null +++ b/icons/GUI/FlatColor/actions/22x22/view-refresh.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/icons/GUI/FlatColor/index.theme b/icons/GUI/FlatColor/index.theme new file mode 100644 index 00000000..d3ce32d9 --- /dev/null +++ b/icons/GUI/FlatColor/index.theme @@ -0,0 +1,10 @@ +[Icon Theme] +Name=GPXSee +Inherits=hicolor +Directories=actions/22x22,preferences/48x48 + +[actions/22x22] +Size=22 + +[preferences/48x48] +Size=48 diff --git a/icons/GUI/FlatColor/licence.txt b/icons/GUI/FlatColor/licence.txt new file mode 100644 index 00000000..8bc0ca5d --- /dev/null +++ b/icons/GUI/FlatColor/licence.txt @@ -0,0 +1,27 @@ +The FlatColor icons are based on Icons8 Flat Color Icons +(https://github.com/icons8/flat-color-icons) licensed under the MIT licence. + +----- + +Copyright (c) 2017 Icons8 (https://icons8.com) + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/icons/GUI/FlatColor/preferences/48x48/gpxsee_appearance.svg b/icons/GUI/FlatColor/preferences/48x48/gpxsee_appearance.svg new file mode 100644 index 00000000..114919df --- /dev/null +++ b/icons/GUI/FlatColor/preferences/48x48/gpxsee_appearance.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/icons/GUI/FlatColor/preferences/48x48/gpxsee_data.svg b/icons/GUI/FlatColor/preferences/48x48/gpxsee_data.svg new file mode 100644 index 00000000..f748b31f --- /dev/null +++ b/icons/GUI/FlatColor/preferences/48x48/gpxsee_data.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/icons/GUI/FlatColor/preferences/48x48/gpxsee_dem.svg b/icons/GUI/FlatColor/preferences/48x48/gpxsee_dem.svg new file mode 100644 index 00000000..574dcf69 --- /dev/null +++ b/icons/GUI/FlatColor/preferences/48x48/gpxsee_dem.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/GUI/FlatColor/preferences/48x48/gpxsee_maps.svg b/icons/GUI/FlatColor/preferences/48x48/gpxsee_maps.svg new file mode 100644 index 00000000..dcda4a75 --- /dev/null +++ b/icons/GUI/FlatColor/preferences/48x48/gpxsee_maps.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/GUI/FlatColor/preferences/48x48/gpxsee_poi.svg b/icons/GUI/FlatColor/preferences/48x48/gpxsee_poi.svg new file mode 100644 index 00000000..b3a50327 --- /dev/null +++ b/icons/GUI/FlatColor/preferences/48x48/gpxsee_poi.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/GUI/FlatColor/preferences/48x48/gpxsee_position.svg b/icons/GUI/FlatColor/preferences/48x48/gpxsee_position.svg new file mode 100644 index 00000000..22397fd5 --- /dev/null +++ b/icons/GUI/FlatColor/preferences/48x48/gpxsee_position.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/icons/GUI/FlatColor/preferences/48x48/gpxsee_print+export.svg b/icons/GUI/FlatColor/preferences/48x48/gpxsee_print+export.svg new file mode 100644 index 00000000..1b8d2b84 --- /dev/null +++ b/icons/GUI/FlatColor/preferences/48x48/gpxsee_print+export.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/icons/GUI/FlatColor/preferences/48x48/gpxsee_system.svg b/icons/GUI/FlatColor/preferences/48x48/gpxsee_system.svg new file mode 100644 index 00000000..ffbe4c7a --- /dev/null +++ b/icons/GUI/FlatColor/preferences/48x48/gpxsee_system.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/GUI/Papirus/actions/22x22/application-exit.svg b/icons/GUI/Papirus/actions/22x22/application-exit.svg new file mode 100644 index 00000000..a44fff1d --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/application-exit.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/document-close.svg b/icons/GUI/Papirus/actions/22x22/document-close.svg new file mode 100644 index 00000000..f47fcd68 --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/document-close.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/document-export.svg b/icons/GUI/Papirus/actions/22x22/document-export.svg new file mode 100644 index 00000000..8b0e4275 --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/document-export.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/document-open-folder.svg b/icons/GUI/Papirus/actions/22x22/document-open-folder.svg new file mode 100644 index 00000000..e4776a9f --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/document-open-folder.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/document-open.svg b/icons/GUI/Papirus/actions/22x22/document-open.svg new file mode 100644 index 00000000..4bc6c791 --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/document-open.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/document-print.svg b/icons/GUI/Papirus/actions/22x22/document-print.svg new file mode 100644 index 00000000..2b8fe314 --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/document-print.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/flag.svg b/icons/GUI/Papirus/actions/22x22/flag.svg new file mode 100644 index 00000000..8dda2d84 --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/flag.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/go-first.svg b/icons/GUI/Papirus/actions/22x22/go-first.svg new file mode 100644 index 00000000..e57f7009 --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/go-first.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/go-last.svg b/icons/GUI/Papirus/actions/22x22/go-last.svg new file mode 100644 index 00000000..d44cf9ae --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/go-last.svg @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/go-next.svg b/icons/GUI/Papirus/actions/22x22/go-next.svg new file mode 100644 index 00000000..a94d8aa0 --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/go-next.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/go-previous.svg b/icons/GUI/Papirus/actions/22x22/go-previous.svg new file mode 100644 index 00000000..277e8d66 --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/go-previous.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/hint.svg b/icons/GUI/Papirus/actions/22x22/hint.svg new file mode 100644 index 00000000..b4eed88b --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/hint.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/map-globe.svg b/icons/GUI/Papirus/actions/22x22/map-globe.svg new file mode 100644 index 00000000..edefc7fb --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/map-globe.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/office-chart-area-stacked.svg b/icons/GUI/Papirus/actions/22x22/office-chart-area-stacked.svg new file mode 100644 index 00000000..b46b39b2 --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/office-chart-area-stacked.svg @@ -0,0 +1,9 @@ + + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/show-hidden.svg b/icons/GUI/Papirus/actions/22x22/show-hidden.svg new file mode 100644 index 00000000..0e070ecd --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/show-hidden.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/transform-move.svg b/icons/GUI/Papirus/actions/22x22/transform-move.svg new file mode 100644 index 00000000..54916892 --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/transform-move.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/view-fullscreen.svg b/icons/GUI/Papirus/actions/22x22/view-fullscreen.svg new file mode 100644 index 00000000..0fd21d99 --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/view-fullscreen.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/icons/GUI/Papirus/actions/22x22/view-refresh.svg b/icons/GUI/Papirus/actions/22x22/view-refresh.svg new file mode 100644 index 00000000..4a11f428 --- /dev/null +++ b/icons/GUI/Papirus/actions/22x22/view-refresh.svg @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/icons/GUI/Papirus/index.theme b/icons/GUI/Papirus/index.theme new file mode 100644 index 00000000..cb034546 --- /dev/null +++ b/icons/GUI/Papirus/index.theme @@ -0,0 +1,10 @@ +[Icon Theme] +Name=GPXSee +Inherits=hicolor +Directories=actions/22x22,preferences/48x48 + +[actions/22x22] +Size=22 + +[actions/48x48] +Size=48 diff --git a/icons/GUI/Papirus/licence.txt b/icons/GUI/Papirus/licence.txt new file mode 100644 index 00000000..1b6b3e54 --- /dev/null +++ b/icons/GUI/Papirus/licence.txt @@ -0,0 +1,679 @@ +Subset of the Papirus icon theme +(https://github.com/PapirusDevelopmentTeam/papirus-icon-theme) + +----- + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/icons/GUI/Papirus/preferences b/icons/GUI/Papirus/preferences new file mode 120000 index 00000000..eeedffe9 --- /dev/null +++ b/icons/GUI/Papirus/preferences @@ -0,0 +1 @@ +../FlatColor/preferences \ No newline at end of file diff --git a/icons/GUI/application-exit.png b/icons/GUI/application-exit.png deleted file mode 100644 index ed5f8b25..00000000 Binary files a/icons/GUI/application-exit.png and /dev/null differ diff --git a/icons/GUI/application-exit@2x.png b/icons/GUI/application-exit@2x.png deleted file mode 100644 index 294f8fd5..00000000 Binary files a/icons/GUI/application-exit@2x.png and /dev/null differ diff --git a/icons/GUI/applications-internet.png b/icons/GUI/applications-internet.png deleted file mode 100644 index adc9fd41..00000000 Binary files a/icons/GUI/applications-internet.png and /dev/null differ diff --git a/icons/GUI/applications-internet@2x.png b/icons/GUI/applications-internet@2x.png deleted file mode 100644 index e47b65a4..00000000 Binary files a/icons/GUI/applications-internet@2x.png and /dev/null differ diff --git a/icons/GUI/applications-internet_32.png b/icons/GUI/applications-internet_32.png deleted file mode 100644 index a9a9d2e9..00000000 Binary files a/icons/GUI/applications-internet_32.png and /dev/null differ diff --git a/icons/GUI/applications-internet_32@2x.png b/icons/GUI/applications-internet_32@2x.png deleted file mode 100644 index 193c46f4..00000000 Binary files a/icons/GUI/applications-internet_32@2x.png and /dev/null differ diff --git a/icons/GUI/arrow-left-double.png b/icons/GUI/arrow-left-double.png deleted file mode 100644 index 1422338f..00000000 Binary files a/icons/GUI/arrow-left-double.png and /dev/null differ diff --git a/icons/GUI/arrow-left-double@2x.png b/icons/GUI/arrow-left-double@2x.png deleted file mode 100644 index 95324cdb..00000000 Binary files a/icons/GUI/arrow-left-double@2x.png and /dev/null differ diff --git a/icons/GUI/arrow-left.png b/icons/GUI/arrow-left.png deleted file mode 100644 index 9988dd35..00000000 Binary files a/icons/GUI/arrow-left.png and /dev/null differ diff --git a/icons/GUI/arrow-left@2x.png b/icons/GUI/arrow-left@2x.png deleted file mode 100644 index a8f1ff49..00000000 Binary files a/icons/GUI/arrow-left@2x.png and /dev/null differ diff --git a/icons/GUI/arrow-right-double.png b/icons/GUI/arrow-right-double.png deleted file mode 100644 index 80386e7a..00000000 Binary files a/icons/GUI/arrow-right-double.png and /dev/null differ diff --git a/icons/GUI/arrow-right-double@2x.png b/icons/GUI/arrow-right-double@2x.png deleted file mode 100644 index 1729db7d..00000000 Binary files a/icons/GUI/arrow-right-double@2x.png and /dev/null differ diff --git a/icons/GUI/arrow-right.png b/icons/GUI/arrow-right.png deleted file mode 100644 index 83870eea..00000000 Binary files a/icons/GUI/arrow-right.png and /dev/null differ diff --git a/icons/GUI/arrow-right@2x.png b/icons/GUI/arrow-right@2x.png deleted file mode 100644 index 4c77710c..00000000 Binary files a/icons/GUI/arrow-right@2x.png and /dev/null differ diff --git a/icons/GUI/dialog-close.png b/icons/GUI/dialog-close.png deleted file mode 100644 index 5492295e..00000000 Binary files a/icons/GUI/dialog-close.png and /dev/null differ diff --git a/icons/GUI/dialog-close@2x.png b/icons/GUI/dialog-close@2x.png deleted file mode 100644 index acc22a5c..00000000 Binary files a/icons/GUI/dialog-close@2x.png and /dev/null differ diff --git a/icons/GUI/document-decrypt.png b/icons/GUI/document-decrypt.png deleted file mode 100644 index 143bee4e..00000000 Binary files a/icons/GUI/document-decrypt.png and /dev/null differ diff --git a/icons/GUI/document-decrypt@2x.png b/icons/GUI/document-decrypt@2x.png deleted file mode 100644 index 0612191f..00000000 Binary files a/icons/GUI/document-decrypt@2x.png and /dev/null differ diff --git a/icons/GUI/document-encrypt.png b/icons/GUI/document-encrypt.png deleted file mode 100644 index c6d26f96..00000000 Binary files a/icons/GUI/document-encrypt.png and /dev/null differ diff --git a/icons/GUI/document-encrypt@2x.png b/icons/GUI/document-encrypt@2x.png deleted file mode 100644 index 353a22ca..00000000 Binary files a/icons/GUI/document-encrypt@2x.png and /dev/null differ diff --git a/icons/GUI/document-export.png b/icons/GUI/document-export.png deleted file mode 100644 index 71fb3a90..00000000 Binary files a/icons/GUI/document-export.png and /dev/null differ diff --git a/icons/GUI/document-export@2x.png b/icons/GUI/document-export@2x.png deleted file mode 100644 index 13814cf8..00000000 Binary files a/icons/GUI/document-export@2x.png and /dev/null differ diff --git a/icons/GUI/document-open.png b/icons/GUI/document-open.png deleted file mode 100644 index 317a3577..00000000 Binary files a/icons/GUI/document-open.png and /dev/null differ diff --git a/icons/GUI/document-open@2x.png b/icons/GUI/document-open@2x.png deleted file mode 100644 index 0300ab3d..00000000 Binary files a/icons/GUI/document-open@2x.png and /dev/null differ diff --git a/icons/GUI/document-print.png b/icons/GUI/document-print.png deleted file mode 100644 index 8eb1c674..00000000 Binary files a/icons/GUI/document-print.png and /dev/null differ diff --git a/icons/GUI/document-print@2x.png b/icons/GUI/document-print@2x.png deleted file mode 100644 index ada04cd4..00000000 Binary files a/icons/GUI/document-print@2x.png and /dev/null differ diff --git a/icons/GUI/document-print_32.png b/icons/GUI/document-print_32.png deleted file mode 100644 index d6555042..00000000 Binary files a/icons/GUI/document-print_32.png and /dev/null differ diff --git a/icons/GUI/document-print_32@2x.png b/icons/GUI/document-print_32@2x.png deleted file mode 100644 index 8dc77a8d..00000000 Binary files a/icons/GUI/document-print_32@2x.png and /dev/null differ diff --git a/icons/GUI/flag.png b/icons/GUI/flag.png deleted file mode 100644 index 3d93e125..00000000 Binary files a/icons/GUI/flag.png and /dev/null differ diff --git a/icons/GUI/flag@2x.png b/icons/GUI/flag@2x.png deleted file mode 100644 index 5ee8f729..00000000 Binary files a/icons/GUI/flag@2x.png and /dev/null differ diff --git a/icons/GUI/flag_32.png b/icons/GUI/flag_32.png deleted file mode 100644 index 51e1c8f8..00000000 Binary files a/icons/GUI/flag_32.png and /dev/null differ diff --git a/icons/GUI/flag_32@2x.png b/icons/GUI/flag_32@2x.png deleted file mode 100644 index fa889df2..00000000 Binary files a/icons/GUI/flag_32@2x.png and /dev/null differ diff --git a/icons/GUI/format-stroke-color.png b/icons/GUI/format-stroke-color.png deleted file mode 100644 index 05c34b9a..00000000 Binary files a/icons/GUI/format-stroke-color.png and /dev/null differ diff --git a/icons/GUI/format-stroke-color@2x.png b/icons/GUI/format-stroke-color@2x.png deleted file mode 100644 index 7274212d..00000000 Binary files a/icons/GUI/format-stroke-color@2x.png and /dev/null differ diff --git a/icons/GUI/licence.txt b/icons/GUI/licence.txt deleted file mode 100644 index 1bce8919..00000000 --- a/icons/GUI/licence.txt +++ /dev/null @@ -1,169 +0,0 @@ -The GUI icons are Oxygen icons from the KDE project (http://www.kde.org) -licensed under LGPLv3. - ------ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/icons/GUI/office-chart-line.png b/icons/GUI/office-chart-line.png deleted file mode 100644 index 70404aae..00000000 Binary files a/icons/GUI/office-chart-line.png and /dev/null differ diff --git a/icons/GUI/office-chart-line@2x.png b/icons/GUI/office-chart-line@2x.png deleted file mode 100644 index 0cbf5994..00000000 Binary files a/icons/GUI/office-chart-line@2x.png and /dev/null differ diff --git a/icons/GUI/preferences-system.png b/icons/GUI/preferences-system.png deleted file mode 100644 index 2afbd23c..00000000 Binary files a/icons/GUI/preferences-system.png and /dev/null differ diff --git a/icons/GUI/preferences-system@2x.png b/icons/GUI/preferences-system@2x.png deleted file mode 100644 index 9ea5cec4..00000000 Binary files a/icons/GUI/preferences-system@2x.png and /dev/null differ diff --git a/icons/GUI/transform-move.png b/icons/GUI/transform-move.png deleted file mode 100644 index 0bd8d04a..00000000 Binary files a/icons/GUI/transform-move.png and /dev/null differ diff --git a/icons/GUI/transform-move@2x.png b/icons/GUI/transform-move@2x.png deleted file mode 100644 index 9ddfaa12..00000000 Binary files a/icons/GUI/transform-move@2x.png and /dev/null differ diff --git a/icons/GUI/transform-move_32.png b/icons/GUI/transform-move_32.png deleted file mode 100644 index a7db0dff..00000000 Binary files a/icons/GUI/transform-move_32.png and /dev/null differ diff --git a/icons/GUI/transform-move_32@2x.png b/icons/GUI/transform-move_32@2x.png deleted file mode 100644 index 44f860b4..00000000 Binary files a/icons/GUI/transform-move_32@2x.png and /dev/null differ diff --git a/icons/GUI/view-filter.png b/icons/GUI/view-filter.png deleted file mode 100644 index d20f31d8..00000000 Binary files a/icons/GUI/view-filter.png and /dev/null differ diff --git a/icons/GUI/view-filter@2x.png b/icons/GUI/view-filter@2x.png deleted file mode 100644 index c10ccc05..00000000 Binary files a/icons/GUI/view-filter@2x.png and /dev/null differ diff --git a/icons/GUI/view-fullscreen.png b/icons/GUI/view-fullscreen.png deleted file mode 100644 index ceda8189..00000000 Binary files a/icons/GUI/view-fullscreen.png and /dev/null differ diff --git a/icons/GUI/view-fullscreen@2x.png b/icons/GUI/view-fullscreen@2x.png deleted file mode 100644 index b6d16076..00000000 Binary files a/icons/GUI/view-fullscreen@2x.png and /dev/null differ diff --git a/icons/GUI/view-grid.png b/icons/GUI/view-grid.png deleted file mode 100644 index 9451b2dc..00000000 Binary files a/icons/GUI/view-grid.png and /dev/null differ diff --git a/icons/GUI/view-grid@2x.png b/icons/GUI/view-grid@2x.png deleted file mode 100644 index df2f44ce..00000000 Binary files a/icons/GUI/view-grid@2x.png and /dev/null differ diff --git a/icons/GUI/view-refresh.png b/icons/GUI/view-refresh.png deleted file mode 100644 index 45b5535c..00000000 Binary files a/icons/GUI/view-refresh.png and /dev/null differ diff --git a/icons/GUI/view-refresh@2x.png b/icons/GUI/view-refresh@2x.png deleted file mode 100644 index 1db3e742..00000000 Binary files a/icons/GUI/view-refresh@2x.png and /dev/null differ diff --git a/icons/app/gpxsee.png b/icons/app/gpxsee.png deleted file mode 100644 index 5569d607..00000000 Binary files a/icons/app/gpxsee.png and /dev/null differ diff --git a/icons/app/gpxsee@2x.png b/icons/app/gpxsee@2x.png deleted file mode 100644 index 6a4bf228..00000000 Binary files a/icons/app/gpxsee@2x.png and /dev/null differ diff --git a/src/GUI/app.cpp b/src/GUI/app.cpp index f2e349fd..d056cd72 100644 --- a/src/GUI/app.cpp +++ b/src/GUI/app.cpp @@ -70,6 +70,8 @@ App::App(int &argc, char **argv) : QApplication(argc, argv) loadPCSs(); Waypoint::loadSymbolIcons(ProgramPaths::symbolsDir()); + QIcon::setFallbackThemeName(APP_NAME); + _gui = new GUI(); #ifdef Q_OS_ANDROID diff --git a/src/GUI/gui.cpp b/src/GUI/gui.cpp index ebcee2a3..df4f640e 100644 --- a/src/GUI/gui.cpp +++ b/src/GUI/gui.cpp @@ -187,7 +187,8 @@ void GUI::createActions() // General actions #if !defined(Q_OS_MAC) && !defined(Q_OS_ANDROID) - _exitAction = new QAction(QIcon(QUIT_ICON), tr("Quit"), this); + _exitAction = new QAction(QIcon::fromTheme(QUIT_NAME, QIcon(QUIT_ICON)), + tr("Quit"), this); _exitAction->setShortcut(QUIT_SHORTCUT); _exitAction->setMenuRole(QAction::QuitRole); connect(_exitAction, &QAction::triggered, this, &GUI::close); @@ -208,45 +209,47 @@ void GUI::createActions() connect(_aboutAction, &QAction::triggered, this, &GUI::about); // File actions - _openFileAction = new QAction(QIcon(OPEN_FILE_ICON), tr("Open..."), this); + _openFileAction = new QAction(QIcon::fromTheme(OPEN_FILE_NAME, + QIcon(OPEN_FILE_ICON)), tr("Open..."), this); _openFileAction->setMenuRole(QAction::NoRole); _openFileAction->setShortcut(OPEN_SHORTCUT); connect(_openFileAction, &QAction::triggered, this, QOverload<>::of(&GUI::openFile)); addAction(_openFileAction); - _openDirAction = new QAction(QIcon(OPEN_FILE_ICON), tr("Open directory..."), - this); + _openDirAction = new QAction(QIcon::fromTheme(OPEN_DIR_NAME, + QIcon(OPEN_DIR_ICON)), tr("Open directory..."), this); _openDirAction->setMenuRole(QAction::NoRole); connect(_openDirAction, &QAction::triggered, this, QOverload<>::of(&GUI::openDir)); - _printFileAction = new QAction(QIcon(PRINT_FILE_ICON), tr("Print..."), - this); + _printFileAction = new QAction(QIcon::fromTheme(PRINT_FILE_NAME, + QIcon(PRINT_FILE_ICON)), tr("Print..."), this); _printFileAction->setMenuRole(QAction::NoRole); _printFileAction->setActionGroup(_fileActionGroup); connect(_printFileAction, &QAction::triggered, this, &GUI::printFile); addAction(_printFileAction); - _exportPDFFileAction = new QAction(QIcon(EXPORT_FILE_ICON), - tr("Export to PDF..."), this); + _exportPDFFileAction = new QAction(QIcon::fromTheme(EXPORT_FILE_NAME, + QIcon(EXPORT_FILE_ICON)), tr("Export to PDF..."), this); _exportPDFFileAction->setMenuRole(QAction::NoRole); _exportPDFFileAction->setShortcut(PDF_EXPORT_SHORTCUT); _exportPDFFileAction->setActionGroup(_fileActionGroup); connect(_exportPDFFileAction, &QAction::triggered, this, &GUI::exportPDFFile); addAction(_exportPDFFileAction); - _exportPNGFileAction = new QAction(QIcon(EXPORT_FILE_ICON), - tr("Export to PNG..."), this); + _exportPNGFileAction = new QAction(QIcon::fromTheme(EXPORT_FILE_NAME, + QIcon(EXPORT_FILE_ICON)), tr("Export to PNG..."), this); _exportPNGFileAction->setMenuRole(QAction::NoRole); _exportPNGFileAction->setShortcut(PNG_EXPORT_SHORTCUT); _exportPNGFileAction->setActionGroup(_fileActionGroup); connect(_exportPNGFileAction, &QAction::triggered, this, &GUI::exportPNGFile); addAction(_exportPNGFileAction); - _closeFileAction = new QAction(QIcon(CLOSE_FILE_ICON), tr("Close"), this); + _closeFileAction = new QAction(QIcon::fromTheme(CLOSE_FILE_NAME, + QIcon(CLOSE_FILE_ICON)), tr("Close"), this); _closeFileAction->setMenuRole(QAction::NoRole); _closeFileAction->setShortcut(CLOSE_SHORTCUT); _closeFileAction->setActionGroup(_fileActionGroup); connect(_closeFileAction, &QAction::triggered, this, &GUI::closeAll); addAction(_closeFileAction); - _reloadFileAction = new QAction(QIcon(RELOAD_FILE_ICON), tr("Reload"), - this); + _reloadFileAction = new QAction(QIcon::fromTheme(RELOAD_FILE_NAME, + QIcon(RELOAD_FILE_ICON)), tr("Reload"), this); _reloadFileAction->setMenuRole(QAction::NoRole); _reloadFileAction->setShortcut(RELOAD_SHORTCUT); _reloadFileAction->setActionGroup(_fileActionGroup); @@ -264,8 +267,8 @@ void GUI::createActions() _poisActionGroup->setExclusive(false); connect(_poisActionGroup, &QActionGroup::triggered, this, &GUI::poiFileChecked); - _openPOIAction = new QAction(QIcon(OPEN_FILE_ICON), tr("Load POI file..."), - this); + _openPOIAction = new QAction(QIcon::fromTheme(OPEN_FILE_NAME, + QIcon(OPEN_FILE_ICON)), tr("Load POI file..."), this); _openPOIAction->setMenuRole(QAction::NoRole); connect(_openPOIAction, &QAction::triggered, this, QOverload<>::of(&GUI::openPOIFile)); @@ -294,7 +297,8 @@ void GUI::createActions() _showPOILabelsAction->setCheckable(true); connect(_showPOILabelsAction, &QAction::triggered, _mapView, &MapView::showPOILabels); - _showPOIAction = new QAction(QIcon(SHOW_POI_ICON), tr("Show POIs"), this); + _showPOIAction = new QAction(QIcon::fromTheme(SHOW_POI_NAME, + QIcon(SHOW_POI_ICON)), tr("Show POIs"), this); _showPOIAction->setMenuRole(QAction::NoRole); _showPOIAction->setCheckable(true); _showPOIAction->setShortcut(SHOW_POI_SHORTCUT); @@ -305,8 +309,8 @@ void GUI::createActions() _mapsActionGroup = new QActionGroup(this); _mapsActionGroup->setExclusive(true); connect(_mapsActionGroup, &QActionGroup::triggered, this, &GUI::mapChanged); - _showMapAction = new QAction(QIcon(SHOW_MAP_ICON), tr("Show map"), - this); + _showMapAction = new QAction(QIcon::fromTheme(SHOW_MAP_NAME, + QIcon(SHOW_MAP_ICON)), tr("Show map"), this); _showMapAction->setEnabled(false); _showMapAction->setMenuRole(QAction::NoRole); _showMapAction->setCheckable(true); @@ -314,13 +318,13 @@ void GUI::createActions() connect(_showMapAction, &QAction::triggered, _mapView, &MapView::showMap); addAction(_showMapAction); - _loadMapAction = new QAction(QIcon(OPEN_FILE_ICON), tr("Load map..."), - this); + _loadMapAction = new QAction(QIcon::fromTheme(OPEN_FILE_NAME, + QIcon(OPEN_FILE_ICON)), tr("Load map..."), this); _loadMapAction->setMenuRole(QAction::NoRole); connect(_loadMapAction, &QAction::triggered, this, QOverload<>::of(&GUI::loadMap)); - _loadMapDirAction = new QAction(QIcon(OPEN_FILE_ICON), - tr("Load map directory..."), this); + _loadMapDirAction = new QAction(QIcon::fromTheme(OPEN_DIR_NAME, + QIcon(OPEN_DIR_ICON)), tr("Load map directory..."), this); _loadMapDirAction->setMenuRole(QAction::NoRole); connect(_loadMapDirAction, &QAction::triggered, this, &GUI::loadMapDir); _clearMapCacheAction = new QAction(tr("Clear tile cache"), this); @@ -345,8 +349,8 @@ void GUI::createActions() &MapView::showCursorCoordinates); // Position - _showPositionAction = new QAction(QIcon(SHOW_POS_ICON), - tr("Show position"), this); + _showPositionAction = new QAction(QIcon::fromTheme(SHOW_POS_NAME, + QIcon(SHOW_POS_ICON)), tr("Show position"), this); _showPositionAction->setMenuRole(QAction::NoRole); _showPositionAction->setCheckable(true); _showPositionAction->setEnabled(false); @@ -444,8 +448,8 @@ void GUI::createActions() connect(_showDEMTilesAction, &QAction::triggered, this, &GUI::showDEMTiles); // Graph actions - _showGraphsAction = new QAction(QIcon(SHOW_GRAPHS_ICON), tr("Show graphs"), - this); + _showGraphsAction = new QAction(QIcon::fromTheme(SHOW_GRAPHS_NAME, + QIcon(SHOW_GRAPHS_ICON)), tr("Show graphs"), this); _showGraphsAction->setMenuRole(QAction::NoRole); _showGraphsAction->setCheckable(true); _showGraphsAction->setShortcut(SHOW_GRAPHS_SHORTCUT); @@ -543,8 +547,8 @@ void GUI::createActions() _dmsAction->setActionGroup(ag); connect(_dmsAction, &QAction::triggered, this, &GUI::setDMS); #ifndef Q_OS_ANDROID - _fullscreenAction = new QAction(QIcon(FULLSCREEN_ICON), - tr("Fullscreen mode"), this); + _fullscreenAction = new QAction(QIcon::fromTheme(FULLSCREEN_NAME, + QIcon(FULLSCREEN_ICON)), tr("Fullscreen mode"), this); _fullscreenAction->setMenuRole(QAction::NoRole); _fullscreenAction->setCheckable(true); _fullscreenAction->setShortcut(FULLSCREEN_SHORTCUT); @@ -557,19 +561,23 @@ void GUI::createActions() // Navigation actions #ifndef Q_OS_ANDROID - _nextAction = new QAction(QIcon(NEXT_FILE_ICON), tr("Next"), this); + _nextAction = new QAction(QIcon::fromTheme(NEXT_FILE_NAME, + QIcon(NEXT_FILE_ICON)), tr("Next"), this); _nextAction->setActionGroup(_navigationActionGroup); _nextAction->setMenuRole(QAction::NoRole); connect(_nextAction, &QAction::triggered, this, &GUI::next); - _prevAction = new QAction(QIcon(PREV_FILE_ICON), tr("Previous"), this); + _prevAction = new QAction(QIcon::fromTheme(PREV_FILE_NAME, + QIcon(PREV_FILE_ICON)), tr("Previous"), this); _prevAction->setMenuRole(QAction::NoRole); _prevAction->setActionGroup(_navigationActionGroup); connect(_prevAction, &QAction::triggered, this, &GUI::prev); - _lastAction = new QAction(QIcon(LAST_FILE_ICON), tr("Last"), this); + _lastAction = new QAction(QIcon::fromTheme(LAST_FILE_NAME, + QIcon(LAST_FILE_ICON)), tr("Last"), this); _lastAction->setMenuRole(QAction::NoRole); _lastAction->setActionGroup(_navigationActionGroup); connect(_lastAction, &QAction::triggered, this, &GUI::last); - _firstAction = new QAction(QIcon(FIRST_FILE_ICON), tr("First"), this); + _firstAction = new QAction(QIcon::fromTheme(FIRST_FILE_NAME, + QIcon(FIRST_FILE_ICON)), tr("First"), this); _firstAction->setMenuRole(QAction::NoRole); _firstAction->setActionGroup(_navigationActionGroup); connect(_firstAction, &QAction::triggered, this, &GUI::first); diff --git a/src/GUI/icons.h b/src/GUI/icons.h index a937c304..c54e653c 100644 --- a/src/GUI/icons.h +++ b/src/GUI/icons.h @@ -1,36 +1,71 @@ #ifndef ICONS_H #define ICONS_H -#define APP_ICON ":/gpxsee.png" +#include "common/config.h" + +#define APP_ICON ":/gpxsee.svg" // Toolbar/menu icons -#define OPEN_FILE_ICON ":/document-open.png" -#define EXPORT_FILE_ICON ":/document-export.png" -#define PRINT_FILE_ICON ":/document-print.png" -#define CLOSE_FILE_ICON ":/dialog-close.png" -#define SHOW_POI_ICON ":/flag.png" -#define SHOW_MAP_ICON ":/applications-internet.png" -#define SHOW_GRAPHS_ICON ":/office-chart-line.png" -#define QUIT_ICON ":/application-exit.png" -#define RELOAD_FILE_ICON ":/view-refresh.png" -#define NEXT_FILE_ICON ":/arrow-right.png" -#define PREV_FILE_ICON ":/arrow-left.png" -#define LAST_FILE_ICON ":/arrow-right-double.png" -#define FIRST_FILE_ICON ":/arrow-left-double.png" -#define FULLSCREEN_ICON ":/view-fullscreen.png" -#define SHOW_POS_ICON ":/transform-move.png" +#define OPEN_FILE_ICON ":/icons/" APP_NAME "/actions/22x22/document-open.svg" +#define OPEN_DIR_ICON ":/icons/" APP_NAME "/actions/22x22/document-open-folder.svg" +#define EXPORT_FILE_ICON ":/icons/" APP_NAME "/actions/22x22/document-export.svg" +#define PRINT_FILE_ICON ":/icons/" APP_NAME "/actions/22x22/document-print.svg" +#define CLOSE_FILE_ICON ":/icons/" APP_NAME "/actions/22x22/document-close.svg" +#define SHOW_POI_ICON ":/icons/" APP_NAME "/actions/22x22/flag.svg" +#define SHOW_MAP_ICON ":/icons/" APP_NAME "/actions/22x22/map-globe.svg" +#define SHOW_GRAPHS_ICON ":/icons/" APP_NAME "/actions/22x22/office-chart-area-stacked.svg" +#define QUIT_ICON ":/icons/" APP_NAME "/actions/22x22/application-exit.svg" +#define RELOAD_FILE_ICON ":/icons/" APP_NAME "/actions/22x22/view-refresh.svg" +#define NEXT_FILE_ICON ":/icons/" APP_NAME "/actions/22x22/go-next.svg" +#define PREV_FILE_ICON ":/icons/" APP_NAME "/actions/22x22/go-previous.svg" +#define LAST_FILE_ICON ":/icons/" APP_NAME "/actions/22x22/go-last.svg" +#define FIRST_FILE_ICON ":/icons/" APP_NAME "/actions/22x22/go-first.svg" +#define FULLSCREEN_ICON ":/icons/" APP_NAME "/actions/22x22/view-fullscreen.svg" +#define SHOW_POS_ICON ":/icons/" APP_NAME "/actions/22x22/transform-move.svg" + +// Widgets +#define SHOW_PWD_ICON ":/icons/" APP_NAME "/actions/22x22/show-hidden.svg" +#define HIDE_PWD_ICON ":/icons/" APP_NAME "/actions/22x22/hint.svg" // Options dialog icons -#define APPEARANCE_ICON ":/format-stroke-color.png" -#define POI_ICON ":/flag_32.png" -#define SYSTEM_ICON ":/preferences-system.png" -#define PRINT_EXPORT_ICON ":/document-print_32.png" -#define DATA_ICON ":/view-filter.png" -#define MAPS_ICON ":/applications-internet_32.png" -#define DEM_ICON ":/view-grid.png" -#define POSITION_ICON ":/transform-move_32.png" +#define APPEARANCE_ICON ":/icons/" APP_NAME "/preferences/48x48/gpxsee_appearance.svg" +#define POI_ICON ":/icons/" APP_NAME "/preferences/48x48/gpxsee_poi.svg" +#define SYSTEM_ICON ":/icons/" APP_NAME "/preferences/48x48/gpxsee_system.svg" +#define PRINT_EXPORT_ICON ":/icons/" APP_NAME "/preferences/48x48/gpxsee_print+export.svg" +#define DATA_ICON ":/icons/" APP_NAME "/preferences/48x48/gpxsee_data.svg" +#define MAPS_ICON ":/icons/" APP_NAME "/preferences/48x48/gpxsee_maps.svg" +#define DEM_ICON ":/icons/" APP_NAME "/preferences/48x48/gpxsee_dem.svg" +#define POSITION_ICON ":/icons/" APP_NAME "/preferences/48x48/gpxsee_position.svg" -#define SHOW_PWD_ICON ":/document-encrypt.png" -#define HIDE_PWD_ICON ":/document-decrypt.png" + +// Desktop theme names +#define OPEN_FILE_NAME "document-open" +#define OPEN_DIR_NAME "document-open-folder" +#define EXPORT_FILE_NAME "document-export" +#define PRINT_FILE_NAME "document-print" +#define CLOSE_FILE_NAME "document-close" +#define SHOW_POI_NAME "flag" +#define SHOW_MAP_NAME "map-globe" +#define SHOW_GRAPHS_NAME "office-chart-area-stacked" +#define QUIT_NAME "application-exit" +#define RELOAD_FILE_NAME "view-refresh" +#define NEXT_FILE_NAME "go-next" +#define PREV_FILE_NAME "go-previous" +#define LAST_FILE_NAME "go-last" +#define FIRST_FILE_NAME "go-first" +#define FULLSCREEN_NAME "view-fullscreen" +#define SHOW_POS_NAME "transform-move" + +#define SHOW_PWD_NAME "show-hidden" +#define HIDE_PWD_NAME "hint" + +#define APPEARANCE_NAME "gpxsee_appearance" +#define POI_NAME "gpxsee_poi" +#define SYSTEM_NAME "gpxsee_system" +#define PRINT_EXPORT_NAME "gpxsee_print+export" +#define DATA_NAME "gpxsee_data" +#define MAPS_NAME "gpxsee_maps" +#define DEM_NAME "gpxsee_dem" +#define POSITION_NAME "gpxsee_position" #endif /* ICONS_H */ diff --git a/src/GUI/optionsdialog.cpp b/src/GUI/optionsdialog.cpp index 3415006b..d51da442 100644 --- a/src/GUI/optionsdialog.cpp +++ b/src/GUI/optionsdialog.cpp @@ -827,14 +827,22 @@ OptionsDialog::OptionsDialog(Options &options, Units units, QWidget *parent) new QListWidgetItem(QIcon(PRINT_EXPORT_ICON), QString(), menu); new QListWidgetItem(QIcon(SYSTEM_ICON), QString(), menu); #else // Q_OS_ANDROID - new QListWidgetItem(QIcon(APPEARANCE_ICON), tr("Appearance"), menu); - new QListWidgetItem(QIcon(MAPS_ICON), tr("Maps"), menu); - new QListWidgetItem(QIcon(DATA_ICON), tr("Data"), menu); - new QListWidgetItem(QIcon(POI_ICON), tr("POI"), menu); - new QListWidgetItem(QIcon(DEM_ICON), tr("DEM"), menu); - new QListWidgetItem(QIcon(POSITION_ICON), tr("Position"), menu); - new QListWidgetItem(QIcon(PRINT_EXPORT_ICON), tr("Print & Export"), menu); - new QListWidgetItem(QIcon(SYSTEM_ICON), tr("System"), menu); + new QListWidgetItem(QIcon::fromTheme(APPEARANCE_NAME, QIcon(APPEARANCE_ICON)), + tr("Appearance"), menu); + new QListWidgetItem(QIcon::fromTheme(MAPS_NAME, QIcon(MAPS_ICON)), + tr("Maps"), menu); + new QListWidgetItem(QIcon::fromTheme(DATA_NAME, QIcon(DATA_ICON)), + tr("Data"), menu); + new QListWidgetItem(QIcon::fromTheme(POI_NAME, QIcon(POI_ICON)), tr("POI"), + menu); + new QListWidgetItem(QIcon::fromTheme(DEM_NAME, QIcon(DEM_ICON)), tr("DEM"), + menu); + new QListWidgetItem(QIcon::fromTheme(POSITION_NAME, QIcon(POSITION_ICON)), + tr("Position"), menu); + new QListWidgetItem(QIcon::fromTheme(PRINT_EXPORT_NAME, + QIcon(PRINT_EXPORT_ICON)), tr("Print & Export"), menu); + new QListWidgetItem(QIcon::fromTheme(SYSTEM_NAME, QIcon(SYSTEM_ICON)), + tr("System"), menu); #endif // Q_OS_ANDROID QHBoxLayout *contentLayout = new QHBoxLayout(); diff --git a/src/GUI/passwordedit.cpp b/src/GUI/passwordedit.cpp index 6fb82292..4c48196f 100644 --- a/src/GUI/passwordedit.cpp +++ b/src/GUI/passwordedit.cpp @@ -5,7 +5,8 @@ PasswordEdit::PasswordEdit(QWidget *parent) : QLineEdit(parent) { _show = false; - _action = addAction(QIcon(SHOW_PWD_ICON), QLineEdit::TrailingPosition); + _action = addAction(QIcon::fromTheme(SHOW_PWD_ICON), + QLineEdit::TrailingPosition); connect(_action, &QAction::triggered, this, &PasswordEdit::showPassword); setEchoMode(QLineEdit::Password); } @@ -13,11 +14,11 @@ PasswordEdit::PasswordEdit(QWidget *parent) : QLineEdit(parent) void PasswordEdit::showPassword() { if (_show) { - _action->setIcon(QIcon(SHOW_PWD_ICON)); + _action->setIcon(QIcon::fromTheme(SHOW_PWD_ICON)); setEchoMode(QLineEdit::Password); _show = false; } else { - _action->setIcon(QIcon(HIDE_PWD_ICON)); + _action->setIcon(QIcon::fromTheme(HIDE_PWD_ICON)); setEchoMode(QLineEdit::Normal); _show = true; } diff --git a/theme-default.qrc b/theme-default.qrc new file mode 100644 index 00000000..92f8c484 --- /dev/null +++ b/theme-default.qrc @@ -0,0 +1,34 @@ + + + icons/GUI/FlatColor/actions/22x22/document-open.svg + icons/GUI/FlatColor/actions/22x22/document-open-folder.svg + icons/GUI/FlatColor/actions/22x22/document-export.svg + icons/GUI/FlatColor/actions/22x22/document-print.svg + icons/GUI/FlatColor/actions/22x22/document-close.svg + icons/GUI/FlatColor/actions/22x22/view-refresh.svg + icons/GUI/FlatColor/actions/22x22/flag.svg + icons/GUI/FlatColor/actions/22x22/map-globe.svg + icons/GUI/FlatColor//actions/22x22/office-chart-area-stacked.svg + icons/GUI/FlatColor/actions/22x22/transform-move.svg + icons/GUI/FlatColor/actions/22x22/go-next.svg + icons/GUI/FlatColor/actions/22x22/go-previous.svg + icons/GUI/FlatColor/actions/22x22/go-first.svg + icons/GUI/FlatColor/actions/22x22/go-last.svg + icons/GUI/FlatColor/actions/22x22/application-exit.svg + icons/GUI/FlatColor/actions/22x22/view-fullscreen.svg + + icons/GUI/FlatColor/actions/22x22/show-hidden.svg + icons/GUI/FlatColor/actions/22x22/hint.svg + + icons/GUI/FlatColor/preferences/48x48/gpxsee_appearance.svg + icons/GUI/FlatColor/preferences/48x48/gpxsee_system.svg + icons/GUI/FlatColor/preferences/48x48/gpxsee_dem.svg + icons/GUI/FlatColor/preferences/48x48/gpxsee_data.svg + icons/GUI/FlatColor/preferences/48x48/gpxsee_poi.svg + icons/GUI/FlatColor/preferences/48x48/gpxsee_maps.svg + icons/GUI/FlatColor/preferences/48x48/gpxsee_print+export.svg + icons/GUI/FlatColor/preferences/48x48/gpxsee_position.svg + + icons/GUI/FlatColor/index.theme + + diff --git a/theme-unix.qrc b/theme-unix.qrc new file mode 100644 index 00000000..ee883244 --- /dev/null +++ b/theme-unix.qrc @@ -0,0 +1,34 @@ + + + icons/GUI/Papirus/actions/22x22/document-open.svg + icons/GUI/Papirus/actions/22x22/document-open-folder.svg + icons/GUI/Papirus/actions/22x22/document-export.svg + icons/GUI/Papirus/actions/22x22/document-print.svg + icons/GUI/Papirus/actions/22x22/document-close.svg + icons/GUI/Papirus/actions/22x22/view-refresh.svg + icons/GUI/Papirus/actions/22x22/flag.svg + icons/GUI/Papirus/actions/22x22/map-globe.svg + icons/GUI/Papirus/actions/22x22/office-chart-area-stacked.svg + icons/GUI/Papirus/actions/22x22/transform-move.svg + icons/GUI/Papirus/actions/22x22/go-next.svg + icons/GUI/Papirus/actions/22x22/go-previous.svg + icons/GUI/Papirus/actions/22x22/go-first.svg + icons/GUI/Papirus/actions/22x22/go-last.svg + icons/GUI/Papirus/actions/22x22/application-exit.svg + icons/GUI/Papirus/actions/22x22/view-fullscreen.svg + + icons/GUI/Papirus/actions/22x22/show-hidden.svg + icons/GUI/Papirus/actions/22x22/hint.svg + + icons/GUI/Papirus/preferences/48x48/gpxsee_appearance.svg + icons/GUI/Papirus/preferences/48x48/gpxsee_system.svg + icons/GUI/Papirus/preferences/48x48/gpxsee_dem.svg + icons/GUI/Papirus/preferences/48x48/gpxsee_data.svg + icons/GUI/Papirus/preferences/48x48/gpxsee_poi.svg + icons/GUI/Papirus/preferences/48x48/gpxsee_maps.svg + icons/GUI/Papirus/preferences/48x48/gpxsee_print+export.svg + icons/GUI/Papirus/preferences/48x48/gpxsee_position.svg + + icons/GUI/Papirus/index.theme + +