[Sugar-devel] [ImageViewer] Changes in the toolbar according to design team review

godiard at sugarlabs.org godiard at sugarlabs.org
Thu Jan 12 08:44:11 EST 2012


From: Gonzalo Odiard <godiard at gmail.com>

Change order in the full screen button, and icons in rotate buttons.

Signed-off-by: Agustin Zubiaga <aguzubiaga97 at gmail.com>
Reviewed-by: Gonzalo Odiard <gonzalo at laptop.org>
---
 ImageViewerActivity.py         |   22 ++++--------
 icons/object-rotate-left.svg   |   16 +++++++++
 icons/object-rotate-right.svg  |   15 ++++++++
 icons/rotate_anticlockwise.svg |   71 ----------------------------------------
 icons/rotate_clockwise.svg     |   71 ----------------------------------------
 5 files changed, 39 insertions(+), 156 deletions(-)
 create mode 100644 icons/object-rotate-left.svg
 create mode 100644 icons/object-rotate-right.svg
 delete mode 100644 icons/rotate_anticlockwise.svg
 delete mode 100644 icons/rotate_clockwise.svg

diff --git a/ImageViewerActivity.py b/ImageViewerActivity.py
index 9bb06e5..e87ffc0 100644
--- a/ImageViewerActivity.py
+++ b/ImageViewerActivity.py
@@ -193,35 +193,29 @@ class ImageViewerActivity(activity.Activity):
         toolbar_box.toolbar.insert(zoom_original_button, -1)
         zoom_original_button.show()
 
+        fullscreen_button = ToolButton('view-fullscreen')
+        fullscreen_button.set_tooltip(_('Fullscreen'))
+        fullscreen_button.connect('clicked', self.__fullscreen_cb)
+        toolbar_box.toolbar.insert(fullscreen_button, -1)
+        fullscreen_button.show()
+
         spacer = gtk.SeparatorToolItem()
-        spacer.props.draw = False
         toolbar_box.toolbar.insert(spacer, -1)
         spacer.show()
 
-        rotate_anticlockwise_button = ToolButton('rotate_anticlockwise')
+        rotate_anticlockwise_button = ToolButton('object-rotate-left')
         rotate_anticlockwise_button.set_tooltip(_('Rotate anticlockwise'))
         rotate_anticlockwise_button.connect('clicked',
                 self.__rotate_anticlockwise_cb)
         toolbar_box.toolbar.insert(rotate_anticlockwise_button, -1)
         rotate_anticlockwise_button.show()
 
-        rotate_clockwise_button = ToolButton('rotate_clockwise')
+        rotate_clockwise_button = ToolButton('object-rotate-right')
         rotate_clockwise_button.set_tooltip(_('Rotate clockwise'))
         rotate_clockwise_button.connect('clicked', self.__rotate_clockwise_cb)
         toolbar_box.toolbar.insert(rotate_clockwise_button, -1)
         rotate_clockwise_button.show()
 
-        spacer = gtk.SeparatorToolItem()
-        spacer.props.draw = False
-        toolbar_box.toolbar.insert(spacer, -1)
-        spacer.show()
-
-        fullscreen_button = ToolButton('view-fullscreen')
-        fullscreen_button.set_tooltip(_('Fullscreen'))
-        fullscreen_button.connect('clicked', self.__fullscreen_cb)
-        toolbar_box.toolbar.insert(fullscreen_button, -1)
-        fullscreen_button.show()
-
         separator = gtk.SeparatorToolItem()
         separator.props.draw = False
         separator.set_expand(True)
