Update qrc's for new Icons and update Import Script

diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 89b286c..6ffb7ec 100644 (file)
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -12,6 +12,18 @@
 if (WANT_MONO OR WANT_QTCLIENT)
     set(ICON_RCS ${CMAKE_CURRENT_SOURCE_DIR}/hicolor.qrc) # always embed those
 
 if (WANT_MONO OR WANT_QTCLIENT)
     set(ICON_RCS ${CMAKE_CURRENT_SOURCE_DIR}/hicolor.qrc) # always embed those
 

+    if (NOT WITH_OXYGEN)
+        message(STATUS "Not installing bundled Oxygen icons")
+    endif()
+
+    if (NOT WITH_BREEZE)
+        message(STATUS "Not installing bundled Breeze icons")
+    endif()
+
+    if (NOT WITH_BREEZE_DARK)
+        message(STATUS "Not installing bundled Breeze Dark icons")
+    endif()
+

     if (EMBED_DATA)
         if (WITH_OXYGEN)
             message(STATUS "Embedding bundled Oxygen icons")
     if (EMBED_DATA)
         if (WITH_OXYGEN)
             message(STATUS "Embedding bundled Oxygen icons")


@@ -25,6 +37,16 @@ if (WANT_MONO OR WANT_QTCLIENT)
             message(STATUS "Embedding bundled Breeze Dark icons")
             set(ICON_RCS ${ICON_RCS} ${CMAKE_CURRENT_SOURCE_DIR}/breezedark.qrc)
         endif()
             message(STATUS "Embedding bundled Breeze Dark icons")
             set(ICON_RCS ${ICON_RCS} ${CMAKE_CURRENT_SOURCE_DIR}/breezedark.qrc)
         endif()

+
+        message(STATUS "Embedding some extra Oxygen styled icons")
+        set(ICON_RCS ${ICON_RCS} ${CMAKE_CURRENT_SOURCE_DIR}/oxygen-extra.qrc)
+
+        message(STATUS "Embedding some extra Breeze styled icons")
+        set(ICON_RCS ${ICON_RCS} ${CMAKE_CURRENT_SOURCE_DIR}/breeze-extra.qrc)
+
+        message(STATUS "Embedding some extra Breeze Dark styled icons")
+        set(ICON_RCS ${ICON_RCS} ${CMAKE_CURRENT_SOURCE_DIR}/breezedark-extra.qrc)
+

     else()
         install(DIRECTORY hicolor DESTINATION ${CMAKE_INSTALL_ICONDIR})
         if (WITH_OXYGEN)
     else()
         install(DIRECTORY hicolor DESTINATION ${CMAKE_INSTALL_ICONDIR})
         if (WITH_OXYGEN)


@@ -39,18 +61,15 @@ if (WANT_MONO OR WANT_QTCLIENT)
             message(STATUS "Installing bundled Breeze Dark icons")
             install(DIRECTORY breezedark DESTINATION ${CMAKE_INSTALL_DATADIR}/quassel/icons)
         endif()
             message(STATUS "Installing bundled Breeze Dark icons")
             install(DIRECTORY breezedark DESTINATION ${CMAKE_INSTALL_DATADIR}/quassel/icons)
         endif()

-    endif()

 
 

-    if (NOT WITH_OXYGEN)
-        message(STATUS "Not installing bundled Oxygen icons")
-    endif()
+        message(STATUS "Installing some extra bundled Oxygen styled icons")
+        install(DIRECTORY extra-icons/oxygen DESTINATION ${CMAKE_INSTALL_DATADIR}/quassel/icons/extra)

 
 

-    if (NOT WITH_BREEZE)
-        message(STATUS "Not installing bundled Breeze icons")
-    endif()
+        message(STATUS "Installing some extra bundled Breeze styled icons")
+        install(DIRECTORY extra-icons/breeze DESTINATION ${CMAKE_INSTALL_DATADIR}/quassel/icons/extra)

 
 

-    if (NOT WITH_BREEZE_DARK)
-        message(STATUS "Not installing bundled Breeze Dark icons")
+        message(STATUS "Installing some extra bundled Breeze Dark styled icons")
+        install(DIRECTORY extra-icons/breezedark DESTINATION ${CMAKE_INSTALL_DATADIR}/quassel/icons/extra)

     endif()
 
     set(CLIENT_RCS ${CLIENT_RCS} ${ICON_RCS} PARENT_SCOPE)
     endif()
 
     set(CLIENT_RCS ${CLIENT_RCS} ${ICON_RCS} PARENT_SCOPE)

