Fix icon import to not lose channel icons in breeze

Resolves GH-289.

diff --git a/icons/breeze.qrc b/icons/breeze.qrc
index c053567..e90b5dc 100644 (file)
--- a/icons/breeze.qrc
+++ b/icons/breeze.qrc
@@ -184,10 +184,14 @@
     <file>breeze/index.theme</file>
     <file>breeze/preferences/32/help-about.svg</file>
     <file>breeze/status/16/dialog-information.svg</file>
+    <file>breeze/status/16/irc-channel-joined.svg</file>
+    <file>breeze/status/16/irc-channel-parted.svg</file>
     <file>breeze/status/16/security-high.svg</file>
     <file>breeze/status/16/security-low.svg</file>
     <file>breeze/status/16/user-away.svg</file>
     <file>breeze/status/22/dialog-information.svg</file>
+    <file>breeze/status/22/irc-channel-joined.svg</file>
+    <file>breeze/status/22/irc-channel-parted.svg</file>
     <file>breeze/status/22/network-wired.svg</file>
     <file>breeze/status/22/security-high.svg</file>
     <file>breeze/status/22/security-low.svg</file>

diff --git a/icons/breeze/status/16/irc-channel-joined.svg b/icons/breeze/status/16/irc-channel-joined.svg
new file mode 100644 (file)
index 0000000..a66c756
--- /dev/null
+++ b/icons/breeze/status/16/irc-channel-joined.svg
@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      .ColorScheme-PositiveText {
+        color:#27ae60;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="m 4,2 0,2 -2,0 0,1 2,0 0,6 -2,0 0,1 2,0 0,2 1,0 0,-2 6,0 0,2 1,0 0,-2 2,0 0,-1 -2,0 0,-6 2.310547,0 0,-1 L 12,4 12,2 11,2 11,4 5,4 5,2 4,2 Z m 1,3 6,0 0,6 -6,0 0,-6 z"
+     class="ColorScheme-Text"
+     />
+  <path
+      style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-PositiveText"
+   d="m 10.499991,6.9999781 c 1.939,0 3.5,1.561 3.5,3.4999999 0,1.939 -1.561,3.5 -3.5,3.5 -1.939,0 -3.5,-1.561 -3.5,-3.5 0,-1.9389999 1.561,-3.4999999 3.5,-3.4999999 z"/>
+</svg>

diff --git a/icons/breeze/status/16/irc-channel-parted.svg b/icons/breeze/status/16/irc-channel-parted.svg
new file mode 100644 (file)
index 0000000..305cb03
--- /dev/null
+++ b/icons/breeze/status/16/irc-channel-parted.svg
@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs
+     id="defs3051">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:currentColor;fill-opacity:0.5;stroke:none" 
+     d="m 10.49997,7.00003 c 1.939,0 3.5,1.561 3.5,3.5 0,1.939 -1.561,3.5 -3.5,3.5 -1.939,0 -3.5,-1.561 -3.5,-3.5 0,-1.939 1.561,-3.5 3.5,-3.5 z"
+     class="ColorScheme-Text" />
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 4 2 L 4 4 L 2 4 L 2 5 L 4 5 L 4 11 L 2 11 L 2 12 L 4 12 L 4 14 L 5 14 L 5 12 L 7.3457031 12 C 7.1981011 11.689116 7.0994754 11.353795 7.0488281 11 L 5 11 L 5 5 L 11 5 L 11 7.0488281 C 11.353795 7.0994754 11.689116 7.1981011 12 7.3457031 L 12 5 L 14 5 L 14 4 L 12 4 L 12 2 L 11 2 L 11 4 L 5 4 L 5 2 L 4 2 z M 13.951172 11 C 13.900525 11.353795 13.801899 11.689116 13.654297 12 L 14 12 L 14 11 L 13.951172 11 z M 12 13.654297 C 11.689116 13.801899 11.353795 13.900525 11 13.951172 L 11 14 L 12 14 L 12 13.654297 z "
+     class="ColorScheme-Text" />
+</svg>

diff --git a/icons/breeze/status/22/irc-channel-joined.svg b/icons/breeze/status/22/irc-channel-joined.svg
new file mode 100644 (file)
index 0000000..6dd99ae
--- /dev/null
+++ b/icons/breeze/status/22/irc-channel-joined.svg
@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 7 3 L 7 7 L 3 7 L 3 8 L 7 8 L 7 14 L 3 14 L 3 15 L 7 15 L 7 19 L 8 19 L 8 15 L 11 15 L 11 14 L 8 14 L 8 8 L 14 8 L 14 11 L 15 11 L 15 8 L 19 8 L 19 7 L 15 7 L 15 3 L 14 3 L 14 7 L 8 7 L 8 3 L 7 3 z "
+     class="ColorScheme-Text"
+     />
+    <path
+     style="fill:#2ecc71;fill-opacity:1;stroke:none"
+     d="M 15.5 12 C 13.561 12 12 13.561 12 15.5 C 12 17.439 13.561 19 15.5 19 C 17.439 19 19 17.439 19 15.5 C 19 13.561 17.439 12 15.5 12 z "
+     />
+</svg>

diff --git a/icons/breeze/status/22/irc-channel-parted.svg b/icons/breeze/status/22/irc-channel-parted.svg
new file mode 100644 (file)
index 0000000..785f844
--- /dev/null
+++ b/icons/breeze/status/22/irc-channel-parted.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#4d4d4d;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 7 3 L 7 7 L 3 7 L 3 8 L 7 8 L 7 14 L 3 14 L 3 15 L 7 15 L 7 19 L 8 19 L 8 15 L 11 15 L 11 14 L 8 14 L 8 8 L 14 8 L 14 11 L 15 11 L 15 8 L 19 8 L 19 7 L 15 7 L 15 3 L 14 3 L 14 7 L 8 7 L 8 3 L 7 3 z "
+     class="ColorScheme-Text"
+     />
+ <path 
+     style="fill:currentColor;fill-opacity:0.51;stroke:none" 
+     d="M 15.5 12 C 13.561 12 12 13.561 12 15.5 C 12 17.439 13.561 19 15.5 19 C 17.439 19 19 17.439 19 15.5 C 19 13.561 17.439 12 15.5 12 z "
+     class="ColorScheme-Text"
+     />
+</svg>

diff --git a/icons/breezedark.qrc b/icons/breezedark.qrc
index 99eda06..39e6907 100644 (file)
--- a/icons/breezedark.qrc
+++ b/icons/breezedark.qrc
@@ -184,10 +184,14 @@
     <file>breezedark/index.theme</file>
     <file>breezedark/preferences/32/help-about.svg</file>
     <file>breezedark/status/16/dialog-information.svg</file>
+    <file>breezedark/status/16/irc-channel-joined.svg</file>
+    <file>breezedark/status/16/irc-channel-parted.svg</file>
     <file>breezedark/status/16/security-high.svg</file>
     <file>breezedark/status/16/security-low.svg</file>
     <file>breezedark/status/16/user-away.svg</file>
     <file>breezedark/status/22/dialog-information.svg</file>
+    <file>breezedark/status/22/irc-channel-joined.svg</file>
+    <file>breezedark/status/22/irc-channel-parted.svg</file>
     <file>breezedark/status/22/network-wired.svg</file>
     <file>breezedark/status/22/security-high.svg</file>
     <file>breezedark/status/22/security-low.svg</file>

diff --git a/icons/breezedark/status/16/irc-channel-joined.svg b/icons/breezedark/status/16/irc-channel-joined.svg
new file mode 100644 (file)
index 0000000..7412660
--- /dev/null
+++ b/icons/breezedark/status/16/irc-channel-joined.svg
@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#f2f2f2;
+      }
+      .ColorScheme-PositiveText {
+        color:#27ae60;
+      }
+      </style>
+  </defs>
+ <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="m 4,2 0,2 -2,0 0,1 2,0 0,6 -2,0 0,1 2,0 0,2 1,0 0,-2 6,0 0,2 1,0 0,-2 2,0 0,-1 -2,0 0,-6 2.310547,0 0,-1 L 12,4 12,2 11,2 11,4 5,4 5,2 4,2 Z m 1,3 6,0 0,6 -6,0 0,-6 z"
+     class="ColorScheme-Text"
+     />
+  <path
+      style="fill:currentColor;fill-opacity:1;stroke:none" 
+     class="ColorScheme-PositiveText"
+   d="m 10.499991,6.9999781 c 1.939,0 3.5,1.561 3.5,3.4999999 0,1.939 -1.561,3.5 -3.5,3.5 -1.939,0 -3.5,-1.561 -3.5,-3.5 0,-1.9389999 1.561,-3.4999999 3.5,-3.4999999 z"/>
+</svg>

