GNOME.org
 

[shotwell] Update icons

commit 13c5537a2efb4bd9b57027a721b73daa755be334
Author: Jens Georg <mail jensge org>
Date:   Mon May 16 21:20:06 2016 +0200

    Update icons
    
    https://bugzilla.gnome.org/show_bug.cgi?id=717326
    
    Signed-off-by: Jens Georg <mail jensge org>

 Makefile                                      |   34 +++--
 app-icons/16x16/apps/shotwell.png             |  Bin 0 -> 884 bytes
 app-icons/22x22/apps/shotwell.png             |  Bin 0 -> 1417 bytes
 app-icons/24x24/apps/shotwell.png             |  Bin 0 -> 1546 bytes
 app-icons/256x256/apps/shotwell.png           |  Bin 0 -> 49656 bytes
 app-icons/32x32/apps/shotwell.png             |  Bin 0 -> 2156 bytes
 app-icons/48x48/apps/shotwell.png             |  Bin 0 -> 3716 bytes
 app-icons/symbolic/apps/shotwell-symbolic.svg |   24 +++
 icons/shotwell-16.png                         |  Bin 0 -> 884 bytes
 icons/shotwell-16.svg                         |  161 -----------------
 icons/shotwell-24.svg                         |  200 ---------------------
 icons/shotwell.ico                            |  Bin 67646 -> 0 bytes
 icons/shotwell.png                            |  Bin 0 -> 884 bytes
 icons/shotwell.svg                            |  237 -------------------------
 src/AppWindow.vala                            |    9 +-
 src/Dialogs.vala                              |    2 +-
 src/Resources.vala                            |    9 +-
 17 files changed, 50 insertions(+), 626 deletions(-)
---
diff --git a/Makefile b/Makefile
index 2e32f3b..d004092 100644
--- a/Makefile
+++ b/Makefile
@@ -206,11 +206,7 @@ ICON_FILES = \
        publish.png \
        redeye.png \
        rejected.svg \
-       shotwell-16.svg \
-       shotwell-24.svg \
-       shotwell.ico \
        shotwell-street.jpg \
-       shotwell.svg \
        shotwell-auto-enhance.png \
        sprocket.png \
        straighten.svg \