diff --git a/icons/breeze-extra.qrc b/icons/breeze-extra.qrc
new file mode 100644 (file)
index 0000000..2f28904
--- /dev/null
+++ b/icons/breeze-extra.qrc
@@ -0,0 +1,27 @@
+<RCC>
+  <qresource prefix="/icons/extra">
+    <file alias="breeze/actions/24/connect-quassel.svg">extra-icons/breeze/actions/24/connect-quassel.svg</file>
+    <file alias="breeze/actions/32/connect-quassel.svg">extra-icons/breeze/actions/32/connect-quassel.svg</file>
+    <file alias="breeze/actions/24/disconnect-quassel.svg">extra-icons/breeze/actions/24/disconnect-quassel.svg</file>
+    <file alias="breeze/actions/32/disconnect-quassel.svg">extra-icons/breeze/actions/32/disconnect-quassel.svg</file>
+    <file alias="breeze/apps/32/quassel.svg">extra-icons/breeze/apps/32/quassel.svg</file>
+    <file alias="breeze/apps/48/quassel.svg">extra-icons/breeze/apps/48/quassel.svg</file>
+    <file alias="breeze/apps/64/quassel.svg">extra-icons/breeze/apps/64/quassel.svg</file>
+    <file alias="breeze/status/24/active-quassel-tray.svg">extra-icons/breeze/status/24/active-quassel-tray.svg</file>
+    <file alias="breeze/status/64/active-quassel-tray.svg">extra-icons/breeze/status/64/active-quassel-tray.svg</file>
+    <file alias="breeze/status/24/active-quassel-tray-inverted.svg">extra-icons/breeze/status/24/active-quassel-tray-inverted.svg</file>
+    <file alias="breeze/status/64/active-quassel-tray-inverted.svg">extra-icons/breeze/status/64/active-quassel-tray-inverted.svg</file>
+    <file alias="breeze/status/24/inactive-quassel.svg">extra-icons/breeze/status/24/inactive-quassel.svg</file>
+    <file alias="breeze/status/64/inactive-quassel.svg">extra-icons/breeze/status/64/inactive-quassel.svg</file>
+    <file alias="breeze/status/24/inactive-quassel-tray.svg">extra-icons/breeze/status/24/inactive-quassel-tray.svg</file>
+    <file alias="breeze/status/64/inactive-quassel-tray.svg">extra-icons/breeze/status/64/inactive-quassel-tray.svg</file>
+    <file alias="breeze/status/24/inactive-quassel-tray-inverted.svg">extra-icons/breeze/status/24/inactive-quassel-tray-inverted.svg</file>
+    <file alias="breeze/status/64/inactive-quassel-tray-inverted.svg">extra-icons/breeze/status/64/inactive-quassel-tray-inverted.svg</file>
+    <file alias="breeze/status/24/message-quassel.svg">extra-icons/breeze/status/24/message-quassel.svg</file>
+    <file alias="breeze/status/64/message-quassel.svg">extra-icons/breeze/status/64/message-quassel.svg</file>
+    <file alias="breeze/status/24/message-quassel-tray.svg">extra-icons/breeze/status/24/message-quassel-tray.svg</file>
+    <file alias="breeze/status/64/message-quassel-tray.svg">extra-icons/breeze/status/64/message-quassel-tray.svg</file>
+    <file alias="breeze/status/24/message-quassel-tray-inverted.svg">extra-icons/breeze/status/24/message-quassel-tray-inverted.svg</file>
+    <file alias="breeze/status/64/message-quassel-tray-inverted.svg">extra-icons/breeze/status/64/message-quassel-tray-inverted.svg</file>
+  </qresource>
+</RCC>

diff --git a/icons/breeze.qrc b/icons/breeze.qrc
index e90b5dc..68a41dd 100644 (file)
--- a/icons/breeze.qrc
+++ b/icons/breeze.qrc
@@ -202,16 +202,5 @@
     <file>breeze/status/64/dialog-warning.svg</file>
     <file>breeze/status/64/security-high.svg</file>
     <file>breeze/status/64/security-low.svg</file>
     <file>breeze/status/64/dialog-warning.svg</file>
     <file>breeze/status/64/security-high.svg</file>
     <file>breeze/status/64/security-low.svg</file>

-    <file alias="breeze/actions/24/connect-quassel.svg">extra-icons/breeze/actions/24/connect-quassel.svg</file>
-    <file alias="breeze/actions/32/connect-quassel.svg">extra-icons/breeze/actions/32/connect-quassel.svg</file>
-    <file alias="breeze/actions/24/disconnect-quassel.svg">extra-icons/breeze/actions/24/disconnect-quassel.svg</file>
-    <file alias="breeze/actions/32/disconnect-quassel.svg">extra-icons/breeze/actions/32/disconnect-quassel.svg</file>
-    <file alias="breeze/apps/32/quassel.svg">extra-icons/breeze/apps/32/quassel.svg</file>
-    <file alias="breeze/apps/48/quassel.svg">extra-icons/breeze/apps/48/quassel.svg</file>
-    <file alias="breeze/apps/64/quassel.svg">extra-icons/breeze/apps/64/quassel.svg</file>
-    <file alias="breeze/status/24/inactive-quassel.svg">extra-icons/breeze/status/24/inactive-quassel.svg</file>
-    <file alias="breeze/status/64/inactive-quassel.svg">extra-icons/breeze/status/64/inactive-quassel.svg</file>
-    <file alias="breeze/status/24/message-quassel.svg">extra-icons/breeze/status/24/message-quassel.svg</file>
-    <file alias="breeze/status/64/message-quassel.svg">extra-icons/breeze/status/64/message-quassel.svg</file>

   </qresource>
 </RCC>
   </qresource>
 </RCC>

