diff options
author | Denis Fomin <fominde@gmail.com> | 2010-11-03 21:10:20 +0300 |
---|---|---|
committer | Denis Fomin <fominde@gmail.com> | 2010-11-03 21:10:20 +0300 |
commit | 08e00fffc265ca1826c271c43d6ca7248fc7b123 (patch) | |
tree | 0efb8950c6acdcaa23789d1490b033988635100f /plugins | |
parent | 59c8eb05a3fcd220b34d05c710c45f1810a3ae81 (diff) |
whiteboard plugin. remove the lebels with the buttons and add tooltips
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/whiteboard/plugin.py | 12 | ||||
-rw-r--r-- | plugins/whiteboard/whiteboard_widget.ui | 195 |
2 files changed, 43 insertions, 164 deletions
diff --git a/plugins/whiteboard/plugin.py b/plugins/whiteboard/plugin.py index 60aa896d2..d81624908 100644 --- a/plugins/whiteboard/plugin.py +++ b/plugins/whiteboard/plugin.py @@ -275,6 +275,18 @@ class Base(object): iconset = gtk.IconSet(pixbuf=pixbuf) factory = gtk.IconFactory() factory.add('whiteboard', iconset) + img_path = self.plugin.local_file_path('brush_tool.png') + pixbuf = gtk.gdk.pixbuf_new_from_file(img_path) + iconset = gtk.IconSet(pixbuf=pixbuf) + factory.add('brush_tool', iconset) + img_path = self.plugin.local_file_path('line_tool.png') + pixbuf = gtk.gdk.pixbuf_new_from_file(img_path) + iconset = gtk.IconSet(pixbuf=pixbuf) + factory.add('line_tool', iconset) + img_path = self.plugin.local_file_path('oval_tool.png') + pixbuf = gtk.gdk.pixbuf_new_from_file(img_path) + iconset = gtk.IconSet(pixbuf=pixbuf) + factory.add('oval_tool', iconset) factory.add_default() img.set_from_stock('whiteboard', gtk.ICON_SIZE_BUTTON) self.button.set_image(img) diff --git a/plugins/whiteboard/whiteboard_widget.ui b/plugins/whiteboard/whiteboard_widget.ui index 22e13852d..403e2dfbc 100644 --- a/plugins/whiteboard/whiteboard_widget.ui +++ b/plugins/whiteboard/whiteboard_widget.ui @@ -9,42 +9,22 @@ <placeholder/> </child> <child> - <object class="GtkVButtonBox" id="vbuttonbox1"> + <object class="GtkVBox" id="vbuttonbox1"> <property name="visible">True</property> <property name="border_width">6</property> <property name="orientation">vertical</property> <property name="spacing">6</property> - <property name="layout_style">start</property> <child> <object class="GtkToggleButton" id="brush_button"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Brush Tool: Draw freehand lines</property> <signal name="toggled" handler="on_brush_button_toggled"/> <child> - <object class="GtkHBox" id="hbox4"> + <object class="GtkImage" id="image5"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="image5"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="pixbuf">brush_tool.png</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Brush Tool</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> + <property name="stock">brush_tool</property> </object> </child> </object> @@ -59,31 +39,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Oval Tool: Create circles and ellipses</property> <signal name="toggled" handler="on_oval_button_toggled"/> <child> - <object class="GtkHBox" id="hbox5"> + <object class="GtkImage" id="image6"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="image6"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="pixbuf">oval_tool.png</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Oval Tool</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> + <property name="stock">oval_tool</property> </object> </child> </object> @@ -98,31 +59,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Line Tool: Draw straight lines</property> <signal name="toggled" handler="on_line_button_toggled"/> <child> - <object class="GtkHBox" id="hbox6"> + <object class="GtkImage" id="image7"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="image7"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="pixbuf">line_tool.png</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Line Tool</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> + <property name="stock">line_tool</property> </object> </child> </object> @@ -137,31 +79,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Delete Tool: Removal of the individual figures</property> <signal name="toggled" handler="on_delete_button_toggled"/> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkImage" id="image2"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="stock">gtk-delete</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Delete Tool</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> + <property name="stock">gtk-delete</property> </object> </child> </object> @@ -176,31 +99,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Clear Canvas: Cleanup Canvas</property> <signal name="clicked" handler="on_clear_button_clicked"/> <child> - <object class="GtkHBox" id="hbox2"> + <object class="GtkImage" id="image3"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="stock">gtk-clear</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Clear Canvas</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> + <property name="stock">gtk-clear</property> </object> </child> </object> @@ -215,31 +119,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Export Images: Save image to file</property> <signal name="clicked" handler="on_export_button_clicked"/> <child> - <object class="GtkHBox" id="hbox3"> + <object class="GtkImage" id="image4"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="image4"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="stock">gtk-save-as</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Export Image</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> + <property name="stock">gtk-save-as</property> </object> </child> </object> @@ -250,55 +135,37 @@ </packing> </child> <child> - <object class="GtkHScale" id="size_scale"> + <object class="GtkVScale" id="size_scale"> + <property name="height_request">68</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Linewidth</property> + <property name="orientation">vertical</property> <property name="adjustment">adjustment1</property> + <property name="inverted">True</property> <property name="digits">0</property> + <property name="value_pos">bottom</property> <signal name="value_changed" handler="on_size_scale_format_value"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">6</property> - <property name="secondary">True</property> </packing> </child> <child> - <object class="GtkHBox" id="fg_color_hbox"> + <object class="GtkColorButton" id="fg_color_button"> <property name="visible">True</property> - <child> - <object class="GtkLabel" id="fg_color_label"> - <property name="visible">True</property> - <property name="xpad">1</property> - <property name="ypad">1</property> - <property name="label" translatable="yes">Foreground -Color:</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkColorButton" id="fg_color_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="color">#000000000000</property> - <signal name="color_set" handler="on_fg_color_button_color_set"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Foreground Color</property> + <property name="color">#000000000000</property> + <signal name="color_set" handler="on_fg_color_button_color_set"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> <property name="position">7</property> - <property name="secondary">True</property> </packing> </child> </object> |