From 3ee9f140df73bcaef21799fce7fd548f4cf1b605 Mon Sep 17 00:00:00 2001 From: souliane Date: Sat, 24 Jan 2015 16:12:50 +0100 Subject: [PATCH] remove remaining references to Wix --- INSTALL | 3 --- MANIFEST.in | 2 +- README | 7 +------ README4PACKAGERS | 8 +------- README4TRANSLATORS | 2 +- frontends/src/constants.py | 2 +- setup.py | 9 ++++----- 7 files changed, 9 insertions(+), 24 deletions(-) diff --git a/INSTALL b/INSTALL index 5aa89614..053ec646 100644 --- a/INSTALL +++ b/INSTALL @@ -49,9 +49,6 @@ $ sat $ sat stop - to launch Primitivus, enter: $ primitivus - then create a profile. - - to launch Wix, enter -$ wix then create a profile. - to use jp, follow its help: $ jp --help diff --git a/MANIFEST.in b/MANIFEST.in index 71f6a0a0..86a43e55 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,6 +5,6 @@ global-include *.po *.mo global-include CHANGELOG COPYING* INSTALL README* global-include *.sh include src/sat.* -include frontends/src/jp/jp frontends/src/primitivus/primitivus frontends/src/wix/wix +include frontends/src/jp/jp frontends/src/primitivus/primitivus include src/bridge/bridge_constructor/mediawiki_template.tpl prune src/bridge/bridge_constructor/generated diff --git a/README b/README index c391683b..2c5fad9a 100644 --- a/README +++ b/README @@ -28,7 +28,6 @@ In addition, SàT has been built with ethic in mind, a social contract show the For the moment, the frontends are: -* wix: based on WxWidgets, a minimal and old fashioned desktop frontend * primitivus: a console interface client, for screen lovers * jp: the powerful command line toolkit. * libervia: the web frontend. It's in a different package, check libervia on the wiki: http://wiki.goffi.org/wiki/Libervia @@ -81,7 +80,6 @@ http://wiki.goffi.org/wiki/Primitivus SàT is the acronym (yes another one :( ) in tribute to the song Salut à Toi from the Bérurier Noir band. I recommend also the excellent cover from Les Ogres de Barback. jp stands for "Jabber coPy" or "JumP". Primitivus is based on Urwid, and, according to their FAQ, "ur" is a German prefix for "ancestral or primal" (primitivus is a latin word). -wix come of course from the WX of wxwidgets and just sounds cool :). ** /!\ PRIVACY WARNING /!\ ** @@ -107,9 +105,6 @@ SàT is heavily based on the twisted framework (http://twistedmatrix.com/trac/), wokkel: SàT use a library with high level enhancements on top of twisted, which is called wokkel (http://wokkel.ik.nu). Lot of thanks to Ralph Meijer and all other contributors. -wxWidgets & wxPython: -The Wix frontend is made with wxWidgets (www.wxwidgets.org) and its python version wxPython (wxPython), which is a really handy UI toolkit who works on most popular platforms. It can be found on probably all major Gnu/Linux distributions. - Urwid: Primitivus is based on Urwid (http://excess.org/urwid/) which saved me a lot of time. It's really a great library to easily make a sophisticated interface. @@ -162,7 +157,7 @@ Salut à Toi has received contributions from: - Matteo Cypriani : jp's mainloop update + doc improvements + various fixes. He's also the other co-maintainer of the Debian package. -- Olly Betts : icon fix in Wix +- Olly Betts : icon fix in Wix [N.B: Wix has been removed] Many thanks to them. diff --git a/README4PACKAGERS b/README4PACKAGERS index 3021748b..b56db1cc 100644 --- a/README4PACKAGERS +++ b/README4PACKAGERS @@ -49,12 +49,6 @@ DBus Suggested: Python X Library (for user notifications in a graphical session) ---------------------------------- -Dependencies for the Wix frontend ---------------------------------- - -wxPython - -------------------------------------- Dependencies for the Libervia frontend -------------------------------------- @@ -107,7 +101,7 @@ The case of SàT Media is particular are there is a compilation of media from se Packages and versions ##################### -We have packaged Wix, Primitivus, and Jp with the core backend, as we think theses frontends should be shipped with each SàT distribution. But allowing them to be installed separately would be good: for example, Wix will be useless for a server or non-graphical workstation. +We have packaged Primitivus and Jp with the core backend, as we think theses frontends should be shipped with each SàT distribution. Libervia is distributed as a separate package because of its specificities (it's a huge project by itself, it uses Pyjamas Python => JS Compiler, etc.). But it's part of the same project. diff --git a/README4TRANSLATORS b/README4TRANSLATORS index 5544fb0e..b212dfa9 100644 --- a/README4TRANSLATORS +++ b/README4TRANSLATORS @@ -5,7 +5,7 @@ NOTE: *.po files are in i18n directory To translate a file, you can use a dedicated tool as the excellent gtranslator: - use the template .po file (e.g. sat.po) and name it to your translated language (e.g. fr.po for french); you can preferably generate a new template directly from the source with the following command (eventually adapted, the following command use zsh's globbing syntax), launched from root sat dir after having emptied the build directory: -> xgettext -L python -d sat --keyword=D_ -p i18n **/*(.py|.tac|primitivus|wix)(.) **/jp(.) +> xgettext -L python -d sat --keyword=D_ -p i18n **/*(.py|.tac|primitivus)(.) **/jp(.) - then to start a new translation, copy i18n/sat.po to your language file, e.g. cd i18n; cp sat.po fr.po diff --git a/frontends/src/constants.py b/frontends/src/constants.py index 5ae08e90..84c0e319 100644 --- a/frontends/src/constants.py +++ b/frontends/src/constants.py @@ -26,7 +26,7 @@ from collections import OrderedDict # only available from python 2.7 def getPresence(): """We cannot do it directly in the Const class, if it is not encapsulated in a method we get a JS runtime SyntaxError: "missing ) in parenthetical". - # TODO: merge this definition with those in primitivus.constants and wix.constants + # TODO: merge this definition with those in primitivus.constants """ diff --git a/setup.py b/setup.py index b6c66bfb..49cc08de 100644 --- a/setup.py +++ b/setup.py @@ -198,7 +198,7 @@ class CustomInstall(install): if os.path.islink(dest): to_remove.append(dest) - for script in ('jp', 'wix', 'primitivus'): + for script in ('jp', 'primitivus'): dest = os.path.join(self.install_scripts, script) if os.path.exists(dest): to_remove.append(dest) @@ -298,14 +298,13 @@ setup(name=NAME, package_dir={'sat': 'src', 'sat_frontends': 'frontends/src', 'twisted.plugins': 'src/twisted/plugins'}, packages=['sat', 'sat.tools', 'sat.bridge', 'sat.plugins', 'sat.test', 'sat.core', 'sat.memory', 'sat_frontends', 'sat_frontends.bridge', 'sat_frontends.quick_frontend', 'sat_frontends.jp', - 'sat_frontends.primitivus', 'sat_frontends.wix', 'sat_frontends.tools', 'sat.stdui', 'twisted.plugins'], - package_data={'sat': ['sat.sh'], - 'sat_frontends': ['wix/COPYING']}, + 'sat_frontends.primitivus', 'sat_frontends.tools', 'sat.stdui', 'twisted.plugins'], + package_data={'sat': ['sat.sh'], }, data_files=[(os.path.join(sys.prefix, 'share/locale/fr/LC_MESSAGES'), ['i18n/fr/LC_MESSAGES/sat.mo']), ('share/doc/%s' % NAME, ['CHANGELOG', 'COPYING', 'INSTALL', 'README', 'README4TRANSLATORS']), (os.path.join('share', DBUS_DIR), (DBUS_FILE,)), ], - scripts=['frontends/src/jp/jp', 'frontends/src/primitivus/primitivus', 'frontends/src/wix/wix'], + scripts=['frontends/src/jp/jp', 'frontends/src/primitivus/primitivus', ], zip_safe=False, dependency_links=['http://home.avvanta.com/%7Esteveha/pyfeed-0.7.4.tar.gz', 'http://home.avvanta.com/%7Esteveha/xe-0.7.4.tar.gz'], install_requires=['twisted', 'wokkel >= 0.7.1', 'progressbar', 'urwid >= 1.2.0', 'urwid-satext >= 0.4.0', 'pyfeed', 'xe', 'mutagen', 'pillow', 'lxml', 'pyxdg', 'markdown', 'html2text', 'pycrypto >= 2.6.1', 'python-potr'],