diff --git a/icons/breezedark/status/16/irc-channel-parted.svg b/icons/breezedark/status/16/irc-channel-parted.svg
new file mode 100644 (file)
index 0000000..aa654cc
--- /dev/null
+++ b/icons/breezedark/status/16/irc-channel-parted.svg
@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <defs
+     id="defs3051">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#f2f2f2;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:currentColor;fill-opacity:0.5;stroke:none" 
+     d="m 10.49997,7.00003 c 1.939,0 3.5,1.561 3.5,3.5 0,1.939 -1.561,3.5 -3.5,3.5 -1.939,0 -3.5,-1.561 -3.5,-3.5 0,-1.939 1.561,-3.5 3.5,-3.5 z"
+     class="ColorScheme-Text" />
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 4 2 L 4 4 L 2 4 L 2 5 L 4 5 L 4 11 L 2 11 L 2 12 L 4 12 L 4 14 L 5 14 L 5 12 L 7.3457031 12 C 7.1981011 11.689116 7.0994754 11.353795 7.0488281 11 L 5 11 L 5 5 L 11 5 L 11 7.0488281 C 11.353795 7.0994754 11.689116 7.1981011 12 7.3457031 L 12 5 L 14 5 L 14 4 L 12 4 L 12 2 L 11 2 L 11 4 L 5 4 L 5 2 L 4 2 z M 13.951172 11 C 13.900525 11.353795 13.801899 11.689116 13.654297 12 L 14 12 L 14 11 L 13.951172 11 z M 12 13.654297 C 11.689116 13.801899 11.353795 13.900525 11 13.951172 L 11 14 L 12 14 L 12 13.654297 z "
+     class="ColorScheme-Text" />
+</svg>

