Merge lp:~codygarver/slingshot/fix-1019057 into lp:~elementary-pantheon/slingshot/trunk

[Cody Garver]

Icon names changed AND old icons removed.

[Danielle Foré (danrabbit)]

Hey Cody, these old names seem to imply that Slingshot ships it's own custom icon names. Should we also make sure we're not shipping these icons prefixed with "slingshot-" ?

[Victor Martinez (victored)]

Daniel, the diff shows the icon files were indeed re-named :)

review: Approve

[Danielle Foré (danrabbit)]

Victor, What I mean is, are we still packaging those icons in Slingshot's data dir? Wouldn't make sense to install an icon that isn't going to be used ;)

[Victor Martinez (victored)]

I see your point now. We shouldn't be shipping these icons twice.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-07-13 11:57:20 +0000
+++ CMakeLists.txt	2012-07-19 19:35:22 +0000
@@ -18,7 +18,6 @@
 
 #file (GLOB stylesheets "${CMAKE_CURRENT_SOURCE_DIR}/data/style/*.css")
 file (GLOB applications_menu "${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-applications.menu")
-file (GLOB icons "${CMAKE_CURRENT_SOURCE_DIR}/data/icons/16x16/actions/*")
 
 # Configure file
 configure_file (${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
@@ -72,19 +71,6 @@
 #install (FILES ${stylesheets} DESTINATION ${PKGDATADIR}/style)
 install (FILES ${applications_menu} DESTINATION /etc/xdg/menus)
 
-# Install symbolic icons - fix bug #854734
-option (INSTALL_ICONS "Install symbolic icons" ON)
-if (INSTALL_ICONS)
-    install (FILES ${icons} DESTINATION ${DATADIR}/icons/hicolor/16x16/actions)
-endif (INSTALL_ICONS)
-
-# Update icon cache
-option (ICONCACHE_UPDATE "Update the icon cache after installation of new icons" ON)
-if (ICONCACHE_UPDATE)
-    install (CODE "message (\"-- Update Gtk icon cache...\")")
-    install (CODE "execute_process (COMMAND gtk-update-icon-cache -f -t ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor)")
-endif (ICONCACHE_UPDATE)
-
 #
 # GSettings Schema
 #

=== removed directory 'data/icons'
=== removed directory 'data/icons/16x16'
=== removed directory 'data/icons/16x16/actions'
=== removed file 'data/icons/16x16/actions/slingshot-view-list-filter-symbolic.svg'
--- data/icons/16x16/actions/slingshot-view-list-filter-symbolic.svg	2011-09-30 16:06:21 +0000
+++ data/icons/16x16/actions/slingshot-view-list-filter-symbolic.svg	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="16"
-   height="16"
-   id="svg7384"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="view-list-filter-symbolic.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1280"
-     inkscape:window-height="753"
-     id="namedview7"
-     showgrid="true"
-     inkscape:zoom="14.75"
-     inkscape:cx="1.3559322"
-     inkscape:cy="8"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg7384">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3051" />
-  </sodipodi:namedview>
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
-  <defs
-     id="defs11" />
-  <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>
-  <path
-     id="rect3055"
-     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-     d="m 10,9 0,4 4,0 0,-4 -4,0 z m 1,1 2,0 0,2 -2,0 0,-2 z m -1,-7 0,4 4,0 0,-4 -4,0 z m 1,1 2,0 0,2 -2,0 0,-2 z M 5,9 5,10 1,10 1,9 z m 0,3 0,1 -4,0 0,-1 z M 5,6 5,7 1,7 1,6 z M 5,3 5,4 1,4 1,3 z M 7,2 8,2 8,14 7,14 z"
-     inkscape:connector-curvature="0" />
-</svg>

=== removed file 'data/icons/16x16/actions/slingshot-view-list-icons-symbolic.svg'
--- data/icons/16x16/actions/slingshot-view-list-icons-symbolic.svg	2011-09-30 16:06:21 +0000
+++ data/icons/16x16/actions/slingshot-view-list-icons-symbolic.svg	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="16"
-   height="16"
-   id="svg7384">
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
-  <defs
-     id="defs11" />
-  <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>
-  <path
-     d="M 2,2 2,6 6,6 6,2 z m 8,0 0,4 4,0 0,-4 z M 3,3 5,3 5,5 3,5 z m 8,0 2,0 0,2 -2,0 z m -9,7 0,4 4,0 0,-4 z m 8,0 0,4 4,0 0,-4 z m -7,1 2,0 0,2 -2,0 z m 8,0 2,0 0,2 -2,0 z"
-     id="rect2999"
-     style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-</svg>

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2012-07-10 22:57:34 +0000
+++ src/SlingshotView.vala	2012-07-19 19:35:22 +0000
@@ -146,11 +146,11 @@
 
             view_selector = new ModeButton ();
             
-            var image = new Image.from_icon_name ("slingshot-view-list-icons-symbolic", IconSize.MENU);
+            var image = new Image.from_icon_name ("view-grid-symbolic", IconSize.MENU);
             image.tooltip_text = _("Grid");
             view_selector.append (image);
             
-            image = new Image.from_icon_name ("slingshot-view-list-filter-symbolic", IconSize.MENU);
+            image = new Image.from_icon_name ("view-filter-symbolic", IconSize.MENU);
             image.tooltip_text = _("Categories");
             view_selector.append (image);