GNOME.org
 

[gnome-builder/wip/project-selector: 62/72] icons: bundle gitg icon as our git vcs icon

commit cc8e6e349755e87fe26bae4b011ae94a7ccfa808
Author: Christian Hergert <christian hergert me>
Date:   Mon Apr 6 16:21:49 2015 -0700

    icons: bundle gitg icon as our git vcs icon
    
    We need to check with the gitg team that this is okay with them. We intend
    to use more and more from gitg, so I think it would be good to recognize
    their work with the iconography as well.
    
    Since I know many of you read this, ping me with alternate suggestions if
    you have them!

 data/icons/Makefile.am                             |    8 ++++++
 data/icons/hicolor/256x256/vcs/builder-vcs-git.png |  Bin 0 -> 20169 bytes
 data/icons/hicolor/32x32/vcs/builder-vcs-git.png   |  Bin 0 -> 2061 bytes
 data/icons/hicolor/48x48/vcs/builder-vcs-git.png   |  Bin 0 -> 2946 bytes
 .../scalable/vcs/builder-vcs-git-symbolic.svg      |   27 ++++++++++++++++++++
 data/ui/gb-new-project-dialog.ui                   |    4 +-
 src/resources/gnome-builder.gresource.xml          |    8 +++++-
 7 files changed, 44 insertions(+), 3 deletions(-)
---
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index b8b44b1..c0fc78c 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -20,7 +20,15 @@ nobase_icon_DATA = \
        hicolor/scalable/autocomplete/lang-function-symbolic.svg \
        $(NULL)
 
+bundled_icon_sources = \
+       hicolor/scalable/vcs/builder-vcs-git-symbolic.svg \
+       hicolor/256x256/vcs/builder-vcs-git.png \
+       hicolor/48x48/vcs/builder-vcs-git.png \
+       hicolor/32x32/vcs/builder-vcs-git.png \
+       $(NULL)
+
 EXTRA_DIST = \
+       $(bundled_icon_sources) \
        $(nobase_icon_DATA) \
        hicolor/source.svg
 
diff --git a/data/icons/hicolor/256x256/vcs/builder-vcs-git.png 
b/data/icons/hicolor/256x256/vcs/builder-vcs-git.png
new file mode 100644
index 0000000..4acbc30
Binary files /dev/null and b/data/icons/hicolor/256x256/vcs/builder-vcs-git.png differ
diff --git a/data/icons/hicolor/32x32/vcs/builder-vcs-git.png 
b/data/icons/hicolor/32x32/vcs/builder-vcs-git.png
new file mode 100644
index 0000000..49af626
Binary files /dev/null and b/data/icons/hicolor/32x32/vcs/builder-vcs-git.png differ
diff --git a/data/icons/hicolor/48x48/vcs/builder-vcs-git.png 
b/data/icons/hicolor/48x48/vcs/builder-vcs-git.png
new file mode 100644
index 0000000..cf01a40
Binary files /dev/null and b/data/icons/hicolor/48x48/vcs/builder-vcs-git.png differ
diff --git a/data/icons/hicolor/scalable/vcs/builder-vcs-git-symbolic.svg 
b/data/icons/hicolor/scalable/vcs/builder-vcs-git-symbolic.svg
new file mode 100644
index 0000000..ed8f223
--- /dev/null
+++ b/data/icons/hicolor/scalable/vcs/builder-vcs-git-symbolic.svg
@@ -0,0 +1,27 @@
+<?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='gitg-symbolic.svg' height='16' id='svg7384' 
xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' 
xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' 
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' 
version='1.1' inkscape:version='0.91 r13725' 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='-13.38958' inkscape:cy='8.6271321' 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='false' showguides='true' inkscape:snap-bbox='true' 
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='1376' inkscape:window-maximized='1' inkscape:window-width='2560' 
inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='1'>
+    <inkscape:grid empspacing='2' enabled='true' id='grid4866' originx='-281.99979' originy='-341.99988' 
snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'>
+    <linearGradient id='linearGradient7212' osb:paint='solid'>
+      <stop id='stop7214' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
+    </linearGradient>
+  </defs>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='apps' style='display:inline' 
transform='translate(-522.99999,124.99988)'>
+    
+    <path inkscape:connector-curvature='0' d='m 531.0002,-124.92187 c -0.25108,0 -0.50701,0.0907 
-0.70599,0.27625 l -2.20026,2.05187 1.75,1.75 c 0.19673,-0.0948 0.42325,-0.15625 0.65625,-0.15625 0.82843,0 
1.5,0.67157 1.5,1.5 0,0.233 -0.0614,0.45952 -0.15625,0.65625 l 1.44757,1.44757 c 0.19673,-0.0948 
0.42325,-0.15625 0.65625,-0.15625 0.82843,0 1.5,0.67157 1.5,1.5 0,0.82843 -0.67157,1.5 -1.5,1.5 -0.82843,0 
-1.5,-0.67157 -1.5,-1.5 0,-0.22264 0.0693,-0.43501 0.15625,-0.625 l -1.47882,-1.47882 c -0.0427,0.0196 
-0.0802,0.0469 -0.125,0.0625 l 0,3.1875 c 0.58641,0.20384 1,0.75041 1,1.40625 0,0.82843 -0.67157,1.5 -1.5,1.5 
-0.82843,0 -1.5,-0.67157 -1.5,-1.5 0,-0.65584 0.41359,-1.20241 1,-1.40625 l 0,-3.1875 c -0.58641,-0.20384 
-1,-0.75041 -1,-1.40625 0,-0.21746 0.0418,-0.43846 0.125,-0.625 l -1.75,-1.75 -4.01812,4.16651 c 
-0.37775,0.3917 -0.38479,1.0272 0,1.41198 l 6.93713,6.93713 c 0.38478,0.38479 1.0272,0.38479 1.41198,0 l 
6.93713,-6.93713 c 0.38479,-0.38478 0.38479,-1.02719 0,-1.4
 1198 l -6.93713,-6.93713 c -0.19239,-0.19239 -0.45491,-0.27625 -0.70599,-0.27625 z' id='rect12952' 
