diff --git a/data/media/style.css b/data/media/style.css
index a2fcd25..ad6cb54 100644
--- a/data/media/style.css
+++ b/data/media/style.css
@@ -33,7 +33,6 @@
#UberwriterWindow {
gtk-key-bindings: window-bindings;
- background: #FFF;
border-radius: 7px 7px 5px 5px;
}
@@ -60,11 +59,12 @@
.scrollbars-junction,
.scrollbar.trough {
- background-color: transparent;
+ background-color: transparent;
}
#UberwriterEditor {
border: none;
+ background-color: transparent;
color: #222;
-GtkWidget-cursor-color: shade(#4D9FCE, 0.9);
-GtkWidget-cursor-aspect-ratio: 0.1;
@@ -141,7 +141,7 @@
box-shadow: 0 0 2px rgba(0,0,0,0.4)
}
.dark_mode #status_bar_box GtkButton {
- background: #F00;
+
}
.dark_mode #status_bar_box GtkButton:hover,
.dark_mode #status_bar_box GtkButton:active {
@@ -167,5 +167,5 @@
}
#LexikonBubble {
- font: Inconsolata 10;
+ font: serif 10;
}
\ No newline at end of file
diff --git a/data/ui/UberwriterWindow.ui b/data/ui/UberwriterWindow.ui
index 044c9ec..641398f 100644
--- a/data/ui/UberwriterWindow.ui
+++ b/data/ui/UberwriterWindow.ui
@@ -657,7 +657,7 @@
False
0
30
- 30
+ 60
diff --git a/debian/changelog b/debian/changelog
index dc0739a..5e4cf51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,39 @@
+uberwriter (14.09.06-public) trusty; urgency=low
+
+ [ Wolf ]
+ * disabling schema because of installation failure
+ -- Wolf Vollprecht Fri, 06 Sep 2014 18:08:00 +0200
+
+uberwriter (14.09.05-public) trusty; urgency=low
+
+ [ Wolf ]
+ * disabling tests for now
+ -- Wolf Vollprecht Fri, 06 Sep 2014 11:08:00 +0200
+
+uberwriter (14.09.04-public) trusty; urgency=low
+
+ [ Wolf ]
+ * disabling tests for now
+ -- Wolf Vollprecht Fri, 06 Sep 2014 11:07:00 +0200
+
+uberwriter (14.09.03-public) trusty; urgency=low
+
+ [ Wolf ]
+ * Making it build with pybuild again
+ -- Wolf Vollprecht Fri, 05 Sep 2014 21:07:00 +0200
+
+uberwriter (14.09.02-public) trusty; urgency=low
+
+ [ Wolf ]
+ * Add python3-all-dev as build dependency
+ -- Wolf Vollprecht Fri, 05 Sep 2014 21:07:00 +0200
+
+uberwriter (14.09.01-public) trusty; urgency=low
+
+ [ Wolf ]
+ * Rewrite of UI code and GTK CSS
+ -- Wolf Vollprecht Fri, 05 Sep 2014 14:21:00 +0200
+
uberwriter (12.11.04-public) quantal; urgency=low
[ Wolf ]
diff --git a/debian/control b/debian/control
index 42a2af9..3fc7c66 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,12 @@ Build-Depends: debhelper (>= 8),
python3-distutils-extra (>= 2.37-1~)
Maintainer: Wolf Vollprecht
Standards-Version: 3.9.3
-X-Python-Version: >= 3.2.3
Package: uberwriter
Architecture: all
-Depends: ${misc:Depends},
+Depends:
+ python3:any (>= 3.3.2-2~),
+ ${misc:Depends},
${python3:Depends},
python3-enchant,
gir1.2-gtk-3.0,
@@ -23,7 +24,7 @@ Depends: ${misc:Depends},
pandoc,
yelp,
gnome-web-photo,
- ttf-ubuntu-font-family,
+ fonts-inconsolata,
dvipng
Suggests: texlive
Description: UberWriter, beautiful distraction free writing
diff --git a/debian/files b/debian/files
deleted file mode 100644
index c446dae..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-uberwriter_12.11.04-public_all.deb python extra
diff --git a/debian/rules b/debian/rules
index 576731b..19f5f61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,22 +1,27 @@
#!/usr/bin/make -f
%:
ifneq ($(shell dh -l | grep -xF translations),)
- dh $@ --with python3,translations
+ dh $@ --with=python3,translations --buildsystem=pybuild
else
- dh $@ --with python3
+ dh $@ --with=python3 --buildsystem=pybuild
endif
override_dh_auto_install:
- dh_auto_install -- --install-scripts=/opt/extras.ubuntu.com/uberwriter/bin --install-data=/opt/extras.ubuntu.com/uberwriter --install-lib=/opt/extras.ubuntu.com/uberwriter
+# dh_auto_install -- --install-scripts=/opt/extras.ubuntu.com/uberwriter/bin --install-data=/opt/extras.ubuntu.com/uberwriter --install-lib=/opt/extras.ubuntu.com/uberwriter
-override_dh_python3:
- dh_python3 /opt/extras.ubuntu.com/uberwriter
override_dh_install:
dh_install
+
python3 setup.py install --root=$(CURDIR)/debian/uberwriter/ \
--install-scripts=/opt/extras.ubuntu.com/uberwriter/bin \
--install-data=/opt/extras.ubuntu.com/uberwriter \
--install-lib=/opt/extras.ubuntu.com/uberwriter
cp uberwriter_lib/pylocales/locales.db debian/uberwriter/opt/extras.ubuntu.com/uberwriter/uberwriter_lib/pylocales/locales.db
+
+override_dh_python3:
+ dh_python3 /opt/extras.ubuntu.com/uberwriter
+
+override_dh_auto_test:
+ PYBUILD_DISABLE=test
\ No newline at end of file
diff --git a/debian/uberwriter.debhelper.log b/debian/uberwriter.debhelper.log
deleted file mode 100644
index b6ec0dd..0000000
--- a/debian/uberwriter.debhelper.log
+++ /dev/null
@@ -1,49 +0,0 @@
-dh_auto_configure
-dh_auto_build
-dh_auto_test
-dh_prep
-dh_installdirs
-override_dh_auto_install dh_auto_install
-dh_auto_install
-override_dh_install dh_install
-dh_install
-dh_installdocs
-dh_installchangelogs
-dh_installexamples
-dh_installman
-dh_installcatalogs
-dh_installcron
-dh_installdebconf
-dh_installemacsen
-dh_installifupdown
-dh_installinfo
-dh_pysupport
-dh_python3
-dh_installinit
-dh_installmenu
-dh_installmime
-dh_installmodules
-dh_installlogcheck
-dh_installlogrotate
-dh_installpam
-dh_installppp
-dh_installudev
-dh_installwm
-dh_installxfonts
-dh_installgsettings
-dh_bugfiles
-dh_ucf
-dh_lintian
-dh_gconf
-dh_icons
-dh_perl
-dh_usrlocal
-dh_link
-dh_translations
-dh_compress
-dh_fixperms
-dh_installdeb
-dh_gencontrol
-dh_md5sums
-dh_builddeb
-dh_builddeb
diff --git a/debian/uberwriter.postinst.debhelper b/debian/uberwriter.postinst.debhelper
deleted file mode 100644
index ec0ca6a..0000000
--- a/debian/uberwriter.postinst.debhelper
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# Automatically added by dh_python3:
-if which py3compile >/dev/null 2>&1; then
- py3compile -p uberwriter /opt/extras.ubuntu.com/uberwriter
-fi
-
-# End automatically added section
diff --git a/debian/uberwriter.prerm.debhelper b/debian/uberwriter.prerm.debhelper
deleted file mode 100644
index 314c8b6..0000000
--- a/debian/uberwriter.prerm.debhelper
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# Automatically added by dh_python3:
-if which py3clean >/dev/null 2>&1; then
- py3clean -p uberwriter
-fi
-
-# End automatically added section
diff --git a/debian/uberwriter.substvars b/debian/uberwriter.substvars
deleted file mode 100644
index 4e7212c..0000000
--- a/debian/uberwriter.substvars
+++ /dev/null
@@ -1,2 +0,0 @@
-python3:Depends=python3, python3 (>= 3.2.3-3~)
-misc:Depends=
diff --git a/po/uberwriter.pot b/po/uberwriter.pot
index b690878..121559a 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: 2013-03-15 10:59+0100\n"
+"POT-Creation-Date: 2014-09-06 17:58+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,293 +17,6 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:472
-msgid "(no suggestions)"
-msgstr ""
-
-#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:494
-#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:497
-msgid "Add \"{}\" to Dictionary"
-msgstr ""
-
-#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:501
-#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:503
-msgid "Ignore All"
-msgstr ""
-
-#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:518
-#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:520
-msgid "Languages"
-msgstr ""
-
-#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:536
-#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:539
-msgid "Suggestions"
-msgstr ""
-
-#: ../uberwriter.desktop.in.h:1
-msgid "UberWriter"
-msgstr ""
-
-#: ../uberwriter.desktop.in.h:2
-msgid "UberWriter, a simple and distraction free Markdown Editor"
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:438
-msgid "Save your File"
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:583
-msgid "You can not export to PDF."
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:585
-msgid ""
-"Please install texlive from the software center."
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:612
-msgid "MarkDown or Plain Text"
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:615
-msgid "Open a .md-File"
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:637
-msgid "You have not saved your changes."
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:639
-msgid "Close without Saving"
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:640
-msgid "Cancel"
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:641
-msgid "Save now"
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:642
-msgid "Unsaved changes"
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:702
-msgid "You can not enable the Spell Checker."
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:704
-msgid ""
-"Please install 'hunspell' or 'aspell' dictionarys for your language from the "
-"software center."
-msgstr ""
-
-#: ../uberwriter/UberwriterInlinePreview.py:61
-msgid "Website is not available"
-msgstr ""
-
-#: ../uberwriter/UberwriterInlinePreview.py:63
-msgid "Website is available"
-msgstr ""
-
-#: ../uberwriter/UberwriterInlinePreview.py:218
-msgid "Open Link in Webbrowser"
-msgstr ""
-
-#: ../uberwriter/UberwriterInlinePreview.py:271
-msgid "No matching footnote found"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:1
-msgid "Case Sensitive"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:2
-msgid "Activate Regex"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:3
-msgid "_File"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:4
-msgid "Open Recent File"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:5
-msgid "Export as ODT"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:6
-msgid "Advanced Export..."
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:7
-msgid "Copy raw HTML to clipboard"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:8
-msgid "_Edit"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:9
-msgid "_View"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:10
-msgid "Light text on a dark background"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:11
-msgid "Dark Mode"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:12
-msgid "Switch to preview mode"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:13
-msgid "Preview"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:14
-msgid "Open Search and Replace"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:15
-msgid "Search and Replace ..."
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:16
-msgid "Auto _Spellcheck"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:17
-msgid "F_ormat"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:18
-msgid "Unordered List Item"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:19
-msgid "Horizontal Rule"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:20 ../uberwriter/FormatShortcuts.py:182
-msgid "Heading"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:21
-msgid "_Help"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:22
-msgid "Contents"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:23
-msgid "Short Markdown Tutorial"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:24
-msgid "Open Pandoc Online Markdown Help ..."
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:25
-msgid "Get Help Online..."
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:26
-msgid "Translate This Application..."
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:27
-msgid "Search"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:28
-msgid "Next Match"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:29
-msgid "Normal"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:30
-msgid "Previous Match"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:31
-msgid "Active"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:32
-msgid "toolbutton"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:33
-msgid "Open Replace"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:34
-msgid "Replace with"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:35
-msgid "Replace"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:36
-msgid "Replace All"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:37
-msgid "Focus Mode"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:38
-msgid "Go into focus mode"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:39
-msgid "Fullscreen"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:40
-msgid "Go into fullscreen mode"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:41
-msgid "Show HTML preview"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:42
-msgid "Words:"
-msgstr ""
-
-#: ../data/ui/UberwriterWindow.ui.h:43
-msgid "Characters:"
-msgstr ""
-
-#: ../uberwriter/__init__.py:35
-msgid "Show debug messages (-vv debugs uberwriter_lib also)"
-msgstr ""
-
-#: ../uberwriter/FormatShortcuts.py:85
-msgid "emphasized text"
-msgstr ""
-
-#: ../uberwriter/FormatShortcuts.py:87
-msgid "strong text"
-msgstr ""
-
-#: ../uberwriter/FormatShortcuts.py:101
-msgid "List item"
-msgstr ""
-
#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:1
msgid "Export"
msgstr ""
@@ -417,6 +130,109 @@ msgstr ""
msgid "Commandline Reference"
msgstr ""
+#: ../uberwriter/__init__.py:35
+msgid "Show debug messages (-vv debugs uberwriter_lib also)"
+msgstr ""
+
+#: ../uberwriter/FormatShortcuts.py:85
+msgid "emphasized text"
+msgstr ""
+
+#: ../uberwriter/FormatShortcuts.py:87
+msgid "strong text"
+msgstr ""
+
+#: ../uberwriter/FormatShortcuts.py:101
+msgid "List item"
+msgstr ""
+
+#: ../uberwriter/FormatShortcuts.py:182
+msgid "Heading"
+msgstr ""
+
+#: ../uberwriter.desktop.in.h:1
+msgid "UberWriter"
+msgstr ""
+
+#: ../uberwriter.desktop.in.h:2
+msgid "UberWriter, a simple and distraction free Markdown Editor"
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:331
+msgid "Save your File"
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:477
+msgid "You can not export to PDF."
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:479
+msgid ""
+"Please install texlive from the software center."
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:509
+msgid "MarkDown or Plain Text"
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:512
+msgid "Open a .md-File"
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:534
+msgid "You have not saved your changes."
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:536
+msgid "Close without Saving"
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:537
+msgid "Cancel"
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:538
+msgid "Save now"
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:539
+msgid "Unsaved changes"
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:604
+msgid "You can not enable the Spell Checker."
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:606
+msgid ""
+"Please install 'hunspell' or 'aspell' dictionarys for your language from the "
+"software center."
+msgstr ""
+
+#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:472
+msgid "(no suggestions)"
+msgstr ""
+
+#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:494
+#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:497
+msgid "Add \"{}\" to Dictionary"
+msgstr ""
+
+#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:501
+#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:503
+msgid "Ignore All"
+msgstr ""
+
+#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:518
+#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:520
+msgid "Languages"
+msgstr ""
+
+#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:536
+#: ../uberwriter_lib/gtkspellcheck/spellcheck.py:539
+msgid "Suggestions"
+msgstr ""
+
#: ../data/ui/AboutUberwriterDialog.ui.h:1
msgid ""
"# Copyright (C) 2012, Wolf Vollprecht \n"
@@ -437,3 +253,171 @@ msgstr ""
#: ../data/ui/AboutUberwriterDialog.ui.h:14
msgid "Copyright (C) 2012, Wolf Vollprecht "
msgstr ""
+
+#: ../uberwriter/UberwriterInlinePreview.py:174
+msgid "Website is not available"
+msgstr ""
+
+#: ../uberwriter/UberwriterInlinePreview.py:176
+msgid "Website is available"
+msgstr ""
+
+#: ../uberwriter/UberwriterInlinePreview.py:375
+msgid "Open Link in Webbrowser"
+msgstr ""
+
+#: ../uberwriter/UberwriterInlinePreview.py:433
+msgid "No matching footnote found"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:1
+msgid "Case Sensitive"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:2
+msgid "Activate Regex"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:3
+msgid "_File"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:4
+msgid "Open Recent File"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:5
+msgid "Export as ODT"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:6
+msgid "Advanced Export..."
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:7
+msgid "Copy raw HTML to clipboard"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:8
+msgid "_View"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:9
+msgid "Light text on a dark background"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:10
+msgid "Dark Mode"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:11
+msgid "Switch to preview mode"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:12
+msgid "Preview"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:13
+msgid "Open Search and Replace"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:14
+msgid "Search and Replace ..."
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:15
+msgid "Auto _Spellcheck"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:16
+msgid "_Help"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:17
+msgid "Contents"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:18
+msgid "Short Markdown Tutorial"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:19
+msgid "Open Pandoc Online Markdown Help ..."
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:20
+msgid "Get Help Online..."
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:21
+msgid "Translate This Application..."
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:22
+msgid "Search"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:23
+msgid "Next Match"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:24
+msgid "Normal"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:25
+msgid "Previous Match"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:26
+msgid "Active"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:27
+msgid "toolbutton"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:28
+msgid "Open Replace"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:29
+msgid "Replace with"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:30
+msgid "Replace"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:31
+msgid "Replace All"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:32
+msgid "Focus Mode"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:33
+msgid "Go into focus mode"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:34
+msgid "Fullscreen"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:35
+msgid "Go into fullscreen mode"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:36
+msgid "Show HTML preview"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:37
+msgid "Words:"
+msgstr ""
+
+#: ../data/ui/UberwriterWindow.ui.h:38
+msgid "Characters:"
+msgstr ""
diff --git a/uberwriter/UberwriterInlinePreview.py b/uberwriter/UberwriterInlinePreview.py
index 332729e..12063ee 100644
--- a/uberwriter/UberwriterInlinePreview.py
+++ b/uberwriter/UberwriterInlinePreview.py
@@ -111,14 +111,17 @@ class DictAccessor(object):
lines = ' '.join(lines)
lines = re.sub('\s+', ' ', lines).strip()
lines = re.split(r'( adv | adj | n | v |^adv |^adj |^n |^v )', lines)
- res = {}
+ res = []
+ act_res = {}
for l in lines:
l = l.strip()
- act_res = {}
- act_res['defs'] = []
if len(l) == 0:
continue
if l in ['adv', 'adj','n','v']:
+ if act_res:
+ res.append(act_res.copy())
+ act_res = {}
+ act_res['defs'] = []
act_res['class'] = l
else:
ll = re.split('(?: |^)(\d): ', l)
@@ -153,8 +156,9 @@ class DictAccessor(object):
if act_def and 'description' in act_def:
act_res['defs'].append(act_def.copy())
- print(act_res)
- return act_res
+ res.append(act_res.copy())
+ return res
+
def check_url(url, item, spinner):
logger.debug("thread started, checking url")
error = False
@@ -175,20 +179,10 @@ def check_url(url, item, spinner):
item.set_label(text)
def get_dictionary(term):
- def parse_response(response):
- # consisting of group (n,v,adj,adv)
- # number, description, examples, synonyms, antonyms
- lines = response.split('\n')
- lines = lines[2:]
- for l in lines:
- l = l.lstrip()
- print(l)
-
da = DictAccessor()
output = da.getDefinition('wn', term)
- print (output)
-
output = output[0]
+ print(output)
return da.parse_wordnet(output.decode(encoding='UTF-8'))
def get_web_thumbnail(url, item, spinner):
@@ -219,10 +213,21 @@ def get_web_thumbnail(url, item, spinner):
def fill_lexikon_bubble(vocab, lexikon_dict):
grid = Gtk.Grid.new()
i = 0
- for entry in lexikon_dict:
- grid.attach(Gtk.Label.new(vocab + ' ~ ' + entry['class']), i, i, 3, 1)
- grid.show_all()
- return grid
+
+ import pprint
+ print("\n\n Pretty Printing \n\n")
+ pprint.pprint(lexikon_dict)
+ if lexikon_dict:
+ for entry in lexikon_dict:
+ grid.attach(Gtk.Label.new(vocab + ' ~ ' + entry['class']), 0, i, 3, 1)
+ for definition in entry['defs']:
+ i = i + 1
+ grid.attach(Gtk.Label.new(definition['num']), 0, i, 1, 1)
+ grid.attach(Gtk.Label.new(' '.join(definition['description'])), 1, i, 1, 1)
+ grid.show_all()
+ return grid
+ else:
+ return None
@@ -276,13 +281,13 @@ class UberwriterInlinePreview():
item.set_name("PreviewMenuItem")
separator = Gtk.SeparatorMenuItem.new()
- table_item = Gtk.MenuItem.new()
- table_item.set_label('Fix that table')
+ # table_item = Gtk.MenuItem.new()
+ # table_item.set_label('Fix that table')
- table_item.connect('activate', self.fix_table)
- table_item.show()
- menu.prepend(table_item)
- menu.show()
+ # table_item.connect('activate', self.fix_table)
+ # table_item.show()
+ # menu.prepend(table_item)
+ # menu.show()
start_iter = self.TextBuffer.get_iter_at_mark(self.ClickMark)
# Line offset of click mark
@@ -456,7 +461,7 @@ class UberwriterInlinePreview():
sc.add(fill_lexikon_bubble(word, get_dictionary(word)))
sc.props.width_request = 500
sc.props.height_request = 400
- tv.get_buffer().set_text(terms)
+ # tv.get_buffer().set_text(terms)
sc.show_all()
self.open_popover_with_widget(sc)
diff --git a/uberwriter/UberwriterWindow.py b/uberwriter/UberwriterWindow.py
index d04fb91..68291d1 100644
--- a/uberwriter/UberwriterWindow.py
+++ b/uberwriter/UberwriterWindow.py
@@ -240,12 +240,11 @@ class UberwriterWindow(Window):
# global t, amount, initvadjustment
target_pos = -1
if self.focusmode:
- print("pos: %i > %i" % (pos, ha.props.page_size * 0.5))
+ # print("pos: %i > %i" % (pos, ha.props.page_size * 0.5))
if pos != (ha.props.page_size * 0.5):
target_pos = pos_y - (ha.props.page_size * 0.5)
- print("focusmode")
- elif pos > ha.props.page_size - gradient_offset:
- target_pos = pos_y - ha.props.page_size + gradient_offset
+ elif pos > ha.props.page_size - gradient_offset - 60:
+ target_pos = pos_y - ha.props.page_size + gradient_offset + 60
elif pos < gradient_offset:
target_pos = pos_y - gradient_offset
self.smooth_scroll_data = {
@@ -263,7 +262,7 @@ class UberwriterWindow(Window):
# Calculate left / right margin
width_request = 600
if(w_width < 900):
- self.MarkupBuffer.set_multiplier(8)
+ # self.MarkupBuffer.set_multiplier(8)
self.current_font_size = 12
self.alignment_padding = 30
lm = 7 * 8
@@ -272,7 +271,7 @@ class UberwriterWindow(Window):
self.get_style_context().add_class("small")
elif(w_width < 1400):
- self.MarkupBuffer.set_multiplier(10)
+ # self.MarkupBuffer.set_multiplier(10)
width_request = 800
self.current_font_size = 15
self.alignment_padding = 40
@@ -281,9 +280,8 @@ class UberwriterWindow(Window):
self.get_style_context().remove_class("large")
self.get_style_context().add_class("medium")
-
else:
- self.MarkupBuffer.set_multiplier(13)
+ # self.MarkupBuffer.set_multiplier(13)
self.current_font_size = 17
width_request = 1000
self.alignment_padding = 60
@@ -292,6 +290,7 @@ class UberwriterWindow(Window):
self.get_style_context().remove_class("small")
self.get_style_context().add_class("large")
+
self.EditorAlignment.props.top_padding = self.alignment_padding
self.EditorAlignment.props.bottom_padding = self.alignment_padding
self.TextEditor.set_left_margin(lm)
@@ -309,6 +308,13 @@ class UberwriterWindow(Window):
alloc.width = width_request
self.TextEditor.size_allocate(alloc)
+ def style_changed(self, widget, data=None):
+ pgc = self.TextEditor.get_pango_context()
+ mets = pgc.get_metrics()
+ self.MarkupBuffer.set_multiplier(Pango.units_to_double(mets.get_approximate_char_width()) + 1)
+ print(Pango.units_to_double(mets.get_approximate_char_width()))
+
+
def save_document(self, widget, data=None):
if self.filename:
logger.info("saving")
@@ -823,7 +829,6 @@ class UberwriterWindow(Window):
# self.status_bar.set_state_flags(Gtk.StateFlags.INSENSITIVE, True)
self.statusbar_revealer.set_reveal_child(False)
self.hb_revealer.set_reveal_child(False)
- self.hb.props.opacity = 0.0
self.status_bar_visible = False
self.buffer_modified_for_status_bar = False
return False
@@ -859,6 +864,18 @@ class UberwriterWindow(Window):
self.buffer_modified_for_status_bar = False
self.update_line_and_char_count()
+ def override_headerbar_background(self, widget, cr):
+ if(widget.get_window().get_state() & self.testbits):
+ bg_color = self.get_style_context().get_background_color(Gtk.StateFlags.ACTIVE)
+ alloc = widget.get_allocation()
+ width = alloc.width
+ height = alloc.height
+
+ cr.rectangle(0,0, width, height)
+ cr.set_source_rgb(bg_color.red, bg_color.green, bg_color.blue)
+ cr.fill()
+
+
def draw_gradient(self, widget, cr):
bg_color = self.get_style_context().get_background_color(Gtk.StateFlags.ACTIVE)
@@ -900,6 +917,7 @@ class UberwriterWindow(Window):
self.connect('close-window', self.on_mnu_close_activate)
self.connect('toggle-search', self.open_search_and_replace)
self.scroll_adjusted = False
+
# Code for other initialization actions should be added here.
# Texlive checker
@@ -932,7 +950,8 @@ class UberwriterWindow(Window):
self.hb.pack_start(bbtn)
self.hb.pack_end(btn_settings)
self.hb.show_all()
-
+ self.testbits = Gdk.WindowState.TILED | Gdk.WindowState.MAXIMIZED
+ self.connect('draw', self.override_headerbar_background)
self.title_end = " – UberWriter"
self.set_headerbar_title("New File" + self.title_end)
@@ -979,6 +998,9 @@ class UberwriterWindow(Window):
self.TextEditor.set_vadjustment(builder.get_object('vadjustment1'))
self.TextEditor.set_wrap_mode(Gtk.WrapMode.WORD)
self.TextEditor.connect('focus-out-event', self.focus_out)
+ self.TextEditor.get_style_context().connect('changed', self.style_changed)
+
+ # self.TextEditor.install_style_property_parser
self.TextEditor.show()
self.TextEditor.grab_focus()
diff --git a/uberwriter_lib/Window.py b/uberwriter_lib/Window.py
index 5949153..e44f392 100644
--- a/uberwriter_lib/Window.py
+++ b/uberwriter_lib/Window.py
@@ -63,8 +63,8 @@ class Window(Gtk.Window):
self.preferences_dialog = None # instance
self.AboutDialog = None # class
- self.settings = Gio.Settings("net.launchpad.uberwriter")
- self.settings.connect('changed', self.on_preferences_changed)
+ # self.settings = Gio.Settings("net.launchpad.uberwriter")
+ # self.settings.connect('changed', self.on_preferences_changed)
# Optional application indicator support
# Run 'quickly add indicator' to get started.