From a246dc96756621ec43595ef7659e27f23d548f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Wed, 18 Jun 2014 22:30:54 +0200 Subject: Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions --- Resources/graphics/ic_action_nfc.svg | 61 + Resources/graphics/ic_action_nfc/NFC.png | Bin 0 -> 88038 bytes Resources/graphics/ic_action_qr_code.png | Bin 5377 -> 0 bytes .../graphics/ic_action_qr_code/ic_menu_qr_code.svg | 753 ++++ Resources/graphics/ic_launcher.png | Bin 0 -> 77995 bytes Resources/graphics/ic_launcher.svg | 3622 ++++++++++++++++++++ Resources/graphics/ic_launcher/AUTHORS | 21 + Resources/graphics/ic_launcher/COPYING | 48 + .../graphics/ic_launcher/kgpg_key2_kopete.svgz | Bin 0 -> 36830 bytes Resources/graphics/icon.png | Bin 77995 -> 0 bytes Resources/graphics/icon.svg | 3622 -------------------- Resources/graphics/icon/AUTHORS | 21 - Resources/graphics/icon/COPYING | 48 - Resources/graphics/icon/kgpg_key2_kopete.svgz | Bin 36830 -> 0 bytes Resources/graphics/update-drawables.sh | 46 + Resources/graphics/update-icon.sh | 32 - 16 files changed, 4551 insertions(+), 3723 deletions(-) create mode 100644 Resources/graphics/ic_action_nfc.svg create mode 100644 Resources/graphics/ic_action_nfc/NFC.png delete mode 100644 Resources/graphics/ic_action_qr_code.png create mode 100644 Resources/graphics/ic_action_qr_code/ic_menu_qr_code.svg create mode 100644 Resources/graphics/ic_launcher.png create mode 100644 Resources/graphics/ic_launcher.svg create mode 100644 Resources/graphics/ic_launcher/AUTHORS create mode 100644 Resources/graphics/ic_launcher/COPYING create mode 100644 Resources/graphics/ic_launcher/kgpg_key2_kopete.svgz delete mode 100644 Resources/graphics/icon.png delete mode 100644 Resources/graphics/icon.svg delete mode 100644 Resources/graphics/icon/AUTHORS delete mode 100644 Resources/graphics/icon/COPYING delete mode 100644 Resources/graphics/icon/kgpg_key2_kopete.svgz create mode 100755 Resources/graphics/update-drawables.sh delete mode 100755 Resources/graphics/update-icon.sh (limited to 'Resources') diff --git a/Resources/graphics/ic_action_nfc.svg b/Resources/graphics/ic_action_nfc.svg new file mode 100644 index 000000000..23ec040ff --- /dev/null +++ b/Resources/graphics/ic_action_nfc.svg @@ -0,0 +1,61 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/Resources/graphics/ic_action_nfc/NFC.png b/Resources/graphics/ic_action_nfc/NFC.png new file mode 100644 index 000000000..96af64049 Binary files /dev/null and b/Resources/graphics/ic_action_nfc/NFC.png differ diff --git a/Resources/graphics/ic_action_qr_code.png b/Resources/graphics/ic_action_qr_code.png deleted file mode 100644 index 3c311c7df..000000000 Binary files a/Resources/graphics/ic_action_qr_code.png and /dev/null differ diff --git a/Resources/graphics/ic_action_qr_code/ic_menu_qr_code.svg b/Resources/graphics/ic_action_qr_code/ic_menu_qr_code.svg new file mode 100644 index 000000000..5cbe9defc --- /dev/null +++ b/Resources/graphics/ic_action_qr_code/ic_menu_qr_code.svg @@ -0,0 +1,753 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Resources/graphics/ic_launcher.png b/Resources/graphics/ic_launcher.png new file mode 100644 index 000000000..a7b133eb9 Binary files /dev/null and b/Resources/graphics/ic_launcher.png differ diff --git a/Resources/graphics/ic_launcher.svg b/Resources/graphics/ic_launcher.svg new file mode 100644 index 000000000..2532ed83c --- /dev/null +++ b/Resources/graphics/ic_launcher.svg @@ -0,0 +1,3622 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Resources/graphics/ic_launcher/AUTHORS b/Resources/graphics/ic_launcher/AUTHORS new file mode 100644 index 000000000..dbfcfb4fc --- /dev/null +++ b/Resources/graphics/ic_launcher/AUTHORS @@ -0,0 +1,21 @@ +Oxygen for KDE3 +Oxygen Icon Theme has been developed by The Oxygen Team. + +Art Director: +David Vignoni + +Designers: +David J. Miller +David Vignoni +Johann Ollivier Lapeyre +Kenneth Wimer +Nuno F. Pinheiro +Riccardo Iaconelli + +Thanks to: +Lee Olson: Contributed drawing used in application-x-bittorent icon. +Marco Aurélio "Coré": Improved audio-input-microphone icon. +Matthias Kretz: Contributed "audio-input-line" device icon. +Mauricio Piacentini : game icons mashup + +Repackaged by Luke Channings \ No newline at end of file diff --git a/Resources/graphics/ic_launcher/COPYING b/Resources/graphics/ic_launcher/COPYING new file mode 100644 index 000000000..2faa27568 --- /dev/null +++ b/Resources/graphics/ic_launcher/COPYING @@ -0,0 +1,48 @@ +The Oxygen Icon Theme for KDE3 + Copyright (C) 2007 David Vignoni + Copyright (C) 2007 Johann Ollivier Lapeyre + Copyright (C) 2007 Kenneth Wimer + Copyright (C) 2007 Nuno Fernades Pinheiro + Copyright (C) 2007 Riccardo Iaconelli + Copyright (C) 2007 David Miller + +and others + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this library. If not, see . + +Clarification: + + The GNU Lesser General Public License or LGPL is written for + software libraries in the first place. We expressly want the LGPL to + be valid for this artwork library too. + + KDE Oxygen theme icons is a special kind of software library, it is an + artwork library, it's elements can be used in a Graphical User Interface, or + GUI. + + Source code, for this library means: + - where they exist, SVG; + - otherwise, if applicable, the multi-layered formats xcf or psd, or + otherwise png. + + The LGPL in some sections obliges you to make the files carry + notices. With images this is in some cases impossible or hardly useful. + + With this library a notice is placed at a prominent place in the directory + containing the elements. You may follow this practice. + + The exception in section 5 of the GNU Lesser General Public License covers + the use of elements of this art library in a GUI. + + kde-artists [at] kde.org diff --git a/Resources/graphics/ic_launcher/kgpg_key2_kopete.svgz b/Resources/graphics/ic_launcher/kgpg_key2_kopete.svgz new file mode 100644 index 000000000..2d43afb83 Binary files /dev/null and b/Resources/graphics/ic_launcher/kgpg_key2_kopete.svgz differ diff --git a/Resources/graphics/icon.png b/Resources/graphics/icon.png deleted file mode 100644 index a7b133eb9..000000000 Binary files a/Resources/graphics/icon.png and /dev/null differ diff --git a/Resources/graphics/icon.svg b/Resources/graphics/icon.svg deleted file mode 100644 index 2532ed83c..000000000 --- a/Resources/graphics/icon.svg +++ /dev/null @@ -1,3622 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Resources/graphics/icon/AUTHORS b/Resources/graphics/icon/AUTHORS deleted file mode 100644 index dbfcfb4fc..000000000 --- a/Resources/graphics/icon/AUTHORS +++ /dev/null @@ -1,21 +0,0 @@ -Oxygen for KDE3 -Oxygen Icon Theme has been developed by The Oxygen Team. - -Art Director: -David Vignoni - -Designers: -David J. Miller -David Vignoni -Johann Ollivier Lapeyre -Kenneth Wimer -Nuno F. Pinheiro -Riccardo Iaconelli - -Thanks to: -Lee Olson: Contributed drawing used in application-x-bittorent icon. -Marco Aurélio "Coré": Improved audio-input-microphone icon. -Matthias Kretz: Contributed "audio-input-line" device icon. -Mauricio Piacentini : game icons mashup - -Repackaged by Luke Channings \ No newline at end of file diff --git a/Resources/graphics/icon/COPYING b/Resources/graphics/icon/COPYING deleted file mode 100644 index 2faa27568..000000000 --- a/Resources/graphics/icon/COPYING +++ /dev/null @@ -1,48 +0,0 @@ -The Oxygen Icon Theme for KDE3 - Copyright (C) 2007 David Vignoni - Copyright (C) 2007 Johann Ollivier Lapeyre - Copyright (C) 2007 Kenneth Wimer - Copyright (C) 2007 Nuno Fernades Pinheiro - Copyright (C) 2007 Riccardo Iaconelli - Copyright (C) 2007 David Miller - -and others - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 3 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library. If not, see . - -Clarification: - - The GNU Lesser General Public License or LGPL is written for - software libraries in the first place. We expressly want the LGPL to - be valid for this artwork library too. - - KDE Oxygen theme icons is a special kind of software library, it is an - artwork library, it's elements can be used in a Graphical User Interface, or - GUI. - - Source code, for this library means: - - where they exist, SVG; - - otherwise, if applicable, the multi-layered formats xcf or psd, or - otherwise png. - - The LGPL in some sections obliges you to make the files carry - notices. With images this is in some cases impossible or hardly useful. - - With this library a notice is placed at a prominent place in the directory - containing the elements. You may follow this practice. - - The exception in section 5 of the GNU Lesser General Public License covers - the use of elements of this art library in a GUI. - - kde-artists [at] kde.org diff --git a/Resources/graphics/icon/kgpg_key2_kopete.svgz b/Resources/graphics/icon/kgpg_key2_kopete.svgz deleted file mode 100644 index 2d43afb83..000000000 Binary files a/Resources/graphics/icon/kgpg_key2_kopete.svgz and /dev/null differ diff --git a/Resources/graphics/update-drawables.sh b/Resources/graphics/update-drawables.sh new file mode 100755 index 000000000..c1dfc77e6 --- /dev/null +++ b/Resources/graphics/update-drawables.sh @@ -0,0 +1,46 @@ +#!/bin/bash + +APP_DIR=../../OpenKeychain/src/main +LDPI_DIR=$APP_DIR/res/drawable-ldpi +MDPI_DIR=$APP_DIR/res/drawable-mdpi +HDPI_DIR=$APP_DIR/res/drawable-hdpi +XDPI_DIR=$APP_DIR/res/drawable-xhdpi +XXDPI_DIR=$APP_DIR/res/drawable-xxhdpi +XXXDPI_DIR=$APP_DIR/res/drawable-xxxhdpi +PLAY_DIR=./ + + +# Launcher Icon: +# ----------------------- +# ldpi: 36x36 +# mdpi: 48x48 +# hdpi: 72x72 +# xhdpi: 96x96 +# xxhdpi: 144x144. +# xxxhdpi 192x192. +# google play: 512x512 + +NAME="ic_launcher" + +inkscape -w 36 -h 36 -e "$LDPI_DIR/$NAME.png" $NAME.svg +inkscape -w 48 -h 48 -e "$MDPI_DIR/$NAME.png" $NAME.svg +inkscape -w 72 -h 72 -e "$HDPI_DIR/$NAME.png" $NAME.svg +inkscape -w 96 -h 96 -e "$XDPI_DIR/$NAME.png" $NAME.svg +inkscape -w 144 -h 144 -e "$XXDPI_DIR/$NAME.png" $NAME.svg +inkscape -w 192 -h 192 -e "$XXXDPI_DIR/$NAME.png" $NAME.svg +inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg + +# Actionbar Icons +# ----------------------- +# mdpi: 32x32 +# hdpi: 48x48 +# xhdpi: 64x64 +# xxhdpi: 96x96 + +for NAME in "ic_action_nfc" "ic_action_qr_code" +do +inkscape -w 32 -h 32 -e "$MDPI_DIR/$NAME.png" $NAME.svg +inkscape -w 48 -h 48 -e "$HDPI_DIR/$NAME.png" $NAME.svg +inkscape -w 64 -h 64 -e "$XDPI_DIR/$NAME.png" $NAME.svg +inkscape -w 96 -h 96 -e "$XXDPI_DIR/$NAME.png" $NAME.svg +done \ No newline at end of file diff --git a/Resources/graphics/update-icon.sh b/Resources/graphics/update-icon.sh deleted file mode 100755 index 05b80e6b3..000000000 --- a/Resources/graphics/update-icon.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -APP_DIR=../../OpenKeychain/src/main -LDPI_DIR=$APP_DIR/res/drawable-ldpi -MDPI_DIR=$APP_DIR/res/drawable-mdpi -HDPI_DIR=$APP_DIR/res/drawable-hdpi -XDPI_DIR=$APP_DIR/res/drawable-xhdpi -XXDPI_DIR=$APP_DIR/res/drawable-xxhdpi -XXXDPI_DIR=$APP_DIR/res/drawable-xxxhdpi -PLAY_DIR=./ - - -# Launcher Icon: -# ----------------------- -# ldpi: 36x36 -# mdpi: 48x48 -# hdpi: 72x72 -# xhdpi: 96x96 -# xxhdpi: 144x144. -# xxxhdpi 192x192. -# google play: 512x512 - -NAME="icon" - -inkscape -w 36 -h 36 -e "$LDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 48 -h 48 -e "$MDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 72 -h 72 -e "$HDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 96 -h 96 -e "$XDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 144 -h 144 -e "$XXDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 192 -h 192 -e "$XXXDPI_DIR/$NAME.png" $NAME.svg -inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg - -- cgit v1.2.3