working setup.py for the first time in .. years?

ccf9e392 · Wolf Vollprecht · 55ef6fb7 · 55ef6fb7 · ccf9e392 · ccf9e392
Commit ccf9e392 authored Sep 12, 2014 by Wolf Vollprecht
--- a/ATTENTION
+++ b/ATTENTION
--- a/data/media/style.css
+++ b/data/media/style.css
@@ -33,7 +33,7 @@

 #UberwriterWindow {
  gtk-key-bindings: window-bindings;
-  border-radius: 7px 7px 5px 5px;
+  border-radius: 7px 7px 3px 3px;
 }

 #UberwriterWindow.small #UberwriterEditor {

--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,6 @@ override_dh_install:
 		--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


--- 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: 2014-09-11 17:47+0200\n"
+"POT-Creation-Date: 2014-09-12 01:57+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,137 +17,156 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:1
-msgid "Export"
+#: ../data/ui/UberwriterWindow.ui.h:1
+msgid "Case Sensitive"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:2
-msgid "Smart"
+#: ../data/ui/UberwriterWindow.ui.h:2
+msgid "Activate Regex"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:3
-msgid "Pandoc can automatically make \"--\" to a long dash and more"
+#: ../data/ui/UberwriterWindow.ui.h:3
+msgid "_File"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:4
-msgid "Normalize"
+#: ../data/ui/UberwriterWindow.ui.h:4
+msgid "Open Recent File"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:5
-msgid ""
-"Removes things like double spaces or spaces at the beginning of a paragraph"
+#: ../data/ui/UberwriterWindow.ui.h:5
+msgid "Export as ODT"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:6
-msgid "Table of Contents"
+#: ../data/ui/UberwriterWindow.ui.h:6
+msgid "Advanced Export..."
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:7
-msgid "Standalone"
+#: ../data/ui/UberwriterWindow.ui.h:7
+msgid "Copy raw HTML to clipboard"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:8
-msgid ""
-"Use a header and footer to include things like stylesheets and meta "
-"information"
+#: ../data/ui/UberwriterWindow.ui.h:8
+msgid "_View"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:9
-msgid "Number Sections"
+#: ../data/ui/UberwriterWindow.ui.h:9
+msgid "Light text on a dark background"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:10
-msgid "Strict Markdown"
+#: ../data/ui/UberwriterWindow.ui.h:10
+msgid "Dark Mode"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:11
-msgid "Use \"strict\" markdown instead of \"pandoc\" markdown"
+#: ../data/ui/UberwriterWindow.ui.h:11
+msgid "Switch to preview mode"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:12
-msgid "Slideshow incremental bullets"
+#: ../data/ui/UberwriterWindow.ui.h:12
+msgid "Preview"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:13
-msgid "Show one bullet point after another in a slideshow"
+#: ../data/ui/UberwriterWindow.ui.h:13
+msgid "Open Search and Replace"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:14
-msgid "<b>General Options</b>"
+#: ../data/ui/UberwriterWindow.ui.h:14
+msgid "Search and Replace ..."
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:15
-msgid "Highlight syntax"
+#: ../data/ui/UberwriterWindow.ui.h:15
+msgid "Auto _Spellcheck"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:16
-msgid "Choose a color theme for syntax highlighting"
+#: ../data/ui/UberwriterWindow.ui.h:16
+msgid "_Help"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:17
-msgid "Highlight style  "
+#: ../data/ui/UberwriterWindow.ui.h:17
+msgid "Contents"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:18
-msgid "<b>Syntax highlighting</b> (HTML, LaTeX)"
+#: ../data/ui/UberwriterWindow.ui.h:18
+msgid "Short Markdown Tutorial"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:19
-msgid "Self Contained"
+#: ../data/ui/UberwriterWindow.ui.h:19
+msgid "Open Pandoc Online Markdown Help ..."
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:20
-msgid ""
-"Produces a HTML that has no external dependencies (all images and "
-"stylesheets are included)"
+#: ../data/ui/UberwriterWindow.ui.h:20
+msgid "Get Help Online..."
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:21
-msgid "HTML 5"
+#: ../data/ui/UberwriterWindow.ui.h:21
+msgid "Translate This Application..."
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:22
-msgid "Use HTML 5 syntax"
+#: ../data/ui/UberwriterWindow.ui.h:22
+msgid "Search"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:23
-msgid "Choose a CSS File that you want to use"
+#: ../data/ui/UberwriterWindow.ui.h:23
+msgid "Next Match"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:24
-msgid "CSS File"
+#: ../data/ui/UberwriterWindow.ui.h:24
+msgid "Normal"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:25
-msgid "<b>HTML Options</b>"
+#: ../data/ui/UberwriterWindow.ui.h:25
+msgid "Previous Match"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:26
-msgid "<b>Bibliography File</b>"
+#: ../data/ui/UberwriterWindow.ui.h:26
+msgid "Active"
 msgstr ""

