From d6e8d8f0a3af86bc4a3cf48e211e0601549115b4 Mon Sep 17 00:00:00 2001 From: Gary Martin Date: Mon, 07 Sep 2009 01:47:56 +0000 Subject: Moved bold, italic, underline, and colour to primary – and fixed non-standard height secondary. --- diff --git a/AbiWordActivity.py b/AbiWordActivity.py index e039938..8345be0 100644 --- a/AbiWordActivity.py +++ b/AbiWordActivity.py @@ -79,21 +79,18 @@ class AbiWordActivity (activity.Activity): view_toolbar.props.icon_name = 'toolbar-view' view_toolbar.props.label = _('View') toolbar_box.toolbar.insert(view_toolbar, -1) - - separator = gtk.SeparatorToolItem() - toolbar_box.toolbar.insert(separator, -1) - - text_toolbar = ToolbarButton() - text_toolbar.props.page = TextToolbar(self.abiword_canvas) - text_toolbar.props.icon_name = 'format-text-size' - text_toolbar.props.label = _('Text') - toolbar_box.toolbar.insert(text_toolbar, -1) para_toolbar = ToolbarButton() para_toolbar.props.page = ParagraphToolbar(self.abiword_canvas) para_toolbar.props.icon_name = 'paragraph-bar' para_toolbar.props.label = _('Paragraph') toolbar_box.toolbar.insert(para_toolbar, -1) + + text_toolbar = ToolbarButton() + text_toolbar.props.page = TextToolbar(self.abiword_canvas) + text_toolbar.props.icon_name = 'format-text-size' + text_toolbar.props.label = _('Text') + toolbar_box.toolbar.insert(text_toolbar, -1) insert_toolbar = ToolbarButton() insert_toolbar.props.page = InsertToolbar(self.abiword_canvas) @@ -109,6 +106,41 @@ class AbiWordActivity (activity.Activity): toolbar_box.toolbar.insert(search_toolbar, -1) separator = gtk.SeparatorToolItem() + toolbar_box.toolbar.insert(separator, -1) + + bold = ToggleToolButton('format-text-bold') + bold.set_tooltip(_('Bold')) + bold_id = bold.connect('clicked', lambda sender: + self.abiword_canvas.toggle_bold()) + self.abiword_canvas.connect('bold', lambda abi, b: + self._setToggleButtonState(bold, b, bold_id)) + toolbar_box.toolbar.insert(bold, -1) + + italic = ToggleToolButton('format-text-italic') + italic.set_tooltip(_('Italic')) + italic_id = italic.connect('clicked', lambda sender: + self.abiword_canvas.toggle_italic()) + self.abiword_canvas.connect('italic', lambda abi, b: + self._setToggleButtonState(italic, b, italic_id)) + toolbar_box.toolbar.insert(italic, -1) + + underline = ToggleToolButton('format-text-underline') + underline.set_tooltip(_('Underline')) + underline_id = underline.connect('clicked', lambda sender: + self.abiword_canvas.toggle_underline()) + self.abiword_canvas.connect('underline', lambda abi, b: + self._setToggleButtonState(underline, b, underline_id)) + toolbar_box.toolbar.insert(underline, -1) + + color = ColorToolButton() + color.connect('color-set', self._text_color_cb, self.abiword_canvas) + tool_item = gtk.ToolItem() + tool_item.add(color) + toolbar_box.toolbar.insert(tool_item, -1) + self.abiword_canvas.connect('color', lambda abi, r, g, b: + color.set_color(gtk.gdk.Color(r * 256, g * 256, b * 256))) + + separator = gtk.SeparatorToolItem() separator.props.draw = False separator.set_expand(True) separator.show() @@ -126,6 +158,17 @@ class AbiWordActivity (activity.Activity): self._zoom_handler = self.abiword_canvas.connect("zoom", self.__zoom_cb) + def _text_color_cb(self, button, abiword_canvas): + newcolor = button.get_color() + abiword_canvas.set_text_color(int(newcolor.red / 256.0), + int(newcolor.green / 256.0), + int(newcolor.blue / 256.0)) + + def _setToggleButtonState(self,button,b,id): + button.handler_block(id) + button.set_active(b) + button.handler_unblock(id) + def __zoom_cb(self, abi, zoom): abi.disconnect(self._zoom_handler) diff --git a/toolbar.py b/toolbar.py index fee3fc6..5928d59 100644 --- a/toolbar.py +++ b/toolbar.py @@ -373,57 +373,11 @@ class TextToolbar(gtk.Toolbar): font_size = ToolComboBox(widgets.FontSizeCombo(abiword_canvas)) self.insert(font_size, -1) - separator = gtk.SeparatorToolItem() - self.insert(separator, -1) - - bold = ToggleToolButton('format-text-bold') - bold.set_tooltip(_('Bold')) - bold_id = bold.connect('clicked', lambda sender: - abiword_canvas.toggle_bold()) - abiword_canvas.connect('bold', lambda abi, b: - self._setToggleButtonState(bold, b, bold_id)) - self.insert(bold, -1) - - italic = ToggleToolButton('format-text-italic') - italic.set_tooltip(_('Italic')) - italic_id = italic.connect('clicked', lambda sender: - abiword_canvas.toggle_italic()) - abiword_canvas.connect('italic', lambda abi, b: - self._setToggleButtonState(italic, b, italic_id)) - self.insert(italic, -1) - - underline = ToggleToolButton('format-text-underline') - underline.set_tooltip(_('Underline')) - underline_id = underline.connect('clicked', lambda sender: - abiword_canvas.toggle_underline()) - abiword_canvas.connect('underline', lambda abi, b: - self._setToggleButtonState(underline, b, underline_id)) - self.insert(underline, -1) - - separator = gtk.SeparatorToolItem() - self.insert(separator, -1) - - color = ColorToolButton() - color.connect('color-set', self._text_color_cb, abiword_canvas) - tool_item = gtk.ToolItem() - tool_item.add(color) - self.insert(tool_item, -1) - abiword_canvas.connect('color', lambda abi, r, g, b: - color.set_color(gtk.gdk.Color(r * 256, g * 256, b * 256))) + # MAGIC NUMBER WARNING: Secondary toolbars are not a standard height? + self.set_size_request(-1, 75) self.show_all() - def _text_color_cb(self, button, abiword_canvas): - newcolor = button.get_color() - abiword_canvas.set_text_color(int(newcolor.red / 256.0), - int(newcolor.green / 256.0), - int(newcolor.blue / 256.0)) - - def _setToggleButtonState(self,button,b,id): - button.handler_block(id) - button.set_active(b) - button.handler_unblock(id) - class ParagraphToolbar(gtk.Toolbar): def __init__(self, abi): gtk.Toolbar.__init__(self) -- cgit v0.9.1