From 29d2af97faaa36521d184193099812322c474f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Genov=C3=A9s?= Date: Sun, 15 Mar 2020 01:11:37 +0100 Subject: [PATCH] Update all references of the app's name from uberwriter to apostrophe, but the appIds --- PKGBUILD | 8 +- README.md | 14 +-- uberwriter.in => apostrophe.in | 20 +-- {uberwriter => apostrophe}/.pylintrc | 0 {uberwriter => apostrophe}/__init__.py | 8 +- {uberwriter => apostrophe}/application.py | 18 +-- {uberwriter => apostrophe}/auto_correct.py | 18 +-- {uberwriter => apostrophe}/builder.py | 2 +- {uberwriter => apostrophe}/config.py | 14 +-- {uberwriter => apostrophe}/export_dialog.py | 6 +- {uberwriter => apostrophe}/fix_table.py | 2 +- {uberwriter => apostrophe}/headerbars.py | 4 +- {uberwriter => apostrophe}/helpers.py | 12 +- {uberwriter => apostrophe}/inline_preview.py | 4 +- {uberwriter => apostrophe}/latex_to_PNG.py | 0 {uberwriter => apostrophe}/main_window.py | 32 ++--- {uberwriter => apostrophe}/markup_regex.py | 0 .../plugins/__init__.py | 0 .../plugins/bibtex/LICENSE.md | 0 .../plugins/bibtex/__init__.py | 0 .../plugins/bibtex/bibtex.glade | 0 .../plugins/bibtex/bibtex.py | 4 +- .../plugins/bibtex/bibtex_item.glade | 0 .../plugins/bibtex/bibtexparser/__init__.py | 0 .../bibtex/bibtexparser/bibdatabase.py | 0 .../plugins/bibtex/bibtexparser/bparser.py | 0 .../plugins/bibtex/bibtexparser/bwriter.py | 0 .../bibtex/bibtexparser/customization.py | 0 .../plugins/bibtex/bibtexparser/latexenc.py | 0 .../bibtex/fuzzywuzzy/StringMatcher.py | 0 .../plugins/bibtex/fuzzywuzzy/__init__.py | 0 .../plugins/bibtex/fuzzywuzzy/fuzz.py | 0 .../plugins/bibtex/fuzzywuzzy/process.py | 0 .../bibtex/fuzzywuzzy/string_processing.py | 0 .../plugins/bibtex/fuzzywuzzy/utils.py | 0 .../plugins/bibtex/gi_composites.py | 0 .../plugins/uberquation/equation_widget.glade | 0 .../plugins/uberquation/icons/Rightarrow | 0 .../plugins/uberquation/icons/^{0} | 0 .../plugins/uberquation/icons/_{0} | 0 .../plugins/uberquation/icons/alpha | 0 .../plugins/uberquation/icons/beta | 0 .../plugins/uberquation/icons/int_{0}^{1}{2} | 0 .../plugins/uberquation/icons/rarrow | 0 .../plugins/uberquation/uberquation.py | 0 .../preferences_dialog.py | 2 +- .../preview_converter.py | 4 +- {uberwriter => apostrophe}/preview_handler.py | 8 +- .../preview_renderer.py | 6 +- .../preview_web_view.py | 0 .../pylocales/__init__.py | 0 .../pylocales/locales.db | Bin .../pylocales/locales.py | 0 .../search_and_replace.py | 6 +- {uberwriter => apostrophe}/settings.py | 2 +- {uberwriter => apostrophe}/sidebar.py | 2 +- {uberwriter => apostrophe}/stats_counter.py | 2 +- {uberwriter => apostrophe}/stats_handler.py | 4 +- {uberwriter => apostrophe}/styled_window.py | 2 +- {uberwriter => apostrophe}/tables.py | 0 {uberwriter => apostrophe}/text_view.py | 22 ++-- .../text_view_drag_drop_handler.py | 2 +- .../text_view_format_inserter.py | 2 +- .../text_view_markup_handler.py | 4 +- .../text_view_scroller.py | 0 .../text_view_undo_redo_handler.py | 2 +- {uberwriter => apostrophe}/theme.py | 4 +- .../de.wolfvollprecht.UberWriter.pipdeps.json | 35 ++++++ ...gresource.xml => apostrophe.gresource.xml} | 0 ...olfvollprecht.UberWriter.appdata.xml.in.in | 26 ++-- ...de.wolfvollprecht.UberWriter.desktop.in.in | 6 +- ...ce => de.wolfvollprecht.apostrophe.Source} | 0 ...ter_markdown.md => apostrophe_markdown.md} | 2 +- data/media/css/gtk/base.css | 30 ++--- data/media/raw/raw_icons.svg | 32 ++--- data/meson.build | 2 +- data/ui/About.ui.in | 6 +- data/ui/Menu.ui | 2 +- help/C/index.page | 8 +- help/C/pandocs-markdown.page | 2 +- help/C/preview.page | 8 +- help/stump/help_backup.html | 14 +-- help/stump/help_backup.md | 10 +- lipsum.md | 2 +- meson.build | 10 +- po/uberwriter.pot | 116 +++++++++--------- po/update_translations.sh | 4 +- screenshots/mockups.svg | 8 +- screenshots/mockups_text.svg | 16 +-- screenshots/mockups_text2.svg | 10 +- scripts/color_palette_generator.py | 2 +- scripts/data_generator.sh | 2 +- tests/test_example.py | 12 +- tests/test_lint.py | 4 +- tests/test_regex_commonmark.py | 2 +- uberwriter/plugins/bibtex/bibtex.glade~ | 99 --------------- uberwriter/plugins/bibtex/bibtex_item.glade~ | 48 -------- .../uberquation/equation_widget.glade~ | 109 ---------------- 98 files changed, 323 insertions(+), 544 deletions(-) rename uberwriter.in => apostrophe.in (74%) rename {uberwriter => apostrophe}/.pylintrc (100%) rename {uberwriter => apostrophe}/__init__.py (86%) rename {uberwriter => apostrophe}/application.py (95%) rename {uberwriter => apostrophe}/auto_correct.py (95%) rename {uberwriter => apostrophe}/builder.py (99%) rename {uberwriter => apostrophe}/config.py (84%) rename {uberwriter => apostrophe}/export_dialog.py (99%) rename {uberwriter => apostrophe}/fix_table.py (99%) rename {uberwriter => apostrophe}/headerbars.py (99%) rename {uberwriter => apostrophe}/helpers.py (96%) rename {uberwriter => apostrophe}/inline_preview.py (99%) rename {uberwriter => apostrophe}/latex_to_PNG.py (100%) rename {uberwriter => apostrophe}/main_window.py (96%) rename {uberwriter => apostrophe}/markup_regex.py (100%) rename {uberwriter => apostrophe}/plugins/__init__.py (100%) rename {uberwriter => apostrophe}/plugins/bibtex/LICENSE.md (100%) rename {uberwriter => apostrophe}/plugins/bibtex/__init__.py (100%) rename {uberwriter => apostrophe}/plugins/bibtex/bibtex.glade (100%) rename {uberwriter => apostrophe}/plugins/bibtex/bibtex.py (90%) rename {uberwriter => apostrophe}/plugins/bibtex/bibtex_item.glade (100%) rename {uberwriter => apostrophe}/plugins/bibtex/bibtexparser/__init__.py (100%) rename {uberwriter => apostrophe}/plugins/bibtex/bibtexparser/bibdatabase.py (100%) rename {uberwriter => apostrophe}/plugins/bibtex/bibtexparser/bparser.py (100%) rename {uberwriter => apostrophe}/plugins/bibtex/bibtexparser/bwriter.py (100%) rename {uberwriter => apostrophe}/plugins/bibtex/bibtexparser/customization.py (100%) rename {uberwriter => apostrophe}/plugins/bibtex/bibtexparser/latexenc.py (100%) rename {uberwriter => apostrophe}/plugins/bibtex/fuzzywuzzy/StringMatcher.py (100%) rename {uberwriter => apostrophe}/plugins/bibtex/fuzzywuzzy/__init__.py (100%) rename {uberwriter => apostrophe}/plugins/bibtex/fuzzywuzzy/fuzz.py (100%) rename {uberwriter => apostrophe}/plugins/bibtex/fuzzywuzzy/process.py (100%) rename {uberwriter => apostrophe}/plugins/bibtex/fuzzywuzzy/string_processing.py (100%) rename {uberwriter => apostrophe}/plugins/bibtex/fuzzywuzzy/utils.py (100%) rename {uberwriter => apostrophe}/plugins/bibtex/gi_composites.py (100%) rename {uberwriter => apostrophe}/plugins/uberquation/equation_widget.glade (100%) rename {uberwriter => apostrophe}/plugins/uberquation/icons/Rightarrow (100%) rename {uberwriter => apostrophe}/plugins/uberquation/icons/^{0} (100%) rename {uberwriter => apostrophe}/plugins/uberquation/icons/_{0} (100%) rename {uberwriter => apostrophe}/plugins/uberquation/icons/alpha (100%) rename {uberwriter => apostrophe}/plugins/uberquation/icons/beta (100%) rename {uberwriter => apostrophe}/plugins/uberquation/icons/int_{0}^{1}{2} (100%) rename {uberwriter => apostrophe}/plugins/uberquation/icons/rarrow (100%) rename {uberwriter => apostrophe}/plugins/uberquation/uberquation.py (100%) rename {uberwriter => apostrophe}/preferences_dialog.py (99%) rename {uberwriter => apostrophe}/preview_converter.py (95%) rename {uberwriter => apostrophe}/preview_handler.py (96%) rename {uberwriter => apostrophe}/preview_renderer.py (97%) rename {uberwriter => apostrophe}/preview_web_view.py (100%) rename {uberwriter => apostrophe}/pylocales/__init__.py (100%) rename {uberwriter => apostrophe}/pylocales/locales.db (100%) rename {uberwriter => apostrophe}/pylocales/locales.py (100%) rename {uberwriter => apostrophe}/search_and_replace.py (98%) rename {uberwriter => apostrophe}/settings.py (97%) rename {uberwriter => apostrophe}/sidebar.py (98%) rename {uberwriter => apostrophe}/stats_counter.py (98%) rename {uberwriter => apostrophe}/stats_handler.py (97%) rename {uberwriter => apostrophe}/styled_window.py (95%) rename {uberwriter => apostrophe}/tables.py (100%) rename {uberwriter => apostrophe}/text_view.py (94%) rename {uberwriter => apostrophe}/text_view_drag_drop_handler.py (98%) rename {uberwriter => apostrophe}/text_view_format_inserter.py (99%) rename {uberwriter => apostrophe}/text_view_markup_handler.py (99%) rename {uberwriter => apostrophe}/text_view_scroller.py (100%) rename {uberwriter => apostrophe}/text_view_undo_redo_handler.py (99%) rename {uberwriter => apostrophe}/theme.py (96%) create mode 100644 build-aux/flatpak/de.wolfvollprecht.UberWriter.pipdeps.json rename data/{uberwriter.gresource.xml => apostrophe.gresource.xml} (100%) rename data/icons/{de.wolfvollprecht.uberwriter.Source => de.wolfvollprecht.apostrophe.Source} (100%) rename data/media/{uberwriter_markdown.md => apostrophe_markdown.md} (99%) delete mode 100644 uberwriter/plugins/bibtex/bibtex.glade~ delete mode 100644 uberwriter/plugins/bibtex/bibtex_item.glade~ delete mode 100644 uberwriter/plugins/uberquation/equation_widget.glade~ diff --git a/PKGBUILD b/PKGBUILD index 24c2817..f21b5f3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,17 +1,17 @@ -pkgname=uberwriter -_pkgname=uberwriter +pkgname=apostrophe +_pkgname=apostrophe pkgver=2.1.3 pkgrel=1 pkgdesc='A distraction free Markdown editor for GNU/Linux made with GTK+' arch=('any') -url='http://uberwriter.github.io/uberwriter/' +url='http://apostrophe.github.io/apostrophe/' license=('GPL3') depends=('gtk3' 'pandoc' 'gspell') makedepends=('python-setuptools') optdepends=('texlive-core' 'otf-fira-mono: Recommended font') provides=("$_pkgname") conflicts=("$_pkgname") -source=('git+https://github.com/UberWriter/uberwriter.git#branch=refactoring') +source=('git+https://github.com/Apostrophe/apostrophe.git#branch=refactoring') sha256sums=('SKIP') pkgver() { diff --git a/README.md b/README.md index 5d920e1..4dec4d1 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ [![Please do not theme this app](https://stopthemingmy.app/badge.svg)](https://stopthemingmy.app) -# Uberwriter +# Apostrophe ![](screenshots/main.png) ## About -Uberwriter is a GTK+ based distraction free Markdown editor, mainly developed by Wolf Vollprecht and Manuel Genovés. It uses pandoc as backend for markdown parsing and offers a very clean and sleek user interface. +Apostrophe is a GTK+ based distraction free Markdown editor, mainly developed by Wolf Vollprecht and Manuel Genovés. It uses pandoc as backend for markdown parsing and offers a very clean and sleek user interface. ## Install -You can get UberWriter on Flathub! +You can get Apostrophe on Flathub! [Get it now](https://flathub.org/apps/details/de.wolfvollprecht.UberWriter) ## Contributions and localization @@ -21,13 +21,13 @@ Any help is appreciated! ## Building from Git ```bash -$ git clone https://github.com/UberWriter/uberwriter.git -$ cd uberwriter +$ git clone https://github.com/Apostrophe/apostrophe.git +$ cd apostrophe $ meson builddir --prefix=/usr # sudo ninja -C builddir install ``` -To use uberwriter, please make sure you have some dependencies installed: +To use apostrophe, please make sure you have some dependencies installed: - Pandoc, the program used to convert Markdown to basically anything else (the package name should be pandoc in most distributions) - Of course, gtk3 etc. needs to be installed as well since this is a gtk application @@ -37,7 +37,7 @@ To use uberwriter, please make sure you have some dependencies installed: ### Running it without installing it -You can run UberWriter with `./uberwriter.in` without installing it in the system, +You can run Apostrophe with `./apostrophe.in` without installing it in the system, but you'll need to install and compile the schemas before: ```bash diff --git a/uberwriter.in b/apostrophe.in similarity index 74% rename from uberwriter.in rename to apostrophe.in index b5431a7..70abee5 100755 --- a/uberwriter.in +++ b/apostrophe.in @@ -31,33 +31,33 @@ from gi.repository import Gio 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 :) +# Set the path if needed. This allows apostrophe to run without installing it :) python_path = [] -if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'uberwriter')) +if (os.path.exists(os.path.join(PROJECT_ROOT_DIRECTORY, 'apostrophe')) 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 +import apostrophe localedir = '@LOCALE_DIR@' pkgdatadir = '@DATA_DIR@' -#locale_dir = os.path.abspath(os.path.join(os.path.dirname(uberwriter.__file__),'../po/')) +#locale_dir = os.path.abspath(os.path.join(os.path.dirname(apostrophe.__file__),'../po/')) # L10n -locale.textdomain('uberwriter') -locale.bindtextdomain('uberwriter', localedir) -gettext.textdomain('uberwriter') -gettext.bindtextdomain('uberwriter', localedir) +locale.textdomain('apostrophe') +locale.bindtextdomain('apostrophe', localedir) +gettext.textdomain('apostrophe') +gettext.bindtextdomain('apostrophe', localedir) -resource = Gio.resource_load(os.path.join(pkgdatadir, 'uberwriter/uberwriter.gresource')) +resource = Gio.resource_load(os.path.join(pkgdatadir, 'apostrophe/apostrophe.gresource')) Gio.Resource._register(resource) -uberwriter.main() +apostrophe.main() diff --git a/uberwriter/.pylintrc b/apostrophe/.pylintrc similarity index 100% rename from uberwriter/.pylintrc rename to apostrophe/.pylintrc diff --git a/uberwriter/__init__.py b/apostrophe/__init__.py similarity index 86% rename from uberwriter/__init__.py rename to apostrophe/__init__.py index 00e5141..0e475c0 100644 --- a/uberwriter/__init__.py +++ b/apostrophe/__init__.py @@ -19,10 +19,10 @@ import gi gi.require_version('Gtk', '3.0') -from uberwriter import main_window -from uberwriter import application -from uberwriter.helpers import set_up_logging -from uberwriter.config import get_version +from apostrophe import main_window +from apostrophe import application +from apostrophe.helpers import set_up_logging +from apostrophe.config import get_version def main(): diff --git a/uberwriter/application.py b/apostrophe/application.py similarity index 95% rename from uberwriter/application.py rename to apostrophe/application.py index 1aeaac9..c015d52 100644 --- a/uberwriter/application.py +++ b/apostrophe/application.py @@ -15,16 +15,16 @@ from gettext import gettext as _ import gi -from uberwriter.main_window import MainWindow +from apostrophe.main_window import MainWindow gi.require_version('Gtk', '3.0') # pylint: disable=wrong-import-position from gi.repository import GLib, Gio, Gtk, GdkPixbuf -from uberwriter import main_window -from uberwriter.settings import Settings -from uberwriter.helpers import set_up_logging -from uberwriter.preferences_dialog import PreferencesDialog -from uberwriter.helpers import get_media_path +from apostrophe import main_window +from apostrophe.settings import Settings +from apostrophe.helpers import set_up_logging +from apostrophe.preferences_dialog import PreferencesDialog +from apostrophe.helpers import get_media_path class Application(Gtk.Application): @@ -161,7 +161,7 @@ class Application(Gtk.Application): if not self.window: # Windows are associated with the application # when the last one is closed the application shuts down - # self.window = Window(application=self, title="UberWriter") + # self.window = Window(application=self, title="Apostrophe") self.window = MainWindow(self) if self.args: self.window.load_file(self.args[0]) @@ -173,7 +173,7 @@ class Application(Gtk.Application): parser = argparse.ArgumentParser() parser.add_argument( "-v", "--verbose", action="count", dest="verbose", - help=_("Show debug messages (-vv debugs uberwriter also)")) + help=_("Show debug messages (-vv debugs apostrophe also)")) parser.add_argument( "-e", "--experimental-features", help=_("Use experimental features"), action='store_true') @@ -263,7 +263,7 @@ class Application(Gtk.Application): builder.get_object("shortcuts").show() def on_open_tutorial(self, _action, _value): - self.window.open_uberwriter_markdown() + self.window.open_apostrophe_markdown() def on_about(self, _action, _param): builder = Gtk.Builder() diff --git a/uberwriter/auto_correct.py b/apostrophe/auto_correct.py similarity index 95% rename from uberwriter/auto_correct.py rename to apostrophe/auto_correct.py index 31ffb5b..94aed66 100644 --- a/uberwriter/auto_correct.py +++ b/apostrophe/auto_correct.py @@ -1,5 +1,5 @@ -# UberwriterAutoCorrect -# The Uberwriter Auto Correct is a auto correction +# ApostropheAutoCorrect +# The Apostrophe Auto Correct is a auto correction # mechanism to prevent stupid typos # CURRENTLY DISABLED @@ -13,16 +13,16 @@ from gi.repository import Gtk, Gdk import enchant -from uberwriter import pressagio -# import uberwriter.pressagio.predictor -# import uberwriter.pressagio.tokenizer -# import uberwriter.pressagio.dbconnector -# import uberwriter.pressagio.context_tracker -# import uberwriter.pressagio.callback +from apostrophe import pressagio +# import apostrophe.pressagio.predictor +# import apostrophe.pressagio.tokenizer +# import apostrophe.pressagio.dbconnector +# import apostrophe.pressagio.context_tracker +# import apostrophe.pressagio.callback # from Levenshtein import distance -from uberwriter.helpers import get_media_path +from apostrophe.helpers import get_media_path # Define and create PresageCallback object class PressagioCallback(pressagio.callback.Callback): diff --git a/uberwriter/builder.py b/apostrophe/builder.py similarity index 99% rename from uberwriter/builder.py rename to apostrophe/builder.py index 99b3160..05cab41 100644 --- a/uberwriter/builder.py +++ b/apostrophe/builder.py @@ -28,7 +28,7 @@ import gi gi.require_version('Gtk', '3.0') # pylint: disable=wrong-import-position from gi.repository import GObject, Gtk # pylint: disable=E0611 -LOGGER = logging.getLogger('uberwriter') +LOGGER = logging.getLogger('apostrophe') # this module is big so uses some conventional prefixes and postfixes # *s list, except self.widgets is a dictionary diff --git a/uberwriter/config.py b/apostrophe/config.py similarity index 84% rename from uberwriter/config.py rename to apostrophe/config.py index ea1dd35..8df9e52 100644 --- a/uberwriter/config.py +++ b/apostrophe/config.py @@ -24,7 +24,7 @@ __all__ = [ # Where your project will look for your data (for instance, images and ui # files). By default, this is ../data, relative your trunk layout -__uberwriter_data_directory__ = '../data/' +__apostrophe_data_directory__ = '../data/' __license__ = 'GPL-3' __version__ = 'VERSION' @@ -45,25 +45,25 @@ def get_data_file(*path_segments): def get_data_path(): - """Retrieve uberwriter data path + """Retrieve apostrophe data path - This path is by default /../data/ in trunk - and /opt/uberwriter/data in an installed version but this path + This path is by default /../data/ in trunk + and /opt/apostrophe/data in an installed version but this path is specified at installation time. """ # Get pathname absolute or relative. if os.path.isfile("/.flatpak-info"): - return '/app/share/uberwriter/' + return '/app/share/apostrophe/' path = os.path.join( - os.path.dirname(__file__), __uberwriter_data_directory__) + os.path.dirname(__file__), __apostrophe_data_directory__) # We try first if the data exists in the local folder and then # in the system installation path abs_data_path = os.path.abspath(path) if not os.path.exists(abs_data_path): - abs_data_path = '/usr/share/uberwriter/' + abs_data_path = '/usr/share/apostrophe/' elif not os.path.exists(abs_data_path): raise ProjectPathNotFound diff --git a/uberwriter/export_dialog.py b/apostrophe/export_dialog.py similarity index 99% rename from uberwriter/export_dialog.py rename to apostrophe/export_dialog.py index 29de0c4..2de14d7 100644 --- a/uberwriter/export_dialog.py +++ b/apostrophe/export_dialog.py @@ -26,10 +26,10 @@ import gi gi.require_version('Gtk', '3.0') from gi.repository import Gtk, GLib -from uberwriter import helpers -from uberwriter.theme import Theme +from apostrophe import helpers +from apostrophe.theme import Theme -LOGGER = logging.getLogger('uberwriter') +LOGGER = logging.getLogger('apostrophe') class Export: diff --git a/uberwriter/fix_table.py b/apostrophe/fix_table.py similarity index 99% rename from uberwriter/fix_table.py rename to apostrophe/fix_table.py index 5f551cc..7c011c3 100644 --- a/uberwriter/fix_table.py +++ b/apostrophe/fix_table.py @@ -4,7 +4,7 @@ gi.require_version('Gtk', '3.0') from gi.repository import Gtk import logging -logger = logging.getLogger('uberwriter') +logger = logging.getLogger('apostrophe') class FixTable(): diff --git a/uberwriter/headerbars.py b/apostrophe/headerbars.py similarity index 99% rename from uberwriter/headerbars.py rename to apostrophe/headerbars.py index f2243df..d25de76 100644 --- a/uberwriter/headerbars.py +++ b/apostrophe/headerbars.py @@ -22,8 +22,8 @@ from gettext import gettext as _ gi.require_version('Gtk', '3.0') from gi.repository import Gtk, GLib -from uberwriter.helpers import get_descendant -from uberwriter.settings import Settings +from apostrophe.helpers import get_descendant +from apostrophe.settings import Settings class BaseHeaderbar: diff --git a/uberwriter/helpers.py b/apostrophe/helpers.py similarity index 96% rename from uberwriter/helpers.py rename to apostrophe/helpers.py index def457b..bab791b 100644 --- a/uberwriter/helpers.py +++ b/apostrophe/helpers.py @@ -26,13 +26,13 @@ import gi import pypandoc from gi.overrides.Pango import Pango -from uberwriter.settings import Settings +from apostrophe.settings import Settings gi.require_version('Gtk', '3.0') from gi.repository import Gtk # pylint: disable=E0611 -from uberwriter.config import get_data_file -from uberwriter.builder import Builder +from apostrophe.config import get_data_file +from apostrophe.builder import Builder @@ -108,12 +108,12 @@ def set_up_logging(opts): formatter = logging.Formatter( "%(levelname)s:%(name)s: %(funcName)s() '%(message)s'") - logger = logging.getLogger('uberwriter') + logger = logging.getLogger('apostrophe') logger_sh = logging.StreamHandler() logger_sh.setFormatter(formatter) logger.addHandler(logger_sh) - lib_logger = logging.getLogger('uberwriter') + lib_logger = logging.getLogger('apostrophe') lib_logger_sh = logging.StreamHandler() lib_logger_sh.setFormatter(formatter) lib_logger.addHandler(lib_logger_sh) @@ -133,7 +133,7 @@ def get_help_uri(page=None): if not os.path.exists(help_uri): # installed so use gnome help tree - user's language - help_uri = 'uberwriter' + help_uri = 'apostrophe' # unspecified page is the index.page if page is not None: diff --git a/uberwriter/inline_preview.py b/apostrophe/inline_preview.py similarity index 99% rename from uberwriter/inline_preview.py rename to apostrophe/inline_preview.py index b9f0c57..4081ccc 100644 --- a/uberwriter/inline_preview.py +++ b/apostrophe/inline_preview.py @@ -26,8 +26,8 @@ gi.require_version("Gtk", "3.0") gi.require_version("WebKit2", "4.0") from gi.repository import Gtk, Gdk, GdkPixbuf, GLib from gi.repository import WebKit2 -from uberwriter import latex_to_PNG, markup_regex -from uberwriter.settings import Settings +from apostrophe import latex_to_PNG, markup_regex +from apostrophe.settings import Settings class DictAccessor: diff --git a/uberwriter/latex_to_PNG.py b/apostrophe/latex_to_PNG.py similarity index 100% rename from uberwriter/latex_to_PNG.py rename to apostrophe/latex_to_PNG.py diff --git a/uberwriter/main_window.py b/apostrophe/main_window.py similarity index 96% rename from uberwriter/main_window.py rename to apostrophe/main_window.py index 246b377..652676b 100644 --- a/uberwriter/main_window.py +++ b/apostrophe/main_window.py @@ -23,22 +23,22 @@ from gettext import gettext as _ import gi -from uberwriter.export_dialog import Export -from uberwriter.preview_handler import PreviewHandler -from uberwriter.stats_handler import StatsHandler -from uberwriter.styled_window import StyledWindow -from uberwriter.text_view import TextView +from apostrophe.export_dialog import Export +from apostrophe.preview_handler import PreviewHandler +from apostrophe.stats_handler import StatsHandler +from apostrophe.styled_window import StyledWindow +from apostrophe.text_view import TextView gi.require_version('Gtk', '3.0') from gi.repository import Gtk, Gdk, GObject, GLib, Gio import cairo -from uberwriter import helpers +from apostrophe import helpers -from uberwriter.sidebar import Sidebar -from uberwriter.search_and_replace import SearchAndReplace -from uberwriter.settings import Settings +from apostrophe.sidebar import Sidebar +from apostrophe.search_and_replace import SearchAndReplace +from apostrophe.settings import Settings from . import headerbars @@ -46,9 +46,9 @@ from . import headerbars # TODO move them somewhere for better # accesibility from other files -LOGGER = logging.getLogger('uberwriter') +LOGGER = logging.getLogger('apostrophe') -CONFIG_PATH = os.path.expanduser("~/.config/uberwriter/") +CONFIG_PATH = os.path.expanduser("~/.config/apostrophe/") class MainWindow(StyledWindow): @@ -65,9 +65,9 @@ class MainWindow(StyledWindow): def __init__(self, app): """Set up the main window""" - super().__init__(application=Gio.Application.get_default(), title="Uberwriter") + super().__init__(application=Gio.Application.get_default(), title="Apostrophe") - self.get_style_context().add_class('uberwriter-window') + self.get_style_context().add_class('apostrophe-window') # Set UI builder = Gtk.Builder() @@ -109,7 +109,7 @@ class MainWindow(StyledWindow): root.reorder_overlay(self.dm_headerbar.hb_revealer, 0) root.set_overlay_pass_through(self.dm_headerbar.hb_revealer, True) - self.title_end = " – UberWriter" + self.title_end = " – Apostrophe" self.set_headerbar_title("New File" + self.title_end) self.accel_group = Gtk.AccelGroup() @@ -531,13 +531,13 @@ class MainWindow(StyledWindow): else: LOGGER.warning("No File arg") - def open_uberwriter_markdown(self, _widget=None, _data=None): + def open_apostrophe_markdown(self, _widget=None, _data=None): """open a markdown mini tutorial """ if self.check_change() == Gtk.ResponseType.CANCEL: return - self.load_file(helpers.get_media_file('uberwriter_markdown.md')) + self.load_file(helpers.get_media_file('apostrophe_markdown.md')) def open_search(self, replace=False): """toggle the search box diff --git a/uberwriter/markup_regex.py b/apostrophe/markup_regex.py similarity index 100% rename from uberwriter/markup_regex.py rename to apostrophe/markup_regex.py diff --git a/uberwriter/plugins/__init__.py b/apostrophe/plugins/__init__.py similarity index 100% rename from uberwriter/plugins/__init__.py rename to apostrophe/plugins/__init__.py diff --git a/uberwriter/plugins/bibtex/LICENSE.md b/apostrophe/plugins/bibtex/LICENSE.md similarity index 100% rename from uberwriter/plugins/bibtex/LICENSE.md rename to apostrophe/plugins/bibtex/LICENSE.md diff --git a/uberwriter/plugins/bibtex/__init__.py b/apostrophe/plugins/bibtex/__init__.py similarity index 100% rename from uberwriter/plugins/bibtex/__init__.py rename to apostrophe/plugins/bibtex/__init__.py diff --git a/uberwriter/plugins/bibtex/bibtex.glade b/apostrophe/plugins/bibtex/bibtex.glade similarity index 100% rename from uberwriter/plugins/bibtex/bibtex.glade rename to apostrophe/plugins/bibtex/bibtex.glade diff --git a/uberwriter/plugins/bibtex/bibtex.py b/apostrophe/plugins/bibtex/bibtex.py similarity index 90% rename from uberwriter/plugins/bibtex/bibtex.py rename to apostrophe/plugins/bibtex/bibtex.py index 6194585..e28e5dc 100644 --- a/uberwriter/plugins/bibtex/bibtex.py +++ b/apostrophe/plugins/bibtex/bibtex.py @@ -6,7 +6,7 @@ from . import fuzzywuzzy from .gi_composites import GtkTemplate -@GtkTemplate(ui='/home/wolfv/Programs/uberwriter/uberwriter/plugins/bibtex/bibtex_item.glade') +@GtkTemplate(ui='/home/wolfv/Programs/apostrophe/apostrophe/plugins/bibtex/bibtex_item.glade') class BibTexItem(Gtk.Box): __gtype_name__ = 'BibTexItem' @@ -68,7 +68,7 @@ class BibTex(object): self.bib_db = bibtexparser.load(f) builder = Gtk.Builder() - builder.add_from_file('/home/wolfv/Programs/uberwriter/uberwriter/plugins/bibtex/bibtex.glade') + builder.add_from_file('/home/wolfv/Programs/apostrophe/apostrophe/plugins/bibtex/bibtex.glade') self.window = builder.get_object('bibtex_window') self.window.set_transient_for(self.app) self.window.set_modal(True) diff --git a/uberwriter/plugins/bibtex/bibtex_item.glade b/apostrophe/plugins/bibtex/bibtex_item.glade similarity index 100% rename from uberwriter/plugins/bibtex/bibtex_item.glade rename to apostrophe/plugins/bibtex/bibtex_item.glade diff --git a/uberwriter/plugins/bibtex/bibtexparser/__init__.py b/apostrophe/plugins/bibtex/bibtexparser/__init__.py similarity index 100% rename from uberwriter/plugins/bibtex/bibtexparser/__init__.py rename to apostrophe/plugins/bibtex/bibtexparser/__init__.py diff --git a/uberwriter/plugins/bibtex/bibtexparser/bibdatabase.py b/apostrophe/plugins/bibtex/bibtexparser/bibdatabase.py similarity index 100% rename from uberwriter/plugins/bibtex/bibtexparser/bibdatabase.py rename to apostrophe/plugins/bibtex/bibtexparser/bibdatabase.py diff --git a/uberwriter/plugins/bibtex/bibtexparser/bparser.py b/apostrophe/plugins/bibtex/bibtexparser/bparser.py similarity index 100% rename from uberwriter/plugins/bibtex/bibtexparser/bparser.py rename to apostrophe/plugins/bibtex/bibtexparser/bparser.py diff --git a/uberwriter/plugins/bibtex/bibtexparser/bwriter.py b/apostrophe/plugins/bibtex/bibtexparser/bwriter.py similarity index 100% rename from uberwriter/plugins/bibtex/bibtexparser/bwriter.py rename to apostrophe/plugins/bibtex/bibtexparser/bwriter.py diff --git a/uberwriter/plugins/bibtex/bibtexparser/customization.py b/apostrophe/plugins/bibtex/bibtexparser/customization.py similarity index 100% rename from uberwriter/plugins/bibtex/bibtexparser/customization.py rename to apostrophe/plugins/bibtex/bibtexparser/customization.py diff --git a/uberwriter/plugins/bibtex/bibtexparser/latexenc.py b/apostrophe/plugins/bibtex/bibtexparser/latexenc.py similarity index 100% rename from uberwriter/plugins/bibtex/bibtexparser/latexenc.py rename to apostrophe/plugins/bibtex/bibtexparser/latexenc.py diff --git a/uberwriter/plugins/bibtex/fuzzywuzzy/StringMatcher.py b/apostrophe/plugins/bibtex/fuzzywuzzy/StringMatcher.py similarity index 100% rename from uberwriter/plugins/bibtex/fuzzywuzzy/StringMatcher.py rename to apostrophe/plugins/bibtex/fuzzywuzzy/StringMatcher.py diff --git a/uberwriter/plugins/bibtex/fuzzywuzzy/__init__.py b/apostrophe/plugins/bibtex/fuzzywuzzy/__init__.py similarity index 100% rename from uberwriter/plugins/bibtex/fuzzywuzzy/__init__.py rename to apostrophe/plugins/bibtex/fuzzywuzzy/__init__.py diff --git a/uberwriter/plugins/bibtex/fuzzywuzzy/fuzz.py b/apostrophe/plugins/bibtex/fuzzywuzzy/fuzz.py similarity index 100% rename from uberwriter/plugins/bibtex/fuzzywuzzy/fuzz.py rename to apostrophe/plugins/bibtex/fuzzywuzzy/fuzz.py diff --git a/uberwriter/plugins/bibtex/fuzzywuzzy/process.py b/apostrophe/plugins/bibtex/fuzzywuzzy/process.py similarity index 100% rename from uberwriter/plugins/bibtex/fuzzywuzzy/process.py rename to apostrophe/plugins/bibtex/fuzzywuzzy/process.py diff --git a/uberwriter/plugins/bibtex/fuzzywuzzy/string_processing.py b/apostrophe/plugins/bibtex/fuzzywuzzy/string_processing.py similarity index 100% rename from uberwriter/plugins/bibtex/fuzzywuzzy/string_processing.py rename to apostrophe/plugins/bibtex/fuzzywuzzy/string_processing.py diff --git a/uberwriter/plugins/bibtex/fuzzywuzzy/utils.py b/apostrophe/plugins/bibtex/fuzzywuzzy/utils.py similarity index 100% rename from uberwriter/plugins/bibtex/fuzzywuzzy/utils.py rename to apostrophe/plugins/bibtex/fuzzywuzzy/utils.py diff --git a/uberwriter/plugins/bibtex/gi_composites.py b/apostrophe/plugins/bibtex/gi_composites.py similarity index 100% rename from uberwriter/plugins/bibtex/gi_composites.py rename to apostrophe/plugins/bibtex/gi_composites.py diff --git a/uberwriter/plugins/uberquation/equation_widget.glade b/apostrophe/plugins/uberquation/equation_widget.glade similarity index 100% rename from uberwriter/plugins/uberquation/equation_widget.glade rename to apostrophe/plugins/uberquation/equation_widget.glade diff --git a/uberwriter/plugins/uberquation/icons/Rightarrow b/apostrophe/plugins/uberquation/icons/Rightarrow similarity index 100% rename from uberwriter/plugins/uberquation/icons/Rightarrow rename to apostrophe/plugins/uberquation/icons/Rightarrow diff --git a/uberwriter/plugins/uberquation/icons/^{0} b/apostrophe/plugins/uberquation/icons/^{0} similarity index 100% rename from uberwriter/plugins/uberquation/icons/^{0} rename to apostrophe/plugins/uberquation/icons/^{0} diff --git a/uberwriter/plugins/uberquation/icons/_{0} b/apostrophe/plugins/uberquation/icons/_{0} similarity index 100% rename from uberwriter/plugins/uberquation/icons/_{0} rename to apostrophe/plugins/uberquation/icons/_{0} diff --git a/uberwriter/plugins/uberquation/icons/alpha b/apostrophe/plugins/uberquation/icons/alpha similarity index 100% rename from uberwriter/plugins/uberquation/icons/alpha rename to apostrophe/plugins/uberquation/icons/alpha diff --git a/uberwriter/plugins/uberquation/icons/beta b/apostrophe/plugins/uberquation/icons/beta similarity index 100% rename from uberwriter/plugins/uberquation/icons/beta rename to apostrophe/plugins/uberquation/icons/beta diff --git a/uberwriter/plugins/uberquation/icons/int_{0}^{1}{2} b/apostrophe/plugins/uberquation/icons/int_{0}^{1}{2} similarity index 100% rename from uberwriter/plugins/uberquation/icons/int_{0}^{1}{2} rename to apostrophe/plugins/uberquation/icons/int_{0}^{1}{2} diff --git a/uberwriter/plugins/uberquation/icons/rarrow b/apostrophe/plugins/uberquation/icons/rarrow similarity index 100% rename from uberwriter/plugins/uberquation/icons/rarrow rename to apostrophe/plugins/uberquation/icons/rarrow diff --git a/uberwriter/plugins/uberquation/uberquation.py b/apostrophe/plugins/uberquation/uberquation.py similarity index 100% rename from uberwriter/plugins/uberquation/uberquation.py rename to apostrophe/plugins/uberquation/uberquation.py diff --git a/uberwriter/preferences_dialog.py b/apostrophe/preferences_dialog.py similarity index 99% rename from uberwriter/preferences_dialog.py rename to apostrophe/preferences_dialog.py index d679dca..78cff6a 100644 --- a/uberwriter/preferences_dialog.py +++ b/apostrophe/preferences_dialog.py @@ -25,7 +25,7 @@ import gi gi.require_version('Gtk', '3.0') from gi.repository import Gtk, Pango, GLib # pylint: disable=E0611 import logging -logger = logging.getLogger('uberwriter') +logger = logging.getLogger('apostrophe') diff --git a/uberwriter/preview_converter.py b/apostrophe/preview_converter.py similarity index 95% rename from uberwriter/preview_converter.py rename to apostrophe/preview_converter.py index 693b92e..2cd3340 100644 --- a/uberwriter/preview_converter.py +++ b/apostrophe/preview_converter.py @@ -4,8 +4,8 @@ import os from gi.repository import GLib -from uberwriter import helpers -from uberwriter.theme import Theme +from apostrophe import helpers +from apostrophe.theme import Theme class PreviewConverter: diff --git a/uberwriter/preview_handler.py b/apostrophe/preview_handler.py similarity index 96% rename from uberwriter/preview_handler.py rename to apostrophe/preview_handler.py index 1e3a2c6..eaaa8b2 100644 --- a/uberwriter/preview_handler.py +++ b/apostrophe/preview_handler.py @@ -4,14 +4,14 @@ from enum import auto, IntEnum import gi -from uberwriter.preview_renderer import PreviewRenderer -from uberwriter.settings import Settings +from apostrophe.preview_renderer import PreviewRenderer +from apostrophe.settings import Settings gi.require_version('WebKit2', '4.0') from gi.repository import WebKit2, GLib, Gtk -from uberwriter.preview_converter import PreviewConverter -from uberwriter.preview_web_view import PreviewWebView +from apostrophe.preview_converter import PreviewConverter +from apostrophe.preview_web_view import PreviewWebView class Step(IntEnum): diff --git a/uberwriter/preview_renderer.py b/apostrophe/preview_renderer.py similarity index 97% rename from uberwriter/preview_renderer.py rename to apostrophe/preview_renderer.py index 3e81d7a..d589714 100644 --- a/uberwriter/preview_renderer.py +++ b/apostrophe/preview_renderer.py @@ -2,9 +2,9 @@ from gettext import gettext as _ from gi.repository import Gtk, Gio, GLib -from uberwriter import headerbars -from uberwriter.settings import Settings -from uberwriter.styled_window import StyledWindow +from apostrophe import headerbars +from apostrophe.settings import Settings +from apostrophe.styled_window import StyledWindow class PreviewRenderer: diff --git a/uberwriter/preview_web_view.py b/apostrophe/preview_web_view.py similarity index 100% rename from uberwriter/preview_web_view.py rename to apostrophe/preview_web_view.py diff --git a/uberwriter/pylocales/__init__.py b/apostrophe/pylocales/__init__.py similarity index 100% rename from uberwriter/pylocales/__init__.py rename to apostrophe/pylocales/__init__.py diff --git a/uberwriter/pylocales/locales.db b/apostrophe/pylocales/locales.db similarity index 100% rename from uberwriter/pylocales/locales.db rename to apostrophe/pylocales/locales.db diff --git a/uberwriter/pylocales/locales.py b/apostrophe/pylocales/locales.py similarity index 100% rename from uberwriter/pylocales/locales.py rename to apostrophe/pylocales/locales.py diff --git a/uberwriter/search_and_replace.py b/apostrophe/search_and_replace.py similarity index 98% rename from uberwriter/search_and_replace.py rename to apostrophe/search_and_replace.py index 0edb937..001b2f7 100644 --- a/uberwriter/search_and_replace.py +++ b/apostrophe/search_and_replace.py @@ -19,20 +19,20 @@ import re import gi -from uberwriter.helpers import user_action +from apostrophe.helpers import user_action gi.require_version('Gtk', '3.0') from gi.repository import Gdk # from plugins import plugins -LOGGER = logging.getLogger('uberwriter') +LOGGER = logging.getLogger('apostrophe') class SearchAndReplace: """ Adds (regex) search and replace functionality to - uberwriter + apostrophe """ def __init__(self, parentwindow, textview, builder): diff --git a/uberwriter/settings.py b/apostrophe/settings.py similarity index 97% rename from uberwriter/settings.py rename to apostrophe/settings.py index 1fcbf4d..562ce85 100644 --- a/uberwriter/settings.py +++ b/apostrophe/settings.py @@ -18,7 +18,7 @@ from gi.repository import Gio class Settings(Gio.Settings): """ - UberWriter Settings + Apostrophe Settings """ def __init__(self): diff --git a/uberwriter/sidebar.py b/apostrophe/sidebar.py similarity index 98% rename from uberwriter/sidebar.py rename to apostrophe/sidebar.py index 571251c..d242d9b 100644 --- a/uberwriter/sidebar.py +++ b/apostrophe/sidebar.py @@ -23,7 +23,7 @@ from gi.repository import Gtk, Gdk # from plugins import plugins import logging -logger = logging.getLogger('uberwriter') +logger = logging.getLogger('apostrophe') class Shelve(): """ diff --git a/uberwriter/stats_counter.py b/apostrophe/stats_counter.py similarity index 98% rename from uberwriter/stats_counter.py rename to apostrophe/stats_counter.py index 718e891..35139ad 100644 --- a/uberwriter/stats_counter.py +++ b/apostrophe/stats_counter.py @@ -3,7 +3,7 @@ from multiprocessing import Process, Pipe from gi.repository import GLib -from uberwriter.markup_regex import ITALIC_ASTERISK, ITALIC_UNDERSCORE, BOLD_ITALIC, BOLD, STRIKETHROUGH, IMAGE, LINK, LINK_ALT,\ +from apostrophe.markup_regex import ITALIC_ASTERISK, ITALIC_UNDERSCORE, BOLD_ITALIC, BOLD, STRIKETHROUGH, IMAGE, LINK, LINK_ALT,\ HORIZONTAL_RULE, LIST, MATH, TABLE, CODE_BLOCK, HEADER_UNDER, HEADER, BLOCK_QUOTE, ORDERED_LIST, \ FOOTNOTE_ID, FOOTNOTE diff --git a/uberwriter/stats_handler.py b/apostrophe/stats_handler.py similarity index 97% rename from uberwriter/stats_handler.py rename to apostrophe/stats_handler.py index 4f762bd..834b30c 100644 --- a/uberwriter/stats_handler.py +++ b/apostrophe/stats_handler.py @@ -2,8 +2,8 @@ from gettext import gettext as _ from gi.repository import GLib, Gio, Gtk -from uberwriter.settings import Settings -from uberwriter.stats_counter import StatsCounter +from apostrophe.settings import Settings +from apostrophe.stats_counter import StatsCounter class StatsHandler: diff --git a/uberwriter/styled_window.py b/apostrophe/styled_window.py similarity index 95% rename from uberwriter/styled_window.py rename to apostrophe/styled_window.py index 9e0fed6..02cb041 100644 --- a/uberwriter/styled_window.py +++ b/apostrophe/styled_window.py @@ -1,6 +1,6 @@ import gi -from uberwriter import helpers +from apostrophe import helpers gi.require_version('Gtk', '3.0') from gi.repository import Gtk, GLib, Gio diff --git a/uberwriter/tables.py b/apostrophe/tables.py similarity index 100% rename from uberwriter/tables.py rename to apostrophe/tables.py diff --git a/uberwriter/text_view.py b/apostrophe/text_view.py similarity index 94% rename from uberwriter/text_view.py rename to apostrophe/text_view.py index d4a749a..54d1ec9 100644 --- a/uberwriter/text_view.py +++ b/apostrophe/text_view.py @@ -1,12 +1,12 @@ import gi -from uberwriter.helpers import user_action -from uberwriter.inline_preview import InlinePreview -from uberwriter.text_view_drag_drop_handler import DragDropHandler, TARGET_URI, TARGET_TEXT -from uberwriter.text_view_format_inserter import FormatInserter -from uberwriter.text_view_markup_handler import MarkupHandler -from uberwriter.text_view_scroller import TextViewScroller -from uberwriter.text_view_undo_redo_handler import UndoRedoHandler +from apostrophe.helpers import user_action +from apostrophe.inline_preview import InlinePreview +from apostrophe.text_view_drag_drop_handler import DragDropHandler, TARGET_URI, TARGET_TEXT +from apostrophe.text_view_format_inserter import FormatInserter +from apostrophe.text_view_markup_handler import MarkupHandler +from apostrophe.text_view_scroller import TextViewScroller +from apostrophe.text_view_undo_redo_handler import UndoRedoHandler gi.require_version('Gtk', '3.0') gi.require_version('Gspell', '1') @@ -14,11 +14,11 @@ from gi.repository import Gtk, Gdk, GObject, GLib, Gspell import logging -LOGGER = logging.getLogger('uberwriter') +LOGGER = logging.getLogger('apostrophe') class TextView(Gtk.TextView): - """UberwriterTextView encapsulates all the features around the editor. + """ApostropheTextView encapsulates all the features around the editor. It combines the following: - Undo / redo (via TextBufferUndoRedoHandler) @@ -27,7 +27,7 @@ class TextView(Gtk.TextView): - Preview popover (via TextBufferMarkupHandler) - Drag and drop (via TextViewDragDropHandler) - Scrolling (via TextViewScroller) - - The various modes supported by UberWriter (eg. Focus Mode, Hemingway Mode) + - The various modes supported by Apostrophe (eg. Focus Mode, Hemingway Mode) """ __gsignals__ = { @@ -52,7 +52,7 @@ class TextView(Gtk.TextView): self.set_pixels_above_lines(4) self.set_pixels_below_lines(4) self.set_pixels_inside_wrap(8) - self.get_style_context().add_class('uberwriter-editor') + self.get_style_context().add_class('apostrophe-editor') self.set_margin_left(8) self.set_margin_right(8) diff --git a/uberwriter/text_view_drag_drop_handler.py b/apostrophe/text_view_drag_drop_handler.py similarity index 98% rename from uberwriter/text_view_drag_drop_handler.py rename to apostrophe/text_view_drag_drop_handler.py index 17b8cc9..aa4271e 100644 --- a/uberwriter/text_view_drag_drop_handler.py +++ b/apostrophe/text_view_drag_drop_handler.py @@ -2,7 +2,7 @@ import mimetypes import urllib from gettext import gettext as _ from os.path import basename -from uberwriter.settings import Settings +from apostrophe.settings import Settings from gi.repository import Gtk diff --git a/uberwriter/text_view_format_inserter.py b/apostrophe/text_view_format_inserter.py similarity index 99% rename from uberwriter/text_view_format_inserter.py rename to apostrophe/text_view_format_inserter.py index 539de8b..6a6a689 100644 --- a/uberwriter/text_view_format_inserter.py +++ b/apostrophe/text_view_format_inserter.py @@ -1,6 +1,6 @@ from gettext import gettext as _ -from uberwriter.helpers import user_action +from apostrophe.helpers import user_action class FormatInserter: diff --git a/uberwriter/text_view_markup_handler.py b/apostrophe/text_view_markup_handler.py similarity index 99% rename from uberwriter/text_view_markup_handler.py rename to apostrophe/text_view_markup_handler.py index 4229bf9..ae1e4fb 100644 --- a/uberwriter/text_view_markup_handler.py +++ b/apostrophe/text_view_markup_handler.py @@ -19,8 +19,8 @@ from multiprocessing import Pipe, Process import gi -from uberwriter import helpers, markup_regex -from uberwriter.markup_regex import STRIKETHROUGH, BOLD_ITALIC, BOLD, ITALIC_ASTERISK, ITALIC_UNDERSCORE, IMAGE, LINK,\ +from apostrophe import helpers, markup_regex +from apostrophe.markup_regex import STRIKETHROUGH, BOLD_ITALIC, BOLD, ITALIC_ASTERISK, ITALIC_UNDERSCORE, IMAGE, LINK,\ LINK_ALT, HORIZONTAL_RULE, LIST, ORDERED_LIST, BLOCK_QUOTE, HEADER, HEADER_UNDER, TABLE, MATH, \ CODE diff --git a/uberwriter/text_view_scroller.py b/apostrophe/text_view_scroller.py similarity index 100% rename from uberwriter/text_view_scroller.py rename to apostrophe/text_view_scroller.py diff --git a/uberwriter/text_view_undo_redo_handler.py b/apostrophe/text_view_undo_redo_handler.py similarity index 99% rename from uberwriter/text_view_undo_redo_handler.py rename to apostrophe/text_view_undo_redo_handler.py index ac15bc2..9a52067 100644 --- a/uberwriter/text_view_undo_redo_handler.py +++ b/apostrophe/text_view_undo_redo_handler.py @@ -1,6 +1,6 @@ import logging -LOGGER = logging.getLogger('uberwriter') +LOGGER = logging.getLogger('apostrophe') class UndoableInsert: diff --git a/uberwriter/theme.py b/apostrophe/theme.py similarity index 96% rename from uberwriter/theme.py rename to apostrophe/theme.py index a80cc18..72cc81a 100644 --- a/uberwriter/theme.py +++ b/apostrophe/theme.py @@ -1,7 +1,7 @@ from gi.repository import Gtk -from uberwriter.settings import Settings -from uberwriter.helpers import get_css_path +from apostrophe.settings import Settings +from apostrophe.helpers import get_css_path class Theme: diff --git a/build-aux/flatpak/de.wolfvollprecht.UberWriter.pipdeps.json b/build-aux/flatpak/de.wolfvollprecht.UberWriter.pipdeps.json new file mode 100644 index 0000000..6fb15b7 --- /dev/null +++ b/build-aux/flatpak/de.wolfvollprecht.UberWriter.pipdeps.json @@ -0,0 +1,35 @@ + + { + "name": "pipdeps", + "buildsystem": "simple", + "build-commands": [ + "pip3 install --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} pyenchant regex pypandoc" + ], + "sources": [ + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/5d/c1/45947333669b31bc6b4933308dd07c2aa2fedcec0a95b14eedae993bd449/wheel-0.31.0.tar.gz", + "sha256": "1ae8153bed701cb062913b72429bcf854ba824f973735427681882a688cb55ce" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/ae/e8/2340d46ecadb1692a1e455f13f75e596d4eab3d11a57446f08259dee8f02/pip-10.0.1.tar.gz", + "sha256": "f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/71/81/00184643e5a10a456b4118fc12c96780823adb8ed974eb2289f29703b29b/pypandoc-1.4.tar.gz", + "sha256": "e914e6d5f84a76764887e4d909b09d63308725f0cbb5293872c2c92f07c11a5b" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/a2/51/c39562cfed3272592c60cfd229e5464d715b78537e332eac2b695422dc49/regex-2018.02.21.tar.gz", + "sha256": "b44624a38d07d3c954c84ad302c29f7930f4bf01443beef5589e9157b14e2a29" + }, + { + "type": "file", + "url": "https://files.pythonhosted.org/packages/9e/54/04d88a59efa33fefb88133ceb638cdf754319030c28aadc5a379d82140ed/pyenchant-2.0.0.tar.gz", + "sha256": "fc31cda72ace001da8fe5d42f11c26e514a91fa8c70468739216ddd8de64e2a0" + } + ] + } diff --git a/data/uberwriter.gresource.xml b/data/apostrophe.gresource.xml similarity index 100% rename from data/uberwriter.gresource.xml rename to data/apostrophe.gresource.xml diff --git a/data/de.wolfvollprecht.UberWriter.appdata.xml.in.in b/data/de.wolfvollprecht.UberWriter.appdata.xml.in.in index a124815..21a1eac 100644 --- a/data/de.wolfvollprecht.UberWriter.appdata.xml.in.in +++ b/data/de.wolfvollprecht.UberWriter.appdata.xml.in.in @@ -2,29 +2,29 @@ @app-id@ @app-id@.desktop - UberWriter + Apostrophe An elegant, distraction-free GTK+ markdown editor -

