From 799dbc090d9bb9ca4a85711e6253ebda9fef266e Mon Sep 17 00:00:00 2001 From: romibi Date: Sat, 25 Mar 2017 16:42:35 +0100 Subject: [PATCH] Support extra theme dependent icons via import-script --- .../breeze/actions/24/connect-quassel.svg | 22 +++++++ .../breeze/actions/24/disconnect-quassel.svg | 22 +++++++ .../breeze/actions/32/connect-quassel.svg | 22 +++++++ .../breeze/actions/32/disconnect-quassel.svg | 22 +++++++ icons/extra-icons/breeze/apps/32/quassel.svg | 59 +++++++++++++++++++ icons/extra-icons/breeze/apps/48/quassel.svg | 59 +++++++++++++++++++ icons/extra-icons/breeze/apps/64/quassel.svg | 59 +++++++++++++++++++ .../scalable/actions/connect-quassel.svg | 22 +++++++ .../scalable/actions/disconnect-quassel.svg | 22 +++++++ .../breeze/scalable/apps/quassel.svg | 59 +++++++++++++++++++ .../scalable/status/inactive-quassel.svg | 59 +++++++++++++++++++ .../scalable/status/message-quassel.svg | 59 +++++++++++++++++++ .../breeze/status/24/inactive-quassel.svg | 59 +++++++++++++++++++ .../breeze/status/24/message-quassel.svg | 59 +++++++++++++++++++ .../breeze/status/64/inactive-quassel.svg | 59 +++++++++++++++++++ .../breeze/status/64/message-quassel.svg | 59 +++++++++++++++++++ .../breezedark/actions/24/connect-quassel.svg | 22 +++++++ .../actions/24/disconnect-quassel.svg | 22 +++++++ .../breezedark/actions/32/connect-quassel.svg | 22 +++++++ .../actions/32/disconnect-quassel.svg | 22 +++++++ .../breezedark/apps/32/quassel.svg | 59 +++++++++++++++++++ .../breezedark/apps/48/quassel.svg | 59 +++++++++++++++++++ .../breezedark/apps/64/quassel.svg | 59 +++++++++++++++++++ .../scalable/actions/connect-quassel.svg | 22 +++++++ .../scalable/actions/disconnect-quassel.svg | 22 +++++++ .../breezedark/scalable/apps/quassel.svg | 59 +++++++++++++++++++ .../scalable/status/inactive-quassel.svg | 59 +++++++++++++++++++ .../scalable/status/message-quassel.svg | 59 +++++++++++++++++++ .../breezedark/status/24/inactive-quassel.svg | 59 +++++++++++++++++++ .../breezedark/status/24/message-quassel.svg | 59 +++++++++++++++++++ .../breezedark/status/64/inactive-quassel.svg | 59 +++++++++++++++++++ .../breezedark/status/64/message-quassel.svg | 59 +++++++++++++++++++ icons/import/blacklisted-icons | 6 +- icons/import/blacklisted-icons.breeze | 3 + icons/import/blacklisted-icons.breezedark | 3 + 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 | 39 ++++++++---- icons/import/whitelist-icons | 1 + 40 files changed, 1530 insertions(+), 12 deletions(-) create mode 100644 icons/extra-icons/breeze/actions/24/connect-quassel.svg create mode 100644 icons/extra-icons/breeze/actions/24/disconnect-quassel.svg create mode 100644 icons/extra-icons/breeze/actions/32/connect-quassel.svg create mode 100644 icons/extra-icons/breeze/actions/32/disconnect-quassel.svg create mode 100644 icons/extra-icons/breeze/apps/32/quassel.svg create mode 100644 icons/extra-icons/breeze/apps/48/quassel.svg create mode 100644 icons/extra-icons/breeze/apps/64/quassel.svg create mode 100644 icons/extra-icons/breeze/scalable/actions/connect-quassel.svg create mode 100644 icons/extra-icons/breeze/scalable/actions/disconnect-quassel.svg create mode 100644 icons/extra-icons/breeze/scalable/apps/quassel.svg create mode 100644 icons/extra-icons/breeze/scalable/status/inactive-quassel.svg create mode 100644 icons/extra-icons/breeze/scalable/status/message-quassel.svg create mode 100644 icons/extra-icons/breeze/status/24/inactive-quassel.svg create mode 100644 icons/extra-icons/breeze/status/24/message-quassel.svg create mode 100644 icons/extra-icons/breeze/status/64/inactive-quassel.svg create mode 100644 icons/extra-icons/breeze/status/64/message-quassel.svg create mode 100644 icons/extra-icons/breezedark/actions/24/connect-quassel.svg create mode 100644 icons/extra-icons/breezedark/actions/24/disconnect-quassel.svg create mode 100644 icons/extra-icons/breezedark/actions/32/connect-quassel.svg create mode 100644 icons/extra-icons/breezedark/actions/32/disconnect-quassel.svg create mode 100644 icons/extra-icons/breezedark/apps/32/quassel.svg create mode 100644 icons/extra-icons/breezedark/apps/48/quassel.svg create mode 100644 icons/extra-icons/breezedark/apps/64/quassel.svg create mode 100644 icons/extra-icons/breezedark/scalable/actions/connect-quassel.svg create mode 100644 icons/extra-icons/breezedark/scalable/actions/disconnect-quassel.svg create mode 100644 icons/extra-icons/breezedark/scalable/apps/quassel.svg create mode 100644 icons/extra-icons/breezedark/scalable/status/inactive-quassel.svg create mode 100644 icons/extra-icons/breezedark/scalable/status/message-quassel.svg create mode 100644 icons/extra-icons/breezedark/status/24/inactive-quassel.svg create mode 100644 icons/extra-icons/breezedark/status/24/message-quassel.svg create mode 100644 icons/extra-icons/breezedark/status/64/inactive-quassel.svg create mode 100644 icons/extra-icons/breezedark/status/64/message-quassel.svg create mode 100644 icons/import/blacklisted-icons.breeze create mode 100644 icons/import/blacklisted-icons.breezedark create mode 100644 icons/import/extra-icons.qrc.breeze create mode 100644 icons/import/extra-icons.qrc.breezedark create mode 100644 icons/import/extra-icons.qrc.oxygen create mode 100644 icons/import/whitelist-icons diff --git a/icons/extra-icons/breeze/actions/24/connect-quassel.svg b/icons/extra-icons/breeze/actions/24/connect-quassel.svg new file mode 100644 index 00000000..c34b1f11 --- /dev/null +++ b/icons/extra-icons/breeze/actions/24/connect-quassel.svg @@ -0,0 +1,22 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breeze/actions/24/disconnect-quassel.svg b/icons/extra-icons/breeze/actions/24/disconnect-quassel.svg new file mode 100644 index 00000000..831e3a3b --- /dev/null +++ b/icons/extra-icons/breeze/actions/24/disconnect-quassel.svg @@ -0,0 +1,22 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breeze/actions/32/connect-quassel.svg b/icons/extra-icons/breeze/actions/32/connect-quassel.svg new file mode 100644 index 00000000..a8ac05d0 --- /dev/null +++ b/icons/extra-icons/breeze/actions/32/connect-quassel.svg @@ -0,0 +1,22 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breeze/actions/32/disconnect-quassel.svg b/icons/extra-icons/breeze/actions/32/disconnect-quassel.svg new file mode 100644 index 00000000..ca303667 --- /dev/null +++ b/icons/extra-icons/breeze/actions/32/disconnect-quassel.svg @@ -0,0 +1,22 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breeze/apps/32/quassel.svg b/icons/extra-icons/breeze/apps/32/quassel.svg new file mode 100644 index 00000000..c2967843 --- /dev/null +++ b/icons/extra-icons/breeze/apps/32/quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breeze/apps/48/quassel.svg b/icons/extra-icons/breeze/apps/48/quassel.svg new file mode 100644 index 00000000..092400bc --- /dev/null +++ b/icons/extra-icons/breeze/apps/48/quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breeze/apps/64/quassel.svg b/icons/extra-icons/breeze/apps/64/quassel.svg new file mode 100644 index 00000000..def17974 --- /dev/null +++ b/icons/extra-icons/breeze/apps/64/quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breeze/scalable/actions/connect-quassel.svg b/icons/extra-icons/breeze/scalable/actions/connect-quassel.svg new file mode 100644 index 00000000..6b06c434 --- /dev/null +++ b/icons/extra-icons/breeze/scalable/actions/connect-quassel.svg @@ -0,0 +1,22 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breeze/scalable/actions/disconnect-quassel.svg b/icons/extra-icons/breeze/scalable/actions/disconnect-quassel.svg new file mode 100644 index 00000000..7a34c8f6 --- /dev/null +++ b/icons/extra-icons/breeze/scalable/actions/disconnect-quassel.svg @@ -0,0 +1,22 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breeze/scalable/apps/quassel.svg b/icons/extra-icons/breeze/scalable/apps/quassel.svg new file mode 100644 index 00000000..97c52b8b --- /dev/null +++ b/icons/extra-icons/breeze/scalable/apps/quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breeze/scalable/status/inactive-quassel.svg b/icons/extra-icons/breeze/scalable/status/inactive-quassel.svg new file mode 100644 index 00000000..d71302b9 --- /dev/null +++ b/icons/extra-icons/breeze/scalable/status/inactive-quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breeze/scalable/status/message-quassel.svg b/icons/extra-icons/breeze/scalable/status/message-quassel.svg new file mode 100644 index 00000000..c2acfe1e --- /dev/null +++ b/icons/extra-icons/breeze/scalable/status/message-quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breeze/status/24/inactive-quassel.svg b/icons/extra-icons/breeze/status/24/inactive-quassel.svg new file mode 100644 index 00000000..b5c6515a --- /dev/null +++ b/icons/extra-icons/breeze/status/24/inactive-quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breeze/status/24/message-quassel.svg b/icons/extra-icons/breeze/status/24/message-quassel.svg new file mode 100644 index 00000000..5e0449a1 --- /dev/null +++ b/icons/extra-icons/breeze/status/24/message-quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breeze/status/64/inactive-quassel.svg b/icons/extra-icons/breeze/status/64/inactive-quassel.svg new file mode 100644 index 00000000..a3cbc012 --- /dev/null +++ b/icons/extra-icons/breeze/status/64/inactive-quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breeze/status/64/message-quassel.svg b/icons/extra-icons/breeze/status/64/message-quassel.svg new file mode 100644 index 00000000..cc4b55d9 --- /dev/null +++ b/icons/extra-icons/breeze/status/64/message-quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breezedark/actions/24/connect-quassel.svg b/icons/extra-icons/breezedark/actions/24/connect-quassel.svg new file mode 100644 index 00000000..a59a5846 --- /dev/null +++ b/icons/extra-icons/breezedark/actions/24/connect-quassel.svg @@ -0,0 +1,22 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breezedark/actions/24/disconnect-quassel.svg b/icons/extra-icons/breezedark/actions/24/disconnect-quassel.svg new file mode 100644 index 00000000..eb48638d --- /dev/null +++ b/icons/extra-icons/breezedark/actions/24/disconnect-quassel.svg @@ -0,0 +1,22 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breezedark/actions/32/connect-quassel.svg b/icons/extra-icons/breezedark/actions/32/connect-quassel.svg new file mode 100644 index 00000000..c2055e2b --- /dev/null +++ b/icons/extra-icons/breezedark/actions/32/connect-quassel.svg @@ -0,0 +1,22 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breezedark/actions/32/disconnect-quassel.svg b/icons/extra-icons/breezedark/actions/32/disconnect-quassel.svg new file mode 100644 index 00000000..02bfd859 --- /dev/null +++ b/icons/extra-icons/breezedark/actions/32/disconnect-quassel.svg @@ -0,0 +1,22 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breezedark/apps/32/quassel.svg b/icons/extra-icons/breezedark/apps/32/quassel.svg new file mode 100644 index 00000000..c2967843 --- /dev/null +++ b/icons/extra-icons/breezedark/apps/32/quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breezedark/apps/48/quassel.svg b/icons/extra-icons/breezedark/apps/48/quassel.svg new file mode 100644 index 00000000..092400bc --- /dev/null +++ b/icons/extra-icons/breezedark/apps/48/quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breezedark/apps/64/quassel.svg b/icons/extra-icons/breezedark/apps/64/quassel.svg new file mode 100644 index 00000000..def17974 --- /dev/null +++ b/icons/extra-icons/breezedark/apps/64/quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breezedark/scalable/actions/connect-quassel.svg b/icons/extra-icons/breezedark/scalable/actions/connect-quassel.svg new file mode 100644 index 00000000..2fe14de2 --- /dev/null +++ b/icons/extra-icons/breezedark/scalable/actions/connect-quassel.svg @@ -0,0 +1,22 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breezedark/scalable/actions/disconnect-quassel.svg b/icons/extra-icons/breezedark/scalable/actions/disconnect-quassel.svg new file mode 100644 index 00000000..f503bf2a --- /dev/null +++ b/icons/extra-icons/breezedark/scalable/actions/disconnect-quassel.svg @@ -0,0 +1,22 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breezedark/scalable/apps/quassel.svg b/icons/extra-icons/breezedark/scalable/apps/quassel.svg new file mode 100644 index 00000000..97c52b8b --- /dev/null +++ b/icons/extra-icons/breezedark/scalable/apps/quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breezedark/scalable/status/inactive-quassel.svg b/icons/extra-icons/breezedark/scalable/status/inactive-quassel.svg new file mode 100644 index 00000000..d71302b9 --- /dev/null +++ b/icons/extra-icons/breezedark/scalable/status/inactive-quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breezedark/scalable/status/message-quassel.svg b/icons/extra-icons/breezedark/scalable/status/message-quassel.svg new file mode 100644 index 00000000..c2acfe1e --- /dev/null +++ b/icons/extra-icons/breezedark/scalable/status/message-quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breezedark/status/24/inactive-quassel.svg b/icons/extra-icons/breezedark/status/24/inactive-quassel.svg new file mode 100644 index 00000000..b5c6515a --- /dev/null +++ b/icons/extra-icons/breezedark/status/24/inactive-quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breezedark/status/24/message-quassel.svg b/icons/extra-icons/breezedark/status/24/message-quassel.svg new file mode 100644 index 00000000..5e0449a1 --- /dev/null +++ b/icons/extra-icons/breezedark/status/24/message-quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breezedark/status/64/inactive-quassel.svg b/icons/extra-icons/breezedark/status/64/inactive-quassel.svg new file mode 100644 index 00000000..a3cbc012 --- /dev/null +++ b/icons/extra-icons/breezedark/status/64/inactive-quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/extra-icons/breezedark/status/64/message-quassel.svg b/icons/extra-icons/breezedark/status/64/message-quassel.svg new file mode 100644 index 00000000..cc4b55d9 --- /dev/null +++ b/icons/extra-icons/breezedark/status/64/message-quassel.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/icons/import/blacklisted-icons b/icons/import/blacklisted-icons index 9289535b..cbee47ca 100644 --- a/icons/import/blacklisted-icons +++ b/icons/import/blacklisted-icons @@ -1,2 +1,4 @@ -quassel-inactive -quassel-message +inactive-quassel +message-quassel +connect-quassel +disconnect-quassel diff --git a/icons/import/blacklisted-icons.breeze b/icons/import/blacklisted-icons.breeze new file mode 100644 index 00000000..269c6509 --- /dev/null +++ b/icons/import/blacklisted-icons.breeze @@ -0,0 +1,3 @@ +irc-channel-parted +irc-channel-joined +quassel \ No newline at end of file diff --git a/icons/import/blacklisted-icons.breezedark b/icons/import/blacklisted-icons.breezedark new file mode 100644 index 00000000..269c6509 --- /dev/null +++ b/icons/import/blacklisted-icons.breezedark @@ -0,0 +1,3 @@ +irc-channel-parted +irc-channel-joined +quassel \ No newline at end of file diff --git a/icons/import/extra-icons.qrc.breeze b/icons/import/extra-icons.qrc.breeze new file mode 100644 index 00000000..28ad7048 --- /dev/null +++ b/icons/import/extra-icons.qrc.breeze @@ -0,0 +1,11 @@ + 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 new file mode 100644 index 00000000..7109b4a6 --- /dev/null +++ b/icons/import/extra-icons.qrc.breezedark @@ -0,0 +1,11 @@ + 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 new file mode 100644 index 00000000..7f082ac2 --- /dev/null +++ b/icons/import/extra-icons.qrc.oxygen @@ -0,0 +1,24 @@ + 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 f02e3f8e..e835a76a 100755 --- a/icons/import/import_theme.pl +++ b/icons/import/import_theme.pl @@ -5,9 +5,9 @@ # This relies on all icons being requested using one of the convenience constructors in # (K)IconLoader, like this: # widget->setIcon(SmallIcon("fubar")); -# Additional icons can be specified in extra-icons; you can also blacklist icons. +# Additional icons can be specified in whitelist-icons; you can also blacklist icons. # -# NOTE: Unless you are a Quassel developer and need to bump the icons we ship, you shouldn'y +# NOTE: Unless you are a Quassel developer and need to bump the icons we ship, you shouldn't # need to use this script! # USAGE: ./import/import_theme.pl $systhemefolder $themename @@ -24,13 +24,16 @@ my $themename = shift; $themename = $themename ? $themename : "oxygen"; my $qrcfile_kde = $themename . ".qrc"; -my $extrafile = "import/extra-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 %extra; +my %themeblacklist; +my %whitelist; +my $extrafilecontent; # First, load the icon blacklist open BLACKLIST, "<$blacklistfile" or die "Could not open $blacklistfile\n"; @@ -48,6 +51,7 @@ if ($hasthemeblacklist) { s/#.*//; next unless my ($name) = /([-\w]+)\s*/; $blacklist{$name} = 1; + $themeblacklist{$name} = 1; } close BLACKLIST; } else { @@ -63,14 +67,27 @@ foreach(@results) { unless exists $blacklist{$name}; } -# Add extra icons -open EXTRA, "<$extrafile" or die "Could not open $extrafile\n"; -while() { +# Add whitelist icons +open WHITELIST, "<$whitelistfile" or die "Could not open $whitelistfile\n"; +while() { s/#.*//; next unless my ($name) = /([-\w]+)\s*/; - $req_icons{$name} = 1; + $req_icons{$name} = 1 + unless exists $themeblacklist{$name}; +} +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 = ""; } -close EXTRA; # Clean old output dir print "Removing old $themename...\n"; @@ -131,7 +148,7 @@ system "cp $themefolder/AUTHORS $themefolder/CONTRIBUTING $themefolder/COPYING $ # Generate .qrc my @file_list; -generate_qrc($themename, $qrcfile_kde); +generate_qrc($themename, $qrcfile_kde, $extrafilecontent); print "Done.\n"; @@ -142,11 +159,13 @@ sub generate_qrc { @file_list = (); find(\&push_icon_path, $dir); + @file_list = sort(@file_list ); my $files = join "\n", @file_list; my $qrc = "\n" ." \n" ."$files\n" + ."$extrafilecontent\n" ." \n" ."\n"; diff --git a/icons/import/whitelist-icons b/icons/import/whitelist-icons new file mode 100644 index 00000000..40fce8f3 --- /dev/null +++ b/icons/import/whitelist-icons @@ -0,0 +1 @@ +quassel -- 2.20.1