[baobab/wip/new-design: 45/59] Use symbolic icons for the chart selection

From: Stefano Facchini <sfacchini src gnome org>
To: commits-list gnome org
Cc:
Subject: [baobab/wip/new-design: 45/59] Use symbolic icons for the chart selection
Date: Sun, 1 Apr 2012 17:13:28 +0000 (UTC)
commit 24b64896d642402fa749351debc83c91bc588325
Author: Paolo Borelli <pborelli gnome org>
Date:   Tue Feb 14 20:30:41 2012 +0100

    Use symbolic icons for the chart selection

 data/Makefile.am                  |    9 ++-
 data/view-ringschart-symbolic.svg |   32 +++++++
 data/view-treemap-symbolic.svg    |  164 +++++++++++++++++++++++++++++++++++++
 src/baobab-main-window.ui         |   24 +++++-
 4 files changed, 224 insertions(+), 5 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 6144343..11d8194 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,11 @@
-baobabappdir	   = $(datadir)/applications
+baobabicondir = $(datadir)/icons/hicolor/scalable/actions/
+baobabicon_DATA = \
+	view-ringschart-symbolic.svg	\
+	view-treemap-symbolic.svg
+
+baobabappdir = $(datadir)/applications
 baobabapp_in_files = baobab.desktop.in
-baobabapp_DATA     = $(baobabapp_in_files:.desktop.in=.desktop)
+baobabapp_DATA = $(baobabapp_in_files:.desktop.in=.desktop)
 
 $(baobabapp_in_files): $(baobabapp_in_files:.desktop.in=.desktop.in.in)
 	sed -e "s|\ VERSION\@|@VERSION@|" $< > $@