diff --git a/icons/object-rotate-left.svg b/icons/object-rotate-left.svg
new file mode 100644
index 0000000..5dfa334
--- /dev/null
+++ b/icons/object-rotate-left.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="55px"
+	 height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+
+<g id="Rotate_Left__x28_90_xBA__CCW_x29_" >
+	<g display="inline">
+		<polygon fill="#FFFFFF" stroke="#FFFFFF" stroke-linejoin="round" points="12.183,32.074 7.513,23.012 21.07,27.354"/>							
+		<path fill="none" stroke="#FFFFFF" stroke-width="3.5" stroke-linecap="round" d="M13.95,28.242
+			c0-7.416,6.01-13.426,13.426-13.426s13.427,6.011,13.427,13.426c0,7.416-6.011,13.427-13.427,13.427
+			c-2.4,0-4.654-0.63-6.604-1.733"/>
+	</g>
+</g>
+
+</svg>
diff --git a/icons/object-rotate-right.svg b/icons/object-rotate-right.svg
new file mode 100644
index 0000000..84c1638
--- /dev/null
+++ b/icons/object-rotate-right.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="55px"
+	 height="55px" viewBox="0 0 55 55" enable-background="new 0 0 55 55" xml:space="preserve">
+
+<g id="Rotate_Right__x28_90_xBA__CW_x29_" >
+	<polygon display="inline" fill="#FFFFFF" stroke="#FFFFFF" stroke-linejoin="round" points="42.693,31.332 47.363,22.27 
+		33.806,26.611 	"/>
+	<path display="inline" fill="none" stroke="#FFFFFF" stroke-width="3.5" stroke-linecap="round" d="M40.926,27.5
+		c0-7.416-6.01-13.426-13.426-13.426S14.073,20.085,14.073,27.5c0,7.416,6.011,13.427,13.427,13.427c2.4,0,4.654-0.63,6.604-1.733"
+		/>
+</g>
+
+</svg>
diff --git a/icons/rotate_anticlockwise.svg b/icons/rotate_anticlockwise.svg
deleted file mode 100644
index 55a9c61..0000000
--- a/icons/rotate_anticlockwise.svg
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<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"
-   x="0px"
-   y="0px"
-   width="55px"
-   height="55px"
-   viewBox="0 0 55 55"
-   enable-background="new 0 0 55 55"
-   xml:space="preserve"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="rotate_anticlockwise.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-   id="metadata14"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-   id="defs12"><inkscape:perspective
-     sodipodi:type="inkscape:persp3d"
-     inkscape:vp_x="0 : 27.5 : 1"
-     inkscape:vp_y="0 : 1000 : 0"
-     inkscape:vp_z="55 : 27.5 : 1"
-     inkscape:persp3d-origin="27.5 : 18.333333 : 1"
-     id="perspective16" /></defs><sodipodi:namedview
-   inkscape:window-height="976"
-   inkscape:window-width="1680"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="0.0"
-   guidetolerance="10.0"
-   gridtolerance="10.0"
-   objecttolerance="10.0"
-   borderopacity="1.0"
-   bordercolor="#666666"
-   pagecolor="#ffffff"
-   id="base"
-   showgrid="false"
-   inkscape:zoom="8.3636364"
-   inkscape:cx="27.5"
-   inkscape:cy="27.5"
-   inkscape:window-x="0"
-   inkscape:window-y="24"
-   inkscape:current-layer="svg2" />
-
-<g
-   id="Undo"
-   transform="matrix(0,-1,1,0,0.975043,54.158)">
-	<g
-   display="inline"
-   id="g5"
-   style="display:inline">
-		<polyline
-   points="    22.903,27.523 15.091,20.935 22.903,14.344   "
-   id="polyline7"
-   style="fill:none;stroke:#ffffff;stroke-width:2.98670006;stroke-linecap:round;stroke-linejoin:round" />
-		<path
-   d="M 15.091,20.935 L 32.345,20.935 C 37.038,20.935 40.879,24.776 40.879,29.469 C 40.879,34.162 40.983652,31.904174 40.83413,38.838957"
-   id="path9"
-   style="fill:none;stroke:#ffffff;stroke-width:2.98670006;stroke-linecap:round"
-   sodipodi:nodetypes="ccsc" />
-	</g>
-</g>
-</svg>
\ No newline at end of file
diff --git a/icons/rotate_clockwise.svg b/icons/rotate_clockwise.svg
deleted file mode 100644
index 474f6f0..0000000
--- a/icons/rotate_clockwise.svg
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 13.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
-<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"
-   x="0px"
-   y="0px"
-   width="55px"
-   height="55px"
-   viewBox="0 0 55 55"
-   enable-background="new 0 0 55 55"
-   xml:space="preserve"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="rotate_clockwise.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"><metadata
-   id="metadata14"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-   id="defs12"><inkscape:perspective
-     sodipodi:type="inkscape:persp3d"
-     inkscape:vp_x="0 : 27.5 : 1"
-     inkscape:vp_y="0 : 1000 : 0"
-     inkscape:vp_z="55 : 27.5 : 1"
-     inkscape:persp3d-origin="27.5 : 18.333333 : 1"
-     id="perspective16" /></defs><sodipodi:namedview
-   inkscape:window-height="976"
-   inkscape:window-width="1680"
-   inkscape:pageshadow="2"
-   inkscape:pageopacity="0.0"
-   guidetolerance="10.0"
-   gridtolerance="10.0"
-   objecttolerance="10.0"
-   borderopacity="1.0"
-   bordercolor="#666666"
-   pagecolor="#ffffff"
-   id="base"
-   showgrid="false"
-   inkscape:zoom="8.3636364"
-   inkscape:cx="27.5"
-   inkscape:cy="27.5"
-   inkscape:window-x="0"
-   inkscape:window-y="24"
-   inkscape:current-layer="svg2" />
-
-<g
-   id="Undo"
-   transform="matrix(0,-1,-1,0,54.158,54.158)">
-	<g
-   display="inline"
-   id="g5"
-   style="display:inline">
-		<polyline
-   points="    22.903,27.523 15.091,20.935 22.903,14.344   "
-   id="polyline7"
-   style="fill:none;stroke:#ffffff;stroke-width:2.98670006;stroke-linecap:round;stroke-linejoin:round" />
-		<path
-   d="M 15.091,20.935 L 32.345,20.935 C 37.038,20.935 40.879,24.776 40.879,29.469 C 40.879,34.162 40.983652,31.904174 40.83413,38.838957"
-   id="path9"
-   style="fill:none;stroke:#ffffff;stroke-width:2.98670006;stroke-linecap:round"
-   sodipodi:nodetypes="ccsc" />
-	</g>
-</g>
-</svg>
\ No newline at end of file
-- 
1.7.7.5



More information about the Sugar-devel mailing list