Mercurial > libervia-backend
changeset 679:59c9a7ff903d
wix, misc: use picture of dimension 32x32 for tray icon + better PEP-8 compliance
| author | souliane <souliane@mailoo.org> |
|---|---|
| date | Tue, 22 Oct 2013 09:41:27 +0200 |
| parents | a630b94280d5 |
| children | 8281587eb528 |
| files | frontends/src/primitivus/primitivus frontends/src/wix/main_window.py src/memory/memory.py |
| diffstat | 3 files changed, 8 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/frontends/src/primitivus/primitivus Mon Oct 21 15:52:28 2013 +0200 +++ b/frontends/src/primitivus/primitivus Tue Oct 22 09:41:27 2013 +0200 @@ -154,11 +154,11 @@ 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 @@ 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()
--- a/frontends/src/wix/main_window.py Mon Oct 21 15:52:28 2013 +0200 +++ b/frontends/src/wix/main_window.py Tue Oct 22 09:41:27 2013 +0200 @@ -72,7 +72,7 @@ #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 @@ 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)