diff --git a/data/view-ringschart-symbolic.svg b/data/view-ringschart-symbolic.svg
new file mode 100644
index 0000000..ccf0adb
--- /dev/null
+++ b/data/view-ringschart-symbolic.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:svg="http://www.w3.org/2000/svg"; xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; height="16" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; xmlns:dc="http://purl.org/dc/elements/1.1/"; xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; inkscape:version="0.48.1 r9760" version="1.1" id="svg7384" xmlns="http://www.w3.org/2000/svg"; sodipodi:docname="view-ringchart-symbolic.svg" width="16.008272" xmlns:cc="http://creativecommons.org/ns#";>
+  <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="false" inkscape:snap-nodes="true" inkscape:current-layer="layer12" showgrid="false" inkscape:window-width="1598" inkscape:window-height="1020" objecttolerance="10" inkscape:zoom="0.70710678" gridtolerance="10" inkscape:pageopacity="1" bordercolor="#666666" guidetolerance="10" inkscape:snap-grids="true" inkscape:snap-to-guides="true" inkscape:window-maximized="0" inkscape:snap-others="false" inkscape:guide-bbox="true" pagecolor="#555753" inkscape:window-x="320" inkscape:window-y="27" showborder="false" inkscape:snap-bbox="true" inkscape:object-nodes="false" id="namedview88" borderopacity="1" showguides="true" inkscape:object-paths="false" inkscape:pageshadow="2" inkscape:snap-global="true" inkscape:cx="371.93918" inkscape:cy="-73.95236" inkscape:snap-bbox-midpoints="false">
+    <inkscape:grid spacingx="1px" spacingy="1px" snapvisiblegridlinesonly="true" visible="true" type="xygrid" enabled="true" id="grid4866" empspacing="2"/>
+  </sodipodi:namedview>
+  <title id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs id="defs7386"/>
+  <g style="display:inline" transform="translate(-200.99193,-787)" inkscape:groupmode="layer" id="layer9" inkscape:label="status"/>
+  <g transform="translate(-200.99193,-787)" inkscape:groupmode="layer" id="layer10" inkscape:label="devices"/>
+  <g transform="translate(-200.99193,-787)" inkscape:groupmode="layer" id="layer11" inkscape:label="apps"/>
+  <g transform="translate(-200.99193,-787)" inkscape:groupmode="layer" id="layer13" inkscape:label="places"/>
+  <g transform="translate(-200.99193,-787)" inkscape:groupmode="layer" id="layer14" inkscape:label="mimetypes"/>
+  <g style="display:inline" transform="translate(-200.99193,-787)" inkscape:groupmode="layer" id="layer15" inkscape:label="emblems"/>
+  <g transform="translate(-200.99193,-787)" style="display:inline" inkscape:groupmode="layer" id="g71291" inkscape:label="emotes"/>
+  <g style="display:inline" transform="translate(-200.99193,-787)" inkscape:groupmode="layer" id="g4953" inkscape:label="categories"/>
+  <g transform="translate(-200.99193,-787)" style="display:inline" inkscape:groupmode="layer" id="layer12" inkscape:label="actions">
+    
+    <path style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.70439327;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="m 213.0002,795 c 0,2.20913 -1.79087,4 -4,4 -1.48448,0 -2.7785,-0.79916 -3.46875,-2 l -3.46875,2 c 1.42906,2.4752 4.07938,4 6.9375,4 4.41827,0 8,-3.58173 8,-8 l -4,0 z" inkscape:connector-curvature="0" id="path40342-3-3-9"/>
+    <path style="opacity:0.35;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.70439327;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="m 209.0002,787 c -1.40429,0 -2.78385,0.36036 -4,1.0625 -3.82633,2.20913 -5.14663,7.11117 -2.9375,10.9375 l 3.46875,-2 c -0.33695,-0.58619 -0.53125,-1.27535 -0.53125,-2 0,-2.20913 1.79087,-4 4,-4 l 0,-4 z" inkscape:connector-curvature="0" id="path40342-3-3-9-3"/>
+    <path sodipodi:rx="2.8173785" sodipodi:ry="2.8173785" style="color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1.87825239;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" transform="matrix(1.0648905,0,0,1.0648906,241.95513,539.86355)" d="m -28.129591,239.58937 a 2.8173785,2.8173785 0 1 1 -5.634758,0 2.8173785,2.8173785 0 1 1 5.634758,0 z" sodipodi:type="arc" id="path40342-3" sodipodi:cx="-30.94697" sodipodi:cy="239.58937"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/data/view-treemap-symbolic.svg b/data/view-treemap-symbolic.svg
new file mode 100644
index 0000000..94bb989
--- /dev/null
+++ b/data/view-treemap-symbolic.svg
@@ -0,0 +1,164 @@
+<?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";
+   sodipodi:docname="view-treemap-symbolic.svg"
+   width="15.981825"
+   id="svg7384"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   height="16">
+  <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:guide-bbox="true"
+     inkscape:current-layer="layer12"
+     inkscape:bbox-paths="false"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-others="false"
+     inkscape:window-width="1598"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true"
+     gridtolerance="10"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:object-paths="false"
+     pagecolor="#555753"
+     inkscape:object-nodes="false"
+     inkscape:cx="12.030937"
+     inkscape:cy="9.9254129"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:window-x="320"
+     inkscape:window-y="27"
+     showborder="false"
+     bordercolor="#666666"
+     showgrid="true"
+     inkscape:zoom="16"
+     inkscape:window-height="1020"
+     objecttolerance="10"
+     inkscape:pageopacity="1"
+     borderopacity="1"
+     showguides="true"
+     inkscape:snap-grids="true"
+     inkscape:pageshadow="2"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       empspacing="2"
+       id="grid4866"
+       type="xygrid"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:label="status"
+     style="display:inline"
+     id="layer9"
+     inkscape:groupmode="layer"
+     transform="translate(-181.0002,-787)" />
+  <g
+     inkscape:label="devices"
+     id="layer10"
+     inkscape:groupmode="layer"
+     transform="translate(-181.0002,-787)" />
+  <g
+     inkscape:label="apps"
+     id="layer11"
+     inkscape:groupmode="layer"
+     transform="translate(-181.0002,-787)" />
+  <g
+     inkscape:label="places"
+     id="layer13"
+     inkscape:groupmode="layer"
+     transform="translate(-181.0002,-787)" />
+  <g
+     inkscape:label="mimetypes"
+     id="layer14"
+     inkscape:groupmode="layer"
+     transform="translate(-181.0002,-787)" />
+  <g
+     inkscape:label="emblems"
+     style="display:inline"
+     id="layer15"
+     inkscape:groupmode="layer"
+     transform="translate(-181.0002,-787)" />
+  <g
+     inkscape:label="emotes"
+     style="display:inline"
+     id="g71291"
+     inkscape:groupmode="layer"
+     transform="translate(-181.0002,-787)" />
+  <g
+     inkscape:label="categories"
+     style="display:inline"
+     id="g4953"
+     inkscape:groupmode="layer"
+     transform="translate(-181.0002,-787)" />
+  <g
+     inkscape:label="actions"
+     style="display:inline"
+     id="layer12"
+     inkscape:groupmode="layer"
+     transform="translate(-181.0002,-787)">
+    <path
+       style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4683"
+       d="m 182.0002,788 0,14 9,0 0,-14 -9,0 z m 2,2 5,0 0,7 -5,0 0,-7 z m 0,8 5,0 0,2 -5,0 0,-2 z"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="4"
+       style="color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       y="792"
+       x="192.0002"
+       id="rect4683-9"
+       height="10" />
+    <rect
+       width="3"
+       style="opacity:0.35;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       y="793"
+       x="-188.0002"
+       id="rect4683-0-6-2-6"
+       transform="scale(-1,1)"
+       height="3" />
+    <rect
+       width="3"
+       style="opacity:0.35;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       y="791"
+       x="-188.0002"
+       id="rect4683-0-6-2-6-1"
+       transform="scale(-1,1)"
+       height="1" />
+    <rect
+       width="4.0000014"
+       style="opacity:0.35;color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       y="788"
+       x="-196.0002"
+       id="rect4683-0-6-2-6-1-9"
+       transform="scale(-1,1)"
+       height="3" />
+  </g>
+</svg>
diff --git a/src/baobab-main-window.ui b/src/baobab-main-window.ui
index fd22fc6..0e5895e 100644
--- a/src/baobab-main-window.ui
+++ b/src/baobab-main-window.ui
@@ -361,48 +361,66 @@
                 <property name="margin_right">20</property>
                 <property name="margin_top">6</property>
                 <property name="margin_bottom">6</property>
