From e4fc79c07f5301ce2c7888e709ada0945b675c4f Mon Sep 17 00:00:00 2001 From: romibi Date: Fri, 14 Apr 2017 16:11:20 +0200 Subject: [PATCH] Fix icon import to not lose channel icons in breeze Resolves GH-289. --- icons/breeze.qrc | 4 ++++ icons/breeze/status/16/irc-channel-joined.svg | 20 +++++++++++++++++++ icons/breeze/status/16/irc-channel-parted.svg | 20 +++++++++++++++++++ icons/breeze/status/22/irc-channel-joined.svg | 18 +++++++++++++++++ icons/breeze/status/22/irc-channel-parted.svg | 19 ++++++++++++++++++ icons/breezedark.qrc | 4 ++++ .../status/16/irc-channel-joined.svg | 20 +++++++++++++++++++ .../status/16/irc-channel-parted.svg | 20 +++++++++++++++++++ .../status/22/irc-channel-joined.svg | 18 +++++++++++++++++ .../status/22/irc-channel-parted.svg | 19 ++++++++++++++++++ icons/import/blacklisted-icons.breeze | 2 -- icons/import/blacklisted-icons.breezedark | 2 -- icons/import/import_theme.pl | 12 ++++++++++- 13 files changed, 173 insertions(+), 5 deletions(-) create mode 100644 icons/breeze/status/16/irc-channel-joined.svg create mode 100644 icons/breeze/status/16/irc-channel-parted.svg create mode 100644 icons/breeze/status/22/irc-channel-joined.svg create mode 100644 icons/breeze/status/22/irc-channel-parted.svg create mode 100644 icons/breezedark/status/16/irc-channel-joined.svg create mode 100644 icons/breezedark/status/16/irc-channel-parted.svg create mode 100644 icons/breezedark/status/22/irc-channel-joined.svg create mode 100644 icons/breezedark/status/22/irc-channel-parted.svg diff --git a/icons/breeze.qrc b/icons/breeze.qrc index c0535672..e90b5dc1 100644 --- a/icons/breeze.qrc +++ b/icons/breeze.qrc @@ -184,10 +184,14 @@ breeze/index.theme breeze/preferences/32/help-about.svg breeze/status/16/dialog-information.svg + breeze/status/16/irc-channel-joined.svg + breeze/status/16/irc-channel-parted.svg breeze/status/16/security-high.svg breeze/status/16/security-low.svg breeze/status/16/user-away.svg breeze/status/22/dialog-information.svg + breeze/status/22/irc-channel-joined.svg + breeze/status/22/irc-channel-parted.svg breeze/status/22/network-wired.svg breeze/status/22/security-high.svg breeze/status/22/security-low.svg diff --git a/icons/breeze/status/16/irc-channel-joined.svg b/icons/breeze/status/16/irc-channel-joined.svg new file mode 100644 index 00000000..a66c7568 --- /dev/null +++ b/icons/breeze/status/16/irc-channel-joined.svg @@ -0,0 +1,20 @@ + + + + + + + diff --git a/icons/breeze/status/16/irc-channel-parted.svg b/icons/breeze/status/16/irc-channel-parted.svg new file mode 100644 index 00000000..305cb037 --- /dev/null +++ b/icons/breeze/status/16/irc-channel-parted.svg @@ -0,0 +1,20 @@ + + + + + + + diff --git a/icons/breeze/status/22/irc-channel-joined.svg b/icons/breeze/status/22/irc-channel-joined.svg new file mode 100644 index 00000000..6dd99ae5 --- /dev/null +++ b/icons/breeze/status/22/irc-channel-joined.svg @@ -0,0 +1,18 @@ + + + + + + + diff --git a/icons/breeze/status/22/irc-channel-parted.svg b/icons/breeze/status/22/irc-channel-parted.svg new file mode 100644 index 00000000..785f844a --- /dev/null +++ b/icons/breeze/status/22/irc-channel-parted.svg @@ -0,0 +1,19 @@ + + + + + + + diff --git a/icons/breezedark.qrc b/icons/breezedark.qrc index 99eda068..39e6907b 100644 --- a/icons/breezedark.qrc +++ b/icons/breezedark.qrc @@ -184,10 +184,14 @@ breezedark/index.theme breezedark/preferences/32/help-about.svg breezedark/status/16/dialog-information.svg + breezedark/status/16/irc-channel-joined.svg + breezedark/status/16/irc-channel-parted.svg breezedark/status/16/security-high.svg breezedark/status/16/security-low.svg breezedark/status/16/user-away.svg breezedark/status/22/dialog-information.svg + breezedark/status/22/irc-channel-joined.svg + breezedark/status/22/irc-channel-parted.svg breezedark/status/22/network-wired.svg breezedark/status/22/security-high.svg breezedark/status/22/security-low.svg diff --git a/icons/breezedark/status/16/irc-channel-joined.svg b/icons/breezedark/status/16/irc-channel-joined.svg new file mode 100644 index 00000000..74126608 --- /dev/null +++ b/icons/breezedark/status/16/irc-channel-joined.svg @@ -0,0 +1,20 @@ + + + + + + + diff --git a/icons/breezedark/status/16/irc-channel-parted.svg b/icons/breezedark/status/16/irc-channel-parted.svg new file mode 100644 index 00000000..aa654cc6 --- /dev/null +++ b/icons/breezedark/status/16/irc-channel-parted.svg @@ -0,0 +1,20 @@ + + + + + + + diff --git a/icons/breezedark/status/22/irc-channel-joined.svg b/icons/breezedark/status/22/irc-channel-joined.svg new file mode 100644 index 00000000..9b41013b --- /dev/null +++ b/icons/breezedark/status/22/irc-channel-joined.svg @@ -0,0 +1,18 @@ + + + + + + + diff --git a/icons/breezedark/status/22/irc-channel-parted.svg b/icons/breezedark/status/22/irc-channel-parted.svg new file mode 100644 index 00000000..c1e40efd --- /dev/null +++ b/icons/breezedark/status/22/irc-channel-parted.svg @@ -0,0 +1,19 @@ + + + + + + + diff --git a/icons/import/blacklisted-icons.breeze b/icons/import/blacklisted-icons.breeze index 269c6509..416c9043 100644 --- a/icons/import/blacklisted-icons.breeze +++ b/icons/import/blacklisted-icons.breeze @@ -1,3 +1 @@ -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 index 269c6509..416c9043 100644 --- a/icons/import/blacklisted-icons.breezedark +++ b/icons/import/blacklisted-icons.breezedark @@ -1,3 +1 @@ -irc-channel-parted -irc-channel-joined quassel \ No newline at end of file diff --git a/icons/import/import_theme.pl b/icons/import/import_theme.pl index cea05c80..1737cb4b 100755 --- a/icons/import/import_theme.pl +++ b/icons/import/import_theme.pl @@ -10,8 +10,13 @@ # 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 +# USAGE: ./import/import_theme.pl $systhemefolder $themename $parentFolderFileSuffix # Run from the icon/ directory. +# +# Examples: (being inside the icons folder) +# ./import/import_theme.pl ~/oxygen-icons oxygen +# ./import/import_theme.pl ~/breeze-icons/icons breeze ICONS +# ./import/import_theme.pl ~/breeze-icons/icons-dark breezedark ICONS use strict; use warnings; @@ -24,6 +29,7 @@ my $source = "../src"; my $themename = shift; $themename = $themename ? $themename : "oxygen"; my $qrcfile_kde = $themename . ".qrc"; +my $parentFolderFileSuffix = shift; my $whitelistfile = "import/whitelist-icons"; my $blacklistfile = "import/blacklisted-icons"; @@ -147,6 +153,10 @@ foreach my $icon (keys %req_icons) { # Copy license etc. system "cp $themefolder/AUTHORS $themefolder/CONTRIBUTING $themefolder/COPYING* $themefolder/index.theme $themename/"; +if($parentFolderFileSuffix) { + system "cp $themefolder/../AUTHORS*$parentFolderFileSuffix $themefolder/../CONTRIBUTING*$parentFolderFileSuffix $themefolder/../COPYING*$parentFolderFileSuffix $themename/"; +} + # Generate .qrc my @file_list; generate_qrc($themename, $qrcfile_kde, $extrafilecontent); -- 2.20.1