Added app list ui.

weijia · Aug 12, 2012 · 3f6fac9 · 3f6fac9
1 parent e635b56
commit 3f6fac9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/trunk/prodRoot/localLibs/qtconsole/CrossGuiLauncher.py b/trunk/prodRoot/localLibs/qtconsole/CrossGuiLauncher.py
@@ -12,7 +12,7 @@ def __init__(self, gui_factory):
         self.gui_factory = gui_factory
         self.taskbar_icon_app = self.gui_factory.create_taskbar_icon_app()
         self.taskbar_icon_app["Exit"] = self.on_quit_clicked
-        self.app_list = self.gui_factory.get_app_list()
+        self.app_list_ui = self.gui_factory.get_app_list()
 
         super(CrossGuiLauncher, self).__init__()
         self.app_name_to_task_dict = {}
@@ -157,7 +157,8 @@ def create_console_wnd_for_app(self, param):
 
         self.app_name_to_task_dict[app_path_and_param_gen_str] = t
         self.task_to_menu_item_dict[collector] = t
-        self.taskbar_icon_app[app_path_and_param_gen_str] = self.on_app_item_selected
+        #self.taskbar_icon_app[app_path_and_param_gen_str] = self.on_app_item_selected
+        self.app_list_ui[app_path_and_param_gen_str] = self.on_app_item_selected
         return collector
 
 

diff --git a/trunk/prodRoot/localLibs/qtconsole/PyQtGuiFactory.py b/trunk/prodRoot/localLibs/qtconsole/PyQtGuiFactory.py
@@ -1,7 +1,7 @@
 from PyQtConsoleOutputWnd import PyQtConsoleOutputWnd
 import PyQt4.QtGui as QtGui
 import sys
-from TaskbarIcon import List2SystemTray
+from TaskbarIcon import List2SystemTray, ConsoleManager
 from PyQt4 import QtCore
 import fileTools
 
@@ -43,3 +43,6 @@ def timeout(self, milliseconds, callback):
         self.ctimer.start(milliseconds)
     def exit(self):
         QtGui.QApplication.quit()
+    def get_app_list(self):
+        self.console_man = ConsoleManager()
+        return self.console_man
diff --git a/trunk/prodRoot/localLibs/qtconsole/TaskbarIcon.py b/trunk/prodRoot/localLibs/qtconsole/TaskbarIcon.py
@@ -1,6 +1,7 @@
 import sys
 from PyQt4 import QtGui
 from PyQt4.QtGui import QApplication
+import fileTools
 
 class SystemTrayIcon(QtGui.QSystemTrayIcon):
 
@@ -20,7 +21,8 @@ def __init__(self, icon, parent=None):
 class ApplicationList(QtGui.QWidget):
     def __init__(self):
         super(ApplicationList, self).__init__()
-        self.ui = uic.loadUi('app_list.ui', self)
+        ui_full_path = fileTools.findFileInProduct('app_list.ui')
+        self.ui = uic.loadUi(ui_full_path, self)
         self.model = QStandardItemModel()
         item = QStandardItem('Hello world')
         item1 = QStandardItem('Hello world1')
@@ -79,8 +81,7 @@ def show_app_list(self):
 
     def __setitem__(self, key, value):
         item = QStandardItem(key)
-        self.model.appendRow(item)
-        self.actionDict[key] = value
+        self.app_list.model.appendRow(item)
 
 
 def main():