Merge pull request #147 from UberWriter/various-improvements

Various improvements

Author: somas95

.gitignore

@@ -5,7 +5,6 @@ build/
 debian/uberwriter/DEBIAN
 debian/uberwriter/opt
 debian/uberwriter/usr
-bin/
 flatpak/*
 !flatpak/fonts-download
 !flatpak/pandoc-download

bin/uberwriter

@@ -0,0 +1,59 @@
+#!/usr/bin/python3
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+### BEGIN LICENSE
+# Copyright (C) 2012, Wolf Vollprecht <w.vollprecht@gmail.com>
+# This program is free software: you can redistribute it and/or modify it 
+# under the terms of the GNU General Public License version 3, as published 
+# by the Free Software Foundation.
+# 
+# This program is distributed in the hope that it will be useful, but 
+# WITHOUT ANY WARRANTY; without even the implied warranties of 
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+# PURPOSE.  See the GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along 
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+### END LICENSE
+
+### DO NOT EDIT THIS FILE ###
+
+import sys
+import os
+
+import pkg_resources
+
+import gettext
+import locale
+
+# Add project root directory (enable symlink and trunk execution)
+PROJECT_ROOT_DIRECTORY = os.path.abspath(
+    os.path.dirname(os.path.dirname(os.path.realpath(sys.argv[0]))))
+
+# Set the path if needed. This allows uberwriter to run without installing it :)
+python_path = []
+if os.path.abspath(__file__).startswith('/opt'):
+    gettext.bindtextdomain('uberwriter', '/opt/extras.ubuntu.com/uberwriter/share/locale')
+    syspath = sys.path[:] # copy to avoid infinite loop in pending objects
+    for path in syspath:
+        opt_path = path.replace('/usr', '/opt/extras.ubuntu.com/uberwriter')
+        python_path.insert(0, opt_path)
+        sys.path.insert(0, opt_path)
+    os.putenv("XDG_DATA_DIRS", "%s:%s" % ("/opt/extras.ubuntu.com/uberwriter/share/", os.getenv("XDG_DATA_DIRS", "/usr/local/share/:/usr/share/")))
+if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'uberwriter'))
+    and PROJECT_ROOT_DIRECTORY not in sys.path):
+    python_path.insert(0, PROJECT_ROOT_DIRECTORY)
+    sys.path.insert(0, PROJECT_ROOT_DIRECTORY)
+if python_path:
+    os.putenv('PYTHONPATH', "%s:%s" % (os.getenv('PYTHONPATH', ''), ':'.join(python_path))) # for subprocesses
+
+import uberwriter
+
+locale_dir = os.path.abspath(os.path.join(os.path.dirname(uberwriter.__file__),'../po/'))
+
+# L10n
+locale.textdomain('uberwriter')
+locale.bindtextdomain('uberwriter', locale_dir)
+gettext.textdomain('uberwriter')
+gettext.bindtextdomain('uberwriter', locale_dir)
+
+uberwriter.main()

data/de.wolfvollprecht.UberWriter.appdata.xml

@@ -28,6 +28,13 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release date="2019-04-17" version="2.2.0-beta1">
+      <description>
+        <ul>
+          <li>...</li>
+        </ul>
+      </description>
+    </release>
     <release date="2019-03-10" version="2.1.5">
       <description>
         <ul>

data/de.wolfvollprecht.UberWriter.gschema.xml

@@ -2,37 +2,57 @@
 
 <schemalist>
 
+  <enum id='de.wolfvollprecht.UberWriter.Stat'>
+    <value nick='characters' value='0' />
+    <value nick='words' value='1' />
+    <value nick='sentences' value='2' />
+    <value nick='paragraphs' value='3' />
+    <value nick='read_time' value='4' />
+  </enum>
+
   <schema path="/de/wolfvollprecht/UberWriter/" id="de.wolfvollprecht.UberWriter">
 
+    <key name='dark-mode-auto' type='b'>
+      <default>true</default>
+      <summary>Set dark mode automatically</summary>
+      <description>
+        Whether dark mode depends on the system theme, or is set to what the user specifies.
+      </description>
+    </key>
     <key name='dark-mode' type='b'>
       <default>false</default>
-      <summary>Dark mode</summary>
+      <summary>Force dark mode</summary>
       <description>
-        If enabled, the window will be dark themed
-        If disabled, the window will be light themed
-        asked to install them manually.
+        Enable or disable the dark mode.
       </description>
     </key>
     <key name='spellcheck' type='b'>
       <default>true</default>
-      <summary>Spellcheck</summary>
+      <summary>Check spelling while typing</summary>
       <description>
-        Enable/disable spellchecking in the application.
+        Enable or disable spellchecking.
       </description>
     </key>
     <key name='gradient-overlay' type='b'>
       <default>false</default>
-      <summary>Show gradient overlay</summary>
+      <summary>Draw scroll gradient</summary>
       <description>
         Show a gradient overlay over the text at the top anf bottom of the window.
-        It can cause performance problems to some users
+        It can cause performance problems to some users.
+      </description>
+    </key>
+    <key name='input-format' type='s'>
+      <default>"markdown"</default>
+      <summary>Input format</summary>
+      <description>
+        Input format to use when previewing and exporting using Pandoc.
       </description>
     </key>
     <key name='poll-motion' type='b'>
       <default>true</default>
       <summary>Allow Uberwriter to poll cursor motion</summary>
       <description>
-        Used for hidding the headerbar after 3 seconds if the cursor is not moving.
+        Hide the header and status bars if the cursor is not moving.
       </description>
     </key>
     <key name='open-file-path' type='s'>
@@ -42,6 +62,13 @@
         Open file paths of the current session
       </description>
     </key>
+    <key name='stat-default' enum='de.wolfvollprecht.UberWriter.Stat'>
+      <default>"words"</default>
+      <summary>Default statistic</summary>
+      <description>
+        Which statistic is shown on the main window.
+      </description>
+    </key>
 
   </schema>
 

data/media/css/_gtk_base.css

@@ -8,42 +8,39 @@
   bind "<ctl>i" { "insert-italic" () };
   bind "<ctl>b" { "insert-bold" () };
   bind "<ctl>r" { "insert-hrule" () };
-  bind "<ctl>u" { "insert-ulistitem" () };
-  bind "<ctl>h" { "insert-heading" () };
+  bind "<ctl>u" { "insert-listitem" () };
+  bind "<ctl>h" { "insert-header" () };
   bind "<ctl>z" { "undo" () };
   bind "<ctl>y" { "redo" () };
-  bind "<ctl><shift>d" { "insert-strikeout" () };
+  bind "<ctl><shift>d" { "insert-strikethrough" () };
   /*bind "<ctl>t" { "insert-at-cursor" ('[ ] ') };*/
   bind "<ctl><shift>z" { "redo" () };
 }
 
 /* Main window and text colors */
 