diff --git a/icons/breezedark-extra.qrc b/icons/breezedark-extra.qrc
new file mode 100644 (file)
index 0000000..a73e007
--- /dev/null
+++ b/icons/breezedark-extra.qrc
@@ -0,0 +1,27 @@
+<RCC>
+  <qresource prefix="/icons/extra">
+    <file alias="breezedark/actions/24/connect-quassel.svg">extra-icons/breezedark/actions/24/connect-quassel.svg</file>
+    <file alias="breezedark/actions/32/connect-quassel.svg">extra-icons/breezedark/actions/32/connect-quassel.svg</file>
+    <file alias="breezedark/actions/24/disconnect-quassel.svg">extra-icons/breezedark/actions/24/disconnect-quassel.svg</file>
+    <file alias="breezedark/actions/32/disconnect-quassel.svg">extra-icons/breezedark/actions/32/disconnect-quassel.svg</file>
+    <file alias="breezedark/apps/32/quassel.svg">extra-icons/breezedark/apps/32/quassel.svg</file>
+    <file alias="breezedark/apps/48/quassel.svg">extra-icons/breezedark/apps/48/quassel.svg</file>
+    <file alias="breezedark/apps/64/quassel.svg">extra-icons/breezedark/apps/64/quassel.svg</file>
+    <file alias="breezedark/status/24/active-quassel-tray.svg">extra-icons/breezedark/status/24/active-quassel-tray.svg</file>
+    <file alias="breezedark/status/64/active-quassel-tray.svg">extra-icons/breezedark/status/64/active-quassel-tray.svg</file>
+    <file alias="breezedark/status/24/active-quassel-tray-inverted.svg">extra-icons/breezedark/status/24/active-quassel-tray-inverted.svg</file>
+    <file alias="breezedark/status/64/active-quassel-tray-inverted.svg">extra-icons/breezedark/status/64/active-quassel-tray-inverted.svg</file>
+    <file alias="breezedark/status/24/inactive-quassel.svg">extra-icons/breezedark/status/24/inactive-quassel.svg</file>
+    <file alias="breezedark/status/64/inactive-quassel.svg">extra-icons/breezedark/status/64/inactive-quassel.svg</file>
+    <file alias="breezedark/status/24/inactive-quassel-tray.svg">extra-icons/breezedark/status/24/inactive-quassel-tray.svg</file>
+    <file alias="breezedark/status/64/inactive-quassel-tray.svg">extra-icons/breezedark/status/64/inactive-quassel-tray.svg</file>
+    <file alias="breezedark/status/24/inactive-quassel-tray-inverted.svg">extra-icons/breezedark/status/24/inactive-quassel-tray-inverted.svg</file>
+    <file alias="breezedark/status/64/inactive-quassel-tray-inverted.svg">extra-icons/breezedark/status/64/inactive-quassel-tray-inverted.svg</file>
+    <file alias="breezedark/status/24/message-quassel.svg">extra-icons/breezedark/status/24/message-quassel.svg</file>
+    <file alias="breezedark/status/64/message-quassel.svg">extra-icons/breezedark/status/64/message-quassel.svg</file>
+    <file alias="breezedark/status/24/message-quassel-tray.svg">extra-icons/breezedark/status/24/message-quassel-tray.svg</file>
+    <file alias="breezedark/status/64/message-quassel-tray.svg">extra-icons/breezedark/status/64/message-quassel-tray.svg</file>
+    <file alias="breezedark/status/24/message-quassel-tray-inverted.svg">extra-icons/breezedark/status/24/message-quassel-tray-inverted.svg</file>
+    <file alias="breezedark/status/64/message-quassel-tray-inverted.svg">extra-icons/breezedark/status/64/message-quassel-tray-inverted.svg</file>
+  </qresource>
+</RCC>

diff --git a/icons/breezedark.qrc b/icons/breezedark.qrc
index 39e6907..d0ab16e 100644 (file)
--- a/icons/breezedark.qrc
+++ b/icons/breezedark.qrc
@@ -202,16 +202,5 @@
     <file>breezedark/status/64/dialog-warning.svg</file>
     <file>breezedark/status/64/security-high.svg</file>
     <file>breezedark/status/64/security-low.svg</file>
     <file>breezedark/status/64/dialog-warning.svg</file>
     <file>breezedark/status/64/security-high.svg</file>
     <file>breezedark/status/64/security-low.svg</file>

