diff options
Diffstat (limited to 'edit.py')
| -rw-r--r-- | edit.py | 48 |
1 files changed, 14 insertions, 34 deletions
@@ -12,16 +12,15 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GObject +import gtk +import gobject from gettext import gettext as _ -from sugar3.graphics.toolbutton import ToolButton -from sugar3.graphics.toggletoolbutton import ToggleToolButton - -from sugar3 import mime -from sugar3.graphics.objectchooser import ObjectChooser +from sugar.graphics.toolbutton import ToolButton +from sugar.graphics.toggletoolbutton import ToggleToolButton +from sugar.activity.activity import ActivityToolbox +from sugar.graphics.objectchooser import ObjectChooser +from sugar import mime from infoslicer.widgets.Edit_Pane import Edit_Pane from infoslicer.widgets.Format_Pane import Format_Pane @@ -32,8 +31,6 @@ from infoslicer.processing.Article import Article import book -import logging - TABS = (Edit_Pane(), Image_Pane(), @@ -41,14 +38,14 @@ TABS = (Edit_Pane(), Format_Pane()) -class View(Gtk.Notebook): +class View(gtk.Notebook): def __init__(self): - GObject.GObject.__init__(self) + gtk.Notebook.__init__(self) self.props.show_border = False self.props.show_tabs = False for i in TABS: - self.append_page(i, None) + self.append_page(i) i.show() self.connect('map', self._map_cb) @@ -64,8 +61,6 @@ class View(Gtk.Notebook): class ToolbarBuilder(): def __init__(self, edit, toolbar): self.edit = edit - logging.debug('init edit toolbar') - logging.debug(self.edit) self.txt_toggle = ToggleToolButton('ascii') self.img_toggle = ToggleToolButton('image') @@ -75,12 +70,12 @@ class ToolbarBuilder(): self.txt_toggle.set_tooltip(_('Text')) self.txt_toggle.connect('toggled', self._toggle_cb, - [self.txt_toggle, self.img_toggle, self.jimg_toggle]) + [self.txt_toggle, self.img_toggle]) toolbar.insert(self.txt_toggle, -1) self.img_toggle.set_tooltip(_('Images')) self.img_toggle.connect('toggled', self._toggle_cb, - [self.txt_toggle, self.img_toggle, self.jimg_toggle]) + [self.txt_toggle, self.img_toggle]) toolbar.insert(self.img_toggle, -1) self.jimg_toggle.set_tooltip(_('Journal Images')) @@ -105,38 +100,25 @@ class ToolbarBuilder(): def sensitize_all(self): self.txt_toggle.set_sensitive(True) self.img_toggle.set_sensitive(True) - self.jimg_toggle.set_sensitive(True) def unsensitize_all(self): self.txt_toggle.set_sensitive(False) self.img_toggle.set_sensitive(False) - self.jimg_toggle.set_sensitive(False) def _toggle_image_chooser(self, widget): - # self._old_cursor = self.edit.get_window().get_cursor() - # self.edit.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH)) - GObject.idle_add(self.__image_chooser) - - def __image_chooser(self): chooser = ObjectChooser(what_filter=mime.GENERIC_TYPE_IMAGE) result = chooser.run() - if result == Gtk.ResponseType.ACCEPT: + if result == gtk.RESPONSE_ACCEPT: jobject = chooser.get_selected_object() if jobject and jobject.file_path: title = str(jobject.metadata['title']) path = str(jobject.file_path) TABS[2].gallery.add_image(path, title) - # self.edit.get_window().set_cursor(self._old_cursor) def _toggle_text_chooser(self, widget): - # self._old_cursor = self.edit.get_window().get_cursor() - # self.edit.get_window().set_cursor(Gdk.Cursor.new(Gdk.CursorType.WATCH)) - GObject.idle_add(self.__text_chooser) - - def __text_chooser(self): chooser = ObjectChooser(what_filter=mime.GENERIC_TYPE_TEXT) result = chooser.run() - if result == Gtk.ResponseType.ACCEPT: + if result == gtk.RESPONSE_ACCEPT: jobject = chooser.get_selected_object() if jobject and jobject.file_path: title = str(jobject.metadata['title']) @@ -146,7 +128,6 @@ class ToolbarBuilder(): fp.close() article_data = dehtml(text, title) TABS[0].set_source_article(Article(article_data)) - # self.edit.get_window().set_cursor(self._old_cursor) def _toggle_cb(self, widget, toggles): for tab in TABS: @@ -165,7 +146,6 @@ class ToolbarBuilder(): for i in TABS[index].toolitems: i.show() - # We don't require any article data to display jounal images if book.wiki.article and index != 2: TABS[index].set_source_article(book.wiki.article) if book.custom.article: |