-                <property name="homogeneous">True</property>
+                <property name="homogeneous">False</property>
                 <property name="layout_style">end</property>
                 <style>
                   <class name="linked"/>
                 </style>
                 <child>
                   <object class="GtkRadioButton" id="rings-button">
-                    <property name="label" translatable="yes">Rings</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
+                    <property name="tooltip_markup" translatable="yes">Rings Chart</property>
                     <property name="xalign">0.5</property>
+                    <property name="yalign">0.5</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">False</property>
                     <property name="action_name">win.active-chart</property>
                     <property name="action_target">'rings'</property>
+                    <child>
+                      <object class="GtkImage" id="ringschart-icon">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">view-ringschart-symbolic</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
                     <property name="position">0</property>
+                    <property name="non_homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="treemap-button">
-                    <property name="label" translatable="yes">Treemap</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
+                    <property name="tooltip_markup" translatable="yes">Treemap Chart</property>
                     <property name="xalign">0.5</property>
+                    <property name="yalign">0.5</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">False</property>
                     <property name="group">rings-button</property>
                     <property name="action_name">win.active-chart</property>
                     <property name="action_target">'treemap'</property>
+                    <child>
+                      <object class="GtkImage" id="treemap-icon">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="icon_name">view-treemap-symbolic</property>
+                      </object>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
                     <property name="position">1</property>
+                    <property name="non_homogeneous">True</property>
                   </packing>
                 </child>
               </object>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]