Merge branch 'quozl-2016-365-hrishi'

This commit is contained in:
Ignacio Rodríguez 2017-01-01 12:00:32 -03:00
commit 67120db593
No known key found for this signature in database
GPG Key ID: 56C1623CF182C6B0
2 changed files with 95 additions and 0 deletions

View File

@ -0,0 +1,33 @@
from gi.repository import Gtk
from sugar3.graphics.toolbarbox import ToolbarBox
from sugar3.graphics.toggletoolbutton import ToggleToolButton
import common
test = common.Test()
test.show()
vbox = Gtk.VBox()
test.pack_start(vbox, True, True, 0)
vbox.show()
toolbar_box = ToolbarBox()
vbox.pack_start(toolbar_box, False, False, 0)
toolbar_box.show()
favorite_button = ToggleToolButton('emblem-favorite')
favorite_button.set_tooltip('Favorite')
toolbar_box.toolbar.insert(favorite_button, -1)
favorite_button.show()
favorite_button2 = ToggleToolButton('emblem-favorite')
favorite_button2.set_tooltip('Favorite')
toolbar_box.toolbar.insert(favorite_button2, -1)
favorite_button2.set_active(True)
favorite_button2.show()
if __name__ == '__main__':
common.main(test)

View File

@ -58,6 +58,24 @@ def setup_accelerator(tool_button):
class ToggleToolButton(Gtk.ToggleToolButton): class ToggleToolButton(Gtk.ToggleToolButton):
'''
UI for toggletoolbutton.
A ToggleToolButton is a ToolItem that contains a toggle button,
having an icon, a tooltip palette, and an accelerator.
Use ToggleToolButton.new() to create a new ToggleToolButton.
Args:
accelerator (string): keyboard shortcut to be used to
activate this button.
Find about format here :
https://developer.gnome.org/gtk3/stable/gtk3-Keyboard-Accelerators.html#gtk-accelerator-parse
tooltip (string): tooltip to be displayed when user
hovers over toggle button.
Keyword Args:
icon_name(string): name of themed icon which is to be used.
'''
__gtype_name__ = 'SugarToggleToolButton' __gtype_name__ = 'SugarToggleToolButton'
@ -76,11 +94,26 @@ class ToggleToolButton(Gtk.ToggleToolButton):
self._palette_invoker.detach() self._palette_invoker.detach()
def set_icon_name(self, icon_name): def set_icon_name(self, icon_name):
'''
Sets the icon for the tool button from a named themed icon.
If it is none then no icon will be shown.
Args:
icon_name(string): The name for a themed icon.
It can be set as 'None' too.
Example:
set_icon_name('view-radial')
'''
icon = Icon(icon_name=icon_name) icon = Icon(icon_name=icon_name)
self.set_icon_widget(icon) self.set_icon_widget(icon)
icon.show() icon.show()
def get_icon_name(self): def get_icon_name(self):
'''
The get_icon_name() method returns the value of the icon_name
property that contains the name of a themed icon or None.
'''
if self.props.icon_widget is not None: if self.props.icon_widget is not None:
return self.props.icon_widget.props.icon_name return self.props.icon_widget.props.icon_name
else: else:
@ -112,19 +145,44 @@ class ToggleToolButton(Gtk.ToggleToolButton):
type=object, setter=set_palette_invoker, getter=get_palette_invoker) type=object, setter=set_palette_invoker, getter=get_palette_invoker)
def set_tooltip(self, text): def set_tooltip(self, text):
'''
Sets the tooltip of the toogle tool button. Displays when
user hovers over the button with cursor.
Args:
tooltip (string): tooltip to be added to the button
'''
self.set_palette(Palette(text)) self.set_palette(Palette(text))
def set_accelerator(self, accelerator): def set_accelerator(self, accelerator):
'''
Sets keyboard shortcut that activates this button.
Args:
accelerator(string): accelerator to be set. Should be in
form <modifier>Letter
Find about format here :
https://developer.gnome.org/gtk3/stable/gtk3-Keyboard-Accelerators.html#gtk-accelerator-parse
Example:
set_accelerator(self, 'accel')
'''
self._accelerator = accelerator self._accelerator = accelerator
setup_accelerator(self) setup_accelerator(self)
def get_accelerator(self): def get_accelerator(self):
'''
Returns above accelerator string.
'''
return self._accelerator return self._accelerator
accelerator = GObject.property(type=str, setter=set_accelerator, accelerator = GObject.property(type=str, setter=set_accelerator,
getter=get_accelerator) getter=get_accelerator)
def do_draw(self, cr): def do_draw(self, cr):
'''
Implementation method for drawing the toogle tool button
'''
if self.palette and self.palette.is_up(): if self.palette and self.palette.is_up():
allocation = self.get_allocation() allocation = self.get_allocation()
# draw a black background, has been done by the engine before # draw a black background, has been done by the engine before
@ -141,6 +199,10 @@ class ToggleToolButton(Gtk.ToggleToolButton):
return False return False
def do_clicked(self): def do_clicked(self):
'''
Implementation method for hiding the tooltip when the
toggle button is clicked
'''
if self.palette: if self.palette:
self.palette.popdown(True) self.palette.popdown(True)