Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--activity/activity.info2
-rw-r--r--toolbox.py23
3 files changed, 25 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index ecff95c..8704cc9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+8
+
+* Translation are working, directory structure modified (nathalia.sautchuk)
* Many improvements in palettes; size now is only choosen inside tool palette (alexandre)
* User may choose 'line shape' in rainbow effect (alexandre)
* Added greek and arabic translations (nathalia.sautchuk)
diff --git a/activity/activity.info b/activity/activity.info
index dd89138..77ee63d 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
[Activity]
name = Paint
-activity_version = 7
+activity_version = 8
service_name = org.laptop.Oficina
icon = activity-paint
class = OficinaActivity.OficinaActivity
diff --git a/toolbox.py b/toolbox.py
index dad84ad..e4bbef8 100644
--- a/toolbox.py
+++ b/toolbox.py
@@ -439,14 +439,23 @@ class ToolsToolbar(gtk.Toolbar):
tool['name'] is self._TOOL_ERASER['name']:
# Changing to gtk.RadioButton
- # TODO: insert images to represent shapes
item1 = gtk.RadioButton(None, _('Circle'))
item1.show()
item1.set_active(True)
+ image1 = gtk.Image()
+ image1.set_from_file('./icons/tool-shape-ellipse.svg')
+ image1.show()
+ item1.set_image(image1)
+
item2 = gtk.RadioButton(item1, _('Square'))
item2.show()
+ image2 = gtk.Image()
+ image2.set_from_file('./icons/tool-shape-rectangle.svg')
+ image2.show()
+ item2.set_image(image2)
+
item1.connect('toggled', self._on_toggled, tool, 'circle')
item2.connect('toggled', self._on_toggled, tool, 'square')
@@ -1417,14 +1426,24 @@ class EffectsToolbar(gtk.Toolbar):
size_spinbutton.connect('value-changed', self._on_size_value_changed, tool)
# Line Shape
- # TODO: insert images to represent shapes
+
item1 = gtk.RadioButton(None, _('Circle'))
item1.show()
item1.set_active(True)
+ image1 = gtk.Image()
+ image1.set_from_file('./icons/tool-shape-ellipse.svg')
+ image1.show()
+ item1.set_image(image1)
+
item2 = gtk.RadioButton(item1, _('Square'))
item2.show()
+ image2 = gtk.Image()
+ image2.set_from_file('./icons/tool-shape-rectangle.svg')
+ image2.show()
+ item2.set_image(image2)
+
item1.connect('toggled', self._on_radio_toggled, tool, 'circle')
item2.connect('toggled', self._on_radio_toggled, tool, 'square')