Adapt Oxygen import script to the new realities

Re-running the adapted version afterwards actually added a couple
new icons too, because the old scripts didn't catch them...

diff --git a/icons/import/import_oxygen.pl b/icons/import/import_oxygen.pl
index 4a84bcf..c6132d0 100755 (executable)
--- a/icons/import/import_oxygen.pl
+++ b/icons/import/import_oxygen.pl
@@ -42,10 +42,9 @@ close BLACKLIST;
 
 # We now grep the source for things like SmallIcon("fubar") and generate size and name from that
 print "Grepping $source for requested icons...\n";
-my @results = `grep -r Icon\\(\\" $source`;
+my @results = `grep -r QIcon::fromTheme\\(\\" $source`;
 foreach(@results) {
-  next unless my ($type, $name) = /\W+(\s|Desktop|Bar|MainBar|Small|Panel|Dialog)Icon\("([-\w]+)/;
-  $type = "Desktop" if $type =~ /\s+/;
+  next unless my ($name) = /\W+QIcon::fromTheme\(\"([-\w]+)/;
   $req_icons{$name} = 1
     unless exists $blacklist{$name};
 }

diff --git a/icons/oxygen.qrc b/icons/oxygen.qrc
index 48a3a5f..3b01942 100644 (file)
--- a/icons/oxygen.qrc
+++ b/icons/oxygen.qrc
@@ -29,6 +29,7 @@
     <file>oxygen/22x22/actions/im-kick-user.png</file>
     <file>oxygen/22x22/actions/irc-operator.png</file>
     <file>oxygen/22x22/actions/configure-shortcuts.png</file>
+    <file>oxygen/22x22/actions/format-list-unordered.png</file>
     <file>oxygen/22x22/actions/irc-join-channel.png</file>
     <file>oxygen/22x22/actions/format-fill-color.png</file>
     <file>oxygen/22x22/actions/help-about.png</file>
@@ -82,6 +83,7 @@
     <file>oxygen/32x32/actions/document-edit.png</file>
     <file>oxygen/32x32/actions/im-ban-user.png</file>
     <file>oxygen/32x32/actions/document-open.png</file>
+    <file>oxygen/32x32/actions/format-list-unordered.png</file>
     <file>oxygen/32x32/actions/dialog-cancel.png</file>
     <file>oxygen/32x32/actions/format-text-italic.png</file>
     <file>oxygen/32x32/actions/list-add-user.png</file>
@@ -133,6 +135,7 @@
     <file>oxygen/16x16/actions/irc-close-channel.png</file>
     <file>oxygen/16x16/actions/zoom-out.png</file>
     <file>oxygen/16x16/actions/irc-join-channel.png</file>
+    <file>oxygen/16x16/actions/format-list-unordered.png</file>
     <file>oxygen/16x16/actions/zoom-original.png</file>
     <file>oxygen/16x16/actions/go-next-view.png</file>
     <file>oxygen/16x16/actions/irc-remove-operator.png</file>
@@ -236,6 +239,7 @@
     <file>oxygen/48x48/actions/network-disconnect.png</file>
     <file>oxygen/48x48/actions/list-add.png</file>
     <file>oxygen/48x48/actions/irc-voice.png</file>
+    <file>oxygen/48x48/actions/format-list-unordered.png</file>
     <file>oxygen/48x48/actions/media-playback-start.png</file>
     <file>oxygen/48x48/actions/tools-report-bug.png</file>
     <file>oxygen/48x48/actions/go-next-view.png</file>

diff --git a/icons/oxygen/16x16/actions/format-list-unordered.png b/icons/oxygen/16x16/actions/format-list-unordered.png
new file mode 100644 (file)
index 0000000..076bf18
Binary files /dev/null and b/icons/oxygen/16x16/actions/format-list-unordered.png differ

diff --git a/icons/oxygen/22x22/actions/format-list-unordered.png b/icons/oxygen/22x22/actions/format-list-unordered.png
new file mode 100644 (file)
index 0000000..d60c0f6
Binary files /dev/null and b/icons/oxygen/22x22/actions/format-list-unordered.png differ

diff --git a/icons/oxygen/32x32/actions/format-list-unordered.png b/icons/oxygen/32x32/actions/format-list-unordered.png
new file mode 100644 (file)
index 0000000..09bca30
Binary files /dev/null and b/icons/oxygen/32x32/actions/format-list-unordered.png differ

diff --git a/icons/oxygen/48x48/actions/format-list-unordered.png b/icons/oxygen/48x48/actions/format-list-unordered.png
new file mode 100644 (file)
index 0000000..830243d
Binary files /dev/null and b/icons/oxygen/48x48/actions/format-list-unordered.png differ