@@ -351,6 +347,7 @@ EXPANDED_C_FILES := $(foreach file,$(subst src,$(BUILD_DIR),$(EXPANDED_SRC_FILES
 EXPANDED_OBJ_FILES := $(foreach file,$(subst src,$(BUILD_DIR),$(EXPANDED_SRC_FILES)),$(file:.vala=.o))
 EXPANDED_SYS_INTEGRATION_FILES := $(foreach file,$(SYS_INTEGRATION_FILES),misc/$(file))
 EXPANDED_ICON_FILES := $(foreach file,$(ICON_FILES),icons/$(file))
+EXPANDED_APP_ICON_FILES := $(shell find -type f app-icons)
 EXPANDED_VAPI_FILES := $(foreach vapi,$(VAPI_FILES),vapi/$(vapi))
 EXPANDED_DEPS_FILES := $(foreach deps,$(DEPS_FILES),vapi/$(deps))
 EXPANDED_SRC_HEADER_FILES := $(foreach header,$(SRC_HEADER_FILES),vapi/$(header))
@@ -370,7 +367,7 @@ PC_FILE := $(PC_INPUT:.m4=.pc)
 
 DIST_FILES = Makefile configure chkver $(EXPANDED_DIST_SRC_FILES) $(EXPANDED_VAPI_FILES) \
        $(EXPANDED_DEPS_FILES) $(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) \
-       $(EXPANDED_ICON_FILES) $(EXPANDED_SYS_INTEGRATION_FILES) $(EXPANDED_CORE_PO_FILES) \
+       $(EXPANDED_ICON_FILES) $(EXPANDED_APP_ICON_FILES) $(EXPANDED_SYS_INTEGRATION_FILES) 
$(EXPANDED_CORE_PO_FILES) \
        po/LINGUAS po/POTFILES.in po/POTFILES.skip \
        $(EXPANDED_DOC_PAGES) $(EXPANDED_DOC_IMAGES) $(EXPANDED_DOC_PO) help/Makefile.am \
        apport/shotwell.py $(UNIT_RESOURCES) $(UNIT_MKS) \
@@ -525,12 +522,21 @@ install:
        $(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(LIBEXECDIR)
        mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons
        $(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons
-       mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
-       $(INSTALL_DATA) icons/shotwell.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
        mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps
-       $(INSTALL_DATA) icons/shotwell-16.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/shotwell.svg
+       $(INSTALL_DATA) app-icons/16x16/apps/shotwell.png 
$(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/shotwell.png
+       mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps
+       $(INSTALL_DATA) app-icons/22x22/apps/shotwell.png 
$(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/shotwell.png
        mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps
-       $(INSTALL_DATA) icons/shotwell-24.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/shotwell.svg
+       $(INSTALL_DATA) app-icons/24x24/apps/shotwell.png 
$(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/shotwell.png
+       mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps
+       $(INSTALL_DATA) app-icons/32x32/apps/shotwell.png 
$(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/shotwell.png
+       mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps
+       $(INSTALL_DATA) app-icons/256x256/apps/shotwell.png 
$(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/shotwell.png
+       mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps
+       $(INSTALL_DATA) app-icons/48x48/apps/shotwell.png 
$(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/shotwell.png
+       mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/symbolic/apps
+       $(INSTALL_DATA) app-icons/symbolic/apps/shotwell-symbolic.svg 
$(DESTDIR)$(PREFIX)/share/icons/hicolor/symbolic/apps/shotwell-symbolic.svg
+
        mkdir -p $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
        $(INSTALL_DATA) misc/org.yorba.shotwell.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
        $(INSTALL_DATA) misc/org.yorba.shotwell-extras.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
@@ -602,9 +608,13 @@ uninstall:
        rm -f $(DESTDIR)$(LIBEXECDIR)/$(PROGRAM_THUMBNAILER)
        rm -f $(DESTDIR)$(LIBEXECDIR)/$(PROGRAM_MIGRATOR)
        rm -fr $(DESTDIR)$(PREFIX)/share/shotwell
-       rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/shotwell.svg
-       rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/shotwell.svg
-       rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/shotwell.svg
+       rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/shotwell.png
+       rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/22x22/apps/shotwell.png
+       rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/shotwell.png
+       rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/32x32/apps/shotwell.png
+       rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/shotwell.png
+       rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/256x256/apps/shotwell.png
+       rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/symbolic/apps/shotwell-symbolic.svg
        rm -f $(DESTDIR)$(PREFIX)/share/applications/shotwell.desktop
        rm -f $(DESTDIR)$(PREFIX)/share/applications/shotwell-viewer.desktop
        rm -f $(DESTDIR)$(PREFIX)/share/appdata/shotwell.appdata.xml
diff --git a/app-icons/16x16/apps/shotwell.png b/app-icons/16x16/apps/shotwell.png
new file mode 100644
index 0000000..546fdcb
Binary files /dev/null and b/app-icons/16x16/apps/shotwell.png differ
diff --git a/app-icons/22x22/apps/shotwell.png b/app-icons/22x22/apps/shotwell.png
new file mode 100644
index 0000000..3eae4bf
Binary files /dev/null and b/app-icons/22x22/apps/shotwell.png differ
diff --git a/app-icons/24x24/apps/shotwell.png b/app-icons/24x24/apps/shotwell.png
new file mode 100644
index 0000000..02c13c4
Binary files /dev/null and b/app-icons/24x24/apps/shotwell.png differ
diff --git a/app-icons/256x256/apps/shotwell.png b/app-icons/256x256/apps/shotwell.png
new file mode 100644
index 0000000..5ce2d70
Binary files /dev/null and b/app-icons/256x256/apps/shotwell.png differ
diff --git a/app-icons/32x32/apps/shotwell.png b/app-icons/32x32/apps/shotwell.png
new file mode 100644
index 0000000..52c1071
Binary files /dev/null and b/app-icons/32x32/apps/shotwell.png differ
diff --git a/app-icons/48x48/apps/shotwell.png b/app-icons/48x48/apps/shotwell.png
new file mode 100644
index 0000000..809b92b
Binary files /dev/null and b/app-icons/48x48/apps/shotwell.png differ
diff --git a/app-icons/symbolic/apps/shotwell-symbolic.svg b/app-icons/symbolic/apps/shotwell-symbolic.svg
new file mode 100644
index 0000000..52c4e1d
--- /dev/null
+++ b/app-icons/symbolic/apps/shotwell-symbolic.svg
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' 
sodipodi:docname='shotwell-symbolic.svg' height='16' id='svg7384' 
xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' 
xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' 
xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg' 
inkscape:version='0.48.2 r9819' version='1.1' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:bbox-paths='true' bordercolor='#666666' borderopacity='1' 
inkscape:current-layer='layer9' inkscape:cx='9.7673099' inkscape:cy='-35.428804' gridtolerance='10' 
inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='false' 
inkscape:object-paths='false' objecttolerance='10' pagecolor='#555753' inkscape:pageopacity='1' 
inkscape:pageshadow='2' showborder='false' showgrid='true' showguides='true' inkscape:snap-bbox='false' 
inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true' inkscape:snap-grids='true' 
inkscape:snap-nodes='true' inkscape:snap-others='false' inkscape:snap-to-guides='true' 
inkscape:window-height='1381' inkscape:window-maximized='1' inkscape:window-width='2560' 
inkscape:window-x='1600' inkscape:window-y='27' inkscape:zoom='16'>
+    <inkscape:grid empspacing='2' enabled='true' id='grid4866' snapvisiblegridlinesonly='true' 
spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' 
transform='translate(-122.99995,-175)'>
+    
+    <path inkscape:connector-curvature='0' d='m 133.0002,177.5 0,-1.4375 -8.90625,0 0,11.03125 3.75,0 
-0.875,-3.0625 -2,0 0,-7.03125 7.0625,0 0,0.75 z' id='rect3118' sodipodi:nodetypes='ccccccccccc' 
style='color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new'/>
+    <path inkscape:connector-curvature='0' d='m 126.94314,180.0217 2.73118,10.19291 8.22941,-2.20506 
-2.73119,-10.19291 -8.2294,2.20506 z m 1.04061,0.64961 6.52578,-1.74857 1.74084,6.4969 -6.52578,1.74858 
-1.74084,-6.49691 z' id='path3123' 
style='color:#000000;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:new'/>
+  </g>
+</svg>
diff --git a/icons/shotwell-16.png b/icons/shotwell-16.png
new file mode 100644
index 0000000..546fdcb
Binary files /dev/null and b/icons/shotwell-16.png differ
diff --git a/icons/shotwell.png b/icons/shotwell.png
new file mode 100644
index 0000000..546fdcb
Binary files /dev/null and b/icons/shotwell.png differ
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index 8ea33a5..743c72e 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -449,14 +449,7 @@ public abstract class AppWindow : PageWindow {
         instance = this;
 
         title = Resources.APP_TITLE;
-        
-        GLib.List<Gdk.Pixbuf> pixbuf_list = new GLib.List<Gdk.Pixbuf>();
-        foreach (string resource in Resources.APP_ICONS)
-            pixbuf_list.append(Resources.get_icon(resource, 0));
-        // Use copy() because set_default_icon_list() actually accepts an owned reference
-        // If we didn't hold the pixbufs in memory, would need to use copy_deep()
-        // See https://mail.gnome.org/archives/vala-list/2014-August/msg00022.html
-        set_default_icon_list(pixbuf_list.copy());
+        set_default_icon_name("shotwell");
 
         // restore previous size and maximization state
         if (this is LibraryWindow) {
diff --git a/src/Dialogs.vala b/src/Dialogs.vala
index c94b1b1..c208caf 100644
--- a/src/Dialogs.vala
+++ b/src/Dialogs.vala
@@ -2094,7 +2094,7 @@ public class WelcomeDialog : Gtk.Dialog {
         secondary_text.set_markup("<span weight=\"normal\">%s</span>".printf(
             _("To get started, import photos in any of these ways:")));
         secondary_text.set_alignment(0, 0.5f);
-        Gtk.Image image = new Gtk.Image.from_pixbuf(Resources.get_icon(Resources.ICON_APP, 50));
+        var image = new Gtk.Image.from_icon_name ("shotwell", Gtk.IconSize.DIALOG);
         
         Gtk.Box header_text = new Gtk.Box(Gtk.Orientation.VERTICAL, 0);
         header_text.pack_start(primary_text, false, false, 5);
diff --git a/src/Resources.vala b/src/Resources.vala
index b79ca68..101c49d 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -86,11 +86,6 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string GO_NEXT = "go-next";
     public const string GO_PREVIOUS = "go-previous";
 
-    public const string ICON_APP = "shotwell.svg";
-    public const string ICON_APP16 = "shotwell-16.svg";
-    public const string ICON_APP24 = "shotwell-24.svg";
-    
-    public const string APP_ICONS[] = { ICON_APP, ICON_APP16, ICON_APP24 };
     
     public const string ICON_ABOUT_LOGO = "shotwell-street.jpg";
     public const string ICON_GENERIC_PLUGIN = "generic-plugin.png";
@@ -103,7 +98,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string ICON_RATING_FIVE = "five-stars.svg";
     public const string ICON_FILTER_REJECTED_OR_BETTER = "all-rejected.png";
     public const int ICON_FILTER_REJECTED_OR_BETTER_FIXED_SIZE = 32;
-    public const string ICON_FILTER_UNRATED_OR_BETTER = "shotwell-16.svg";
+    public const string ICON_FILTER_UNRATED_OR_BETTER = "shotwell-16.png";
     public const int ICON_FILTER_UNRATED_OR_BETTER_FIXED_SIZE = 16;
     public const string ICON_FILTER_ONE_OR_BETTER = "one-star-filter-plus.svg";
     public const string ICON_FILTER_TWO_OR_BETTER = "two-star-filter-plus.svg";
@@ -125,7 +120,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string ICON_IMPORTING = "go-down";
     public const string ICON_LAST_IMPORT = "document-open-recent";
     public const string ICON_MISSING_FILES = "process-stop";
-    public const string ICON_PHOTOS = "shotwell-16";
+    public const string ICON_PHOTOS = "shotwell";
     public const string ICON_SINGLE_PHOTO = "image-x-generic";
     public const string ICON_FILTER_PHOTOS = "filter-photos";
     public const string ICON_FILTER_PHOTOS_DISABLED = "filter-photos-disabled";
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]