Uberwriter is a GTK+ based distraction free Markdown editor, mainly developed by Wolf Vollprecht and Manuel Genovés. It uses pandoc as backend for markdown parsing and offers a very clean and sleek user interface.

+

Apostrophe is a GTK+ based distraction free Markdown editor, mainly developed by Wolf Vollprecht and Manuel Genovés. It uses pandoc as backend for markdown parsing and offers a very clean and sleek user interface.

You can install the recommended TexLive extension with the command:

flatpak install flathub de.wolfvollprecht.UberWriter.Plugin.TexLive

or from Gnome-Software

 - https://raw.githubusercontent.com/UberWriter/uberwriter/master/screenshots/main.png + https://raw.githubusercontent.com/Apostrophe/apostrophe/master/screenshots/main.png - https://raw.githubusercontent.com/UberWriter/uberwriter/master/screenshots/main-dark.png + https://raw.githubusercontent.com/Apostrophe/apostrophe/master/screenshots/main-dark.png - https://raw.githubusercontent.com/UberWriter/uberwriter/master/screenshots/formula.png + https://raw.githubusercontent.com/Apostrophe/apostrophe/master/screenshots/formula.png - https://raw.githubusercontent.com/UberWriter/uberwriter/master/screenshots/preview.png + https://raw.githubusercontent.com/Apostrophe/apostrophe/master/screenshots/preview.png - https://raw.githubusercontent.com/UberWriter/uberwriter/master/screenshots/focus.png + https://raw.githubusercontent.com/Apostrophe/apostrophe/master/screenshots/focus.png @@ -39,7 +39,7 @@
  • Added italian language
    • -
  • Initial themes support: now uberwriter adapts his colors to the current GTK theme
    • +
  • Initial themes support: now apostrophe adapts his colors to the current GTK theme
  • Disabled scroll gradient, can be enabled in the preferences dialog
  • Allow to disable headerbar autohidding in Dconf
  • Now a single click is enough to open files in the recent files popover
    • @@ -61,7 +61,7 @@ -

    This release provides a fix to a bug that caused Uberwriter to not mark properly **bold**, *cursive*, and ***bold and cursive*** words.

    +

    This release provides a fix to a bug that caused Apostrophe to not mark properly **bold**, *cursive*, and ***bold and cursive*** words.

         @@ -115,12 +115,12 @@ CC0-1.0 GPL-3.0+ - http://uberwriter.github.io/uberwriter + http://apostrophe.github.io/apostrophe Wolf V., Manuel G. - https://github.com/UberWriter/uberwriter/issues - https://liberapay.com/UberWriter/donate - http://uberwriter.github.io/uberwriter + https://github.com/Apostrophe/apostrophe/issues + https://liberapay.com/Apostrophe/donate + http://apostrophe.github.io/apostrophe https://poeditor.com/join/project/gxVzFyXb2x manuel.genoves_at_gmail.com @gettext-package@ diff --git a/data/de.wolfvollprecht.UberWriter.desktop.in.in b/data/de.wolfvollprecht.UberWriter.desktop.in.in index 306c123..1f993ba 100644 --- a/data/de.wolfvollprecht.UberWriter.desktop.in.in +++ b/data/de.wolfvollprecht.UberWriter.desktop.in.in @@ -1,8 +1,8 @@ [Desktop Entry] -Name=UberWriter -Comment=UberWriter, a simple and distraction free Markdown Editor +Name=Apostrophe +Comment=Apostrophe, a simple and distraction free Markdown Editor Categories=GNOME;GTK;Office; -Exec=uberwriter %U +Exec=apostrophe %U Icon=@icon@ Terminal=false Type=Application diff --git a/data/icons/de.wolfvollprecht.uberwriter.Source b/data/icons/de.wolfvollprecht.apostrophe.Source similarity index 100% rename from data/icons/de.wolfvollprecht.uberwriter.Source rename to data/icons/de.wolfvollprecht.apostrophe.Source diff --git a/data/media/uberwriter_markdown.md b/data/media/apostrophe_markdown.md similarity index 99% rename from data/media/uberwriter_markdown.md rename to data/media/apostrophe_markdown.md index 9b2de43..f6227e5 100644 --- a/data/media/uberwriter_markdown.md +++ b/data/media/apostrophe_markdown.md @@ -1,4 +1,4 @@ -Markdown Tutorial for UberWriter +Markdown Tutorial for Apostrophe ================================ I will try to give a short impressions on how I use markdown/pandocs capabilities to greatly reduce the time spent on formatting anything -- from websites to PDF Documents. diff --git a/data/media/css/gtk/base.css b/data/media/css/gtk/base.css index 8d4bffa..50a65f4 100644 --- a/data/media/css/gtk/base.css +++ b/data/media/css/gtk/base.css @@ -21,22 +21,22 @@ /* Main window and text colors */ -.uberwriter-window { +.apostrophe-window { background: @theme_base_color; color: @theme_fg_color; caret-color: @theme_fg_color; } -.uberwriter-window.focus:not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized):not(.fullscreen) { +.apostrophe-window.focus:not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized):not(.fullscreen) { border-top-left-radius: 8px; border-top-right-radius: 8px; } -.uberwriter-window.focus:not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized):not(.fullscreen):dir(ltr) scrollbar { +.apostrophe-window.focus:not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized):not(.fullscreen):dir(ltr) scrollbar { border-top-right-radius: 8px; } -.uberwriter-window.focus:not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized):not(.fullscreen):dir(rtl) scrollbar { +.apostrophe-window.focus:not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized):not(.fullscreen):dir(rtl) scrollbar { border-top-left-radius: 8px; } @@ -53,7 +53,7 @@ background: @theme_base_color; } -.uberwriter-editor { +.apostrophe-editor { -gtk-key-bindings: editor-bindings; border: none; background-color: transparent; @@ -62,44 +62,44 @@ font-size: 16px; } -.uberwriter-editor.size14 { +.apostrophe-editor.size14 { font-size: 14px; } -.uberwriter-editor.size15 { +.apostrophe-editor.size15 { font-size: 15px; } -.uberwriter-editor.size16 { +.apostrophe-editor.size16 { font-size: 16px; } -.uberwriter-editor.size17 { +.apostrophe-editor.size17 { font-size: 17px; } -.uberwriter-editor.size18 { +.apostrophe-editor.size18 { font-size: 18px; } -.uberwriter-editor text { +.apostrophe-editor text { background-color: @theme_base_color; color: @theme_fg_color; caret-color: @theme_fg_color; } -.uberwriter-editor text selection { +.apostrophe-editor text selection { background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; } -.uberwriter-editor button { +.apostrophe-editor button { margin: 0; padding: 0; /*background: #CCC;*/ } -.uberwriter-editor toolbar { +.apostrophe-editor toolbar { /*background: transparent;*/ border: none; padding: 0; @@ -131,7 +131,7 @@ background-color: mix(@theme_base_color, @theme_bg_color, 0.5); } -.uberwriter-window treeview { +.apostrophe-window treeview { padding: 4px 4px 4px 4px; } diff --git a/data/media/raw/raw_icons.svg b/data/media/raw/raw_icons.svg index e80acdf..d4b3e1e 100644 --- a/data/media/raw/raw_icons.svg +++ b/data/media/raw/raw_icons.svg @@ -61,7 +61,7 @@ sodipodi:ry="42.445595" d="m 209.95411,89.756706 a 42.445595,42.445595 0 1 1 -84.89119,0 42.445595,42.445595 0 1 1 84.89119,0 z" transform="matrix(0.1557609,0,0,0.15394422,115.30017,191.85093)" - inkscape:export-filename="/home/wolf/Programme/uberwriter/data/media/crh.png" + inkscape:export-filename="/home/wolf/Programme/apostrophe/data/media/crh.png" inkscape:export-xdpi="82.699997" inkscape:export-ydpi="82.699997" /> diff --git a/data/meson.build b/data/meson.build index b126f0b..21a236b 100644 --- a/data/meson.build +++ b/data/meson.build @@ -62,7 +62,7 @@ install_data( ui_config = configuration_data() ui_config.set('app-id', application_id) ui_config.set('version', meson.project_version() + version_suffix) -ui_config.set('package_url', 'http://uberwriter.github.io/uberwriter/') +ui_config.set('package_url', 'http://apostrophe.github.io/apostrophe/') ui_preconfigured_files = files( 'ui/About.ui.in' ) diff --git a/data/ui/About.ui.in b/data/ui/About.ui.in index 031124c..faaa363 100644 --- a/data/ui/About.ui.in +++ b/data/ui/About.ui.in @@ -7,11 +7,11 @@ True center dialog - Uberwriter + Apostrophe @version@ Copyright (C) 2018, Wolf Vollprecht @package_url@ - Uberwriter website + Apostrophe website Wolf Vollprecht <w.vollprecht@gmail.com> Manuel Genovés <manuel.genoves@gmail.com> Gonçalo Silva <goncalossilva@gmail.com> @@ -84,7 +84,7 @@ Manuel (Spanish, Catalan) True start none - https://liberapay.com/UberWriter/donate + https://liberapay.com/Apostrophe/donate 1 diff --git a/data/ui/Menu.ui b/data/ui/Menu.ui index cb2214f..336ae59 100644 --- a/data/ui/Menu.ui +++ b/data/ui/Menu.ui @@ -214,7 +214,7 @@ True True app.about - About Uberwriter + About Apostrophe False diff --git a/help/C/index.page b/help/C/index.page index 8954936..089b0eb 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -4,8 +4,8 @@ - UberWriter - The UberWriter help. + Apostrophe + The Apostrophe help. Wolf Vollprecht w.vollprecht@gmail.com @@ -20,10 +20,10 @@ [icon] -UberWriter Help +Apostrophe Help -

    Help Topics for UberWriter:

    +

    Help Topics for Apostrophe:

    diff --git a/help/C/pandocs-markdown.page b/help/C/pandocs-markdown.page index a5c6b9c..a0bfbfd 100644 --- a/help/C/pandocs-markdown.page +++ b/help/C/pandocs-markdown.page @@ -13,7 +13,7 @@ Pandoc's Markdown -

    Markdown Tutorial for UberWriter

    +

    Markdown Tutorial for Apostrophe

    I will try to give a short impressions on how I use markdown/pandocs capabilities to greatly reduce the time spent on formatting anything – from websites to PDF Documents.

    You can find a much more exhaustive documentation for all features pandoc offers on pandoc’s help page: Link

    Headers

    diff --git a/help/C/preview.page b/help/C/preview.page index f7ca957..244c8a2 100644 --- a/help/C/preview.page +++ b/help/C/preview.page @@ -9,11 +9,11 @@ w.vollprecht@gmail.com 2012 - UberWriters preview functionalities + Apostrophes preview functionalities -UberWriter Preview -

    There are 2 different ways to preview your Markdown files in UberWriter and +Apostrophe Preview +

    There are 2 different ways to preview your Markdown files in Apostrophe and quickly check, what you have written.

    @@ -28,7 +28,7 @@ quickly check, what you have written.
    Complete Preview

    If you want a complete Preview of your document, you just need to hit the - preview Button on the statusbar at the bottom of the UberWriter window. + preview Button on the statusbar at the bottom of the Apostrophe window. It will render the complete HTML Output of your Markdown file.

    diff --git a/help/stump/help_backup.html b/help/stump/help_backup.html index dc82ab5..01b5175 100644 --- a/help/stump/help_backup.html +++ b/help/stump/help_backup.html @@ -5,18 +5,18 @@ - UberWriter & Pandoc User Guide - + Apostrophe & Pandoc User Guide + -

    UberWriter’s goals

    -

    UberWriter aims to make the writing process very easy and beautiful. The editor offers inline highlighting for a specific subset of markdown, which is used to do the formatting of your text.

    -

    A short explanation of the core markdown features you’ll find below. Pandoc is used to generate PDF, HTML or RTF files from markdown. Please note that Pandoc’s syntax offers many, many more features which are well documented on the (pandoc homepage)[http://johnmacfarlane.net/pandoc/README.html].
    However, please note that not all of the advanced features play well with inline highlighting of UberWriter.

    +

    Apostrophe’s goals

    +

    Apostrophe aims to make the writing process very easy and beautiful. The editor offers inline highlighting for a specific subset of markdown, which is used to do the formatting of your text.

    +

    A short explanation of the core markdown features you’ll find below. Pandoc is used to generate PDF, HTML or RTF files from markdown. Please note that Pandoc’s syntax offers many, many more features which are well documented on the (pandoc homepage)[http://johnmacfarlane.net/pandoc/README.html].
    However, please note that not all of the advanced features play well with inline highlighting of Apostrophe.

    But for a quick start, this will be sufficient.

    Pandoc’s markdown

    Pandoc understands an extended and slightly revised version of John Gruber’s [markdown] syntax. This document explains the syntax, noting differences from standard markdown.

    @@ -403,6 +403,6 @@ isn't indented.

    Inline and regular footnotes may be mixed freely.

    Authors of this documentation

    © 2006-2012 John MacFarlane (jgm at berkeley dot edu). Released under the [GPL], version 2 or greater. This software carries no warranty of any kind. (See COPYRIGHT for full copyright and warranty notices.) Other contributors include Recai Oktaş, Paulo Tanimoto, Peter Wang, Andrea Rossato, Eric Kow, infinity0x, Luke Plant, shreevatsa.public, Puneeth Chaganti, Paul Rivier, rodja.trappe, Bradley Kuhn, thsutton, Nathan Gass, Jonathan Daugherty, Jérémy Bobbio, Justin Bogner, qerub, Christopher Sawicki, Kelsey Hightower, Masayoshi Takahashi, Antoine Latter, Ralf Stephan, Eric Seidel, B. Scott Michel, Gavin Beatty, Sergey Astanin.

    -

    © Reworked for UberWriter: Wolf Vollprecht

    +

    © Reworked for Apostrophe: Wolf Vollprecht

    diff --git a/help/stump/help_backup.md b/help/stump/help_backup.md index 17518d1..90e811f 100644 --- a/help/stump/help_backup.md +++ b/help/stump/help_backup.md @@ -1,13 +1,13 @@ -% UberWriter & Pandoc User Guide +% Apostrophe & Pandoc User Guide % John MacFarlane, Wolf Vollprecht % 01.08.2012 -## UberWriter's goals +## Apostrophe's goals -UberWriter aims to make the writing process very easy and beautiful. The editor offers inline highlighting for a specific subset of markdown, which is used to do the formatting of your text. +Apostrophe aims to make the writing process very easy and beautiful. The editor offers inline highlighting for a specific subset of markdown, which is used to do the formatting of your text. A short explanation of the core markdown features you'll find below. Pandoc is used to generate PDF, HTML or RTF files from markdown. Please note that Pandoc's syntax offers many, many more features which are well documented on the (pandoc homepage)[http://johnmacfarlane.net/pandoc/README.html]. -However, please note that not all of the advanced features play well with inline highlighting of UberWriter. +However, please note that not all of the advanced features play well with inline highlighting of Apostrophe. But for a quick start, this will be sufficient. @@ -607,4 +607,4 @@ Inline and regular footnotes may be mixed freely. © 2006-2012 John MacFarlane (jgm at berkeley dot edu). Released under the [GPL], version 2 or greater. This software carries no warranty of any kind. (See COPYRIGHT for full copyright and warranty notices.) Other contributors include Recai Oktaş, Paulo Tanimoto, Peter Wang, Andrea Rossato, Eric Kow, infinity0x, Luke Plant, shreevatsa.public, Puneeth Chaganti, Paul Rivier, rodja.trappe, Bradley Kuhn, thsutton, Nathan Gass, Jonathan Daugherty, Jérémy Bobbio, Justin Bogner, qerub, Christopher Sawicki, Kelsey Hightower, Masayoshi Takahashi, Antoine Latter, Ralf Stephan, Eric Seidel, B. Scott Michel, Gavin Beatty, Sergey Astanin. -© Reworked for UberWriter: Wolf Vollprecht \ No newline at end of file +© Reworked for Apostrophe: Wolf Vollprecht \ No newline at end of file diff --git a/lipsum.md b/lipsum.md index 813eaf2..c2e8f1c 100644 --- a/lipsum.md +++ b/lipsum.md @@ -4,7 +4,7 @@ asdja kdja dskj $\frac{1}{2} + 1 12+2=14$ Testing more input whatt. -[](http://uberwriter.github.io/uberwriter) +[](http://apostrophe.github.io/apostrophe) [](http://google.com) ![Insert image title here](/home/wolf/Pictures/IMG_20130901_152337.jpg) diff --git a/meson.build b/meson.build index 7718852..088e796 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project( - 'uberwriter', + 'apostrophe', version: '2.2.0', meson_version: '>= 0.50.0' ) @@ -50,7 +50,7 @@ pkgdatadir = datadir / meson.project_name() podir = meson.source_root() / 'po' conf = configuration_data() -conf.set('PACKAGE_URL', 'http://uberwriter.github.io/uberwriter/') +conf.set('PACKAGE_URL', 'http://apostrophe.github.io/apostrophe/') conf.set('DATA_DIR', datadir) conf.set('LOCALE_DIR', join_paths(get_option('prefix'), get_option('datadir'), 'locale')) conf.set('PYTHON_DIR', pythondir) @@ -63,14 +63,14 @@ subdir('data') subdir('po') install_subdir( - 'uberwriter', + 'apostrophe', install_dir: pythondir ) message('Preparing init file') configure_file( - input: 'uberwriter.in', - output: 'uberwriter', + input: 'apostrophe.in', + output: 'apostrophe', configuration: conf, install_dir: bindir ) diff --git a/po/uberwriter.pot b/po/uberwriter.pot index 0b480f7..07693cb 100644 --- a/po/uberwriter.pot +++ b/po/uberwriter.pot @@ -17,12 +17,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.2.1\n" "X-Poedit-Basepath: ..\n" -"X-Poedit-SearchPath-0: uberwriter\n" +"X-Poedit-SearchPath-0: apostrophe\n" "X-Poedit-SearchPath-1: data\n" #: data/de.wolfvollprecht.UberWriter.appdata.xml:5 #: data/de.wolfvollprecht.UberWriter.desktop:3 -msgid "UberWriter" +msgid "Apostrophe" msgstr "" #: data/de.wolfvollprecht.UberWriter.appdata.xml:6 @@ -31,7 +31,7 @@ msgstr "" #: data/de.wolfvollprecht.UberWriter.appdata.xml:8 msgid "" -"Uberwriter is a GTK+ based distraction free Markdown editor, mainly " +"Apostrophe is a GTK+ based distraction free Markdown editor, mainly " "developed by Wolf Vollprecht and Manuel Genovés. It uses pandoc as backend " "for markdown parsing and offers a very clean and sleek user interface." msgstr "" @@ -58,7 +58,7 @@ msgstr "" #: data/de.wolfvollprecht.UberWriter.appdata.xml:42 msgid "" -"Initial themes support: now uberwriter adapts his colors to the current GTK " +"Initial themes support: now apostrophe adapts his colors to the current GTK " "theme" msgstr "" @@ -98,7 +98,7 @@ msgstr "" #: data/de.wolfvollprecht.UberWriter.appdata.xml:64 msgid "" -"This release provides a fix to a bug that caused Uberwriter to not mark " +"This release provides a fix to a bug that caused Apostrophe to not mark " "properly **bold**, *cursive*, and ***bold and cursive*** words." msgstr "" @@ -179,7 +179,7 @@ msgid "Wolf V., Manuel G." msgstr "" #: data/de.wolfvollprecht.UberWriter.desktop:4 -msgid "UberWriter, a simple and distraction free Markdown Editor" +msgid "Apostrophe, a simple and distraction free Markdown Editor" msgstr "" #: data/de.wolfvollprecht.UberWriter.desktop:7 @@ -239,7 +239,7 @@ msgid "Input format to use when previewing and exporting using Pandoc." msgstr "" #: data/de.wolfvollprecht.UberWriter.gschema.xml:67 -msgid "Allow Uberwriter to poll cursor motion" +msgid "Allow Apostrophe to poll cursor motion" msgstr "" #: data/de.wolfvollprecht.UberWriter.gschema.xml:68 @@ -283,7 +283,7 @@ msgid "Copyright (C) 2018, Wolf Vollprecht" msgstr "" #: data/ui/About.ui:14 -msgid "Uberwriter website" +msgid "Apostrophe website" msgstr "" #: data/ui/About.ui:71 @@ -422,9 +422,9 @@ msgstr "" msgid "PDF" msgstr "" -#: data/ui/Export.ui:618 uberwriter/plugins/bibtex/bibtex_item.glade:18 -#: uberwriter/plugins/bibtex/bibtex_item.glade:32 -#: uberwriter/plugins/bibtex/bibtex_item.glade:45 +#: data/ui/Export.ui:618 apostrophe/plugins/bibtex/bibtex_item.glade:18 +#: apostrophe/plugins/bibtex/bibtex_item.glade:32 +#: apostrophe/plugins/bibtex/bibtex_item.glade:45 msgid "label" msgstr "" @@ -440,7 +440,7 @@ msgstr "" msgid "Hemingway Mode" msgstr "" -#: data/ui/Menu.ui:14 uberwriter/preview_renderer.py:51 +#: data/ui/Menu.ui:14 apostrophe/preview_renderer.py:51 msgid "Preview" msgstr "" @@ -473,10 +473,10 @@ msgid "Open Tutorial" msgstr "" #: data/ui/Menu.ui:51 -msgid "_About UberWriter" +msgid "_About Apostrophe" msgstr "" -#: data/ui/Preview.ui:28 uberwriter/preview_renderer.py:166 +#: data/ui/Preview.ui:28 apostrophe/preview_renderer.py:166 msgid "Full-Width" msgstr "" @@ -678,174 +678,174 @@ msgstr "" msgid "Replace all" msgstr "" -#: uberwriter/application.py:171 -msgid "Show debug messages (-vv debugs uberwriter also)" +#: apostrophe/application.py:171 +msgid "Show debug messages (-vv debugs apostrophe also)" msgstr "" -#: uberwriter/application.py:173 +#: apostrophe/application.py:173 msgid "Use experimental features" msgstr "" -#: uberwriter/export_dialog.py:159 +#: apostrophe/export_dialog.py:159 msgid "Untitled document.md" msgstr "" -#: uberwriter/export_dialog.py:340 +#: apostrophe/export_dialog.py:340 msgid "Please, install the TexLive extension from Gnome Software or running\n" msgstr "" -#: uberwriter/export_dialog.py:343 +#: apostrophe/export_dialog.py:343 msgid "Please, install TexLive from your distribuiton repositories" msgstr "" -#: uberwriter/format_shortcuts.py:95 +#: apostrophe/format_shortcuts.py:95 msgid "emphasized text" msgstr "" -#: uberwriter/format_shortcuts.py:97 +#: apostrophe/format_shortcuts.py:97 msgid "strong text" msgstr "" -#: uberwriter/format_shortcuts.py:99 +#: apostrophe/format_shortcuts.py:99 msgid "striked out text" msgstr "" -#: uberwriter/format_shortcuts.py:117 +#: apostrophe/format_shortcuts.py:117 msgid "List item" msgstr "" -#: uberwriter/format_shortcuts.py:177 +#: apostrophe/format_shortcuts.py:177 msgid "Heading" msgstr "" -#: uberwriter/headerbars.py:101 +#: apostrophe/headerbars.py:101 msgid "Exit Fullscreen" msgstr "" -#: uberwriter/headerbars.py:137 +#: apostrophe/headerbars.py:137 msgid "New" msgstr "" -#: uberwriter/headerbars.py:139 +#: apostrophe/headerbars.py:139 msgid "Save" msgstr "" -#: uberwriter/headerbars.py:147 +#: apostrophe/headerbars.py:147 msgid "Open" msgstr "" -#: uberwriter/headerbars.py:162 +#: apostrophe/headerbars.py:162 msgid "Open Recent" msgstr "" -#: uberwriter/headerbars.py:169 +#: apostrophe/headerbars.py:169 msgid "Search and Replace" msgstr "" -#: uberwriter/headerbars.py:170 +#: apostrophe/headerbars.py:170 msgid "Menu" msgstr "" -#: uberwriter/inline_preview.py:184 +#: apostrophe/inline_preview.py:184 msgid "Website is not available" msgstr "" -#: uberwriter/inline_preview.py:186 +#: apostrophe/inline_preview.py:186 msgid "Website is available" msgstr "" -#: uberwriter/inline_preview.py:436 +#: apostrophe/inline_preview.py:436 msgid "Open Link in Webbrowser" msgstr "" -#: uberwriter/inline_preview.py:500 +#: apostrophe/inline_preview.py:500 msgid "No matching footnote found" msgstr "" -#: uberwriter/main_window.py:234 +#: apostrophe/main_window.py:234 msgid "Save your File" msgstr "" -#: uberwriter/main_window.py:334 +#: apostrophe/main_window.py:334 msgid "Markdown Files" msgstr "" -#: uberwriter/main_window.py:338 +#: apostrophe/main_window.py:338 msgid "Plain Text Files" msgstr "" -#: uberwriter/main_window.py:341 +#: apostrophe/main_window.py:341 msgid "Open a .md file" msgstr "" -#: uberwriter/main_window.py:367 +#: apostrophe/main_window.py:367 msgid "You have not saved your changes." msgstr "" -#: uberwriter/main_window.py:369 +#: apostrophe/main_window.py:369 msgid "Close without saving" msgstr "" -#: uberwriter/main_window.py:370 +#: apostrophe/main_window.py:370 msgid "Cancel" msgstr "" -#: uberwriter/main_window.py:371 +#: apostrophe/main_window.py:371 msgid "Save now" msgstr "" -#: uberwriter/main_window.py:400 +#: apostrophe/main_window.py:400 msgid "New File" msgstr "" -#: uberwriter/preview_renderer.py:168 +#: apostrophe/preview_renderer.py:168 msgid "Half-Width" msgstr "" -#: uberwriter/preview_renderer.py:170 +#: apostrophe/preview_renderer.py:170 msgid "Half-Height" msgstr "" -#: uberwriter/preview_renderer.py:172 +#: apostrophe/preview_renderer.py:172 msgid "Windowed" msgstr "" -#: uberwriter/stats_handler.py:69 +#: apostrophe/stats_handler.py:69 msgid "{:n} Characters" msgstr "" -#: uberwriter/stats_handler.py:71 +#: apostrophe/stats_handler.py:71 msgid "{:n} Words" msgstr "" -#: uberwriter/stats_handler.py:73 +#: apostrophe/stats_handler.py:73 msgid "{:n} Sentences" msgstr "" -#: uberwriter/stats_handler.py:75 +#: apostrophe/stats_handler.py:75 msgid "{:n} Paragraphs" msgstr "" -#: uberwriter/stats_handler.py:77 +#: apostrophe/stats_handler.py:77 msgid "{:d}:{:02d}:{:02d} Read Time" msgstr "" -#: uberwriter/text_view_format_inserter.py:12 +#: apostrophe/text_view_format_inserter.py:12 msgid "italic text" msgstr "" -#: uberwriter/text_view_format_inserter.py:17 +#: apostrophe/text_view_format_inserter.py:17 msgid "bold text" msgstr "" -#: uberwriter/text_view_format_inserter.py:22 +#: apostrophe/text_view_format_inserter.py:22 msgid "strikethrough text" msgstr "" -#: uberwriter/text_view_format_inserter.py:45 +#: apostrophe/text_view_format_inserter.py:45 msgid "Item" msgstr "" -#: uberwriter/text_view_format_inserter.py:91 +#: apostrophe/text_view_format_inserter.py:91 msgid "Header" msgstr "" diff --git a/po/update_translations.sh b/po/update_translations.sh index 2b9502d..54207f9 100755 --- a/po/update_translations.sh +++ b/po/update_translations.sh @@ -3,13 +3,13 @@ function generate_po() >LINGUAS for po in */LC_MESSAGES/*.po do - msgmerge -N $po uberwriter.pot > /tmp/$$language_new.po + msgmerge -N $po apostrophe.pot > /tmp/$$language_new.po mv /tmp/$$language_new.po $po language=${po%.po} echo $language >>LINGUAS done - find . -name \*.po -execdir sh -c 'msgfmt "$0" -o uberwriter.mo' '{}' \; + find . -name \*.po -execdir sh -c 'msgfmt "$0" -o apostrophe.mo' '{}' \; } diff --git a/screenshots/mockups.svg b/screenshots/mockups.svg index 41daae5..cd327d5 100644 --- a/screenshots/mockups.svg +++ b/screenshots/mockups.svg @@ -683,7 +683,7 @@ font-size="21.3333px" font-weight="bold" style="font-weight:bold;font-size:21.33329964px;font-family:'Fira Mono';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal" - id="tspan8217">UberWriter helps your textediting workflowApostrophe helps your textediting workflowUberWriter.md - UberWriter + id="tspan8305">Apostrophe.md - Apostrophe @@ -1705,7 +1705,7 @@ y="371.00919" font-size="18.6667px" style="font-size:18.66670036px;font-family:'Fira Mono';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal" - id="tspan8398">feature of UberWriter it's his feature of Apostrophe it's his *Inline Preview*Dark Mode.md - UberWriter + id="tspan8406">Dark Mode.md - Apostrophe diff --git a/screenshots/mockups_text.svg b/screenshots/mockups_text.svg index 6b78ad5..ff9cac2 100644 --- a/screenshots/mockups_text.svg +++ b/screenshots/mockups_text.svg @@ -17,7 +17,7 @@ id="svg8720" sodipodi:docname="mockups_text.svg" inkscape:version="0.92.4 5da689c313, 2019-01-14" - inkscape:export-filename="/home/manu/Documentos/Programacion/Uberwriter/uberwriter/screenshots/mockups.svg.png" + inkscape:export-filename="/home/manu/Documentos/Programacion/Apostrophe/apostrophe/screenshots/mockups.svg.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> UberWriter helps your textediting workflowApostrophe helps your textediting workflowUberWriter.md - UberWriter + id="tspan8305">Apostrophe.md - Apostrophe UberWriter.md - UberWriter + id="tspan8305-7">Apostrophe.md - Apostrophe ~/Documents/examples/UberWriter.md + id="tspan8305-7-4">~/Documents/examples/Apostrophe.md About UberWriterAbout Apostrophefeature of UberWriter it's his feature of Apostrophe it's his *Inline Preview*Dark Mode.md - UberWriter + id="tspan8406">Dark Mode.md - Apostrophe diff --git a/screenshots/mockups_text2.svg b/screenshots/mockups_text2.svg index a750f48..0a20540 100644 --- a/screenshots/mockups_text2.svg +++ b/screenshots/mockups_text2.svg @@ -17,7 +17,7 @@ id="svg8720" sodipodi:docname="mockups_text2.svg" inkscape:version="0.92.4 5da689c313, 2019-01-14" - inkscape:export-filename="/home/manu/Documentos/Programacion/Uberwriter/uberwriter/screenshots/mockups.svg.png" + inkscape:export-filename="/home/manu/Documentos/Programacion/Apostrophe/apostrophe/screenshots/mockups.svg.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> UberWriter helps your textediting workflowApostrophe helps your textediting workflowUberWriter.md - UberWriter + id="tspan8305">Apostrophe.md - Apostrophe feature of UberWriter it's his feature of Apostrophe it's his *Inline Preview*Dark Mode.md - UberWriter + id="tspan8406">Dark Mode.md - Apostrophe diff --git a/scripts/color_palette_generator.py b/scripts/color_palette_generator.py index 90d5220..e9b0c44 100644 --- a/scripts/color_palette_generator.py +++ b/scripts/color_palette_generator.py @@ -4,7 +4,7 @@ # # Usage: python color_palette_generator.py #fg_hex #bg_hex light|dark # -# The light variant is based on GitHub's style, while the dark variant is based on pre-existing UberWriter styles. +# The light variant is based on GitHub's style, while the dark variant is based on pre-existing Apostrophe styles. # # Accessibility is not accounted for, so make sure to verify contrast: https://webaim.org/resources/contrastchecker/ diff --git a/scripts/data_generator.sh b/scripts/data_generator.sh index b9b8e05..6735d3c 100755 --- a/scripts/data_generator.sh +++ b/scripts/data_generator.sh @@ -24,5 +24,5 @@ function generate_resource() echo '' } -generate_resource > ../data/uberwriter.gresource.xml +generate_resource > ../data/apostrophe.gresource.xml diff --git a/tests/test_example.py b/tests/test_example.py index f36dc58..a10f470 100644 --- a/tests/test_example.py +++ b/tests/test_example.py @@ -20,18 +20,18 @@ import os.path import unittest sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), ".."))) -from uberwriter import AboutUberwriterDialog +from apostrophe import AboutApostropheDialog class TestExample(unittest.TestCase): def setUp(self): - self.AboutUberwriterDialog_members = [ - 'AboutDialog', 'AboutUberwriterDialog', 'gettext', 'logger', 'logging'] + self.AboutApostropheDialog_members = [ + 'AboutDialog', 'AboutApostropheDialog', 'gettext', 'logger', 'logging'] - def test_AboutUberwriterDialog_members(self): - all_members = dir(AboutUberwriterDialog) + def test_AboutApostropheDialog_members(self): + all_members = dir(AboutApostropheDialog) public_members = [x for x in all_members if not x.startswith('_')] public_members.sort() - self.assertEqual(self.AboutUberwriterDialog_members, public_members) + self.assertEqual(self.AboutApostropheDialog_members, public_members) if __name__ == '__main__': unittest.main() diff --git a/tests/test_lint.py b/tests/test_lint.py index 08b60d8..529b318 100644 --- a/tests/test_lint.py +++ b/tests/test_lint.py @@ -24,7 +24,7 @@ class TestPylint(unittest.TestCase): your code may well work even with pylint errors but have some unusual code''' - return_code = subprocess.call(["pylint", '-E', 'uberwriter']) + return_code = subprocess.call(["pylint", '-E', 'apostrophe']) # not needed because nosetests displays pylint console output #self.assertEqual(return_code, 0) @@ -34,7 +34,7 @@ class TestPylint(unittest.TestCase): #~ #~ you will have to make judgement calls about your code standards #~ that differ from the norm''' - #~ return_code = subprocess.call(["pylint", 'uberwriter']) + #~ return_code = subprocess.call(["pylint", 'apostrophe']) if __name__ == '__main__': 'you will get better results with nosetests' diff --git a/tests/test_regex_commonmark.py b/tests/test_regex_commonmark.py index f8179e5..8ea6d7e 100644 --- a/tests/test_regex_commonmark.py +++ b/tests/test_regex_commonmark.py @@ -18,7 +18,7 @@ import unittest import re -from uberwriter import markup_regex +from apostrophe import markup_regex class TestRegex(unittest.TestCase): diff --git a/uberwriter/plugins/bibtex/bibtex.glade~ b/uberwriter/plugins/bibtex/bibtex.glade~ deleted file mode 100644 index 8aa2ad8..0000000 --- a/uberwriter/plugins/bibtex/bibtex.glade~ +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - False - True - center-on-parent - center - - - True - False - vertical - - - True - True - edit-find-symbolic - False - False - - - False - True - 0 - - - - - True - True - in - - - True - False - - - True - False - False - - - - - - - True - True - 1 - - - - - - - diff --git a/uberwriter/plugins/bibtex/bibtex_item.glade~ b/uberwriter/plugins/bibtex/bibtex_item.glade~ deleted file mode 100644 index bec5c09..0000000 --- a/uberwriter/plugins/bibtex/bibtex_item.glade~ +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - diff --git a/uberwriter/plugins/uberquation/equation_widget.glade~ b/uberwriter/plugins/uberquation/equation_widget.glade~ deleted file mode 100644 index 63bd82b..0000000 --- a/uberwriter/plugins/uberquation/equation_widget.glade~ +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - True - False - - - - - - False - - - - True - False - 5 - 5 - 5 - 5 - - - True - False - True - True - gtk-justify-center - - - 0 - 1 - 3 - - - - - True - True - textbuffer1 - - - - - 0 - 2 - 3 - - - - - True - False - vertical - - - True - True - 5 - edit-find-symbolic - False - False - - - - False - True - 0 - - - - - True - True - in - - - True - False - - - listbox - True - False - True - False - - - - - - - False - True - 1 - - - - - 0 - 0 - 3 - - - - - -