-    <file alias="breezedark/actions/24/connect-quassel.svg">extra-icons/breezedark/actions/24/connect-quassel.svg</file>
-    <file alias="breezedark/actions/32/connect-quassel.svg">extra-icons/breezedark/actions/32/connect-quassel.svg</file>
-    <file alias="breezedark/actions/24/disconnect-quassel.svg">extra-icons/breezedark/actions/24/disconnect-quassel.svg</file>
-    <file alias="breezedark/actions/32/disconnect-quassel.svg">extra-icons/breezedark/actions/32/disconnect-quassel.svg</file>
-    <file alias="breezedark/apps/32/quassel.svg">extra-icons/breezedark/apps/32/quassel.svg</file>
-    <file alias="breezedark/apps/48/quassel.svg">extra-icons/breezedark/apps/48/quassel.svg</file>
-    <file alias="breezedark/apps/64/quassel.svg">extra-icons/breezedark/apps/64/quassel.svg</file>
-    <file alias="breezedark/status/24/inactive-quassel.svg">extra-icons/breezedark/status/24/inactive-quassel.svg</file>
-    <file alias="breezedark/status/64/inactive-quassel.svg">extra-icons/breezedark/status/64/inactive-quassel.svg</file>
-    <file alias="breezedark/status/24/message-quassel.svg">extra-icons/breezedark/status/24/message-quassel.svg</file>
-    <file alias="breezedark/status/64/message-quassel.svg">extra-icons/breezedark/status/64/message-quassel.svg</file>

   </qresource>
 </RCC>
   </qresource>
 </RCC>

diff --git a/icons/hicolor.qrc b/icons/hicolor.qrc
index 740adc8..a32a298 100644 (file)
--- a/icons/hicolor.qrc
+++ b/icons/hicolor.qrc
@@ -15,18 +15,6 @@
     <file>hicolor/16x16/status/inactive-quassel.png</file>
     <file>hicolor/22x22/status/inactive-quassel.png</file>
     <file>hicolor/32x32/status/inactive-quassel.png</file>
     <file>hicolor/16x16/status/inactive-quassel.png</file>
     <file>hicolor/22x22/status/inactive-quassel.png</file>
     <file>hicolor/32x32/status/inactive-quassel.png</file>

-    <file>hicolor/16x16/actions/connect-quassel.png</file>
-    <file>hicolor/22x22/actions/connect-quassel.png</file>
-    <file>hicolor/32x32/actions/connect-quassel.png</file>
-    <file>hicolor/64x64/actions/connect-quassel.png</file>
-    <file>hicolor/128x128/actions/connect-quassel.png</file>
-    <file alias="connect-quassel.png">hicolor/48x48/actions/connect-quassel.png</file>
-    <file>hicolor/16x16/actions/disconnect-quassel.png</file>
-    <file>hicolor/22x22/actions/disconnect-quassel.png</file>
-    <file>hicolor/32x32/actions/disconnect-quassel.png</file>
-    <file>hicolor/64x64/actions/disconnect-quassel.png</file>
-    <file>hicolor/128x128/actions/disconnect-quassel.png</file>
-    <file alias="disconnect-quassel.png">hicolor/48x48/actions/disconnect-quassel.png</file>

     <file alias="inactive-quassel.png">hicolor/48x48/status/inactive-quassel.png</file>
     <file alias="inactive-quassel-64.png">hicolor/64x64/status/inactive-quassel.png</file>
     <file alias="inactive-quassel-128.png">hicolor/128x128/status/inactive-quassel.png</file>
     <file alias="inactive-quassel.png">hicolor/48x48/status/inactive-quassel.png</file>
     <file alias="inactive-quassel-64.png">hicolor/64x64/status/inactive-quassel.png</file>
     <file alias="inactive-quassel-128.png">hicolor/128x128/status/inactive-quassel.png</file>

diff --git a/icons/import/extra-icons.qrc.breeze b/icons/import/extra-icons.qrc.breeze
deleted file mode 100644 (file)
index 28ad704..0000000
--- a/icons/import/extra-icons.qrc.breeze
+++ /dev/null
@@ -1,11 +0,0 @@
-    <file alias="breeze/actions/24/connect-quassel.svg">extra-icons/breeze/actions/24/connect-quassel.svg</file>
-    <file alias="breeze/actions/32/connect-quassel.svg">extra-icons/breeze/actions/32/connect-quassel.svg</file>
-    <file alias="breeze/actions/24/disconnect-quassel.svg">extra-icons/breeze/actions/24/disconnect-quassel.svg</file>
-    <file alias="breeze/actions/32/disconnect-quassel.svg">extra-icons/breeze/actions/32/disconnect-quassel.svg</file>
-    <file alias="breeze/apps/32/quassel.svg">extra-icons/breeze/apps/32/quassel.svg</file>
-    <file alias="breeze/apps/48/quassel.svg">extra-icons/breeze/apps/48/quassel.svg</file>
-    <file alias="breeze/apps/64/quassel.svg">extra-icons/breeze/apps/64/quassel.svg</file>
-    <file alias="breeze/status/24/inactive-quassel.svg">extra-icons/breeze/status/24/inactive-quassel.svg</file>
-    <file alias="breeze/status/64/inactive-quassel.svg">extra-icons/breeze/status/64/inactive-quassel.svg</file>
-    <file alias="breeze/status/24/message-quassel.svg">extra-icons/breeze/status/24/message-quassel.svg</file>
-    <file alias="breeze/status/64/message-quassel.svg">extra-icons/breeze/status/64/message-quassel.svg</file>
\ No newline at end of file

