diff --git a/frontends/src/constants.py b/frontends/src/constants.py
deleted file mode 100644
index e3cd3dfb..00000000
--- a/frontends/src/constants.py
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# generic module for SàT frontends
-# Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Jérôme Poisson (goffi@goffi.org)
-
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see .
-
-
-from sat.core import constants
-from sat.core.i18n import _, D_
-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
- """
-
-
-class Const(constants.Const):
-
- 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"
- SYNTAX_CURRENT = "@CURRENT@"
- SYNTAX_TEXT = "text"
-
- # XMLUI
- SAT_FORM_PREFIX = "SAT_FORM_"
- SAT_PARAM_SEPARATOR = "_XMLUI_PARAM_" # used to have unique elements names
- XMLUI_STATUS_VALIDATED = "validated"
- XMLUI_STATUS_CANCELLED = constants.Const.XMLUI_DATA_CANCELLED
-
- # MUC
- ALL_OCCUPANTS = 1
- MUC_USER_STATES = {
- "active": u'✔',
- "inactive": u'☄',
- "gone": u'✈',
- "composing": u'✎',
- "paused": u"⦷"
- }
-
- # Roster
- GROUP_NOT_IN_ROSTER = D_('Not in roster')
-
- # Chats
- CHAT_ONE2ONE = 'one2one'
- CHAT_GROUP = 'group'
-
- # Widgets management
- # FIXME: should be in quick_frontend.constant, but Libervia doesn't inherit from it
- WIDGET_NEW = 'NEW'
- WIDGET_KEEP = 'KEEP'
- WIDGET_RAISE = 'RAISE'
- WIDGET_RECREATE = 'RECREATE'
-
diff --git a/frontends/src/primitivus/status.py b/frontends/src/primitivus/status.py
index 00123cba..91158d45 100644
--- a/frontends/src/primitivus/status.py
+++ b/frontends/src/primitivus/status.py
@@ -20,7 +20,7 @@
from sat.core.i18n import _
import urwid
from urwid_satext import sat_widgets
-from sat_frontends.constants import Const as commonConst
+from sat_frontends.quick_frontend.constants import Const as commonConst
from sat_frontends.primitivus.constants import Const
diff --git a/frontends/src/quick_frontend/constants.py b/frontends/src/quick_frontend/constants.py
index 0cb1a26d..0063e42c 100644
--- a/frontends/src/quick_frontend/constants.py
+++ b/frontends/src/quick_frontend/constants.py
@@ -17,18 +17,58 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
-from sat_frontends import constants
+from sat.core import constants
+from sat.core.i18n import _, D_
+from collections import OrderedDict # only available from python 2.7
class Const(constants.Const):
- #Contact list
+ 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"
+ SYNTAX_CURRENT = "@CURRENT@"
+ SYNTAX_TEXT = "text"
+
+ # XMLUI
+ SAT_FORM_PREFIX = "SAT_FORM_"
+ SAT_PARAM_SEPARATOR = "_XMLUI_PARAM_" # used to have unique elements names
+ XMLUI_STATUS_VALIDATED = "validated"
+ XMLUI_STATUS_CANCELLED = constants.Const.XMLUI_DATA_CANCELLED
+
+ # MUC
+ ALL_OCCUPANTS = 1
+ MUC_USER_STATES = {
+ "active": u'✔',
+ "inactive": u'☄',
+ "gone": u'✈',
+ "composing": u'✎',
+ "paused": u"⦷"
+ }
+
+ # Roster
CONTACT_GROUPS = 'groups'
CONTACT_RESOURCES = 'resources'
CONTACT_MAIN_RESOURCE = 'main_resource'
CONTACT_SPECIAL = 'special'
- CONTACT_SPECIAL_GROUP = 'group' # group chat special entity
- CONTACT_SPECIAL_ALLOWED = (CONTACT_SPECIAL_GROUP,) # set of allowed values for special flag
- CONTACT_DATA_FORBIDDEN = {CONTACT_GROUPS, CONTACT_RESOURCES, CONTACT_MAIN_RESOURCE} # set of forbidden names for contact data
+ CONTACT_SPECIAL_GROUP = 'group' # group chat special entity
+ CONTACT_SPECIAL_ALLOWED = (CONTACT_SPECIAL_GROUP,) # set of allowed values for special flag
+ CONTACT_DATA_FORBIDDEN = {CONTACT_GROUPS, CONTACT_RESOURCES, CONTACT_MAIN_RESOURCE} # set of forbidden names for contact data
+
+ # Chats
+ CHAT_ONE2ONE = 'one2one'
+ CHAT_GROUP = 'group'
+
+ # Widgets management
+ # FIXME: should be in quick_frontend.constant, but Libervia doesn't inherit from it
+ WIDGET_NEW = 'NEW'
+ WIDGET_KEEP = 'KEEP'
+ WIDGET_RAISE = 'RAISE'
+ WIDGET_RECREATE = 'RECREATE'
LISTENERS = {'avatar'}
diff --git a/frontends/src/tools/xmlui.py b/frontends/src/tools/xmlui.py
index 2573f25d..dc483f68 100644
--- a/frontends/src/tools/xmlui.py
+++ b/frontends/src/tools/xmlui.py
@@ -20,7 +20,7 @@
from sat.core.i18n import _
from sat.core.log import getLogger
log = getLogger(__name__)
-from sat_frontends.constants import Const as C
+from sat_frontends.quick_frontend.constants import Const as C
from sat.core.exceptions import DataError