diff --git a/uberwriter/FixTable.py b/uberwriter/FixTable.py index e1b59ac..5f551cc 100644 --- a/uberwriter/FixTable.py +++ b/uberwriter/FixTable.py @@ -1,4 +1,6 @@ import re +import gi +gi.require_version('Gtk', '3.0') from gi.repository import Gtk import logging diff --git a/uberwriter/MarkupBuffer.py b/uberwriter/MarkupBuffer.py index 7b7a133..bbc762c 100644 --- a/uberwriter/MarkupBuffer.py +++ b/uberwriter/MarkupBuffer.py @@ -15,6 +15,8 @@ ### END LICENSE import re +import gi +gi.require_version('Gtk', '3.0') from gi.repository import Gtk from gi.repository import Pango diff --git a/uberwriter/UberwriterExportDialog.py b/uberwriter/UberwriterExportDialog.py index a43820a..018210c 100644 --- a/uberwriter/UberwriterExportDialog.py +++ b/uberwriter/UberwriterExportDialog.py @@ -23,6 +23,8 @@ import logging # import gettext from gettext import gettext as _ +import gi +gi.require_version('Gtk', '3.0') from gi.repository import Gtk from uberwriter_lib import helpers diff --git a/uberwriter/UberwriterInlinePreview.py b/uberwriter/UberwriterInlinePreview.py index bf59507..3ec7afd 100644 --- a/uberwriter/UberwriterInlinePreview.py +++ b/uberwriter/UberwriterInlinePreview.py @@ -26,6 +26,8 @@ import telnetlib from gettext import gettext as _ +import gi +gi.require_version('Gtk', '3.0') from gi.repository import Gtk, Gdk, GdkPixbuf, GObject from uberwriter_lib import LatexToPNG from .Settings import Settings diff --git a/uberwriter/UberwriterSearchAndReplace.py b/uberwriter/UberwriterSearchAndReplace.py index d24f82f..b0015c6 100644 --- a/uberwriter/UberwriterSearchAndReplace.py +++ b/uberwriter/UberwriterSearchAndReplace.py @@ -16,8 +16,9 @@ import re import logging - -from gi.repository import Gdk +import gi +gi.require_version('Gtk', '3.0') +from gi.repository import Gtk, Gdk # from plugins import plugins LOGGER = logging.getLogger('uberwriter') diff --git a/uberwriter/UberwriterSidebar.py b/uberwriter/UberwriterSidebar.py index 6b2b84f..6b8d300 100644 --- a/uberwriter/UberwriterSidebar.py +++ b/uberwriter/UberwriterSidebar.py @@ -16,6 +16,8 @@ import os import subprocess +import gi +gi.require_version('Gtk', '3.0') from gi.repository import Gtk, Gdk # from plugins import plugins @@ -151,10 +153,10 @@ class UberwriterSidebar(): filename = self.store.get_value(treeiter, 1) item = Gtk.MenuItem.new() item.set_label("Open ...") - item.connect("activate", self.context_menu_open_file) - item.filename = filename + # item.connect("activate", self.context_menu_open_file) + # item.filename = filename item.show() - self.popup.append(item) + # self.popup.append(item) self.popup.show() self.popup.popup(None, None, None, None, event.button, event.time) return True diff --git a/uberwriter/UberwriterWindow.py b/uberwriter/UberwriterWindow.py index a9010ca..0af555c 100644 --- a/uberwriter/UberwriterWindow.py +++ b/uberwriter/UberwriterWindow.py @@ -29,7 +29,7 @@ from gettext import gettext as _ import gi gi.require_version('Gtk', '3.0') -gi.require_version('WebKit2', '4.0') # pylint: disable=wrong-import-position +gi.require_version('WebKit2', '4.0') # pylint: disable=wrong-import-position from gi.repository import Gtk, Gdk, GObject, GLib, Gio from gi.repository import WebKit2 as WebKit from gi.repository import Pango # pylint: disable=E0611 @@ -45,7 +45,7 @@ from uberwriter_lib.gtkspellcheck import SpellChecker from .MarkupBuffer import MarkupBuffer from .UberwriterTextEditor import TextEditor from .UberwriterInlinePreview import UberwriterInlinePreview -# from .UberwriterSidebar import UberwriterSidebar +from .UberwriterSidebar import UberwriterSidebar from .UberwriterSearchAndReplace import UberwriterSearchAndReplace from .Settings import Settings # from .UberwriterAutoCorrect import UberwriterAutoCorrect @@ -62,9 +62,9 @@ CONFIG_PATH = os.path.expanduser("~/.config/uberwriter/") # See texteditor_lib.Window.py for more details about how this class works + class UberwriterWindow(Gtk.ApplicationWindow): - #__gtype_name__ = "UberwriterWindow" WORDCOUNT = re.compile(r"(?!\-\w)[\s#*\+\-]+", re.UNICODE) def __init__(self, app): @@ -442,7 +442,7 @@ class UberwriterWindow(Gtk.ApplicationWindow): loc_rect = self.text_editor.get_iter_location(ins_it) # alignment offset added from top - pos_y = loc_rect.y + loc_rect.height + self.text_editor.props.top_margin # pylint: disable=no-member + pos_y = loc_rect.y + loc_rect.height + self.text_editor.props.top_margin # pylint: disable=no-member ha = self.scrolled_window.get_vadjustment() if ha.props.page_size < gradient_offset: @@ -518,7 +518,7 @@ class UberwriterWindow(Gtk.ApplicationWindow): self.remove_typewriter() self.init_typewriter() - if self.text_editor.props.width_request != width_request: # pylint: disable=no-member + if self.text_editor.props.width_request != width_request: # pylint: disable=no-member self.text_editor.props.width_request = width_request self.scrolled_window.props.width_request = width_request alloc = self.text_editor.get_allocation() @@ -744,11 +744,11 @@ class UberwriterWindow(Gtk.ApplicationWindow): except: try: self.spell_checker = SpellChecker( - self.text_editor, locale.getdefaultlocale()[0], - collapse=False) + self.text_editor, locale.getdefaultlocale()[0], + collapse=False) if self.auto_correct: self.auto_correct.set_language(self.spell_checker.language) - self.spell_checker.connect_language_change( # pylint: disable=no-member + self.spell_checker.connect_language_change( # pylint: disable=no-member self.auto_correct.set_language) except: self.spell_checker = None @@ -819,7 +819,6 @@ class UberwriterWindow(Gtk.ApplicationWindow): state {gtk bool} -- Desired state of the preview mode (enabled/disabled) """ - if state.get_boolean(): # Insert a tag with ID to scroll to @@ -987,7 +986,7 @@ class UberwriterWindow(Gtk.ApplicationWindow): if (self.was_motion is False and self.status_bar_visible and self.buffer_modified_for_status_bar - and self.text_editor.props.has_focus): #pylint: disable=no-member + and self.text_editor.props.has_focus): # pylint: disable=no-member # self.status_bar.set_state_flags(Gtk.StateFlags.INSENSITIVE, True) self.statusbar_revealer.set_reveal_child(False) self.headerbar.hb_revealer.set_reveal_child(False) @@ -1037,7 +1036,7 @@ class UberwriterWindow(Gtk.ApplicationWindow): """ bg_color = self.get_style_context().get_background_color(Gtk.StateFlags.ACTIVE) - lg_top = cairo.LinearGradient(0, 0, 0, 35) #pylint: disable=no-member + lg_top = cairo.LinearGradient(0, 0, 0, 35) # pylint: disable=no-member lg_top.add_color_stop_rgba( 0, bg_color.red, bg_color.green, bg_color.blue, 1) lg_top.add_color_stop_rgba( @@ -1051,7 +1050,7 @@ class UberwriterWindow(Gtk.ApplicationWindow): cr.fill() cr.rectangle(0, height - 35, width, height) - lg_btm = cairo.LinearGradient(0, height - 35, 0, height) # pylint: disable=no-member + lg_btm = cairo.LinearGradient(0, height - 35, 0, height) # pylint: disable=no-member lg_btm.add_color_stop_rgba( 1, bg_color.red, bg_color.green, bg_color.blue, 1) lg_btm.add_color_stop_rgba( diff --git a/uberwriter/headerbars.py b/uberwriter/headerbars.py index 0f9b41c..373bc2c 100644 --- a/uberwriter/headerbars.py +++ b/uberwriter/headerbars.py @@ -18,6 +18,9 @@ from collections import namedtuple from gettext import gettext as _ + +import gi +gi.require_version('Gtk', '3.0') from gi.repository import Gtk from uberwriter_lib.helpers import get_builder diff --git a/uberwriter_lib/PreferencesDialog.py b/uberwriter_lib/PreferencesDialog.py index 8a559a0..bf07c0d 100644 --- a/uberwriter_lib/PreferencesDialog.py +++ b/uberwriter_lib/PreferencesDialog.py @@ -18,7 +18,8 @@ """this dialog adjusts values in gsettings """ - +import gi +gi.require_version('Gtk', '3.0') from gi.repository import Gtk # pylint: disable=E0611 import logging logger = logging.getLogger('uberwriter_lib') diff --git a/uberwriter_lib/gtkspellcheck/spellcheck.py b/uberwriter_lib/gtkspellcheck/spellcheck.py index 5aae086..4a296a6 100644 --- a/uberwriter_lib/gtkspellcheck/spellcheck.py +++ b/uberwriter_lib/gtkspellcheck/spellcheck.py @@ -56,6 +56,8 @@ else: if _py3k: # there is only the gi binding for Python 3 + import gi + gi.require_version('Gtk', '3.0') from gi.repository import Gtk as gtk _pygobject = True else: diff --git a/uberwriter_lib/helpers.py b/uberwriter_lib/helpers.py index efd4cde..6c55e4d 100644 --- a/uberwriter_lib/helpers.py +++ b/uberwriter_lib/helpers.py @@ -21,6 +21,9 @@ import logging import os import shutil +import gi +gi.require_version('Gtk', '3.0') +from gi.repository import Gtk # pylint: disable=E0611 from . uberwriterconfig import get_data_file from . Builder import Builder @@ -125,7 +128,6 @@ def get_help_uri(page=None): def show_uri(parent, link): - from gi.repository import Gtk # pylint: disable=E0611 screen = parent.get_screen() Gtk.show_uri(screen, link, Gtk.get_current_event_time())