Moved main darkstyle resource files to the SPIERScommon directory

This reduces the number of duplicate files in use - including the palaeoware logo, lisence images, etc... so changing them for all SPIERS programs in one go will now be much easier. At the same tiem I've moved the .h/.cpp files of SPIERScommon into their own ./src folder.
palaeoware · Nov 6, 2018 · b45cc2d · b45cc2d
1 parent 145bb08
commit b45cc2d
Show file tree

Hide file tree

Showing 181 changed files with 202 additions and 1,658 deletions.
diff --git a/SPIERSalign/SPIERSalign.pro b/SPIERSalign/SPIERSalign.pro
@@ -13,7 +13,7 @@ CONFIG += qt \
     warn_on
 
 RESOURCES += align.qrc \
-    ../SPIERScommon/licenseresource.qrc
+    ../SPIERScommon/commonresources.qrc
 
 UI_DIR = build
 
@@ -40,19 +40,19 @@ FORMS += ui/mainwindow.ui \
 HEADERS += src/mainwindowimpl.h \
     src/globals.h \
     src/scene.h \
-    src/darkstyletheme.h \
+    ../SPIERScommon/src/darkstyletheme.h \
     src/about.h \
-    ../SPIERScommon/netmodule.h \
-    ../SPIERScommon/semanticversion.h \
-    ../SPIERScommon/prereleasecomponent.h
+    ../SPIERScommon/src/netmodule.h \
+    ../SPIERScommon/src/semanticversion.h \
+    ../SPIERScommon/src/prereleasecomponent.h
 
 SOURCES += src/mainwindowimpl.cpp \
     src/main.cpp \
     src/globals.cpp \
     src/scene.cpp \
-    src/darkstyletheme.cpp \
+    ../SPIERScommon/src/darkstyletheme.cpp \
     src/about.cpp \
-   ../SPIERScommon/netmodule.cpp \
-    ../SPIERScommon/semanticversion.cpp \
-    ../SPIERScommon/prereleasecomponent.cpp
+    ../SPIERScommon/src/netmodule.cpp \
+    ../SPIERScommon/src/semanticversion.cpp \
+    ../SPIERScommon/src/prereleasecomponent.cpp
 
diff --git a/SPIERSalign/align.qrc b/SPIERSalign/align.qrc
@@ -1,38 +1,5 @@
 <RCC>
     <qresource prefix="/">
         <file alias="alignicon.png">resources/alignicon.png</file>
-        <file alias="gplV3Logo">resources/gplv3-127x51.png</file>
-        <file alias="builtWithQTLogo">resources/Built_with_Qt_RGB_logo.png</file>
-        <file alias="palaeoware_logo_square.png">resources/palaeoware_logo_square.png</file>
-    </qresource>
-    <qresource prefix="/darkstyle">
-        <file alias="stylesheet_dark.qss">resources/darkstyle/stylesheet_dark.qss</file>
-        <file alias="icon_branch_closed.png">resources/darkstyle/icon_branch_closed.png</file>
-        <file alias="icon_branch_end.png">resources/darkstyle/icon_branch_end.png</file>
-        <file alias="icon_branch_more.png">resources/darkstyle/icon_branch_more.png</file>
-        <file alias="icon_branch_open.png">resources/darkstyle/icon_branch_open.png</file>
-        <file alias="icon_checkbox_checked.png">resources/darkstyle/icon_checkbox_checked.png</file>
-        <file alias="icon_checkbox_checked_disabled.png">resources/darkstyle/icon_checkbox_checked_disabled.png</file>
-        <file alias="icon_checkbox_checked_pressed.png">resources/darkstyle/icon_checkbox_checked_pressed.png</file>
-        <file alias="icon_checkbox_indeterminate.png">resources/darkstyle/icon_checkbox_indeterminate.png</file>
-        <file alias="icon_checkbox_indeterminate_disabled.png">resources/darkstyle/icon_checkbox_indeterminate_disabled.png</file>
-        <file alias="icon_checkbox_indeterminate_pressed.png">resources/darkstyle/icon_checkbox_indeterminate_pressed.png</file>
-        <file alias="icon_checkbox_unchecked.png">resources/darkstyle/icon_checkbox_unchecked.png</file>
-        <file alias="icon_checkbox_unchecked_disabled.png">resources/darkstyle/icon_checkbox_unchecked_disabled.png</file>
-        <file alias="icon_checkbox_unchecked_pressed.png">resources/darkstyle/icon_checkbox_unchecked_pressed.png</file>
-        <file alias="icon_close.png">resources/darkstyle/icon_close.png</file>
-        <file alias="icon_radiobutton_checked.png">resources/darkstyle/icon_radiobutton_checked.png</file>
-        <file alias="icon_radiobutton_checked_disabled.png">resources/darkstyle/icon_radiobutton_checked_disabled.png</file>
-        <file alias="icon_radiobutton_pressed.png">resources/darkstyle/icon_radiobutton_checked_pressed.png</file>
-        <file alias="icon_radiobutton_unchecked.png">resources/darkstyle/icon_radiobutton_unchecked.png</file>
-        <file alias="icon_radiobutton_disabled.png">resources/darkstyle/icon_radiobutton_unchecked_disabled.png</file>
-        <file alias="icon_radiobutton_unchecked_pressed.png">resources/darkstyle/icon_radiobutton_unchecked_pressed.png</file>
-        <file alias="icon_restore.png">resources/darkstyle/icon_restore.png</file>
-        <file alias="icon_undock.png">resources/darkstyle/icon_undock.png</file>
-        <file alias="icon_vline.png">resources/darkstyle/icon_vline.png</file>
-        <file alias="icon_about_button.png">resources/darkstyle/icon_about_button.png</file>
-        <file alias="icon_log_button.png">resources/darkstyle/icon_log_button.png</file>
-        <file alias="icon_settings_1_button.png">resources/darkstyle/icon_settings_1_button.png</file>
-        <file alias="icon_settings_2_button.png">resources/darkstyle/icon_settings_2_button.png</file>
     </qresource>
 </RCC>