Skip to content

Commit

Permalink
Update all references of the app's name
Browse files Browse the repository at this point in the history
from uberwriter to apostrophe, but the appIds
  • Loading branch information
somas95 committed Mar 15, 2020
1 parent af2975d commit 29d2af9
Show file tree
Hide file tree
Showing 98 changed files with 323 additions and 544 deletions.
8 changes: 4 additions & 4 deletions 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() {
Expand Down
14 changes: 7 additions & 7 deletions 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
Expand All @@ -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
Expand All @@ -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
Expand Down
20 changes: 10 additions & 10 deletions uberwriter.in → apostrophe.in
Expand Up @@ -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()
File renamed without changes.
8 changes: 4 additions & 4 deletions uberwriter/__init__.py → apostrophe/__init__.py
Expand Up @@ -19,10 +19,10 @@

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():
Expand Down
18 changes: 9 additions & 9 deletions uberwriter/application.py → apostrophe/application.py
Expand Up @@ -15,16 +15,16 @@

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):
Expand Down Expand Up @@ -161,7 +161,7 @@ def do_activate(self, *args, **kwargs):
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])
Expand All @@ -173,7 +173,7 @@ def do_command_line(self, _command_line):
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')
Expand Down Expand Up @@ -263,7 +263,7 @@ def on_shortcuts(self, _action, _param):
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()
Expand Down
18 changes: 9 additions & 9 deletions uberwriter/auto_correct.py → 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

Expand All @@ -13,16 +13,16 @@

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):
Expand Down
2 changes: 1 addition & 1 deletion uberwriter/builder.py → apostrophe/builder.py
Expand Up @@ -28,7 +28,7 @@
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
Expand Down
14 changes: 7 additions & 7 deletions uberwriter/config.py → apostrophe/config.py
Expand Up @@ -24,7 +24,7 @@

# 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'

Expand All @@ -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 <uberwriter_path>/../data/ in trunk
and /opt/uberwriter/data in an installed version but this path
This path is by default <apostrophe_path>/../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

Expand Down
6 changes: 3 additions & 3 deletions uberwriter/export_dialog.py → apostrophe/export_dialog.py
Expand Up @@ -26,10 +26,10 @@
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:
Expand Down
2 changes: 1 addition & 1 deletion uberwriter/fix_table.py → apostrophe/fix_table.py
Expand Up @@ -4,7 +4,7 @@
from gi.repository import Gtk

import logging
logger = logging.getLogger('uberwriter')
logger = logging.getLogger('apostrophe')

class FixTable():

Expand Down
4 changes: 2 additions & 2 deletions uberwriter/headerbars.py → apostrophe/headerbars.py
Expand Up @@ -22,8 +22,8 @@

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:
Expand Down
12 changes: 6 additions & 6 deletions uberwriter/helpers.py → apostrophe/helpers.py
Expand Up @@ -26,13 +26,13 @@
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



Expand Down Expand Up @@ -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)
Expand All @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions uberwriter/inline_preview.py → apostrophe/inline_preview.py
Expand Up @@ -26,8 +26,8 @@
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:
Expand Down
File renamed without changes.

0 comments on commit 29d2af9

Please sign in to comment.