diff --git a/icons/import/extra-icons.qrc.breezedark b/icons/import/extra-icons.qrc.breezedark
deleted file mode 100644 (file)
index 7109b4a..0000000
--- a/icons/import/extra-icons.qrc.breezedark
+++ /dev/null
@@ -1,11 +0,0 @@
-    <file alias="breezedark/actions/24/connect-quassel.svg">extra-icons/breezedark/actions/24/connect-quassel.svg</file>
-    <file alias="breezedark/actions/32/connect-quassel.svg">extra-icons/breezedark/actions/32/connect-quassel.svg</file>
-    <file alias="breezedark/actions/24/disconnect-quassel.svg">extra-icons/breezedark/actions/24/disconnect-quassel.svg</file>
-    <file alias="breezedark/actions/32/disconnect-quassel.svg">extra-icons/breezedark/actions/32/disconnect-quassel.svg</file>
-    <file alias="breezedark/apps/32/quassel.svg">extra-icons/breezedark/apps/32/quassel.svg</file>
-    <file alias="breezedark/apps/48/quassel.svg">extra-icons/breezedark/apps/48/quassel.svg</file>
-    <file alias="breezedark/apps/64/quassel.svg">extra-icons/breezedark/apps/64/quassel.svg</file>
-    <file alias="breezedark/status/24/inactive-quassel.svg">extra-icons/breezedark/status/24/inactive-quassel.svg</file>
-    <file alias="breezedark/status/64/inactive-quassel.svg">extra-icons/breezedark/status/64/inactive-quassel.svg</file>
-    <file alias="breezedark/status/24/message-quassel.svg">extra-icons/breezedark/status/24/message-quassel.svg</file>
-    <file alias="breezedark/status/64/message-quassel.svg">extra-icons/breezedark/status/64/message-quassel.svg</file>
\ No newline at end of file

diff --git a/icons/import/extra-icons.qrc.oxygen b/icons/import/extra-icons.qrc.oxygen
deleted file mode 100644 (file)
index 7f082ac..0000000
--- a/icons/import/extra-icons.qrc.oxygen
+++ /dev/null
@@ -1,24 +0,0 @@
-    <file alias="oxygen/16x16/status/inactive-quassel.png">hicolor/16x16/status/inactive-quassel.png</file>
-    <file alias="oxygen/22x22/status/inactive-quassel.png">hicolor/22x22/status/inactive-quassel.png</file>
-    <file alias="oxygen/32x32/status/inactive-quassel.png">hicolor/32x32/status/inactive-quassel.png</file>
-    <file alias="oxygen/48x48/status/inactive-quassel.png">hicolor/48x48/status/inactive-quassel.png</file>
-    <file alias="oxygen/64x64/status/inactive-quassel.png">hicolor/64x64/status/inactive-quassel.png</file>
-    <file alias="oxygen/128x128/status/inactive-quassel.png">hicolor/128x128/status/inactive-quassel.png</file>
-    <file alias="oxygen/16x16/status/message-quassel.png">hicolor/16x16/status/message-quassel.png</file>
-    <file alias="oxygen/22x22/status/message-quassel.png">hicolor/22x22/status/message-quassel.png</file>
-    <file alias="oxygen/32x32/status/message-quassel.png">hicolor/32x32/status/message-quassel.png</file>
-    <file alias="oxygen/48x48/status/message-quassel.png">hicolor/48x48/status/message-quassel.png</file>
-    <file alias="oxygen/64x64/status/message-quassel.png">hicolor/64x64/status/message-quassel.png</file>
-    <file alias="oxygen/128x128/status/message-quassel.png">hicolor/128x128/status/message-quassel.png</file>
-    <file alias="oxygen/16x16/actions/connect-quassel.png">hicolor/16x16/actions/connect-quassel.png</file>
-    <file alias="oxygen/22x22/actions/connect-quassel.png">hicolor/22x22/actions/connect-quassel.png</file>
-    <file alias="oxygen/32x32/actions/connect-quassel.png">hicolor/32x32/actions/connect-quassel.png</file>
-    <file alias="oxygen/48x48/actions/connect-quassel.png">hicolor/48x48/actions/connect-quassel.png</file>
-    <file alias="oxygen/64x64/actions/connect-quassel.png">hicolor/64x64/actions/connect-quassel.png</file>
-    <file alias="oxygen/128x128/actions/connect-quassel.png">hicolor/128x128/actions/connect-quassel.png</file>
-    <file alias="oxygen/16x16/actions/disconnect-quassel.png">hicolor/16x16/actions/disconnect-quassel.png</file>
-    <file alias="oxygen/22x22/actions/disconnect-quassel.png">hicolor/22x22/actions/disconnect-quassel.png</file>
-    <file alias="oxygen/32x32/actions/disconnect-quassel.png">hicolor/32x32/actions/disconnect-quassel.png</file>
-    <file alias="oxygen/48x48/actions/disconnect-quassel.png">hicolor/48x48/actions/disconnect-quassel.png</file>
-    <file alias="oxygen/64x64/actions/disconnect-quassel.png">hicolor/64x64/actions/disconnect-quassel.png</file>
-    <file alias="oxygen/128x128/actions/disconnect-quassel.png">hicolor/128x128/actions/disconnect-quassel.png</file>
\ No newline at end of file

