From bd295c044a8a8d2bb4efc1e8b0607a404b0db42c Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Sat, 25 Oct 2014 23:28:54 +0200 Subject: [PATCH] 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... --- icons/import/import_oxygen.pl | 5 ++--- icons/oxygen.qrc | 4 ++++ .../16x16/actions/format-list-unordered.png | Bin 0 -> 309 bytes .../22x22/actions/format-list-unordered.png | Bin 0 -> 314 bytes .../32x32/actions/format-list-unordered.png | Bin 0 -> 348 bytes .../48x48/actions/format-list-unordered.png | Bin 0 -> 435 bytes 6 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 icons/oxygen/16x16/actions/format-list-unordered.png create mode 100644 icons/oxygen/22x22/actions/format-list-unordered.png create mode 100644 icons/oxygen/32x32/actions/format-list-unordered.png create mode 100644 icons/oxygen/48x48/actions/format-list-unordered.png diff --git a/icons/import/import_oxygen.pl b/icons/import/import_oxygen.pl index 4a84bcfe..c6132d01 100755 --- 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 48a3a5f8..3b019426 100644 --- a/icons/oxygen.qrc +++ b/icons/oxygen.qrc @@ -29,6 +29,7 @@ oxygen/22x22/actions/im-kick-user.png oxygen/22x22/actions/irc-operator.png oxygen/22x22/actions/configure-shortcuts.png + oxygen/22x22/actions/format-list-unordered.png oxygen/22x22/actions/irc-join-channel.png oxygen/22x22/actions/format-fill-color.png oxygen/22x22/actions/help-about.png @@ -82,6 +83,7 @@ oxygen/32x32/actions/document-edit.png oxygen/32x32/actions/im-ban-user.png oxygen/32x32/actions/document-open.png + oxygen/32x32/actions/format-list-unordered.png oxygen/32x32/actions/dialog-cancel.png oxygen/32x32/actions/format-text-italic.png oxygen/32x32/actions/list-add-user.png @@ -133,6 +135,7 @@ oxygen/16x16/actions/irc-close-channel.png oxygen/16x16/actions/zoom-out.png oxygen/16x16/actions/irc-join-channel.png + oxygen/16x16/actions/format-list-unordered.png oxygen/16x16/actions/zoom-original.png oxygen/16x16/actions/go-next-view.png oxygen/16x16/actions/irc-remove-operator.png @@ -236,6 +239,7 @@ oxygen/48x48/actions/network-disconnect.png oxygen/48x48/actions/list-add.png oxygen/48x48/actions/irc-voice.png + oxygen/48x48/actions/format-list-unordered.png oxygen/48x48/actions/media-playback-start.png oxygen/48x48/actions/tools-report-bug.png oxygen/48x48/actions/go-next-view.png diff --git a/icons/oxygen/16x16/actions/format-list-unordered.png b/icons/oxygen/16x16/actions/format-list-unordered.png new file mode 100644 index 0000000000000000000000000000000000000000..076bf18acdf2135239c44b4db41b707627c72e7a GIT binary patch literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJbFq_W2nPqp?T7vkfLzW3kH})6 z^6MbX=%g{b0w^e1;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6i|^zfKQ0) z|Ns9P(m*I`4wM8k{QdobdVqpTRUmN)2^36DPA**aA1L+U!GlMS9=&||^23J@-@bkO z^XCsw$JDt%GxF86t#6B8U8<4# d5t8RtA9$R7>76;B*8mM<@O1TaS?83{1OVDXfRq3L literal 0 HcmV?d00001 diff --git a/icons/oxygen/22x22/actions/format-list-unordered.png b/icons/oxygen/22x22/actions/format-list-unordered.png new file mode 100644 index 0000000000000000000000000000000000000000..d60c0f60b3c18830239fab8fb5905674ec8400a3 GIT binary patch literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H3?x5i&EW)6%*9TgAsieWw;%dH0CG7CJR*yM z%CCbkqm#z$3ZS55iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0u>0X`wF z|NsAINc$f-=RZUG|ESqec0fQtMMVWrM7ipJ)ZG6{KyuE1e}Dhvui5{ebH)s6Sco;Y&WM8ZjcL1Qz=6`$kpW&urQ@O1TaS?83{1OPzxcLe|d literal 0 HcmV?d00001 diff --git a/icons/oxygen/32x32/actions/format-list-unordered.png b/icons/oxygen/32x32/actions/format-list-unordered.png new file mode 100644 index 0000000000000000000000000000000000000000..09bca30f85003c61bada290efc599d70ea43288f GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg8`{prB-lYeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kt(q_T^vIy zZoQpi$aTm-r0qWUIoZ99a*hRp-yhu*zH-#DsBw+0gIG0lda1a%ZF}>Aj^JQL-`pkB z9NvVz_*7T%q`px_e$R*G$Y~drM})FmSk0EVd4j?EX)E*3`v zQ6~xh2fvz1ESo2Ooqbt6C1-Dt)|4Qp*>BwSx|p_Hi@RC-eX+Wy(aFy>5jSV^e_*M2 zea!sSCZ1as(tVwvELv1Y85dl`WJX{k`X?f>Zzi literal 0 HcmV?d00001 diff --git a/icons/oxygen/48x48/actions/format-list-unordered.png b/icons/oxygen/48x48/actions/format-list-unordered.png new file mode 100644 index 0000000000000000000000000000000000000000..830243d222837999edcf6d085f7d73064f02da14 GIT binary patch literal 435 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-s%*9TgAsieWw;%dH0CG7CJR*yM z%CCbkqm#z$3ZS55iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0v>0(?ST z|NsBbkoezo(tn2Z|NI62OxM|sS3)CiHV7w_dhu~IV&p*C{?uj z|GIPk*Ps8t@#6peH~&9)@ZjOYhmRgTdi?nDlP6D}K7IP^*|X=*pTBtV;^oViuU@@+ z{rdHrH*em)ef#d+yZ7(kfB5j>~)o#f5cV8G+D zeCtQ%d53=AKi7KemJ9QxvZqms{V8J3X@U|G^AD{2;qWr0NBG{2va1U&osErqf1ru& z*_mBdi`uR*R6f^q44C+Ajy$)j0P|7~1Fo}`dU1ab{