summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-05-07 23:03:24 +0900
committerkali <kali@leap.se>2013-05-11 21:59:59 +0900
commit89805e33ca85616fdea351b8ce0652adf2c99e2c (patch)
tree9343c9230fb39369bbfb4a50d960a27d098c2d7d
parent7126aad25c3dd45bfe026ba1ad383bf5476ffb15 (diff)
fix pyqt references
-rw-r--r--docs/checklist_for_leap_client_release.wiki2
-rw-r--r--docs/dev/internationalization.rst22
-rw-r--r--docs/dev/resources.rst4
-rw-r--r--docs/pkg/debian.rst4
-rw-r--r--pkg/scripts/leap_client_bootstrap.sh2
5 files changed, 15 insertions, 19 deletions
diff --git a/docs/checklist_for_leap_client_release.wiki b/docs/checklist_for_leap_client_release.wiki
index 5abced80..d3bdf1ee 100644
--- a/docs/checklist_for_leap_client_release.wiki
+++ b/docs/checklist_for_leap_client_release.wiki
@@ -4,7 +4,7 @@
* [ ] all rc-critical closed!
* [ ] all bbots green
* [ ] uploaded translations: make translations
- * [ ] re-generate pyqt resources
+ * [ ] re-generate pyside resources
* [ ] update docs
* [ ] CREDITS
diff --git a/docs/dev/internationalization.rst b/docs/dev/internationalization.rst
index 1a9af0be..8c584fdd 100644
--- a/docs/dev/internationalization.rst
+++ b/docs/dev/internationalization.rst
@@ -6,7 +6,7 @@ Internationalization
This part of the documentation covers the localization and translation of LEAP Client.
Because we want to *bring fire to the people*, in as many countries and languages as possible.
-Translating the LEAP Client PyQt Application
+Translating the LEAP Client PySide Application
--------------------------------------------
.. raw:: html
@@ -32,7 +32,7 @@ For devs: i18n conventions
.. note::
should say something about our special cases (provider labels and exceptions) when we get decision about it.
-Refer to `pyqt documentation <http://www.riverbankcomputing.co.uk/static/Docs/PyQt4/html/i18n.html>`_.
+Refer to `pyside documentation <http://qt-project.org/wiki/PySide_Internationalization>`_.
tl;dr;::
@@ -40,15 +40,11 @@ tl;dr;::
for any string that you want to be translated, as long as the instance derives from ``QObject``.
-If you have to translate something that it is not a ``QObject``, use the magic leap ``translate`` method:
-
-
-.. code-block:: python
-
- from leap.util.translations import translate
-
- class Foo(object):
- bar = translate(<Context>, <string>, <comment>)
+.. If you have to translate something that it is not a ``QObject``, use the magic leap ``translate`` method:
+.. .. code-block:: python
+.. from leap.util.translations import translate
+.. class Foo(object):
+.. bar = translate(<Context>, <string>, <comment>)
.. Note about this: there seems to be some problems with the .tr method
@@ -59,9 +55,9 @@ If you have to translate something that it is not a ``QObject``, use the magic l
For i18n maintainers
^^^^^^^^^^^^^^^^^^^^
-You need ``pylupdate4`` and ``lrelease`` for these steps. To get it, in debian::
+You need ``pyside-lupdate`` and ``lrelease`` for these steps. To get it, in debian::
- $ apt-get install pyqt4-dev-tools qt4-linguist-tools
+ $ apt-get install pyside-tools qt4-linguist-tools
If you do not already have it, install the ``transifex-client`` from the cheese shop::
diff --git a/docs/dev/resources.rst b/docs/dev/resources.rst
index 7cfa2b70..e68649a1 100644
--- a/docs/dev/resources.rst
+++ b/docs/dev/resources.rst
@@ -1,7 +1,7 @@
.. _resources:
-PyQt Resource files
-===================
+PySide Resource files
+=====================
Compiling resource/ui files
---------------------------
diff --git a/docs/pkg/debian.rst b/docs/pkg/debian.rst
index e98032a5..204d4073 100644
--- a/docs/pkg/debian.rst
+++ b/docs/pkg/debian.rst
@@ -10,9 +10,9 @@ Dependencies
------------
* ``openvpn``
-* ``python-qt4``
+* ``python-pyside``
* ``python-crypto``
-* ``python setuptools``
+* ``python-setuptools``
* ``python-requests``
* ``python-openssl``
diff --git a/pkg/scripts/leap_client_bootstrap.sh b/pkg/scripts/leap_client_bootstrap.sh
index 6c302d3f..dcde64f9 100644
--- a/pkg/scripts/leap_client_bootstrap.sh
+++ b/pkg/scripts/leap_client_bootstrap.sh
@@ -38,7 +38,7 @@ pip install -e 'git://leap.se/leap_client@develop#egg=leap-client'
cd leap-client-testbuild
-# symlink the pyqt libraries to the system libs
+# symlink the pyside libraries to the system libs
./src/leap-client/pkg/postmkvenv.sh
echo "${cc_green}leap-client installed! =)"