-#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:27
-msgid "Commandline Reference"
+#: ../data/ui/UberwriterWindow.ui.h:27
+msgid "toolbutton"
 msgstr ""

-#: ../uberwriter/FormatShortcuts.py:85
-msgid "emphasized text"
+#: ../data/ui/UberwriterWindow.ui.h:28
+msgid "Open Replace"
 msgstr ""

-#: ../uberwriter/FormatShortcuts.py:87
-msgid "strong text"
+#: ../data/ui/UberwriterWindow.ui.h:29
+msgid "Replace with"
 msgstr ""

-#: ../uberwriter/FormatShortcuts.py:101
-msgid "List item"
+#: ../data/ui/UberwriterWindow.ui.h:30
+msgid "Replace"
 msgstr ""

-#: ../uberwriter/FormatShortcuts.py:182
-msgid "Heading"
+#: ../data/ui/UberwriterWindow.ui.h:31
+msgid "Replace All"
 msgstr ""

-#: ../uberwriter/__init__.py:35
-msgid "Show debug messages (-vv debugs uberwriter_lib also)"
+#: ../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 ""

 #: ../data/ui/AboutUberwriterDialog.ui.h:1
@@ -171,57 +190,6 @@ msgstr ""
 msgid "Copyright (C) 2012, Wolf Vollprecht <w.vollprecht@gmail.com>"
 msgstr ""

-#: ../uberwriter/UberwriterWindow.py:338
-msgid "Save your File"
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:484
-msgid "You can not export to PDF."
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:486
-msgid ""
-"Please install <a href=\"apt:texlive\">texlive</a> from the software center."
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:516
-msgid "MarkDown or Plain Text"
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:519
-msgid "Open a .md-File"
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:541
-msgid "You have not saved your changes."
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:543
-msgid "Close without Saving"
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:544
-msgid "Cancel"
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:545
-msgid "Save now"
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:546
-msgid "Unsaved changes"
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:611
-msgid "You can not enable the Spell Checker."
-msgstr ""
-
-#: ../uberwriter/UberwriterWindow.py:613
-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 ""
@@ -246,6 +214,10 @@ msgstr ""
 msgid "Suggestions"
 msgstr ""

+#: ../uberwriter/__init__.py:35
+msgid "Show debug messages (-vv debugs uberwriter_lib also)"
+msgstr ""
+
 #: ../uberwriter/UberwriterInlinePreview.py:174
 msgid "Website is not available"
 msgstr ""
@@ -270,154 +242,182 @@ msgstr ""
 msgid "UberWriter, a simple and distraction free Markdown Editor"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:1
-msgid "Case Sensitive"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:1
+msgid "Export"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:2
-msgid "Activate Regex"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:2
+msgid "Smart"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:3
-msgid "_File"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:3
+msgid "Pandoc can automatically make \"--\" to a long dash and more"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:4
-msgid "Open Recent File"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:4
+msgid "Normalize"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:5
-msgid "Export as ODT"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:5
+msgid ""
+"Removes things like double spaces or spaces at the beginning of a paragraph"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:6
-msgid "Advanced Export..."
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:6
+msgid "Table of Contents"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:7
-msgid "Copy raw HTML to clipboard"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:7
+msgid "Standalone"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:8
-msgid "_View"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:8
+msgid ""
+"Use a header and footer to include things like stylesheets and meta "
+"information"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:9
-msgid "Light text on a dark background"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:9
+msgid "Number Sections"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:10
-msgid "Dark Mode"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:10
+msgid "Strict Markdown"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:11
-msgid "Switch to preview mode"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:11
+msgid "Use \"strict\" markdown instead of \"pandoc\" markdown"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:12
-msgid "Preview"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:12
+msgid "Slideshow incremental bullets"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:13
-msgid "Open Search and Replace"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:13
+msgid "Show one bullet point after another in a slideshow"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:14
-msgid "Search and Replace ..."
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:14
+msgid "<b>General Options</b>"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:15
-msgid "Auto _Spellcheck"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:15
+msgid "Highlight syntax"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:16
-msgid "_Help"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:16
+msgid "Choose a color theme for syntax highlighting"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:17
-msgid "Contents"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:17
+msgid "Highlight style  "
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:18
-msgid "Short Markdown Tutorial"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:18
+msgid "<b>Syntax highlighting</b> (HTML, LaTeX)"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:19
-msgid "Open Pandoc Online Markdown Help ..."
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:19
+msgid "Self Contained"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:20
-msgid "Get Help Online..."
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:20
+msgid ""
+"Produces a HTML that has no external dependencies (all images and "
+"stylesheets are included)"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:21
-msgid "Translate This Application..."
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:21
+msgid "HTML 5"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:22
-msgid "Search"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:22
+msgid "Use HTML 5 syntax"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:23
-msgid "Next Match"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:23
+msgid "Choose a CSS File that you want to use"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:24
-msgid "Normal"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:24
+msgid "CSS File"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:25
-msgid "Previous Match"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:25
+msgid "<b>HTML Options</b>"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:26
-msgid "Active"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:26
+msgid "<b>Bibliography File</b>"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:27
-msgid "toolbutton"
+#: ../data/ui/UberwriterAdvancedExportDialog.ui.h:27
+msgid "Commandline Reference"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:28
-msgid "Open Replace"
+#: ../uberwriter/FormatShortcuts.py:85
+msgid "emphasized text"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:29
-msgid "Replace with"
+#: ../uberwriter/FormatShortcuts.py:87
+msgid "strong text"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:30
-msgid "Replace"
+#: ../uberwriter/FormatShortcuts.py:101
+msgid "List item"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:31
-msgid "Replace All"
+#: ../uberwriter/FormatShortcuts.py:182
+msgid "Heading"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:32
-msgid "Focus Mode"
+#: ../uberwriter/UberwriterWindow.py:338
+msgid "Save your File"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:33
-msgid "Go into focus mode"
+#: ../uberwriter/UberwriterWindow.py:484
+msgid "You can not export to PDF."
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:34
-msgid "Fullscreen"
+#: ../uberwriter/UberwriterWindow.py:486
+msgid ""
+"Please install <a href=\"apt:texlive\">texlive</a> from the software center."
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:35
-msgid "Go into fullscreen mode"
+#: ../uberwriter/UberwriterWindow.py:516
+msgid "MarkDown or Plain Text"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:36
-msgid "Show HTML preview"
+#: ../uberwriter/UberwriterWindow.py:519
+msgid "Open a .md-File"
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:37
-msgid "Words:"
+#: ../uberwriter/UberwriterWindow.py:541
+msgid "You have not saved your changes."
 msgstr ""

