Little enhancement in the qt4 ui. Also, add the skin and the theme ma…

…nager in __init__ in login.py

amsn2/core/userinterface_manager.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 
 from views import *
 

amsn2/ui/front_ends/qt4/login.py

@@ -48,6 +48,9 @@ class aMSNLoginWindow(StyledWidget, base.aMSNLoginWindow):
     def __init__(self, amsn_core, parent):
         StyledWidget.__init__(self, parent)
         self._amsn_core = amsn_core
+        self._parent = parent
+        self._skin = amsn_core._skin_manager.skin
+        self._theme_manager = self._amsn_core._theme_manager
         self._ui_manager = self._amsn_core._ui_manager
         self.ui = Ui_Login()
         self.ui.setupUi(self)
@@ -68,11 +71,13 @@ def __init__(self, amsn_core, parent):
         status_n = 0
         for key in self._amsn_core.p2s:
             name = self._amsn_core.p2s[key]
-            if (name == 'offline'): continue
-            self.status_values[name] = status_n
+            _, path = self._theme_manager.get_statusicon("buddy_%s" % name)
+            if (name == self._amsn_core.Presence.OFFLINE): continue
+            self.status_values[key] = status_n
             self.status_dict[str.capitalize(name)] = key
             status_n = status_n +1
-            self.ui.comboStatus.addItem(str.capitalize(name))
+            icon = QIcon(path)
+            self.ui.comboStatus.addItem(icon, str.capitalize(name))
 
     def setTestStyle(self):
         styleData = QFile()

amsn2/ui/front_ends/qt4/main.py

@@ -64,9 +64,12 @@ def __fadeIn(self):
     def __activateNewWidget(self):
         self.stackedLayout.setCurrentIndex(self.stackedLayout.count()-1)
 
+    def __on_show(self):
+        self._amsn_core.mainWindowShown()
+
     def show(self):
         self.setVisible(True)
-        self._amsn_core.mainWindowShown()
+        self._amsn_core.idlerAdd(self.__on_show)
 
     def hide(self):
         self.setVisible(False)
@@ -87,3 +90,6 @@ def setMenu(self, menu):
                     menu.addAction(subitem.label)
 
         self.setMenuBar(mb)
+
+    def set_view(self, view):
+        pass

amsn2/ui/front_ends/qt4/main_loop.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from amsn2.ui import base
 import sys
 
@@ -8,6 +9,7 @@
 class aMSNMainLoop(base.aMSNMainLoop):
     def __init__(self, amsn_core):
         import os
+        self._amsn_core = amsn_core
         os.putenv("QT_NO_GLIB", "1") # FIXME: Temporary workaround for segfault
                                      #        caused by GLib Event Loop integration
         self.app = QApplication(sys.argv)
@@ -30,12 +32,10 @@ def on_idle(self):
             iter += 1
 
     def idlerAdd(self, func):
-        print "idlerAdd req"
-        pass
+        gobject.idle_add(func)
 
     def timerAdd(self, delay, func):
-        print "timerAdd req"
-        pass
+        gobject.timeout_add(delay, func)
 
     def quit(self):
-        pass
+        self.gmainloop.quit()