Mercurial > libervia-backend

diff frontends/src/constants.py @ 1290:faa1129559b8 frontends_multi_profiles

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
core, frontends: refactoring to base Libervia on QuickFrontend (big mixed commit): /!\ not finished, everything is still instable ! - bridge: DBus bridge has been modified to allow blocking call to be called in the same way as asynchronous calls - bridge: calls with a callback and no errback are now possible, default errback log the error - constants: removed hack to manage presence without OrderedDict, as an OrderedDict like class has been implemented in Libervia - core: getLastResource has been removed and replaced by getMainResource (there is a global better management of resources) - various style improvments: use of constants when possible, fixed variable overlaps, import of module instead of direct class import - frontends: printInfo and printMessage methods in (Quick)Chat are more generic (use of extra instead of timestamp) - frontends: bridge creation and option parsing (command line arguments) are now specified by the frontend in QuickApp __init__ - frontends: ProfileManager manage a more complete plug sequence (some stuff formerly manage in contact_list have moved to ProfileManager) - quick_frontend (quick_widgets): QuickWidgetsManager is now iterable (all widgets are then returned), or can return an iterator on a specific class (return all widgets of this class) with getWidgets - frontends: tools.jid can now be used in Pyjamas, with some care - frontends (XMLUI): profile is now managed - core (memory): big improvment on entities cache management (and specially resource management) - core (params/exceptions): added PermissionError - various fixes and improvments, check diff for more details
author Goffi <goffi@goffi.org>
date Sat, 24 Jan 2015 01:00:29 +0100
parents 5968fd8d2248
children 0db0013c59dd
line wrap: on
line diff
--- a/frontends/src/constants.py	Sat Jan 24 00:15:01 2015 +0100
+++ b/frontends/src/constants.py	Sat Jan 24 01:00:29 2015 +0100
@@ -20,14 +20,7 @@
 
 from sat.core import constants
 from sat.core.i18n import _, D_
-
-try:
-    from collections import OrderedDict  # only available from python 2.7
-except ImportError:
-    try:
-        from ordereddict import OrderedDict
-    except ImportError:
-        pass  # libervia can not import external libraries
+from collections import OrderedDict  # only available from python 2.7
 
 
 def getPresence():
@@ -35,25 +28,15 @@
     in a method we get a JS runtime SyntaxError: "missing ) in parenthetical".
     # TODO: merge this definition with those in primitivus.constants and wix.constants
     """
-    try:
-        presence = OrderedDict([("", _("Online")),
-                                ("chat", _("Free for chat")),
-                                ("away", _("Away from keyboard")),
-                                ("dnd", _("Do not disturb")),
-                                ("xa", _("Extended away"))])
-    except TypeError:
-        presence = {"": _("Online"),
-                    "chat": _("Free for chat"),
-                    "away": _("Away from keyboard"),
-                    "dnd": _("Do not disturb"),
-                    "xa": _("Extended away")
-                    }
-    return presence
 
 
 class Const(constants.Const):
 
-    PRESENCE = getPresence()
+    PRESENCE = OrderedDict([("", _("Online")),
+                            ("chat", _("Free for chat")),
+                            ("away", _("Away from keyboard")),
+                            ("dnd", _("Do not disturb")),
+                            ("xa", _("Extended away"))])
 
     # from plugin_misc_text_syntaxes
     SYNTAX_XHTML = "XHTML"
@@ -78,3 +61,7 @@
 
     # Roster
     GROUP_NOT_IN_ROSTER = D_('Not in roster')
+
+    #Chats
+    CHAT_ONE2ONE = 'one2one'
+    CHAT_GROUP = 'group'