wix, misc: use picture of dimension 32x32 for tray icon + better PEP-8 compliance

This commit is contained in:
souliane 2013-10-22 09:41:27 +02:00
commit 23d8b52f5b
3 changed files with 8 additions and 9 deletions

View file

@ -154,11 +154,11 @@ class PrimitivusApp(QuickApp, InputHistory):
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)
self.chat_wins = ChatList(self)
self.notBar = sat_widgets.NotificationBar()
urwid.connect_signal(self.notBar,'change',self.onNotification)
urwid.connect_signal(self.notBar, 'change', self.onNotification)
self.progress_wid = Progress(self)
urwid.connect_signal(self.notBar.progress,'click',lambda x:self.addWindow(self.progress_wid))
urwid.connect_signal(self.notBar.progress, 'click', lambda x: self.addWindow(self.progress_wid))
self.__saved_overlay = None
self.x_notify = Notify()
@ -299,9 +299,9 @@ class PrimitivusApp(QuickApp, InputHistory):
return menu_roller
def __buildMainWidget(self):
self.contact_list = ContactList(self, on_click = self.contactSelected, on_change=lambda w: self.redraw())
self.contact_list = ContactList(self, on_click=self.contactSelected, on_change=lambda w: self.redraw())
#self.center_part = urwid.Columns([('weight',2,self.contact_list),('weight',8,Chat('',self))])
self.center_part = urwid.Columns([('weight',2,self.contact_list), ('weight',8,urwid.Filler(urwid.Text('')))])
self.center_part = urwid.Columns([('weight', 2, self.contact_list), ('weight', 8, urwid.Filler(urwid.Text('')))])
self.editBar = EditBar(self)
self.menu_roller = self.__buildMenuRoller()

View file

@ -72,7 +72,7 @@ class MainWindow(wx.Frame, QuickApp):
#ToolBar
self.tools=self.CreateToolBar()
self.statusBox = wx.ComboBox(self.tools, -1, "Online", choices=[status[1] for status in const_STATUS],
self.statusBox = wx.ComboBox(self.tools, -1, "Online", choices=[status[1] for status in const_STATUS],
style=wx.CB_DROPDOWN | wx.CB_READONLY)
self.tools.AddControl(self.statusBox)
self.tools.AddSeparator()
@ -82,10 +82,8 @@ class MainWindow(wx.Frame, QuickApp):
self.Bind(wx.EVT_TEXT_ENTER, self.onStatusChange, self.statusTxt)
self.tools.Disable()
#tray icon
ticon = wx.Icon(os.path.join(self.media_dir, 'icons/crystal/tray_icon.xpm'), wx.BITMAP_TYPE_XPM)
ticon = wx.Icon(os.path.join(self.media_dir, 'icons/crystal/32/tray_icon.xpm'), wx.BITMAP_TYPE_XPM)
self.tray_icon = wx.TaskBarIcon()
self.tray_icon.SetIcon(ticon, _("Wix jabber client"))
wx.EVT_TASKBAR_LEFT_UP(self.tray_icon, self.onTrayClick)

View file

@ -35,6 +35,7 @@ from sat.core import exceptions
SAVEFILE_DATABASE = "/sat.db"
NO_SECURITY_LIMIT = -1
class Params(object):
"""This class manage parameters with xml"""
### TODO: add desciption in params