From 02e44e372f5720c924fea7259c778a3d8aa4be23 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 19 Feb 2017 18:00:32 +0100 Subject: [PATCH] Move icons used in models to model library --- model/CMakeLists.txt | 3 +++ .../hicolor/scalable/mimetypes/text-x-generic.svg | 0 .../hicolor/scalable/status/syncthing-default.svg | 0 .../scalable/status/syncthing-disconnected.svg | 0 .../scalable/status/syncthing-error-sync.svg | 0 .../hicolor/scalable/status/syncthing-error.svg | 0 .../hicolor/scalable/status/syncthing-notify.svg | 0 .../icons/hicolor/scalable/status/syncthing-ok.svg | 0 .../hicolor/scalable/status/syncthing-pause.svg | 0 .../hicolor/scalable/status/syncthing-sync.svg | 0 model/resources/syncthingmodelicons.qrc | 13 +++++++++++++ tray/CMakeLists.txt | 4 +++- .../resources/{icons.qrc => syncthingtrayicons.qrc} | 9 --------- 13 files changed, 19 insertions(+), 10 deletions(-) rename {tray => model}/resources/icons/hicolor/scalable/mimetypes/text-x-generic.svg (100%) rename {tray => model}/resources/icons/hicolor/scalable/status/syncthing-default.svg (100%) rename {tray => model}/resources/icons/hicolor/scalable/status/syncthing-disconnected.svg (100%) rename {tray => model}/resources/icons/hicolor/scalable/status/syncthing-error-sync.svg (100%) rename {tray => model}/resources/icons/hicolor/scalable/status/syncthing-error.svg (100%) rename {tray => model}/resources/icons/hicolor/scalable/status/syncthing-notify.svg (100%) rename {tray => model}/resources/icons/hicolor/scalable/status/syncthing-ok.svg (100%) rename {tray => model}/resources/icons/hicolor/scalable/status/syncthing-pause.svg (100%) rename {tray => model}/resources/icons/hicolor/scalable/status/syncthing-sync.svg (100%) create mode 100644 model/resources/syncthingmodelicons.qrc rename tray/resources/{icons.qrc => syncthingtrayicons.qrc} (72%) diff --git a/model/CMakeLists.txt b/model/CMakeLists.txt index aa020ac..d8ad343 100644 --- a/model/CMakeLists.txt +++ b/model/CMakeLists.txt @@ -24,6 +24,9 @@ set(SRC_FILES syncthingdevicemodel.cpp syncthingdownloadmodel.cpp ) +set(RES_FILES + resources/${META_PROJECT_NAME}icons.qrc +) set(TS_FILES translations/${META_PROJECT_NAME}_de_DE.ts diff --git a/tray/resources/icons/hicolor/scalable/mimetypes/text-x-generic.svg b/model/resources/icons/hicolor/scalable/mimetypes/text-x-generic.svg similarity index 100% rename from tray/resources/icons/hicolor/scalable/mimetypes/text-x-generic.svg rename to model/resources/icons/hicolor/scalable/mimetypes/text-x-generic.svg diff --git a/tray/resources/icons/hicolor/scalable/status/syncthing-default.svg b/model/resources/icons/hicolor/scalable/status/syncthing-default.svg similarity index 100% rename from tray/resources/icons/hicolor/scalable/status/syncthing-default.svg rename to model/resources/icons/hicolor/scalable/status/syncthing-default.svg diff --git a/tray/resources/icons/hicolor/scalable/status/syncthing-disconnected.svg b/model/resources/icons/hicolor/scalable/status/syncthing-disconnected.svg similarity index 100% rename from tray/resources/icons/hicolor/scalable/status/syncthing-disconnected.svg rename to model/resources/icons/hicolor/scalable/status/syncthing-disconnected.svg diff --git a/tray/resources/icons/hicolor/scalable/status/syncthing-error-sync.svg b/model/resources/icons/hicolor/scalable/status/syncthing-error-sync.svg similarity index 100% rename from tray/resources/icons/hicolor/scalable/status/syncthing-error-sync.svg rename to model/resources/icons/hicolor/scalable/status/syncthing-error-sync.svg diff --git a/tray/resources/icons/hicolor/scalable/status/syncthing-error.svg b/model/resources/icons/hicolor/scalable/status/syncthing-error.svg similarity index 100% rename from tray/resources/icons/hicolor/scalable/status/syncthing-error.svg rename to model/resources/icons/hicolor/scalable/status/syncthing-error.svg diff --git a/tray/resources/icons/hicolor/scalable/status/syncthing-notify.svg b/model/resources/icons/hicolor/scalable/status/syncthing-notify.svg similarity index 100% rename from tray/resources/icons/hicolor/scalable/status/syncthing-notify.svg rename to model/resources/icons/hicolor/scalable/status/syncthing-notify.svg diff --git a/tray/resources/icons/hicolor/scalable/status/syncthing-ok.svg b/model/resources/icons/hicolor/scalable/status/syncthing-ok.svg similarity index 100% rename from tray/resources/icons/hicolor/scalable/status/syncthing-ok.svg rename to model/resources/icons/hicolor/scalable/status/syncthing-ok.svg diff --git a/tray/resources/icons/hicolor/scalable/status/syncthing-pause.svg b/model/resources/icons/hicolor/scalable/status/syncthing-pause.svg similarity index 100% rename from tray/resources/icons/hicolor/scalable/status/syncthing-pause.svg rename to model/resources/icons/hicolor/scalable/status/syncthing-pause.svg diff --git a/tray/resources/icons/hicolor/scalable/status/syncthing-sync.svg b/model/resources/icons/hicolor/scalable/status/syncthing-sync.svg similarity index 100% rename from tray/resources/icons/hicolor/scalable/status/syncthing-sync.svg rename to model/resources/icons/hicolor/scalable/status/syncthing-sync.svg diff --git a/model/resources/syncthingmodelicons.qrc b/model/resources/syncthingmodelicons.qrc new file mode 100644 index 0000000..06296eb --- /dev/null +++ b/model/resources/syncthingmodelicons.qrc @@ -0,0 +1,13 @@ + + + icons/hicolor/scalable/status/syncthing-default.svg + icons/hicolor/scalable/status/syncthing-notify.svg + icons/hicolor/scalable/status/syncthing-pause.svg + icons/hicolor/scalable/status/syncthing-sync.svg + icons/hicolor/scalable/status/syncthing-disconnected.svg + icons/hicolor/scalable/status/syncthing-ok.svg + icons/hicolor/scalable/status/syncthing-error.svg + icons/hicolor/scalable/mimetypes/text-x-generic.svg + icons/hicolor/scalable/status/syncthing-error-sync.svg + + diff --git a/tray/CMakeLists.txt b/tray/CMakeLists.txt index a1f6756..8e3b8fd 100644 --- a/tray/CMakeLists.txt +++ b/tray/CMakeLists.txt @@ -43,7 +43,9 @@ set(WIDGETS_SRC_FILES gui/devview.cpp gui/downloadview.cpp gui/textviewdialog.cpp - resources/icons.qrc +) +set(RES_FILES + resources/${META_PROJECT_NAME}icons.qrc ) set(WIDGETS_UI_FILES gui/traywidget.ui diff --git a/tray/resources/icons.qrc b/tray/resources/syncthingtrayicons.qrc similarity index 72% rename from tray/resources/icons.qrc rename to tray/resources/syncthingtrayicons.qrc index b0b62e4..f3af383 100644 --- a/tray/resources/icons.qrc +++ b/tray/resources/syncthingtrayicons.qrc @@ -1,13 +1,6 @@ icons/hicolor/scalable/app/syncthingtray.svg - icons/hicolor/scalable/status/syncthing-default.svg - icons/hicolor/scalable/status/syncthing-notify.svg - icons/hicolor/scalable/status/syncthing-pause.svg - icons/hicolor/scalable/status/syncthing-sync.svg - icons/hicolor/scalable/status/syncthing-disconnected.svg - icons/hicolor/scalable/status/syncthing-ok.svg - icons/hicolor/scalable/status/syncthing-error.svg icons/hicolor/scalable/actions/application-menu.svg icons/hicolor/scalable/actions/edit-copy.svg icons/hicolor/scalable/actions/folder-sync.svg @@ -21,13 +14,11 @@ icons/hicolor/scalable/apps/internet-web-browser.svg icons/hicolor/scalable/apps/preferences-other.svg icons/hicolor/scalable/devices/network-card.svg - icons/hicolor/scalable/mimetypes/text-x-generic.svg icons/hicolor/scalable/places/folder-open.svg icons/hicolor/scalable/places/folder.svg icons/hicolor/scalable/places/network-workgroup.svg icons/hicolor/scalable/apps/system-run.svg icons/hicolor/scalable/actions/network-connect.svg - icons/hicolor/scalable/status/syncthing-error-sync.svg icons/hicolor/scalable/places/folder-download.svg icons/hicolor/scalable/actions/process-stop.svg icons/hicolor/scalable/actions/list-add.svg