-#: ../data/ui/UberwriterWindow.ui.h:38
-msgid "Characters:"
+#: ../uberwriter/UberwriterWindow.py:543
+msgid "Close without Saving"
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:544
+msgid "Cancel"
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:545
+msgid "Save now"
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:546
+msgid "Unsaved changes"
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:611
+msgid "You can not enable the Spell Checker."
+msgstr ""
+
+#: ../uberwriter/UberwriterWindow.py:613
+msgid ""
+"Please install 'hunspell' or 'aspell' dictionarys for your language from the "
+"software center."
 msgstr ""
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,9 @@ def move_desktop_file(root, target_data, prefix):
    # always really be installed into prefix, because while we can install
    # normal data files anywhere we want, the desktop file needs to exist in
    # the main system to be found.  Only actually useful for /opt installs.
-
+    print("renaming desktop file")
+    print(root, target_data, prefix)
+    if(root == '/'): root = ''
    old_desktop_path = os.path.normpath(root + target_data +
                                        '/share/applications')
    old_desktop_file = old_desktop_path + '/uberwriter.desktop'
@@ -70,8 +72,10 @@ def move_desktop_file(root, target_data, prefix):
    elif target_data != prefix + '/':
        # This is an /opt install, so rename desktop file to use extras-
        desktop_file = desktop_path + '/extras-uberwriter.desktop'
+        print(desktop_file, desktop_path)
        try:
-            os.makedirs(desktop_path)
+            # os.makedirs(desktop_path)
+            print('renaming to: %s' % desktop_file)
            os.rename(old_desktop_file, desktop_file)
            os.rmdir(old_desktop_path)
        except OSError as e:
@@ -81,7 +85,7 @@ def move_desktop_file(root, target_data, prefix):
    return desktop_file

 def update_desktop_file(filename, target_pkgdata, target_scripts):
-
+    print("updateing deskop file: %s" % filename)
    try:
        fin = open(filename, 'r', encoding="utf-8")
        fout = open(filename + '.new', 'w', encoding="utf-8")
@@ -136,7 +140,7 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto):

 DistUtilsExtra.auto.setup(
    name='uberwriter',
-    version='0.1',
+    version='1.0',
    license='GPL-3',
    author='Wolf Vollprecht',
    author_email='w.vollprecht@gmail.com',
@@ -160,6 +164,7 @@ DistUtilsExtra.auto.setup(
        "uberwriter"
    ],
    package_data={
-            'pylocales' : ['locales.db']
-            }
-    )
\ No newline at end of file
+        'uberwriter_lib.pylocales' : ['locales.db']
+    },
+    data_files=[('uberwriter_lib/pylocales', ['uberwriter_lib/pylocales/locales.db'])]
+)
\ No newline at end of file
--- a/uberwriter.desktop.in
+++ b/uberwriter.desktop.in
@@ -6,4 +6,4 @@ Exec=uberwriter %U
 Icon=/usr/share/uberwriter/media/uberwriter.svg
 Terminal=false
 Type=Application
-MimeType=text/x-markdown;text/plain;
\ No newline at end of file
+MimeType=text/x-markdown;text/plain;asdas/dkwodw;
\ No newline at end of file