Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Quiñones <manuq@laptop.org>2012-03-12 13:22:03 (GMT)
committer Manuel Quiñones <manuq@laptop.org>2012-03-12 13:22:03 (GMT)
commit22b243e419bcdb7b208abcab8faf4ef474a4303e (patch)
tree0bcc08824a6ad7c85fdf2116755eeccd733f50ff
parent91f89010da263ef2fea95cae9e67b77e07b40211 (diff)
Toolbuttons icon changes
- redesigne new-game.svg using the * badget (as in abacus, for example) - redesigne replay-game.svg using as a base sugar's media-seek-backward.svg - remove edit-undo.svg edit-redo.svg so that sugar defaults are used - remove edit-undo-many.svg and using sugar's edit-undo instead - add a separator between new - replay and undo - redo Signed-off-by: Manuel Quiñones <manuq@laptop.org>
-rw-r--r--icons/edit-redo.svg7
-rw-r--r--icons/edit-undo-many.svg9
-rw-r--r--icons/edit-undo.svg7
-rw-r--r--icons/new-game.svg70
-rw-r--r--icons/replay-game.svg32
-rw-r--r--implodeactivity.py5
6 files changed, 96 insertions, 34 deletions
diff --git a/icons/edit-redo.svg b/icons/edit-redo.svg
deleted file mode 100644
index 00cb7f6..0000000
--- a/icons/edit-redo.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="55px" height="55px">
- <path
- style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linejoin:round;stroke-linecap:round"
- d="M 33,27 L 41,21 L 33,15
- M 41,21 h -17 c -4,0 -8.5,4 -8.5,8.5 s 4,8.5 8.5,8.5 h 15"/>
-</svg>
diff --git a/icons/edit-undo-many.svg b/icons/edit-undo-many.svg
deleted file mode 100644
index 215714c..0000000
--- a/icons/edit-undo-many.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="55px" height="55px">
- <path
- style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linejoin:round;stroke-linecap:round"
- d="M 19,27 L 15,21 L 19,15
- M 15,21 h 5 c 6,0 6.5,4 6.5,8.5 s -0.5,8.5 -6.5,8.5 h -2
- M 33,27 L 29,21 L 33,15
- M 29,21 h 5 c 6,0 6.5,4 6.5,8.5 s -0.5,8.5 -6.5,8.5 h -2"/>
-</svg>
diff --git a/icons/edit-undo.svg b/icons/edit-undo.svg
deleted file mode 100644
index 1acb4ee..0000000
--- a/icons/edit-undo.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="55px" height="55px">
- <path
- style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linejoin:round;stroke-linecap:round"
- d="M 23,27 L 15,21 L 23,15
- M 15,21 h 17 c 4,0 8.5,4 8.5,8.5 s -4,8.5 -8.5,8.5 h -15"/>
-</svg>
diff --git a/icons/new-game.svg b/icons/new-game.svg
index 2152df4..00ad9de 100644
--- a/icons/new-game.svg
+++ b/icons/new-game.svg
@@ -1,6 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="55px" height="55px">
+<?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.0"
+ width="55"
+ height="55"
+ id="Icon">
+ <metadata
+ id="metadata25">
+ <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></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs23" />
<path
- style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:4"
- d="M 17,44 l 4,-13 l -11,-8 l 13,0 l 5,-13 l 4,13 l 14,0 l -11,8 l 4,13 l -11,-8 z"/>
+ d="m 10.805605,38.211574 5.204778,0 c 0.886476,0 1.600139,0.73845 1.600139,1.655718 l 0,5.222057 c 0,0.917268 -0.713663,1.655719 -1.600139,1.655719 l -5.204778,0 c -0.886478,0 -1.6001395,-0.738451 -1.6001395,-1.655719 l 0,-5.222057 c 0,-0.917268 0.7136615,-1.655718 1.6001395,-1.655718 z"
+ id="path3"
+ style="fill:none;stroke:#ffffff;stroke-width:1.15481782;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ d="m 31.405605,38.211574 5.204778,0 c 0.886476,0 1.600139,0.73845 1.600139,1.655718 l 0,5.222057 c 0,0.917268 -0.713663,1.655719 -1.600139,1.655719 l -5.204778,0 c -0.886478,0 -1.600139,-0.738451 -1.600139,-1.655719 l 0,-5.222057 c 0,-0.917268 0.713661,-1.655718 1.600139,-1.655718 z"
+ id="path5"
+ style="fill:none;stroke:#ffffff;stroke-width:1.15481782;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ d="m 21.105605,38.211574 5.204778,0 c 0.886476,0 1.600139,0.73845 1.600139,1.655718 l 0,5.222057 c 0,0.917268 -0.713663,1.655719 -1.600139,1.655719 l -5.204778,0 c -0.886478,0 -1.600139,-0.738451 -1.600139,-1.655719 l 0,-5.222057 c 0,-0.917268 0.713661,-1.655718 1.600139,-1.655718 z"
+ id="path7"
+ style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.15481782;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ d="m 41.705605,38.211574 5.204778,0 c 0.886476,0 1.600139,0.73845 1.600139,1.655718 l 0,5.222057 c 0,0.917268 -0.713663,1.655719 -1.600139,1.655719 l -5.204778,0 c -0.886478,0 -1.600139,-0.738451 -1.600139,-1.655719 l 0,-5.222057 c 0,-0.917268 0.713661,-1.655718 1.600139,-1.655718 z"
+ id="path9"
+ style="fill:none;stroke:#ffffff;stroke-width:1.15481782;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ d="m 21.105605,27.911574 5.204778,0 c 0.886476,0 1.600139,0.73845 1.600139,1.655718 l 0,5.222057 c 0,0.917268 -0.713663,1.655719 -1.600139,1.655719 l -5.204778,0 c -0.886478,0 -1.600139,-0.738451 -1.600139,-1.655719 l 0,-5.222057 c 0,-0.917268 0.713661,-1.655718 1.600139,-1.655718 z"
+ id="path11"
+ style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.15481782;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ d="m 21.105605,17.611574 5.204778,0 c 0.886476,0 1.600139,0.73845 1.600139,1.655718 l 0,5.222057 c 0,0.917268 -0.713663,1.655719 -1.600139,1.655719 l -5.204778,0 c -0.886478,0 -1.600139,-0.738451 -1.600139,-1.655719 l 0,-5.222057 c 0,-0.917268 0.713661,-1.655718 1.600139,-1.655718 z"
+ id="path13"
+ style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.15481782;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ d="m 31.405605,27.911574 5.204778,0 c 0.886476,0 1.600139,0.73845 1.600139,1.655718 l 0,5.222057 c 0,0.917268 -0.713663,1.655719 -1.600139,1.655719 l -5.204778,0 c -0.886478,0 -1.600139,-0.738451 -1.600139,-1.655719 l 0,-5.222057 c 0,-0.917268 0.713661,-1.655718 1.600139,-1.655718 z"
+ id="path15"
+ style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.15481782;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ d="m 10.805605,27.911574 5.204778,0 c 0.886476,0 1.600139,0.73845 1.600139,1.655718 l 0,5.222057 c 0,0.917268 -0.713663,1.655719 -1.600139,1.655719 l -5.204778,0 c -0.886478,0 -1.6001395,-0.738451 -1.6001395,-1.655719 l 0,-5.222057 c 0,-0.917268 0.7136615,-1.655718 1.6001395,-1.655718 z"
+ id="path17"
+ style="fill:none;stroke:#ffffff;stroke-width:1.15481782;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ d="m 31.405605,17.611574 5.204778,0 c 0.886476,0 1.600139,0.73845 1.600139,1.655718 l 0,5.222057 c 0,0.917268 -0.713663,1.655719 -1.600139,1.655719 l -5.204778,0 c -0.886478,0 -1.600139,-0.738451 -1.600139,-1.655719 l 0,-5.222057 c 0,-0.917268 0.713661,-1.655718 1.600139,-1.655718 z"
+ id="path19"
+ style="fill:none;stroke:#ffffff;stroke-width:1.15481782;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+ <path
+ d="m 41.114542,29.583321 c -1.10877,0 -2.018763,0.909992 -2.018763,2.018761 l 0,4.629689 -3.283849,-3.283849 c -0.784855,-0.783184 -2.043082,-0.78485 -2.826264,0 -0.783183,0.784854 -0.784823,2.069998 0,2.85318 l 3.310766,3.28385 -4.683521,0 c -1.10877,0 -2.018762,0.909991 -2.018762,2.018762 0,1.108769 0.909992,1.991843 2.018762,1.991843 l 4.656605,0 -3.28385,3.283849 c -0.783181,0.784854 -0.784823,2.069999 0,2.85318 0.784855,0.783182 2.07,0.757938 2.85318,-0.02692 l 3.256933,-3.283849 0,4.683524 c 0,1.10877 0.909993,1.991844 2.018763,1.991844 1.108769,0 1.991843,-0.883074 1.991843,-1.991844 l 0,-4.71044 3.337683,3.310765 c 0.784853,0.783182 2.043082,0.784855 2.826262,0 0.783182,-0.784853 0.784858,-2.043082 0,-2.826262 l -3.310765,-3.28385 4.656607,0 c 1.10877,0 1.991844,-0.883074 1.991844,-1.991843 0,-1.108771 -0.883074,-2.018763 -1.991844,-2.018763 l -4.683523,0 3.310765,-3.337683 c 0.783182,-0.784854 0.784857,-2.016165 0,-2.799347 -0.784854,-0.78318 -2.043082,-0.811775 -2.826263,-0.02691 l -3.310766,3.337682 0,-4.656604 c 0,-1.10877 -0.883074,-2.018763 -1.991843,-2.018763 z"
+ id="rect3894"
+ style="fill:#ffffff;fill-opacity:1;stroke:#282828;stroke-width:1.72267997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
</svg>
diff --git a/icons/replay-game.svg b/icons/replay-game.svg
index a8335e3..bdc1847 100644
--- a/icons/replay-game.svg
+++ b/icons/replay-game.svg
@@ -1,6 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="55px" height="55px">
- <path
- style="fill:none;stroke:#ffffff;stroke-width:3;stroke-linejoin:round"
- d="M 24,16 l 0,26 l -15,-13 z M 43,16 l 0,26 l -15,-13 z "/>
-</svg>
+<?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="55"
+ height="55"
+ viewBox="0 0 55 55"
+ id="svg4330"
+ xml:space="preserve"><metadata
+ id="metadata4339"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs4337" /><g
+ id="media-seek-backward"
+ style="display:block">
+ <path
+ d="M 46.223778,38.345007 26.591704,27.902056 c 0,10.430689 0,10.442951 0,10.442951 L 6.0276897,27.406963 26.591704,17.780993 c 0,3.689444 0,6.70599 0,9.190655 L 46.22531,17.780993 c -0.0015,20.564014 -0.0015,20.564014 -0.0015,20.564014 z"
+ id="path4333"
+ style="fill:#ffffff;display:inline" />
+</g></svg> \ No newline at end of file
diff --git a/implodeactivity.py b/implodeactivity.py
index 58e7f18..7c3f289 100644
--- a/implodeactivity.py
+++ b/implodeactivity.py
@@ -175,6 +175,9 @@ class ImplodeActivity(Activity):
add_button('new-game' , _("New") , self._game.new_game)
add_button('replay-game', _("Replay"), self._game.replay_game)
+
+ toolbar.add(gtk.SeparatorToolItem())
+
add_button('edit-undo' , _("Undo") , self._game.undo)
add_button('edit-redo' , _("Redo") , self._game.redo)
@@ -422,7 +425,7 @@ class _StuckStrip(gtk.HBox):
self.pack_start(label, expand=False)
icon = Icon()
- icon.set_from_icon_name('edit-undo-many', gtk.ICON_SIZE_LARGE_TOOLBAR)
+ icon.set_from_icon_name('edit-undo', gtk.ICON_SIZE_LARGE_TOOLBAR)
self.button = gtk.Button(stock=gtk.STOCK_UNDO)
self.button.set_image(icon)
self.button.set_label(_("Undo some moves"))