From 68644aa25d7b713988f9ad7882fec72e882c82c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Wed, 20 Mar 2019 00:00:08 +0100 Subject: [PATCH] Icon files structure cleanup --- gpxsee.qrc | 84 +++++++++--------- icons/{ => GUI}/application-exit.png | Bin icons/{ => GUI}/application-exit@2x.png | Bin icons/{ => GUI}/applications-internet.png | Bin icons/{ => GUI}/applications-internet@2x.png | Bin icons/{ => GUI}/applications-internet_32.png | Bin .../{ => GUI}/applications-internet_32@2x.png | Bin icons/{ => GUI}/arrow-left-double.png | Bin icons/{ => GUI}/arrow-left-double@2x.png | Bin icons/{ => GUI}/arrow-left.png | Bin icons/{ => GUI}/arrow-left@2x.png | Bin icons/{ => GUI}/arrow-right-double.png | Bin icons/{ => GUI}/arrow-right-double@2x.png | Bin icons/{ => GUI}/arrow-right.png | Bin icons/{ => GUI}/arrow-right@2x.png | Bin icons/{ => GUI}/dialog-close.png | Bin icons/{ => GUI}/dialog-close@2x.png | Bin icons/{ => GUI}/document-export.png | Bin icons/{ => GUI}/document-export@2x.png | Bin icons/{ => GUI}/document-open.png | Bin icons/{ => GUI}/document-open@2x.png | Bin icons/{ => GUI}/document-print.png | Bin icons/{ => GUI}/document-print@2x.png | Bin icons/{ => GUI}/document-print_32.png | Bin icons/{ => GUI}/document-print_32@2x.png | Bin icons/{ => GUI}/flag.png | Bin icons/{ => GUI}/flag@2x.png | Bin icons/{ => GUI}/flag_32.png | Bin icons/{ => GUI}/flag_32@2x.png | Bin icons/{ => GUI}/format-stroke-color.png | Bin icons/{ => GUI}/format-stroke-color@2x.png | Bin icons/{ => GUI}/office-chart-line.png | Bin icons/{ => GUI}/office-chart-line@2x.png | Bin icons/{ => GUI}/preferences-system.png | Bin icons/{ => GUI}/preferences-system@2x.png | Bin icons/{ => GUI}/view-filter.png | Bin icons/{ => GUI}/view-filter@2x.png | Bin icons/{ => GUI}/view-fullscreen.png | Bin icons/{ => GUI}/view-fullscreen@2x.png | Bin icons/{ => GUI}/view-refresh.png | Bin icons/{ => GUI}/view-refresh@2x.png | Bin src/GUI/icons.h | 42 ++++----- 42 files changed, 63 insertions(+), 63 deletions(-) rename icons/{ => GUI}/application-exit.png (100%) rename icons/{ => GUI}/application-exit@2x.png (100%) rename icons/{ => GUI}/applications-internet.png (100%) rename icons/{ => GUI}/applications-internet@2x.png (100%) rename icons/{ => GUI}/applications-internet_32.png (100%) rename icons/{ => GUI}/applications-internet_32@2x.png (100%) rename icons/{ => GUI}/arrow-left-double.png (100%) rename icons/{ => GUI}/arrow-left-double@2x.png (100%) rename icons/{ => GUI}/arrow-left.png (100%) rename icons/{ => GUI}/arrow-left@2x.png (100%) rename icons/{ => GUI}/arrow-right-double.png (100%) rename icons/{ => GUI}/arrow-right-double@2x.png (100%) rename icons/{ => GUI}/arrow-right.png (100%) rename icons/{ => GUI}/arrow-right@2x.png (100%) rename icons/{ => GUI}/dialog-close.png (100%) rename icons/{ => GUI}/dialog-close@2x.png (100%) rename icons/{ => GUI}/document-export.png (100%) rename icons/{ => GUI}/document-export@2x.png (100%) rename icons/{ => GUI}/document-open.png (100%) rename icons/{ => GUI}/document-open@2x.png (100%) rename icons/{ => GUI}/document-print.png (100%) rename icons/{ => GUI}/document-print@2x.png (100%) rename icons/{ => GUI}/document-print_32.png (100%) rename icons/{ => GUI}/document-print_32@2x.png (100%) rename icons/{ => GUI}/flag.png (100%) rename icons/{ => GUI}/flag@2x.png (100%) rename icons/{ => GUI}/flag_32.png (100%) rename icons/{ => GUI}/flag_32@2x.png (100%) rename icons/{ => GUI}/format-stroke-color.png (100%) rename icons/{ => GUI}/format-stroke-color@2x.png (100%) rename icons/{ => GUI}/office-chart-line.png (100%) rename icons/{ => GUI}/office-chart-line@2x.png (100%) rename icons/{ => GUI}/preferences-system.png (100%) rename icons/{ => GUI}/preferences-system@2x.png (100%) rename icons/{ => GUI}/view-filter.png (100%) rename icons/{ => GUI}/view-filter@2x.png (100%) rename icons/{ => GUI}/view-fullscreen.png (100%) rename icons/{ => GUI}/view-fullscreen@2x.png (100%) rename icons/{ => GUI}/view-refresh.png (100%) rename icons/{ => GUI}/view-refresh@2x.png (100%) diff --git a/gpxsee.qrc b/gpxsee.qrc index 9e3fb036..9c52a432 100644 --- a/gpxsee.qrc +++ b/gpxsee.qrc @@ -1,46 +1,46 @@ - icons/dialog-close.png - icons/dialog-close@2x.png - icons/document-open.png - icons/document-open@2x.png - icons/document-print.png - icons/document-print@2x.png - icons/document-export.png - icons/document-export@2x.png - icons/flag.png - icons/flag@2x.png - icons/gpxsee.png - icons/gpxsee@2x.png - icons/application-exit.png - icons/application-exit@2x.png - icons/applications-internet.png - icons/applications-internet@2x.png - icons/view-refresh.png - icons/view-refresh@2x.png - icons/arrow-left.png - icons/arrow-left@2x.png - icons/arrow-right.png - icons/arrow-right@2x.png - icons/arrow-left-double.png - icons/arrow-left-double@2x.png - icons/arrow-right-double.png - icons/arrow-right-double@2x.png - icons/view-fullscreen.png - icons/view-fullscreen@2x.png - icons/office-chart-line.png - icons/office-chart-line@2x.png - icons/format-stroke-color.png - icons/format-stroke-color@2x.png - icons/flag_32.png - icons/flag_32@2x.png - icons/preferences-system.png - icons/preferences-system@2x.png - icons/document-print_32.png - icons/document-print_32@2x.png - icons/view-filter.png - icons/view-filter@2x.png - icons/applications-internet_32.png - icons/applications-internet_32@2x.png + icons/gpxsee.png + icons/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 diff --git a/icons/application-exit.png b/icons/GUI/application-exit.png similarity index 100% rename from icons/application-exit.png rename to icons/GUI/application-exit.png diff --git a/icons/application-exit@2x.png b/icons/GUI/application-exit@2x.png similarity index 100% rename from icons/application-exit@2x.png rename to icons/GUI/application-exit@2x.png diff --git a/icons/applications-internet.png b/icons/GUI/applications-internet.png similarity index 100% rename from icons/applications-internet.png rename to icons/GUI/applications-internet.png diff --git a/icons/applications-internet@2x.png b/icons/GUI/applications-internet@2x.png similarity index 100% rename from icons/applications-internet@2x.png rename to icons/GUI/applications-internet@2x.png diff --git a/icons/applications-internet_32.png b/icons/GUI/applications-internet_32.png similarity index 100% rename from icons/applications-internet_32.png rename to icons/GUI/applications-internet_32.png diff --git a/icons/applications-internet_32@2x.png b/icons/GUI/applications-internet_32@2x.png similarity index 100% rename from icons/applications-internet_32@2x.png rename to icons/GUI/applications-internet_32@2x.png diff --git a/icons/arrow-left-double.png b/icons/GUI/arrow-left-double.png similarity index 100% rename from icons/arrow-left-double.png rename to icons/GUI/arrow-left-double.png diff --git a/icons/arrow-left-double@2x.png b/icons/GUI/arrow-left-double@2x.png similarity index 100% rename from icons/arrow-left-double@2x.png rename to icons/GUI/arrow-left-double@2x.png diff --git a/icons/arrow-left.png b/icons/GUI/arrow-left.png similarity index 100% rename from icons/arrow-left.png rename to icons/GUI/arrow-left.png diff --git a/icons/arrow-left@2x.png b/icons/GUI/arrow-left@2x.png similarity index 100% rename from icons/arrow-left@2x.png rename to icons/GUI/arrow-left@2x.png diff --git a/icons/arrow-right-double.png b/icons/GUI/arrow-right-double.png similarity index 100% rename from icons/arrow-right-double.png rename to icons/GUI/arrow-right-double.png diff --git a/icons/arrow-right-double@2x.png b/icons/GUI/arrow-right-double@2x.png similarity index 100% rename from icons/arrow-right-double@2x.png rename to icons/GUI/arrow-right-double@2x.png diff --git a/icons/arrow-right.png b/icons/GUI/arrow-right.png similarity index 100% rename from icons/arrow-right.png rename to icons/GUI/arrow-right.png diff --git a/icons/arrow-right@2x.png b/icons/GUI/arrow-right@2x.png similarity index 100% rename from icons/arrow-right@2x.png rename to icons/GUI/arrow-right@2x.png diff --git a/icons/dialog-close.png b/icons/GUI/dialog-close.png similarity index 100% rename from icons/dialog-close.png rename to icons/GUI/dialog-close.png diff --git a/icons/dialog-close@2x.png b/icons/GUI/dialog-close@2x.png similarity index 100% rename from icons/dialog-close@2x.png rename to icons/GUI/dialog-close@2x.png diff --git a/icons/document-export.png b/icons/GUI/document-export.png similarity index 100% rename from icons/document-export.png rename to icons/GUI/document-export.png diff --git a/icons/document-export@2x.png b/icons/GUI/document-export@2x.png similarity index 100% rename from icons/document-export@2x.png rename to icons/GUI/document-export@2x.png diff --git a/icons/document-open.png b/icons/GUI/document-open.png similarity index 100% rename from icons/document-open.png rename to icons/GUI/document-open.png diff --git a/icons/document-open@2x.png b/icons/GUI/document-open@2x.png similarity index 100% rename from icons/document-open@2x.png rename to icons/GUI/document-open@2x.png diff --git a/icons/document-print.png b/icons/GUI/document-print.png similarity index 100% rename from icons/document-print.png rename to icons/GUI/document-print.png diff --git a/icons/document-print@2x.png b/icons/GUI/document-print@2x.png similarity index 100% rename from icons/document-print@2x.png rename to icons/GUI/document-print@2x.png diff --git a/icons/document-print_32.png b/icons/GUI/document-print_32.png similarity index 100% rename from icons/document-print_32.png rename to icons/GUI/document-print_32.png diff --git a/icons/document-print_32@2x.png b/icons/GUI/document-print_32@2x.png similarity index 100% rename from icons/document-print_32@2x.png rename to icons/GUI/document-print_32@2x.png diff --git a/icons/flag.png b/icons/GUI/flag.png similarity index 100% rename from icons/flag.png rename to icons/GUI/flag.png diff --git a/icons/flag@2x.png b/icons/GUI/flag@2x.png similarity index 100% rename from icons/flag@2x.png rename to icons/GUI/flag@2x.png diff --git a/icons/flag_32.png b/icons/GUI/flag_32.png similarity index 100% rename from icons/flag_32.png rename to icons/GUI/flag_32.png diff --git a/icons/flag_32@2x.png b/icons/GUI/flag_32@2x.png similarity index 100% rename from icons/flag_32@2x.png rename to icons/GUI/flag_32@2x.png diff --git a/icons/format-stroke-color.png b/icons/GUI/format-stroke-color.png similarity index 100% rename from icons/format-stroke-color.png rename to icons/GUI/format-stroke-color.png diff --git a/icons/format-stroke-color@2x.png b/icons/GUI/format-stroke-color@2x.png similarity index 100% rename from icons/format-stroke-color@2x.png rename to icons/GUI/format-stroke-color@2x.png diff --git a/icons/office-chart-line.png b/icons/GUI/office-chart-line.png similarity index 100% rename from icons/office-chart-line.png rename to icons/GUI/office-chart-line.png diff --git a/icons/office-chart-line@2x.png b/icons/GUI/office-chart-line@2x.png similarity index 100% rename from icons/office-chart-line@2x.png rename to icons/GUI/office-chart-line@2x.png diff --git a/icons/preferences-system.png b/icons/GUI/preferences-system.png similarity index 100% rename from icons/preferences-system.png rename to icons/GUI/preferences-system.png diff --git a/icons/preferences-system@2x.png b/icons/GUI/preferences-system@2x.png similarity index 100% rename from icons/preferences-system@2x.png rename to icons/GUI/preferences-system@2x.png diff --git a/icons/view-filter.png b/icons/GUI/view-filter.png similarity index 100% rename from icons/view-filter.png rename to icons/GUI/view-filter.png diff --git a/icons/view-filter@2x.png b/icons/GUI/view-filter@2x.png similarity index 100% rename from icons/view-filter@2x.png rename to icons/GUI/view-filter@2x.png diff --git a/icons/view-fullscreen.png b/icons/GUI/view-fullscreen.png similarity index 100% rename from icons/view-fullscreen.png rename to icons/GUI/view-fullscreen.png diff --git a/icons/view-fullscreen@2x.png b/icons/GUI/view-fullscreen@2x.png similarity index 100% rename from icons/view-fullscreen@2x.png rename to icons/GUI/view-fullscreen@2x.png diff --git a/icons/view-refresh.png b/icons/GUI/view-refresh.png similarity index 100% rename from icons/view-refresh.png rename to icons/GUI/view-refresh.png diff --git a/icons/view-refresh@2x.png b/icons/GUI/view-refresh@2x.png similarity index 100% rename from icons/view-refresh@2x.png rename to icons/GUI/view-refresh@2x.png diff --git a/src/GUI/icons.h b/src/GUI/icons.h index 93a3f8d2..f7a043ce 100644 --- a/src/GUI/icons.h +++ b/src/GUI/icons.h @@ -1,30 +1,30 @@ #ifndef ICONS_H #define ICONS_H -#define APP_ICON ":/icons/gpxsee.png" +#define APP_ICON ":/gpxsee.png" // Toolbar/menu icons -#define OPEN_FILE_ICON ":/icons/document-open.png" -#define EXPORT_FILE_ICON ":/icons/document-export.png" -#define PRINT_FILE_ICON ":/icons/document-print.png" -#define CLOSE_FILE_ICON ":/icons/dialog-close.png" -#define SHOW_POI_ICON ":/icons/flag.png" -#define SHOW_MAP_ICON ":/icons/applications-internet.png" -#define SHOW_GRAPHS_ICON ":/icons/office-chart-line.png" -#define QUIT_ICON ":/icons/application-exit.png" -#define RELOAD_FILE_ICON ":/icons/view-refresh.png" -#define NEXT_FILE_ICON ":/icons/arrow-right.png" -#define PREV_FILE_ICON ":/icons/arrow-left.png" -#define LAST_FILE_ICON ":/icons/arrow-right-double.png" -#define FIRST_FILE_ICON ":/icons/arrow-left-double.png" -#define FULLSCREEN_ICON ":/icons/view-fullscreen.png" +#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" // Options dialog icons -#define APPEARANCE_ICON ":/icons/format-stroke-color.png" -#define POI_ICON ":/icons/flag_32.png" -#define SYSTEM_ICON ":/icons/preferences-system.png" -#define PRINT_EXPORT_ICON ":/icons/document-print_32.png" -#define DATA_ICON ":/icons/view-filter.png" -#define MAPS_ICON ":/icons/applications-internet_32.png" +#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" #endif /* ICONS_H */