-.uberwriter_window {
+.uberwriter-window {
   /*border-radius: 7px 7px 3px 3px;*/
   background: @background_color;
   caret-color: @foreground_color;
 }
 
-.uberwriter_window.small .uberwriter-editor {
+.uberwriter-window .uberwriter-editor {
   font-family: 'Fira Mono', monospace;
-  font-size: 12px;
-}
-.uberwriter_window grid {
-  background-color: @background_color;
+  font-size: 16px;
+  padding-top: 80px;
+  padding-bottom: 16px;
 }
 
-#UberwriterWindow.medium .uberwriter-editor {
-  font-family: 'Fira Mono', monospace;
-  font-size: 15px;
+.uberwriter-window.small .uberwriter-editor {
+  font-size: 14px;
 }
 
-#UberwriterWindow.large .uberwriter-editor {
-  font-family: 'Fira Mono', monospace;
+.uberwriter-window.large .uberwriter-editor {
   font-size: 18px;
 }
 
-#titlebar_revealer {
+#titlebar-revealer {
   padding: 0;
 }
 
@@ -52,8 +49,8 @@
   background: transparent;
 }
 
-#titlebar_container { 
-  background: @background_color; 
+#titlebar-container {
+  background: @background_color;
 }
 
 .uberwriter-editor {
@@ -89,15 +86,10 @@
 }
 
 
-.status_bar_box label {
-  color: #666;
-}
-
-.status_bar_box button {
-  /* finding reset */
+.stats-counter {
+  color: alpha(@foreground_color, 0.6);
   background-color: @background_color;
   text-shadow: inherit;
-  /*icon-shadow: inherit;*/
   box-shadow: initial;
   background-clip: initial;
   background-origin: initial;
@@ -109,37 +101,15 @@
   border-image-repeat: initial;
   border-image-slice: initial;
   border-image-width: initial;
-
   border-style: none;
-  -button-images: true;
-  border-radius: 2px;
-  color: #666;
-  padding: 3px 5px;
+  padding: 0px 16px;
   transition: 100ms ease-in;
 }
 
-.status_bar_box button:hover,
-.status_bar_box button:checked {
-  transition: 0s ease-in;
-  color: @background_color;
-  background-color: #666;
-}
-
-.status_bar_box button:hover label,
-.status_bar_box button:checked label {
-  color: @background_color;
-}
-
-.status_bar_box button:active {
-  color: #EEE;
-  background-color: #EEE;
-  background-image: none;
-  box-shadow: 0 0 2px rgba(0,0,0,0.4)
-}
-
-.status_bar_box separator {
-  border-color: #999;
-  border-right: none;
+.stats-counter:hover,
+.stats-counter:checked {
+  color: @foreground_color;
+  background-color: lighter(@background_color);
 }
 
 #PreviewMenuItem image {
@@ -150,7 +120,7 @@
   background: #FFF;
 }
 
-#UberwriterWindow treeview {
+.uberwriter-window treeview {
   padding: 3px 3px 3px 3px;
 }
 
@@ -165,7 +135,7 @@
   padding: 5px;
 }
 
-/* .QuickPreviewPopup {
+/* .quick-preview-popup {
   padding: 5px;
   margin: 5px;
   border: 1px solid #333;
@@ -183,8 +153,7 @@
   border: 5px solid @background_color;
 }
 
-#LexikonBubble .lexikon_heading {
-  /*font: serif 12;*/
+#LexikonBubble .lexikon-heading {
   font-family: serif;
   font-size: 12px;
   padding-bottom: 5px;
@@ -193,21 +162,21 @@
   padding-left: 10px;
 }
 
-#LexikonBubble .lexikon_num {
+#LexikonBubble .lexikon-num {
   padding-right: 5px;
   padding-left: 20px;
 }
 
-.QuickPreviewPopup {
+.quick-preview-popup {
 	background-color: @background_color;
 }
 
-.QuickPreviewPopup grid {
+.quick-preview-popup grid {
 	background-color: @background_color;
 	color: @foreground_color;
 	border-color: @background_color;
 }
 
-.QuickPreviewPopup label {
+.quick-preview-popup label {
 	color: @foreground_color;
 }