diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index d821048..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 8b73af7..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 4fbd725..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b..0000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/uberwriter.iml b/.idea/uberwriter.iml deleted file mode 100644 index d0876a7..0000000 --- a/.idea/uberwriter.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/data/media/style.css b/data/media/style.css index de419b6..6f00b5f 100644 --- a/data/media/style.css +++ b/data/media/style.css @@ -37,13 +37,14 @@ } .uberwriter_window { - gtk-key-bindings: window-bindings; + -gtk-key-bindings: window-bindings; /*border-radius: 7px 7px 3px 3px;*/ background: @light_editor_bg; } .uberwriter_window.small .uberwriter-editor { - font: Inconsolata 12; + font-family: 'Fira Mono', monospace; + font-size: 12px; } .uberwriter_window GtkGrid { background-color: @light_editor_bg; @@ -55,13 +56,13 @@ } #UberwriterWindow.medium .uberwriter-editor { - font: Fira Mono 15; + font-family: 'Fira Mono', monospace; + font-size: 15px; } #UberwriterWindow.large .uberwriter-editor { - /*font: Inconsolata 17; - */ - font: Fira Mono 12; + font-family: 'Fira Mono', monospace; + font-size: 18px; } #UberwriterWindow GtkAlignment { @@ -80,7 +81,7 @@ .uberwriter_window.dark_mode .uberwriter-editor { color: #CCC; background: @dark_bg; - -GtkWidget-cursor-color: shade(#4D9FCE, 0.9); + /*-GtkWidget-cursor-color: shade(#4D9FCE, 0.9);*/ } .scrollbars-junction, @@ -92,9 +93,9 @@ border: none; background-color: transparent; color: #222; - -GtkWidget-cursor-color: shade(#4D9FCE, 0.9); - -GtkWidget-cursor-aspect-ratio: 0.1; - gtk-key-bindings: editor-bindings; + /*-GtkWidget-cursor-color: shade(#4D9FCE, 0.9);*/ + /*-GtkWidget-cursor-aspect-ratio: 0.1;*/ + -gtk-key-bindings: editor-bindings; } .uberwriter-editor:selected { @@ -123,7 +124,7 @@ /* finding reset */ background-color: initial; text-shadow: inherit; - icon-shadow: inherit; + /*icon-shadow: inherit;*/ box-shadow: initial; background-clip: initial; background-origin: initial; @@ -141,13 +142,14 @@ border-radius: 2px; color: #666; padding: 3px 5px; - + /* -GtkButton-child-displacement-y: 0px; -GtkButton-child-displacement-x: 0px; -GtkButton-default-border: 0; -GtkButton-image-spacing: 5px; -GtkButton-interior-focus: false; -GtkButton-inner-border: 0; + */ transition: 500ms ease-in; } @@ -191,7 +193,9 @@ } #LexikonBubble { - font: serif 10; + /*font: serif 10;*/ + font-family: serif; + font-size: 10px; background: #FFF; border-radius: 4px; margin: 5px; @@ -215,7 +219,9 @@ } #LexikonBubble .lexikon_heading { - font: serif 12; + /*font: serif 12;*/ + font-family: serif; + font-size: 12px; padding-bottom: 5px; padding-top: 5px; font-weight: bold; @@ -238,7 +244,7 @@ #UberwriterWindow #AutoCorrect GtkLabel { padding: 3px 5px; - font: sans-serif; + font-family: sans-serif; } #UberwriterWindow #AutoCorrect GtkImage { diff --git a/uberwriter/UberwriterWindow.py b/uberwriter/UberwriterWindow.py index 131a529..c3d730a 100644 --- a/uberwriter/UberwriterWindow.py +++ b/uberwriter/UberwriterWindow.py @@ -27,7 +27,8 @@ locale.textdomain('uberwriter') import mimetypes -from gi.repository import Gtk, Gdk, GObject, WebKit, Gio # pylint: disable=E0611 +from gi.repository import Gtk, Gdk, GObject, Gio # pylint: disable=E0611 +from gi.repository import WebKit2 as WebKit from gi.repository import Pango # pylint: disable=E0611 import cairo @@ -40,7 +41,7 @@ from .UberwriterTextEditor import TextEditor from .UberwriterInlinePreview import UberwriterInlinePreview from .UberwriterSidebar import UberwriterSidebar from .UberwriterSearchAndReplace import UberwriterSearchAndReplace -from .UberwriterAutoCorrect import UberwriterAutoCorrect +# from .UberwriterAutoCorrect import UberwriterAutoCorrect import logging logger = logging.getLogger('uberwriter') @@ -61,7 +62,7 @@ from uberwriter_lib import Window from uberwriter_lib import helpers from .AboutUberwriterDialog import AboutUberwriterDialog from .UberwriterAdvancedExportDialog import UberwriterAdvancedExportDialog -from .plugins.bibtex import BibTex +# from .plugins.bibtex import BibTex # Some Globals # TODO move them somewhere for better # accesibility from other files @@ -1149,7 +1150,7 @@ class UberwriterWindow(Window): self.gtk_settings = Gtk.Settings.get_default() self.load_settings(builder) - self.plugins = [BibTex(self)] + # self.plugins = [BibTex(self)] # self.connect_after('realize', self.color_window)