diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..d821048 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..8b73af7 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..4fbd725 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/uberwriter.iml b/.idea/uberwriter.iml new file mode 100644 index 0000000..d0876a7 --- /dev/null +++ b/.idea/uberwriter.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/data/media/style.css b/data/media/style.css index f5c25fd..53c51d2 100644 --- a/data/media/style.css +++ b/data/media/style.css @@ -35,39 +35,42 @@ bind "z" { "redo" () }; } -#UberwriterWindow { +.uberwriter_window { gtk-key-bindings: window-bindings; /*border-radius: 7px 7px 3px 3px;*/ background: @light_editor_bg; - } -#UberwriterWindow.small #UberwriterEditor { +.uberwriter_window.small .uberwriter-editor { font: Inconsolata 12; } +.uberwriter_window GtkGrid { + background-color: @light_editor_bg; +} -#UberwriterWindow.medium #UberwriterEditor { +.uberwriter_window.dark_mode GtkGrid, +.uberwriter_window.dark_mode GtkScrolledWindow { + background-color: @dark_bg; +} + +#UberwriterWindow.medium .uberwriter-editor { font: Inconsolata 15; } -#UberwriterWindow.large #UberwriterEditor { +#UberwriterWindow.large .uberwriter-editor { font: Inconsolata 17; } -#UberwriterWindow.large #UberwriterEditor *{ - font: initial; -} - #UberwriterWindow GtkAlignment { margin-top: 30px; margin-bottom: 60px; } -#UberwriterWindow.dark_mode { +.uberwriter_window.dark_mode { background: #333; } -#UberwriterWindow.dark_mode #UberwriterEditor { +.uberwriter_window.dark_mode .uberwriter-editor { color: #CCC; background: @dark_bg; @@ -76,42 +79,41 @@ .scrollbars-junction, .scrollbar.trough { - background-color: transparent; + background: transparent; } -#UberwriterEditor { +.uberwriter-editor { border: none; - background: @light_editor_bg; - /*background: und-color: transparent;*/ + background-color: transparent; color: #222; -GtkWidget-cursor-color: shade(#4D9FCE, 0.9); -GtkWidget-cursor-aspect-ratio: 0.1; gtk-key-bindings: editor-bindings; } -#UberwriterEditor:selected { +.uberwriter-editor:selected { background-color: #4D9FCE; color: #FFF; } -#UberwriterEditor GtkButton { +.uberwriter-editor GtkButton { margin: 0; padding: 0; /*background: #CCC;*/ } -#UberwriterWindow GtkToolbar { +.uberwriter-editor GtkToolbar { /*background: transparent;*/ border: none; padding: 0; } -#status_bar_box GtkLabel { +.status_bar_box GtkLabel { color: #666; } -#status_bar_box GtkButton { +.status_bar_box GtkButton { /* finding reset */ background-color: initial; text-shadow: inherit; @@ -143,28 +145,28 @@ transition: 500ms ease-in; } -#status_bar_box GtkButton:hover, -#status_bar_box GtkButton:active:hover { +.status_bar_box GtkButton:hover, +.status_bar_box GtkButton:active:hover { transition: 0s ease-in; color: #333; background: #EEE; } -#status_bar_box GtkButton:active { +.status_bar_box GtkButton:active { color: #EEE; background-color: #EEE; background-image: none; box-shadow: 0 0 2px rgba(0,0,0,0.4) } -.dark_mode #status_bar_box GtkButton { +.dark_mode .status_bar_box GtkButton { } -.dark_mode #status_bar_box GtkButton:hover, -.dark_mode #status_bar_box GtkButton:active { +.dark_mode .status_bar_box GtkButton:hover, +.dark_mode .status_bar_box GtkButton:active { background-color: shade(@dark_bg, 0.8); } -#status_bar_box GtkSeparator { +.status_bar_box GtkSeparator { border-color: #999; border-right: none; } @@ -235,4 +237,4 @@ #UberwriterWindow #AutoCorrect GtkImage { padding: 3px 5px; -} \ No newline at end of file +} diff --git a/debian/changelog b/debian/changelog index bb0f638..0221816 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,8 @@ +uberwriter (15.05.01-publicubuntu3) vivid; urgency=medium + + * some fixes for ubuntu gtk :) + + -- Wolf Vollprecht Wed, 20 May 2015 00:03:00 +0200 uberwriter (14.09.08-publicubuntu3) trusty; urgency=medium * added missing dependency diff --git a/po/uberwriter.pot b/po/uberwriter.pot index f5da8c2..6453a30 100644 --- a/po/uberwriter.pot +++ b/po/uberwriter.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-19 22:15+0200\n" +"POT-Creation-Date: 2015-05-19 23:56+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,6 +25,231 @@ msgstr "" msgid "UberWriter, a simple and distraction free Markdown Editor" msgstr "" +#: ../uberwriter/UberwriterInlinePreview.py:172 +msgid "Website is not available" +msgstr "" + +#: ../uberwriter/UberwriterInlinePreview.py:174 +msgid "Website is available" +msgstr "" + +#: ../uberwriter/UberwriterInlinePreview.py:414 +msgid "Open Link in Webbrowser" +msgstr "" + +#: ../uberwriter/UberwriterInlinePreview.py:470 +msgid "No matching footnote found" +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:343 +msgid "Save your File" +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:489 +msgid "You can not export to PDF." +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:491 +msgid "" +"Please install texlive from the software center." +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:521 +msgid "MarkDown or Plain Text" +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:524 +msgid "Open a .md-File" +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:546 +msgid "You have not saved your changes." +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:548 +msgid "Close without Saving" +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:549 +msgid "Cancel" +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:550 +msgid "Save now" +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:551 +msgid "Unsaved changes" +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:617 +msgid "You can not enable the Spell Checker." +msgstr "" + +#: ../uberwriter/UberwriterWindow.py:619 +msgid "" +"Please install 'hunspell' or 'aspell' dictionarys for your language from the " +"software center." +msgstr "" + +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:507 +msgid "(no suggestions)" +msgstr "" + +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:544 +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:547 +msgid "Add \"{}\" to Dictionary" +msgstr "" + +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:551 +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:553 +msgid "Ignore All" +msgstr "" + +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:568 +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:570 +msgid "Languages" +msgstr "" + +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:586 +#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:589 +msgid "Suggestions" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:1 +msgid "Export" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:2 +msgid "Smart" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:3 +msgid "Pandoc can automatically make \"--\" to a long dash and more" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:4 +msgid "Normalize" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:5 +msgid "" +"Removes things like double spaces or spaces at the beginning of a paragraph" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:6 +msgid "Table of Contents" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:7 +msgid "Standalone" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:8 +msgid "" +"Use a header and footer to include things like stylesheets and meta " +"information" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:9 +msgid "Number Sections" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:10 +msgid "Strict Markdown" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:11 +msgid "Use \"strict\" markdown instead of \"pandoc\" markdown" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:12 +msgid "Slideshow incremental bullets" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:13 +msgid "Show one bullet point after another in a slideshow" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:14 +msgid "General Options" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:15 +msgid "Highlight syntax" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:16 +msgid "Choose a color theme for syntax highlighting" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:17 +msgid "Highlight style " +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:18 +msgid "Syntax highlighting (HTML, LaTeX)" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:19 +msgid "Self Contained" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:20 +msgid "" +"Produces a HTML that has no external dependencies (all images and " +"stylesheets are included)" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:21 +msgid "HTML 5" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:22 +msgid "Use HTML 5 syntax" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:23 +msgid "Choose a CSS File that you want to use" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:24 +msgid "CSS File" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:25 +msgid "HTML Options" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:26 +msgid "Bibliography File" +msgstr "" + +#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:27 +msgid "Commandline Reference" +msgstr "" + +#: ../data/ui/AboutUberwriterDialog.ui.h:1 +msgid "" +"# Copyright (C) 2012, Wolf Vollprecht \n" +"# This program is free software: you can redistribute it and/or modify it \n" +"# under the terms of the GNU General Public License version 3, as " +"published \n" +"# by the Free Software Foundation.\n" +"# \n" +"# This program is distributed in the hope that it will be useful, but \n" +"# WITHOUT ANY WARRANTY; without even the implied warranties of \n" +"# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR \n" +"# PURPOSE. See the GNU General Public License for more details.\n" +"# \n" +"# You should have received a copy of the GNU General Public License along \n" +"# with this program. If not, see .\n" +msgstr "" + +#: ../data/ui/AboutUberwriterDialog.ui.h:14 +msgid "Copyright (C) 2012, Wolf Vollprecht " +msgstr "" + #: ../data/ui/UberwriterWindow.ui.h:1 msgid "Case Sensitive" msgstr "" @@ -173,65 +398,8 @@ msgstr "" msgid "Characters:" msgstr "" -#: ../data/ui/AboutUberwriterDialog.ui.h:1 -msgid "" -"# Copyright (C) 2012, Wolf Vollprecht \n" -"# This program is free software: you can redistribute it and/or modify it \n" -"# under the terms of the GNU General Public License version 3, as " -"published \n" -"# by the Free Software Foundation.\n" -"# \n" -"# This program is distributed in the hope that it will be useful, but \n" -"# WITHOUT ANY WARRANTY; without even the implied warranties of \n" -"# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR \n" -"# PURPOSE. See the GNU General Public License for more details.\n" -"# \n" -"# You should have received a copy of the GNU General Public License along \n" -"# with this program. If not, see .\n" -msgstr "" - -#: ../data/ui/AboutUberwriterDialog.ui.h:14 -msgid "Copyright (C) 2012, Wolf Vollprecht " -msgstr "" - -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:507 -msgid "(no suggestions)" -msgstr "" - -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:544 -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:547 -msgid "Add \"{}\" to Dictionary" -msgstr "" - -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:551 -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:553 -msgid "Ignore All" -msgstr "" - -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:568 -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:570 -msgid "Languages" -msgstr "" - -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:586 -#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:589 -msgid "Suggestions" -msgstr "" - -#: ../uberwriter/UberwriterInlinePreview.py:172 -msgid "Website is not available" -msgstr "" - -#: ../uberwriter/UberwriterInlinePreview.py:174 -msgid "Website is available" -msgstr "" - -#: ../uberwriter/UberwriterInlinePreview.py:414 -msgid "Open Link in Webbrowser" -msgstr "" - -#: ../uberwriter/UberwriterInlinePreview.py:470 -msgid "No matching footnote found" +#: ../uberwriter/__init__.py:35 +msgid "Show debug messages (-vv debugs uberwriter_lib also)" msgstr "" #: ../uberwriter/FormatShortcuts.py:88 @@ -253,171 +421,3 @@ msgstr "" #: ../uberwriter/FormatShortcuts.py:187 msgid "Heading" msgstr "" - -#: ../uberwriter/UberwriterWindow.py:343 -msgid "Save your File" -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:489 -msgid "You can not export to PDF." -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:491 -msgid "" -"Please install texlive from the software center." -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:521 -msgid "MarkDown or Plain Text" -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:524 -msgid "Open a .md-File" -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:546 -msgid "You have not saved your changes." -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:548 -msgid "Close without Saving" -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:549 -msgid "Cancel" -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:550 -msgid "Save now" -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:551 -msgid "Unsaved changes" -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:617 -msgid "You can not enable the Spell Checker." -msgstr "" - -#: ../uberwriter/UberwriterWindow.py:619 -msgid "" -"Please install 'hunspell' or 'aspell' dictionarys for your language from the " -"software center." -msgstr "" - -#: ../uberwriter/__init__.py:35 -msgid "Show debug messages (-vv debugs uberwriter_lib also)" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:1 -msgid "Export" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:2 -msgid "Smart" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:3 -msgid "Pandoc can automatically make \"--\" to a long dash and more" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:4 -msgid "Normalize" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:5 -msgid "" -"Removes things like double spaces or spaces at the beginning of a paragraph" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:6 -msgid "Table of Contents" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:7 -msgid "Standalone" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:8 -msgid "" -"Use a header and footer to include things like stylesheets and meta " -"information" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:9 -msgid "Number Sections" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:10 -msgid "Strict Markdown" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:11 -msgid "Use \"strict\" markdown instead of \"pandoc\" markdown" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:12 -msgid "Slideshow incremental bullets" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:13 -msgid "Show one bullet point after another in a slideshow" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:14 -msgid "General Options" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:15 -msgid "Highlight syntax" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:16 -msgid "Choose a color theme for syntax highlighting" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:17 -msgid "Highlight style " -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:18 -msgid "Syntax highlighting (HTML, LaTeX)" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:19 -msgid "Self Contained" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:20 -msgid "" -"Produces a HTML that has no external dependencies (all images and " -"stylesheets are included)" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:21 -msgid "HTML 5" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:22 -msgid "Use HTML 5 syntax" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:23 -msgid "Choose a CSS File that you want to use" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:24 -msgid "CSS File" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:25 -msgid "HTML Options" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:26 -msgid "Bibliography File" -msgstr "" - -#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:27 -msgid "Commandline Reference" -msgstr "" diff --git a/uberwriter/UberwriterTextEditor.py b/uberwriter/UberwriterTextEditor.py index 0d4c220..68cfb99 100644 --- a/uberwriter/UberwriterTextEditor.py +++ b/uberwriter/UberwriterTextEditor.py @@ -143,6 +143,7 @@ class TextEditor(Gtk.TextView): self.connect('redo', self.redo) self.connect('undo', self.undo) + self.get_style_context().add_class("uberwriter-editor") @property def text(self): diff --git a/uberwriter/UberwriterWindow.py b/uberwriter/UberwriterWindow.py index a0130c0..c4b3fdd 100644 --- a/uberwriter/UberwriterWindow.py +++ b/uberwriter/UberwriterWindow.py @@ -983,7 +983,7 @@ class UberwriterWindow(Window): self.status_bar = builder.get_object('status_bar_box') self.statusbar_revealer = builder.get_object('status_bar_revealer') - self.status_bar.set_name('status_bar_box') + self.status_bar.get_style_context().add_class('status_bar_box') self.status_bar_visible = True self.was_motion = True self.buffer_modified_for_status_bar = False @@ -996,6 +996,7 @@ class UberwriterWindow(Window): # Setup light background self.TextEditor = TextEditor() self.TextEditor.set_name('UberwriterEditor') + self.get_style_context().add_class('uberwriter_window') base_leftmargin = 40 # self.TextEditor.set_left_margin(base_leftmargin) @@ -1149,7 +1150,7 @@ class UberwriterWindow(Window): def color_window(self, widget, data=None): window_gdk = self.get_window() - window_gdk.set_background(Gdk.Color(0, 1, 0)) + window_gdk.set_background(Gdk.Color(0, 0, 0)) def alt_mod(self, widget, event, data=None): # TODO: Click and open when alt is pressed @@ -1218,4 +1219,4 @@ class UberwriterWindow(Window): except Exception as e: logger.debug("(First Run?) Error loading settings from home dir. \ Error: %r", e) - return True \ No newline at end of file + return True