diff --git a/icons/import/import_theme.pl b/icons/import/import_theme.pl
index 1737cb4..8e56c27 100755 (executable)
--- a/icons/import/import_theme.pl
+++ b/icons/import/import_theme.pl
@@ -33,14 +33,12 @@ my $parentFolderFileSuffix = shift;
 
 my $whitelistfile = "import/whitelist-icons";
 my $blacklistfile = "import/blacklisted-icons";
 
 my $whitelistfile = "import/whitelist-icons";
 my $blacklistfile = "import/blacklisted-icons";

-my $extrafile = "import/extra-icons.qrc." . $themename;

 
 my %req_icons;
 my %found_icons;
 my %blacklist;
 my %themeblacklist;
 my %whitelist;
 
 my %req_icons;
 my %found_icons;
 my %blacklist;
 my %themeblacklist;
 my %whitelist;

-my $extrafilecontent;

 
 # First, load the icon blacklist
 open BLACKLIST, "<$blacklistfile" or die "Could not open $blacklistfile\n";
 
 # First, load the icon blacklist
 open BLACKLIST, "<$blacklistfile" or die "Could not open $blacklistfile\n";


@@ -84,18 +82,6 @@ while(<WHITELIST>) {
 }
 close WHITELIST;
 
 }
 close WHITELIST;
 

-# Read in extra-icons
-my $hasthemeextrafile = 1;
-local $/;
-open EXTRAFILE, "<$extrafile" or $hasthemeextrafile = 0;
-if($hasthemeextrafile) {
-  binmode EXTRAFILE;
-  $extrafilecontent = <EXTRAFILE>;
-  close EXTRAFILE;
-} else {
-  $extrafilecontent = "";
-}
-

 # Clean old output dir
 print "Removing old $themename...\n";
 system("rm -rf $themename");
 # Clean old output dir
 print "Removing old $themename...\n";
 system("rm -rf $themename");


