add clear_session_cache button in session widget, fix icons

console/gui/ShortFrameResult.py

@@ -61,18 +61,34 @@ class TaskWidget(QtGui.QWidget):
 
     def set_ok(self):
         if not self.set_status:
-            icon = QtGui.QIcon.fromTheme('dialog-ok-apply')
-            if icon.isNull():
-                icon = QtGui.QIcon.fromTheme('list-add')
-            self.image_but.setIcon(icon)
+            themeName = QtGui.QIcon.themeName()
+            icons = ['dialog-ok-apply','emblem-default','list-add']
+            icon = QtGui.QIcon()
+            for image in icons:
+                icon.setThemeName(themeName)
+                icon = icon.fromTheme(image)
+                if not icon.isNull():
+                    break
+                icon.setThemeName('Tango')
+                icon = icon.fromTheme(image)
+                if not icon.isNull():
+                    break
             self.set_status = True
 
     def set_error(self):
         if not self.set_status:
-            icon = QtGui.QIcon.fromTheme('window-close')
-            if icon.isNull():
-                icon = QtGui.QIcon.fromTheme('list-remove')
-            self.image_but.setIcon(icon)
+            themeName = QtGui.QIcon.themeName()
+            icons = ['window-close','emblem-important','list-remove']
+            icon = QtGui.QIcon()
+            for image in icons:
+                icon.setThemeName(themeName)
+                icon = icon.fromTheme(image)
+                if not icon.isNull():
+                    break
+                icon.setThemeName('Tango')
+                icon = icon.fromTheme(image)
+                if not icon.isNull():
+                    break
             self.set_status = True
             
     def setText(self, text):

console/gui/mainframe.py

@@ -1251,6 +1251,13 @@ class MainFrame(QtGui.QWidget):
                 for field in Group.fields.Field:
                     if not hasattr (self.param_object, field.name):
                         continue
+                    if hasattr (self.param_object, 'cl_page_count'):
+                        self.param_object.cl_page_count = \
+                                            self.ClientObj.count_row_res_table
+                    if hasattr (self.param_object, 'cl_page_offset'):
+                        self.param_object.cl_page_offset = str(0 + \
+                                                self.ClientObj.param_objects \
+                                                [self.method_name]['offset'])
                     if field.name == 'cl_page_count':
                         self.param_object[field.name] = \
                                             self.ClientObj.count_row_res_table

console/gui/more.py

@@ -1259,18 +1259,34 @@ class TaskWidget(QtGui.QWidget):
 
     def set_ok(self):
         if not self.set_status:
-            icon = QtGui.QIcon.fromTheme('dialog-ok-apply')
-            if icon.isNull():
-                icon = QtGui.QIcon.fromTheme('list-add')
-            self.image_but.setIcon(icon)
+            themeName = QtGui.QIcon.themeName()
+            icons = ['dialog-ok-apply','emblem-default','list-add']
+            icon = QtGui.QIcon()
+            for image in icons:
+                icon.setThemeName(themeName)
+                icon = icon.fromTheme(image)
+                if not icon.isNull():
+                    break
+                icon.setThemeName('Tango')
+                icon = icon.fromTheme(image)
+                if not icon.isNull():
+                    break
             self.set_status = True
 
     def set_error(self):
         if not self.set_status:
-            icon = QtGui.QIcon.fromTheme('window-close')
-            if icon.isNull():
-                icon = QtGui.QIcon.fromTheme('list-remove')
-            self.image_but.setIcon(icon)
+            themeName = QtGui.QIcon.themeName()
+            icons = ['window-close','emblem-important','list-remove']
+            icon = QtGui.QIcon()
+            for image in icons:
+                icon.setThemeName(themeName)
+                icon = icon.fromTheme(image)
+                if not icon.isNull():
+                    break
+                icon.setThemeName('Tango')
+                icon = icon.fromTheme(image)
+                if not icon.isNull():
+                    break
             self.set_status = True
 
 class ButtonsWidget(QtGui.QWidget):

console/gui/session_function.py

@@ -143,7 +143,13 @@ class ViewSessionInfo (QtGui.QWidget):
                 pass
         self.layout.addWidget(LabelWordWrap(_('Your IP adress - ')+ip, self))
         self.layout.addWidget(LabelWordWrap(_('Your MAC adress - ')+mac, self))
-            
+        
+        # Add clear cache Button
+        self.clear_cache_button = QtGui.QPushButton \
+                                    (_('Clear your cache session'), self)
+        self.clear_cache_button.clicked.connect(self.clear_cache(client, sid))
+        self.layout.addWidget(self.clear_cache_button)
+        
         Quit_button = QtGui.QPushButton(_("Quit"), self)
         
         self.layout.addWidget(Quit_button)
@@ -160,4 +166,17 @@ class ViewSessionInfo (QtGui.QWidget):
                   window.geometry().y() + window.geometry().height() / 2 \
                   - self.size().height() / 2)
         # for clear memory after closed this window
-        self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
+        self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
+        
+    def clear_cache(self, client, sid):
+        def wrapper():
+            try:
+                res = client.service.clear_session_cache(sid)
+            except Exception, e:
+                show_msg(e, 'Error')
+                return 1
+            if res:
+                show_msg('Error clearing session cache')
+            else:
+                show_msg('Session cache is cleared')
+        return wrapper