sodipodi:nodetypes='ssccssccssssccccsssccsccssssssss' 
style='color:#000000;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new'/>
+  </g>
+</svg>
diff --git a/data/ui/gb-new-project-dialog.ui b/data/ui/gb-new-project-dialog.ui
index 4e0eaaf..2abacda 100644
--- a/data/ui/gb-new-project-dialog.ui
+++ b/data/ui/gb-new-project-dialog.ui
@@ -127,7 +127,7 @@
                                 <property name="visible">true</property>
                                 <child>
                                   <object class="GtkImage">
-                                    <property name="icon-name">gitg</property>
+                                    <property name="icon-name">builder-vcs-git</property>
                                     <property name="pixel-size">32</property>
                                     <property name="visible">true</property>
                                   </object>
@@ -303,7 +303,7 @@
                   <object class="GtkImage">
                     <property name="valign">center</property>
                     <property name="vexpand">true</property>
-                    <property name="icon-name">gitg</property>
+                    <property name="icon-name">builder-vcs-git</property>
                     <property name="pixel-size">128</property>
                     <property name="visible">true</property>
                   </object>
diff --git a/src/resources/gnome-builder.gresource.xml b/src/resources/gnome-builder.gresource.xml
index 852bda3..d3df17c 100644
--- a/src/resources/gnome-builder.gresource.xml
+++ b/src/resources/gnome-builder.gresource.xml
@@ -8,16 +8,22 @@
 
     <file alias="gtk/menus.ui">../../data/gtk/menus.ui</file>
 
+    <!-- Scalable icons all go into actions/ since gtk+ will ignore our directory scheme -->
     <file 
alias="icons/scalable/actions/builder-move-left-symbolic.svg">../../data/icons/hicolor/scalable/actions/builder-move-left-symbolic.svg</file>
     <file 
alias="icons/scalable/actions/builder-move-right-symbolic.svg">../../data/icons/hicolor/scalable/actions/builder-move-right-symbolic.svg</file>
     <file 
alias="icons/scalable/actions/builder-split-tab-left-symbolic.svg">../../data/icons/hicolor/scalable/actions/builder-split-tab-left-symbolic.svg</file>
     <file 
alias="icons/scalable/actions/builder-split-tab-right-symbolic.svg">../../data/icons/hicolor/scalable/actions/builder-split-tab-right-symbolic.svg</file>
     <file 
alias="icons/scalable/actions/builder-split-tab-symbolic.svg">../../data/icons/hicolor/scalable/actions/builder-split-tab-symbolic.svg</file>
-    
     <file 
alias="icons/scalable/actions/lang-class-symbolic.svg">../../data/icons/hicolor/scalable/autocomplete/lang-class-symbolic.svg</file>
     <file 
alias="icons/scalable/actions/lang-enum-symbolic.svg">../../data/icons/hicolor/scalable/autocomplete/lang-enum-symbolic.svg</file>
     <file 
alias="icons/scalable/actions/lang-function-symbolic.svg">../../data/icons/hicolor/scalable/autocomplete/lang-function-symbolic.svg</file>
     <file 
alias="icons/scalable/actions/lang-struct-symbolic.svg">../../data/icons/hicolor/scalable/autocomplete/lang-struct-symbolic.svg</file>
+    <file 
alias="icons/scalable/actions/builder-vcs-git-symbolic.svg">../../data/icons/hicolor/scalable/vcs/builder-vcs-git-symbolic.svg</file>
+
+    <!-- Non-scalable vcs icons -->
+    <file 
alias="icons/256x256/actions/builder-vcs-git.png">../../data/icons/hicolor/256x256/vcs/builder-vcs-git.png</file>
+    <file 
alias="icons/48x48/actions/builder-vcs-git.png">../../data/icons/hicolor/48x48/vcs/builder-vcs-git.png</file>
+    <file 
alias="icons/32x32/actions/builder-vcs-git.png">../../data/icons/hicolor/32x32/vcs/builder-vcs-git.png</file>
 
     <file alias="js/marked.js">../../data/js/marked.js</file>
     <file alias="js/markdown-view.js">../../data/js/markdown-view.js</file>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]