From 041c9df658289105e566fe0b31cf7ffab51bc275 Mon Sep 17 00:00:00 2001 From: romibi Date: Thu, 1 Feb 2018 23:47:30 +0100 Subject: [PATCH] Update qrc's for new Icons and update Import Script --- icons/CMakeLists.txt | 37 +++++++++++++----- icons/breeze-extra.qrc | 27 +++++++++++++ icons/breeze.qrc | 11 ------ icons/breezedark-extra.qrc | 27 +++++++++++++ icons/breezedark.qrc | 11 ------ icons/hicolor.qrc | 12 ------ icons/import/extra-icons.qrc.breeze | 11 ------ icons/import/extra-icons.qrc.breezedark | 11 ------ icons/import/extra-icons.qrc.oxygen | 24 ------------ icons/import/import_theme.pl | 15 ------- icons/oxygen-extra.qrc | 52 +++++++++++++++++++++++++ icons/oxygen.qrc | 24 ------------ 12 files changed, 134 insertions(+), 128 deletions(-) create mode 100644 icons/breeze-extra.qrc create mode 100644 icons/breezedark-extra.qrc delete mode 100644 icons/import/extra-icons.qrc.breeze delete mode 100644 icons/import/extra-icons.qrc.breezedark delete mode 100644 icons/import/extra-icons.qrc.oxygen create mode 100644 icons/oxygen-extra.qrc diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt index 89b286c1..6ffb7ecd 100644 --- 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 (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") @@ -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 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) @@ -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() - 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) diff --git a/icons/breeze-extra.qrc b/icons/breeze-extra.qrc new file mode 100644 index 00000000..2f289049 --- /dev/null +++ b/icons/breeze-extra.qrc @@ -0,0 +1,27 @@ + + + extra-icons/breeze/actions/24/connect-quassel.svg + extra-icons/breeze/actions/32/connect-quassel.svg + extra-icons/breeze/actions/24/disconnect-quassel.svg + extra-icons/breeze/actions/32/disconnect-quassel.svg + extra-icons/breeze/apps/32/quassel.svg + extra-icons/breeze/apps/48/quassel.svg + extra-icons/breeze/apps/64/quassel.svg + extra-icons/breeze/status/24/active-quassel-tray.svg + extra-icons/breeze/status/64/active-quassel-tray.svg + extra-icons/breeze/status/24/active-quassel-tray-inverted.svg + extra-icons/breeze/status/64/active-quassel-tray-inverted.svg + extra-icons/breeze/status/24/inactive-quassel.svg + extra-icons/breeze/status/64/inactive-quassel.svg + extra-icons/breeze/status/24/inactive-quassel-tray.svg + extra-icons/breeze/status/64/inactive-quassel-tray.svg + extra-icons/breeze/status/24/inactive-quassel-tray-inverted.svg + extra-icons/breeze/status/64/inactive-quassel-tray-inverted.svg + extra-icons/breeze/status/24/message-quassel.svg + extra-icons/breeze/status/64/message-quassel.svg + extra-icons/breeze/status/24/message-quassel-tray.svg + extra-icons/breeze/status/64/message-quassel-tray.svg + extra-icons/breeze/status/24/message-quassel-tray-inverted.svg + extra-icons/breeze/status/64/message-quassel-tray-inverted.svg + + diff --git a/icons/breeze.qrc b/icons/breeze.qrc index e90b5dc1..68a41ddd 100644 --- a/icons/breeze.qrc +++ b/icons/breeze.qrc @@ -202,16 +202,5 @@ breeze/status/64/dialog-warning.svg breeze/status/64/security-high.svg breeze/status/64/security-low.svg - extra-icons/breeze/actions/24/connect-quassel.svg - extra-icons/breeze/actions/32/connect-quassel.svg - extra-icons/breeze/actions/24/disconnect-quassel.svg - extra-icons/breeze/actions/32/disconnect-quassel.svg - extra-icons/breeze/apps/32/quassel.svg - extra-icons/breeze/apps/48/quassel.svg - extra-icons/breeze/apps/64/quassel.svg - extra-icons/breeze/status/24/inactive-quassel.svg - extra-icons/breeze/status/64/inactive-quassel.svg - extra-icons/breeze/status/24/message-quassel.svg - extra-icons/breeze/status/64/message-quassel.svg diff --git a/icons/breezedark-extra.qrc b/icons/breezedark-extra.qrc new file mode 100644 index 00000000..a73e007d --- /dev/null +++ b/icons/breezedark-extra.qrc @@ -0,0 +1,27 @@ + + + extra-icons/breezedark/actions/24/connect-quassel.svg + extra-icons/breezedark/actions/32/connect-quassel.svg + extra-icons/breezedark/actions/24/disconnect-quassel.svg + extra-icons/breezedark/actions/32/disconnect-quassel.svg + extra-icons/breezedark/apps/32/quassel.svg + extra-icons/breezedark/apps/48/quassel.svg + extra-icons/breezedark/apps/64/quassel.svg + extra-icons/breezedark/status/24/active-quassel-tray.svg + extra-icons/breezedark/status/64/active-quassel-tray.svg + extra-icons/breezedark/status/24/active-quassel-tray-inverted.svg + extra-icons/breezedark/status/64/active-quassel-tray-inverted.svg + extra-icons/breezedark/status/24/inactive-quassel.svg + extra-icons/breezedark/status/64/inactive-quassel.svg + extra-icons/breezedark/status/24/inactive-quassel-tray.svg + extra-icons/breezedark/status/64/inactive-quassel-tray.svg + extra-icons/breezedark/status/24/inactive-quassel-tray-inverted.svg + extra-icons/breezedark/status/64/inactive-quassel-tray-inverted.svg + extra-icons/breezedark/status/24/message-quassel.svg + extra-icons/breezedark/status/64/message-quassel.svg + extra-icons/breezedark/status/24/message-quassel-tray.svg + extra-icons/breezedark/status/64/message-quassel-tray.svg + extra-icons/breezedark/status/24/message-quassel-tray-inverted.svg + extra-icons/breezedark/status/64/message-quassel-tray-inverted.svg + + diff --git a/icons/breezedark.qrc b/icons/breezedark.qrc index 39e6907b..d0ab16e6 100644 --- a/icons/breezedark.qrc +++ b/icons/breezedark.qrc @@ -202,16 +202,5 @@ breezedark/status/64/dialog-warning.svg breezedark/status/64/security-high.svg breezedark/status/64/security-low.svg - extra-icons/breezedark/actions/24/connect-quassel.svg - extra-icons/breezedark/actions/32/connect-quassel.svg - extra-icons/breezedark/actions/24/disconnect-quassel.svg - extra-icons/breezedark/actions/32/disconnect-quassel.svg - extra-icons/breezedark/apps/32/quassel.svg - extra-icons/breezedark/apps/48/quassel.svg - extra-icons/breezedark/apps/64/quassel.svg - extra-icons/breezedark/status/24/inactive-quassel.svg - extra-icons/breezedark/status/64/inactive-quassel.svg - extra-icons/breezedark/status/24/message-quassel.svg - extra-icons/breezedark/status/64/message-quassel.svg diff --git a/icons/hicolor.qrc b/icons/hicolor.qrc index 740adc89..a32a2984 100644 --- a/icons/hicolor.qrc +++ b/icons/hicolor.qrc @@ -15,18 +15,6 @@ hicolor/16x16/status/inactive-quassel.png hicolor/22x22/status/inactive-quassel.png hicolor/32x32/status/inactive-quassel.png - hicolor/16x16/actions/connect-quassel.png - hicolor/22x22/actions/connect-quassel.png - hicolor/32x32/actions/connect-quassel.png - hicolor/64x64/actions/connect-quassel.png - hicolor/128x128/actions/connect-quassel.png - hicolor/48x48/actions/connect-quassel.png - hicolor/16x16/actions/disconnect-quassel.png - hicolor/22x22/actions/disconnect-quassel.png - hicolor/32x32/actions/disconnect-quassel.png - hicolor/64x64/actions/disconnect-quassel.png - hicolor/128x128/actions/disconnect-quassel.png - hicolor/48x48/actions/disconnect-quassel.png hicolor/48x48/status/inactive-quassel.png hicolor/64x64/status/inactive-quassel.png hicolor/128x128/status/inactive-quassel.png diff --git a/icons/import/extra-icons.qrc.breeze b/icons/import/extra-icons.qrc.breeze deleted file mode 100644 index 28ad7048..00000000 --- a/icons/import/extra-icons.qrc.breeze +++ /dev/null @@ -1,11 +0,0 @@ - extra-icons/breeze/actions/24/connect-quassel.svg - extra-icons/breeze/actions/32/connect-quassel.svg - extra-icons/breeze/actions/24/disconnect-quassel.svg - extra-icons/breeze/actions/32/disconnect-quassel.svg - extra-icons/breeze/apps/32/quassel.svg - extra-icons/breeze/apps/48/quassel.svg - extra-icons/breeze/apps/64/quassel.svg - extra-icons/breeze/status/24/inactive-quassel.svg - extra-icons/breeze/status/64/inactive-quassel.svg - extra-icons/breeze/status/24/message-quassel.svg - extra-icons/breeze/status/64/message-quassel.svg \ 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 index 7109b4a6..00000000 --- a/icons/import/extra-icons.qrc.breezedark +++ /dev/null @@ -1,11 +0,0 @@ - extra-icons/breezedark/actions/24/connect-quassel.svg - extra-icons/breezedark/actions/32/connect-quassel.svg - extra-icons/breezedark/actions/24/disconnect-quassel.svg - extra-icons/breezedark/actions/32/disconnect-quassel.svg - extra-icons/breezedark/apps/32/quassel.svg - extra-icons/breezedark/apps/48/quassel.svg - extra-icons/breezedark/apps/64/quassel.svg - extra-icons/breezedark/status/24/inactive-quassel.svg - extra-icons/breezedark/status/64/inactive-quassel.svg - extra-icons/breezedark/status/24/message-quassel.svg - extra-icons/breezedark/status/64/message-quassel.svg \ 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 index 7f082ac2..00000000 --- a/icons/import/extra-icons.qrc.oxygen +++ /dev/null @@ -1,24 +0,0 @@ - hicolor/16x16/status/inactive-quassel.png - hicolor/22x22/status/inactive-quassel.png - hicolor/32x32/status/inactive-quassel.png - hicolor/48x48/status/inactive-quassel.png - hicolor/64x64/status/inactive-quassel.png - hicolor/128x128/status/inactive-quassel.png - hicolor/16x16/status/message-quassel.png - hicolor/22x22/status/message-quassel.png - hicolor/32x32/status/message-quassel.png - hicolor/48x48/status/message-quassel.png - hicolor/64x64/status/message-quassel.png - hicolor/128x128/status/message-quassel.png - hicolor/16x16/actions/connect-quassel.png - hicolor/22x22/actions/connect-quassel.png - hicolor/32x32/actions/connect-quassel.png - hicolor/48x48/actions/connect-quassel.png - hicolor/64x64/actions/connect-quassel.png - hicolor/128x128/actions/connect-quassel.png - hicolor/16x16/actions/disconnect-quassel.png - hicolor/22x22/actions/disconnect-quassel.png - hicolor/32x32/actions/disconnect-quassel.png - hicolor/48x48/actions/disconnect-quassel.png - hicolor/64x64/actions/disconnect-quassel.png - hicolor/128x128/actions/disconnect-quassel.png \ No newline at end of file diff --git a/icons/import/import_theme.pl b/icons/import/import_theme.pl index 1737cb4b..8e56c27a 100755 --- 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 $extrafile = "import/extra-icons.qrc." . $themename; 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"; @@ -84,18 +82,6 @@ while() { } close WHITELIST; -# Read in extra-icons -my $hasthemeextrafile = 1; -local $/; -open EXTRAFILE, "<$extrafile" or $hasthemeextrafile = 0; -if($hasthemeextrafile) { - binmode EXTRAFILE; - $extrafilecontent = ; - close EXTRAFILE; -} else { - $extrafilecontent = ""; -} - # Clean old output dir print "Removing old $themename...\n"; system("rm -rf $themename"); @@ -176,7 +162,6 @@ sub generate_qrc { my $qrc = "\n" ." \n" ."$files\n" - ."$extrafilecontent\n" ." \n" ."\n"; diff --git a/icons/oxygen-extra.qrc b/icons/oxygen-extra.qrc new file mode 100644 index 00000000..46f7af7f --- /dev/null +++ b/icons/oxygen-extra.qrc @@ -0,0 +1,52 @@ + + + extra-icons/oxygen/16x16/apps/quassel.png + extra-icons/oxygen/22x22/apps/quassel.png + extra-icons/oxygen/32x32/apps/quassel.png + extra-icons/oxygen/48x48/apps/quassel.png + extra-icons/oxygen/64x64/apps/quassel.png + extra-icons/oxygen/128x128/apps/quassel.png + extra-icons/oxygen/16x16/status/active-quassel.png + extra-icons/oxygen/22x22/status/active-quassel.png + extra-icons/oxygen/32x32/status/active-quassel.png + extra-icons/oxygen/48x48/status/active-quassel.png + extra-icons/oxygen/64x64/status/active-quassel.png + extra-icons/oxygen/128x128/status/active-quassel.png + extra-icons/oxygen/16x16/status/inactive-quassel.png + extra-icons/oxygen/22x22/status/inactive-quassel.png + extra-icons/oxygen/32x32/status/inactive-quassel.png + extra-icons/oxygen/48x48/status/inactive-quassel.png + extra-icons/oxygen/64x64/status/inactive-quassel.png + extra-icons/oxygen/128x128/status/inactive-quassel.png + extra-icons/oxygen/16x16/status/inactive-quassel.png + extra-icons/oxygen/22x22/status/inactive-quassel.png + extra-icons/oxygen/32x32/status/inactive-quassel.png + extra-icons/oxygen/48x48/status/inactive-quassel.png + extra-icons/oxygen/64x64/status/inactive-quassel.png + extra-icons/oxygen/128x128/status/inactive-quassel.png + extra-icons/oxygen/16x16/status/message-quassel.png + extra-icons/oxygen/22x22/status/message-quassel.png + extra-icons/oxygen/32x32/status/message-quassel.png + extra-icons/oxygen/48x48/status/message-quassel.png + extra-icons/oxygen/64x64/status/message-quassel.png + extra-icons/oxygen/128x128/status/message-quassel.png + extra-icons/oxygen/16x16/status/message-quassel.png + extra-icons/oxygen/22x22/status/message-quassel.png + extra-icons/oxygen/32x32/status/message-quassel.png + extra-icons/oxygen/48x48/status/message-quassel.png + extra-icons/oxygen/64x64/status/message-quassel.png + extra-icons/oxygen/128x128/status/message-quassel.png + extra-icons/oxygen/16x16/actions/connect-quassel.png + extra-icons/oxygen/22x22/actions/connect-quassel.png + extra-icons/oxygen/32x32/actions/connect-quassel.png + extra-icons/oxygen/48x48/actions/connect-quassel.png + extra-icons/oxygen/64x64/actions/connect-quassel.png + extra-icons/oxygen/128x128/actions/connect-quassel.png + extra-icons/oxygen/16x16/actions/disconnect-quassel.png + extra-icons/oxygen/22x22/actions/disconnect-quassel.png + extra-icons/oxygen/32x32/actions/disconnect-quassel.png + extra-icons/oxygen/48x48/actions/disconnect-quassel.png + extra-icons/oxygen/64x64/actions/disconnect-quassel.png + extra-icons/oxygen/128x128/actions/disconnect-quassel.png + + diff --git a/icons/oxygen.qrc b/icons/oxygen.qrc index bf3bf80d..2a631a1c 100644 --- a/icons/oxygen.qrc +++ b/icons/oxygen.qrc @@ -303,29 +303,5 @@ oxygen/64x64/status/security-low.png oxygen/64x64/status/user-away.png oxygen/index.theme - hicolor/16x16/status/inactive-quassel.png - hicolor/22x22/status/inactive-quassel.png - hicolor/32x32/status/inactive-quassel.png - hicolor/48x48/status/inactive-quassel.png - hicolor/64x64/status/inactive-quassel.png - hicolor/128x128/status/inactive-quassel.png - hicolor/16x16/status/message-quassel.png - hicolor/22x22/status/message-quassel.png - hicolor/32x32/status/message-quassel.png - hicolor/48x48/status/message-quassel.png - hicolor/64x64/status/message-quassel.png - hicolor/128x128/status/message-quassel.png - hicolor/16x16/actions/connect-quassel.png - hicolor/22x22/actions/connect-quassel.png - hicolor/32x32/actions/connect-quassel.png - hicolor/48x48/actions/connect-quassel.png - hicolor/64x64/actions/connect-quassel.png - hicolor/128x128/actions/connect-quassel.png - hicolor/16x16/actions/disconnect-quassel.png - hicolor/22x22/actions/disconnect-quassel.png - hicolor/32x32/actions/disconnect-quassel.png - hicolor/48x48/actions/disconnect-quassel.png - hicolor/64x64/actions/disconnect-quassel.png - hicolor/128x128/actions/disconnect-quassel.png -- 2.20.1