@@ -176,7 +162,6 @@ sub generate_qrc {
   my $qrc = "<RCC>\n"
            ."  <qresource prefix=\"/icons\">\n"
            ."$files\n"
   my $qrc = "<RCC>\n"
            ."  <qresource prefix=\"/icons\">\n"
            ."$files\n"

-           ."$extrafilecontent\n"

            ."  </qresource>\n"
            ."</RCC>\n";
 
            ."  </qresource>\n"
            ."</RCC>\n";
 

diff --git a/icons/oxygen-extra.qrc b/icons/oxygen-extra.qrc
new file mode 100644 (file)
index 0000000..46f7af7
--- /dev/null
+++ b/icons/oxygen-extra.qrc
@@ -0,0 +1,52 @@
+<RCC>
+  <qresource prefix="/icons/extra">
+    <file alias="oxygen/16x16/apps/quassel.png">extra-icons/oxygen/16x16/apps/quassel.png</file>
+    <file alias="oxygen/22x22/apps/quassel.png">extra-icons/oxygen/22x22/apps/quassel.png</file>
+    <file alias="oxygen/32x32/apps/quassel.png">extra-icons/oxygen/32x32/apps/quassel.png</file>
+    <file alias="oxygen/48x48/apps/quassel.png">extra-icons/oxygen/48x48/apps/quassel.png</file>
+    <file alias="oxygen/64x64/apps/quassel.png">extra-icons/oxygen/64x64/apps/quassel.png</file>
+    <file alias="oxygen/128x128/apps/quassel.png">extra-icons/oxygen/128x128/apps/quassel.png</file>
+    <file alias="oxygen/16x16/status/active-quassel-tray.png">extra-icons/oxygen/16x16/status/active-quassel.png</file>
+    <file alias="oxygen/22x22/status/active-quassel-tray.png">extra-icons/oxygen/22x22/status/active-quassel.png</file>
+    <file alias="oxygen/32x32/status/active-quassel-tray.png">extra-icons/oxygen/32x32/status/active-quassel.png</file>
+    <file alias="oxygen/48x48/status/active-quassel-tray.png">extra-icons/oxygen/48x48/status/active-quassel.png</file>
+    <file alias="oxygen/64x64/status/active-quassel-tray.png">extra-icons/oxygen/64x64/status/active-quassel.png</file>
+    <file alias="oxygen/128x128/status/active-quassel-tray.png">extra-icons/oxygen/128x128/status/active-quassel.png</file>
+    <file alias="oxygen/16x16/status/inactive-quassel.png">extra-icons/oxygen/16x16/status/inactive-quassel.png</file>
+    <file alias="oxygen/22x22/status/inactive-quassel.png">extra-icons/oxygen/22x22/status/inactive-quassel.png</file>
+    <file alias="oxygen/32x32/status/inactive-quassel.png">extra-icons/oxygen/32x32/status/inactive-quassel.png</file>
+    <file alias="oxygen/48x48/status/inactive-quassel.png">extra-icons/oxygen/48x48/status/inactive-quassel.png</file>
+    <file alias="oxygen/64x64/status/inactive-quassel.png">extra-icons/oxygen/64x64/status/inactive-quassel.png</file>
+    <file alias="oxygen/128x128/status/inactive-quassel.png">extra-icons/oxygen/128x128/status/inactive-quassel.png</file>
+    <file alias="oxygen/16x16/status/inactive-quassel-tray.png">extra-icons/oxygen/16x16/status/inactive-quassel.png</file>
+    <file alias="oxygen/22x22/status/inactive-quassel-tray.png">extra-icons/oxygen/22x22/status/inactive-quassel.png</file>
+    <file alias="oxygen/32x32/status/inactive-quassel-tray.png">extra-icons/oxygen/32x32/status/inactive-quassel.png</file>
+    <file alias="oxygen/48x48/status/inactive-quassel-tray.png">extra-icons/oxygen/48x48/status/inactive-quassel.png</file>
+    <file alias="oxygen/64x64/status/inactive-quassel-tray.png">extra-icons/oxygen/64x64/status/inactive-quassel.png</file>
+    <file alias="oxygen/128x128/status/inactive-quassel-tray.png">extra-icons/oxygen/128x128/status/inactive-quassel.png</file>
+    <file alias="oxygen/16x16/status/message-quassel.png">extra-icons/oxygen/16x16/status/message-quassel.png</file>
+    <file alias="oxygen/22x22/status/message-quassel.png">extra-icons/oxygen/22x22/status/message-quassel.png</file>
+    <file alias="oxygen/32x32/status/message-quassel.png">extra-icons/oxygen/32x32/status/message-quassel.png</file>
+    <file alias="oxygen/48x48/status/message-quassel.png">extra-icons/oxygen/48x48/status/message-quassel.png</file>
+    <file alias="oxygen/64x64/status/message-quassel.png">extra-icons/oxygen/64x64/status/message-quassel.png</file>
+    <file alias="oxygen/128x128/status/message-quassel.png">extra-icons/oxygen/128x128/status/message-quassel.png</file>
+    <file alias="oxygen/16x16/status/message-quassel-tray.png">extra-icons/oxygen/16x16/status/message-quassel.png</file>
+    <file alias="oxygen/22x22/status/message-quassel-tray.png">extra-icons/oxygen/22x22/status/message-quassel.png</file>
+    <file alias="oxygen/32x32/status/message-quassel-tray.png">extra-icons/oxygen/32x32/status/message-quassel.png</file>
+    <file alias="oxygen/48x48/status/message-quassel-tray.png">extra-icons/oxygen/48x48/status/message-quassel.png</file>
+    <file alias="oxygen/64x64/status/message-quassel-tray.png">extra-icons/oxygen/64x64/status/message-quassel.png</file>
+    <file alias="oxygen/128x128/status/message-quassel-tray.png">extra-icons/oxygen/128x128/status/message-quassel.png</file>
+    <file alias="oxygen/16x16/actions/connect-quassel.png">extra-icons/oxygen/16x16/actions/connect-quassel.png</file>
+    <file alias="oxygen/22x22/actions/connect-quassel.png">extra-icons/oxygen/22x22/actions/connect-quassel.png</file>
+    <file alias="oxygen/32x32/actions/connect-quassel.png">extra-icons/oxygen/32x32/actions/connect-quassel.png</file>
+    <file alias="oxygen/48x48/actions/connect-quassel.png">extra-icons/oxygen/48x48/actions/connect-quassel.png</file>
+    <file alias="oxygen/64x64/actions/connect-quassel.png">extra-icons/oxygen/64x64/actions/connect-quassel.png</file>
+    <file alias="oxygen/128x128/actions/connect-quassel.png">extra-icons/oxygen/128x128/actions/connect-quassel.png</file>
+    <file alias="oxygen/16x16/actions/disconnect-quassel.png">extra-icons/oxygen/16x16/actions/disconnect-quassel.png</file>
+    <file alias="oxygen/22x22/actions/disconnect-quassel.png">extra-icons/oxygen/22x22/actions/disconnect-quassel.png</file>
+    <file alias="oxygen/32x32/actions/disconnect-quassel.png">extra-icons/oxygen/32x32/actions/disconnect-quassel.png</file>
+    <file alias="oxygen/48x48/actions/disconnect-quassel.png">extra-icons/oxygen/48x48/actions/disconnect-quassel.png</file>
+    <file alias="oxygen/64x64/actions/disconnect-quassel.png">extra-icons/oxygen/64x64/actions/disconnect-quassel.png</file>
+    <file alias="oxygen/128x128/actions/disconnect-quassel.png">extra-icons/oxygen/128x128/actions/disconnect-quassel.png</file>
+  </qresource>
+</RCC>

diff --git a/icons/oxygen.qrc b/icons/oxygen.qrc
index bf3bf80..2a631a1 100644 (file)
--- a/icons/oxygen.qrc
+++ b/icons/oxygen.qrc
@@ -303,29 +303,5 @@
     <file>oxygen/64x64/status/security-low.png</file>
     <file>oxygen/64x64/status/user-away.png</file>
     <file>oxygen/index.theme</file>
     <file>oxygen/64x64/status/security-low.png</file>
     <file>oxygen/64x64/status/user-away.png</file>
     <file>oxygen/index.theme</file>

-    <file alias="oxygen/16x16/status/inactive-quassel.png">hicolor/16x16/status/inactive-quassel.png</file>
-    <file alias="oxygen/22x22/status/inactive-quassel.png">hicolor/22x22/status/inactive-quassel.png</file>
-    <file alias="oxygen/32x32/status/inactive-quassel.png">hicolor/32x32/status/inactive-quassel.png</file>
-    <file alias="oxygen/48x48/status/inactive-quassel.png">hicolor/48x48/status/inactive-quassel.png</file>
-    <file alias="oxygen/64x64/status/inactive-quassel.png">hicolor/64x64/status/inactive-quassel.png</file>
-    <file alias="oxygen/128x128/status/inactive-quassel.png">hicolor/128x128/status/inactive-quassel.png</file>
-    <file alias="oxygen/16x16/status/message-quassel.png">hicolor/16x16/status/message-quassel.png</file>
-    <file alias="oxygen/22x22/status/message-quassel.png">hicolor/22x22/status/message-quassel.png</file>
-    <file alias="oxygen/32x32/status/message-quassel.png">hicolor/32x32/status/message-quassel.png</file>
-    <file alias="oxygen/48x48/status/message-quassel.png">hicolor/48x48/status/message-quassel.png</file>
-    <file alias="oxygen/64x64/status/message-quassel.png">hicolor/64x64/status/message-quassel.png</file>
-    <file alias="oxygen/128x128/status/message-quassel.png">hicolor/128x128/status/message-quassel.png</file>
-    <file alias="oxygen/16x16/actions/connect-quassel.png">hicolor/16x16/actions/connect-quassel.png</file>
-    <file alias="oxygen/22x22/actions/connect-quassel.png">hicolor/22x22/actions/connect-quassel.png</file>
-    <file alias="oxygen/32x32/actions/connect-quassel.png">hicolor/32x32/actions/connect-quassel.png</file>
-    <file alias="oxygen/48x48/actions/connect-quassel.png">hicolor/48x48/actions/connect-quassel.png</file>
-    <file alias="oxygen/64x64/actions/connect-quassel.png">hicolor/64x64/actions/connect-quassel.png</file>
-    <file alias="oxygen/128x128/actions/connect-quassel.png">hicolor/128x128/actions/connect-quassel.png</file>
-    <file alias="oxygen/16x16/actions/disconnect-quassel.png">hicolor/16x16/actions/disconnect-quassel.png</file>
-    <file alias="oxygen/22x22/actions/disconnect-quassel.png">hicolor/22x22/actions/disconnect-quassel.png</file>
-    <file alias="oxygen/32x32/actions/disconnect-quassel.png">hicolor/32x32/actions/disconnect-quassel.png</file>
-    <file alias="oxygen/48x48/actions/disconnect-quassel.png">hicolor/48x48/actions/disconnect-quassel.png</file>
-    <file alias="oxygen/64x64/actions/disconnect-quassel.png">hicolor/64x64/actions/disconnect-quassel.png</file>
-    <file alias="oxygen/128x128/actions/disconnect-quassel.png">hicolor/128x128/actions/disconnect-quassel.png</file>

   </qresource>
 </RCC>
   </qresource>
 </RCC>