diff --git a/icons/breezedark/status/22/irc-channel-joined.svg b/icons/breezedark/status/22/irc-channel-joined.svg
new file mode 100644 (file)
index 0000000..9b41013
--- /dev/null
+++ b/icons/breezedark/status/22/irc-channel-joined.svg
@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#f2f2f2;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 7 3 L 7 7 L 3 7 L 3 8 L 7 8 L 7 14 L 3 14 L 3 15 L 7 15 L 7 19 L 8 19 L 8 15 L 11 15 L 11 14 L 8 14 L 8 8 L 14 8 L 14 11 L 15 11 L 15 8 L 19 8 L 19 7 L 15 7 L 15 3 L 14 3 L 14 7 L 8 7 L 8 3 L 7 3 z "
+     class="ColorScheme-Text"
+     />
+    <path
+     style="fill:#2ecc71;fill-opacity:1;stroke:none"
+     d="M 15.5 12 C 13.561 12 12 13.561 12 15.5 C 12 17.439 13.561 19 15.5 19 C 17.439 19 19 17.439 19 15.5 C 19 13.561 17.439 12 15.5 12 z "
+     />
+</svg>

diff --git a/icons/breezedark/status/22/irc-channel-parted.svg b/icons/breezedark/status/22/irc-channel-parted.svg
new file mode 100644 (file)
index 0000000..c1e40ef
--- /dev/null
+++ b/icons/breezedark/status/22/irc-channel-parted.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+  <defs id="defs3051">
+    <style type="text/css" id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#f2f2f2;
+      }
+      </style>
+  </defs>
+ <path 
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 7 3 L 7 7 L 3 7 L 3 8 L 7 8 L 7 14 L 3 14 L 3 15 L 7 15 L 7 19 L 8 19 L 8 15 L 11 15 L 11 14 L 8 14 L 8 8 L 14 8 L 14 11 L 15 11 L 15 8 L 19 8 L 19 7 L 15 7 L 15 3 L 14 3 L 14 7 L 8 7 L 8 3 L 7 3 z "
+     class="ColorScheme-Text"
+     />
+ <path 
+     style="fill:currentColor;fill-opacity:0.51;stroke:none" 
+     d="M 15.5 12 C 13.561 12 12 13.561 12 15.5 C 12 17.439 13.561 19 15.5 19 C 17.439 19 19 17.439 19 15.5 C 19 13.561 17.439 12 15.5 12 z "
+     class="ColorScheme-Text"
+     />
+</svg>

diff --git a/icons/import/blacklisted-icons.breeze b/icons/import/blacklisted-icons.breeze
index 269c650..416c904 100644 (file)
--- 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 269c650..416c904 100644 (file)
--- 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 cea05c8..1737cb4 100755 (executable)
--- 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);