frontends: define the constants with classes and inheritance instance of using __builtin__
This commit is contained in:
parent
b824f9c2ce
commit
f5dd3f2265
3 changed files with 169 additions and 95 deletions
|
|
@ -16,59 +16,65 @@
|
|||
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
import __builtin__
|
||||
|
||||
__builtin__.__dict__['const_APP_NAME'] = "Primitivus"
|
||||
__builtin__.__dict__['const_PALETTE'] = [
|
||||
('title', 'black', 'light gray', 'standout,underline'),
|
||||
('title_focus', 'white,bold', 'light gray', 'standout,underline'),
|
||||
('selected', 'default', 'dark red'),
|
||||
('selected_focus', 'default,bold', 'dark red'),
|
||||
('default', 'default', 'default'),
|
||||
('default_focus', 'default,bold', 'default'),
|
||||
('alert', 'default,underline', 'default'),
|
||||
('alert_focus', 'default,bold,underline', 'default'),
|
||||
('date', 'light gray', 'default'),
|
||||
('my_nick', 'dark red,bold', 'default'),
|
||||
('other_nick', 'dark cyan,bold', 'default'),
|
||||
('menubar', 'light gray,bold', 'dark red'),
|
||||
('menubar_focus', 'light gray,bold', 'dark green'),
|
||||
('selected_menu', 'light gray,bold', 'dark green'),
|
||||
('menuitem', 'light gray,bold', 'dark red'),
|
||||
('menuitem_focus', 'light gray,bold', 'dark green'),
|
||||
('notifs', 'black,bold', 'yellow'),
|
||||
('notifs_focus', 'dark red', 'yellow'),
|
||||
('card_neutral', 'dark gray', 'white', 'standout,underline'),
|
||||
('card_neutral_selected', 'dark gray', 'dark green', 'standout,underline'),
|
||||
('card_special', 'brown', 'white', 'standout,underline'),
|
||||
('card_special_selected', 'brown', 'dark green', 'standout,underline'),
|
||||
('card_red', 'dark red', 'white', 'standout,underline'),
|
||||
('card_red_selected', 'dark red', 'dark green', 'standout,underline'),
|
||||
('card_black', 'black', 'white', 'standout,underline'),
|
||||
('card_black_selected', 'black', 'dark green', 'standout,underline'),
|
||||
('directory', 'dark cyan, bold', 'default'),
|
||||
('directory_focus', 'dark cyan, bold', 'dark green'),
|
||||
('separator', 'brown', 'default'),
|
||||
('warning', 'light red', 'default'),
|
||||
('progress_normal', 'default', 'black'),
|
||||
('progress_complete', 'default', 'light red'),
|
||||
('show_disconnected', 'dark gray', 'default'),
|
||||
('show_normal', 'default', 'default'),
|
||||
('show_normal_focus', 'default, bold', 'default'),
|
||||
('show_chat', 'dark green', 'default'),
|
||||
('show_chat_focus', 'dark green, bold', 'default'),
|
||||
('show_away', 'brown', 'default'),
|
||||
('show_away_focus', 'brown, bold', 'default'),
|
||||
('show_dnd', 'dark red', 'default'),
|
||||
('show_dnd_focus', 'dark red, bold', 'default'),
|
||||
('show_xa', 'dark red', 'default'),
|
||||
('show_xa_focus', 'dark red, bold', 'default'),
|
||||
('status', 'yellow', 'default'),
|
||||
('status_focus', 'yellow, bold', 'default'),
|
||||
]
|
||||
__builtin__.__dict__['const_SHOW_ICON'] = {"unavailable": (u'⨯', "show_disconnected"),
|
||||
"": (u'✔', "show_normal"),
|
||||
"chat": (u'✆', "show_chat"),
|
||||
"away": (u'✈', "show_away"),
|
||||
"dnd": (u'✖', "show_dnd"),
|
||||
"xa": (u'☄', "show_xa")}
|
||||
from sat_frontends.quick_frontend import constants
|
||||
|
||||
|
||||
class Const(constants.Const):
|
||||
|
||||
APP_NAME = "Primitivus"
|
||||
PALETTE = [
|
||||
('title', 'black', 'light gray', 'standout,underline'),
|
||||
('title_focus', 'white,bold', 'light gray', 'standout,underline'),
|
||||
('selected', 'default', 'dark red'),
|
||||
('selected_focus', 'default,bold', 'dark red'),
|
||||
('default', 'default', 'default'),
|
||||
('default_focus', 'default,bold', 'default'),
|
||||
('alert', 'default,underline', 'default'),
|
||||
('alert_focus', 'default,bold,underline', 'default'),
|
||||
('date', 'light gray', 'default'),
|
||||
('my_nick', 'dark red,bold', 'default'),
|
||||
('other_nick', 'dark cyan,bold', 'default'),
|
||||
('menubar', 'light gray,bold', 'dark red'),
|
||||
('menubar_focus', 'light gray,bold', 'dark green'),
|
||||
('selected_menu', 'light gray,bold', 'dark green'),
|
||||
('menuitem', 'light gray,bold', 'dark red'),
|
||||
('menuitem_focus', 'light gray,bold', 'dark green'),
|
||||
('notifs', 'black,bold', 'yellow'),
|
||||
('notifs_focus', 'dark red', 'yellow'),
|
||||
('card_neutral', 'dark gray', 'white', 'standout,underline'),
|
||||
('card_neutral_selected', 'dark gray', 'dark green', 'standout,underline'),
|
||||
('card_special', 'brown', 'white', 'standout,underline'),
|
||||
('card_special_selected', 'brown', 'dark green', 'standout,underline'),
|
||||
('card_red', 'dark red', 'white', 'standout,underline'),
|
||||
('card_red_selected', 'dark red', 'dark green', 'standout,underline'),
|
||||
('card_black', 'black', 'white', 'standout,underline'),
|
||||
('card_black_selected', 'black', 'dark green', 'standout,underline'),
|
||||
('directory', 'dark cyan, bold', 'default'),
|
||||
('directory_focus', 'dark cyan, bold', 'dark green'),
|
||||
('separator', 'brown', 'default'),
|
||||
('warning', 'light red', 'default'),
|
||||
('progress_normal', 'default', 'black'),
|
||||
('progress_complete', 'default', 'light red'),
|
||||
('show_disconnected', 'dark gray', 'default'),
|
||||
('show_normal', 'default', 'default'),
|
||||
('show_normal_focus', 'default, bold', 'default'),
|
||||
('show_chat', 'dark green', 'default'),
|
||||
('show_chat_focus', 'dark green, bold', 'default'),
|
||||
('show_away', 'brown', 'default'),
|
||||
('show_away_focus', 'brown, bold', 'default'),
|
||||
('show_dnd', 'dark red', 'default'),
|
||||
('show_dnd_focus', 'dark red, bold', 'default'),
|
||||
('show_xa', 'dark red', 'default'),
|
||||
('show_xa_focus', 'dark red, bold', 'default'),
|
||||
('status', 'yellow', 'default'),
|
||||
('status_focus', 'yellow, bold', 'default'),
|
||||
]
|
||||
PRESENCE = {"unavailable": (u'⨯', "show_disconnected"),
|
||||
"": (u'✔', "show_normal"),
|
||||
"chat": (u'✆', "show_chat"),
|
||||
"away": (u'✈', "show_away"),
|
||||
"dnd": (u'✖', "show_dnd"),
|
||||
"xa": (u'☄', "show_xa")
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ from urwid_satext import sat_widgets
|
|||
from sat_frontends.quick_frontend.quick_contact_list import QuickContactList
|
||||
from sat_frontends.quick_frontend.quick_utils import escapePrivate, unescapePrivate
|
||||
from sat.tools.jid import JID
|
||||
|
||||
from sat_frontends.primitivus.constants import Const
|
||||
|
||||
class ContactList(urwid.WidgetWrap, QuickContactList):
|
||||
signals = ['click','change']
|
||||
|
|
@ -87,7 +87,7 @@ class ContactList(urwid.WidgetWrap, QuickContactList):
|
|||
# contact group
|
||||
value = widget.getValue()
|
||||
elif isinstance(widget, sat_widgets.SelectableText):
|
||||
if widget.data.startswith(const_PRIVATE_PREFIX):
|
||||
if widget.data.startswith(Const.PRIVATE_PREFIX):
|
||||
# muc private dialog
|
||||
value = widget.getValue()
|
||||
else:
|
||||
|
|
@ -137,7 +137,7 @@ class ContactList(urwid.WidgetWrap, QuickContactList):
|
|||
widgets = [] #list of built widgets
|
||||
|
||||
for contact in contacts:
|
||||
if contact.startswith(const_PRIVATE_PREFIX):
|
||||
if contact.startswith(Const.PRIVATE_PREFIX):
|
||||
contact_disp = ('alert' if contact in self.alert_jid else "show_normal", unescapePrivate(contact))
|
||||
show_icon = ''
|
||||
status = ''
|
||||
|
|
@ -152,7 +152,7 @@ class ContactList(urwid.WidgetWrap, QuickContactList):
|
|||
if (not self.show_disconnected and show == "unavailable"
|
||||
and not contact in self.alert_jid and contact != self.selected):
|
||||
continue
|
||||
show_icon, show_attr = const_SHOW_ICON.get(show,('','default'))
|
||||
show_icon, show_attr = Const.PRESENCE.get(show, ('', 'default'))
|
||||
contact_disp = ('alert' if contact in self.alert_jid else show_attr, nick or name or jid.node or jid.bare)
|
||||
display = [ show_icon + " " , contact_disp]
|
||||
if self.show_status:
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ from sat_frontends.primitivus.xmlui import XMLUI
|
|||
from sat_frontends.primitivus.progress import Progress
|
||||
from sat_frontends.primitivus.notify import Notify
|
||||
from sat_frontends.tools.misc import InputHistory
|
||||
import sat_frontends.primitivus.constants
|
||||
from sat_frontends.primitivus.constants import Const
|
||||
import logging
|
||||
from logging import debug, info, error
|
||||
from sat.tools.jid import JID
|
||||
|
|
@ -151,7 +151,7 @@ class PrimitivusApp(QuickApp, InputHistory):
|
|||
|
||||
## main loop setup ##
|
||||
self.main_widget = ProfileManager(self)
|
||||
self.loop = urwid.MainLoop(self.main_widget, const_PALETTE, event_loop=urwid.GLibEventLoop(), input_filter=self.inputFilter, unhandled_input=self.keyHandler)
|
||||
self.loop = urwid.MainLoop(self.main_widget, const.PALETTE, event_loop=urwid.GLibEventLoop(), input_filter=self.inputFilter, unhandled_input=self.keyHandler)
|
||||
|
||||
##misc setup##
|
||||
self.chat_wins = ChatList(self)
|
||||
|
|
@ -590,7 +590,7 @@ class PrimitivusApp(QuickApp, InputHistory):
|
|||
self.showPopUp(pop_up_widget)
|
||||
|
||||
def onAboutRequest(self, menu):
|
||||
self.showPopUp(sat_widgets.Alert(_("About"), const_APP_NAME + " v" + self.bridge.getVersion(), ok_cb=self.removePopUp))
|
||||
self.showPopUp(sat_widgets.Alert(_("About"), const.APP_NAME + " v" + self.bridge.getVersion(), ok_cb=self.removePopUp))
|
||||
|
||||
#MISC CALLBACKS#
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue