add a messages refresh button, and better handler of contacts selection

weboob/applications/qhavesex/contacts.py

@@ -43,6 +43,9 @@ class ThreadMessage(QFrame):
         self.ui = Ui_ThreadMessage()
         self.ui.setupUi(self)
 
+        self.set_message(message)
+
+    def set_message(self, message):
         self.message = message
 
         self.ui.nameLabel.setText(message.sender)
@@ -58,6 +61,7 @@ class ThreadMessage(QFrame):
             content = message.content.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('\n', '<br />')
         self.ui.contentLabel.setText(content)
 
+
     def __eq__(self, m):
         return self.message == m.message
 
@@ -76,6 +80,7 @@ class ContactThread(QWidget):
         self.thread = None
         self.messages = []
         self.process_msg = None
+        self.connect(self.ui.refreshButton, SIGNAL('clicked()'), self.refreshMessages)
 
         if support_reply:
             self.connect(self.ui.sendButton, SIGNAL('clicked()'), self.postReply)
@@ -84,12 +89,12 @@ class ContactThread(QWidget):
 
         self.refreshMessages()
 
-    def refreshMessages(self):
+    def refreshMessages(self, fillobj=False):
         if self.process_msg:
             return
 
         self.process_msg = QtDo(self.weboob, self.gotThread, self.gotError)
-        if self.thread:
+        if fillobj and self.thread:
             self.process_msg.do('fillobj', self.thread, ['root'], backends=self.contact.backend)
         else:
             self.process_msg.do('get_thread', self.contact.id, backends=self.contact.backend)
@@ -120,6 +125,9 @@ class ContactThread(QWidget):
     def _insert_message(self, message):
         widget = ThreadMessage(message)
         if widget in self.messages:
+            old_widget = self.messages[self.messages.index(widget)]
+            if old_widget.message.flags != widget.message.flags:
+                old_widget.set_message(widget.message)
             return
 
         for i, m in enumerate(self.messages):
@@ -148,7 +156,7 @@ class ContactThread(QWidget):
         button.hide()
         button.deleteLater()
 
-        self.refreshMessages()
+        self.refreshMessages(fillobj=True)
 
     def postReply(self):
         text = unicode(self.ui.textEdit.toPlainText())
@@ -306,7 +314,7 @@ class ContactsWidget(QWidget):
         self.ui.groupBox.setCurrentIndex(1)
 
         self.connect(self.ui.groupBox, SIGNAL('currentIndexChanged(int)'), self.groupChanged)
-        self.connect(self.ui.contactList, SIGNAL('currentItemChanged(QListWidgetItem*, QListWidgetItem*)'), self.contactChanged)
+        self.connect(self.ui.contactList, SIGNAL('itemClicked(QListWidgetItem*)'), self.contactChanged)
         self.connect(self.ui.refreshButton, SIGNAL('clicked()'), self.refreshContactList)
 
     def load(self):
@@ -369,18 +377,17 @@ class ContactsWidget(QWidget):
 
         self.ui.contactList.addItem(item)
 
-    def contactChanged(self, current, previous):
-        self.ui.tabWidget.clear()
-        self.contact = None
-
+    def contactChanged(self, current):
         if not current:
             return
 
-        self.contact = current.data(Qt.UserRole).toPyObject()
+        contact = current.data(Qt.UserRole).toPyObject()
 
-        if not self.contact:
+        if not contact or contact == self.contact:
             return
 
+        self.ui.tabWidget.clear()
+        self.contact = contact
         backend = self.weboob.get_backend(self.contact.backend)
 
         self.ui.tabWidget.addTab(ContactProfile(self.weboob, self.contact), self.tr('Profile'))

weboob/applications/qhavesex/ui/contact_thread.ui

@@ -13,13 +13,19 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <widget class="QSplitter" name="splitter">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <widget class="QFrame" name="frame">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Ignored">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
       <property name="frameShape">
        <enum>QFrame::StyledPanel</enum>
       </property>
@@ -52,41 +58,81 @@
        </item>
       </layout>
      </widget>
-     <widget class="QScrollArea" name="scrollArea">
+     <widget class="QWidget" name="widget" native="true">
       <property name="sizePolicy">
-       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
         <horstretch>0</horstretch>
-        <verstretch>1</verstretch>
+        <verstretch>5</verstretch>
        </sizepolicy>
       </property>
-      <property name="styleSheet">
-       <string notr="true"/>
-      </property>
-      <property name="horizontalScrollBarPolicy">
-       <enum>Qt::ScrollBarAsNeeded</enum>
-      </property>
-      <property name="widgetResizable">
-       <bool>true</bool>
-      </property>
-      <property name="alignment">
-       <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-      </property>
-      <widget class="QWidget" name="scrollAreaContent">
-       <property name="geometry">
-        <rect>
-         <x>0</x>
-         <y>0</y>
-         <width>556</width>
-         <height>187</height>
-        </rect>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="margin">
+        <number>0</number>
        </property>
-       <property name="styleSheet">
-        <string notr="true">QWidget#scrollAreaContent {
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QToolButton" name="refreshButton">
+           <property name="icon">
+            <iconset>
+             <normaloff>../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../usr/share/icons/oxygen/16x16/actions/view-refresh.png</normaloff>../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../../usr/share/icons/oxygen/16x16/actions/view-refresh.png</iconset>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QScrollArea" name="scrollArea">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>1</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="styleSheet">
+          <string notr="true"/>
+         </property>
+         <property name="horizontalScrollBarPolicy">
+          <enum>Qt::ScrollBarAsNeeded</enum>
+         </property>
+         <property name="widgetResizable">
+          <bool>true</bool>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+         </property>
+         <widget class="QWidget" name="scrollAreaContent">
+          <property name="geometry">
+           <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>556</width>
+            <height>154</height>
+           </rect>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">QWidget#scrollAreaContent {
 	background-color: rgb(255, 255, 255);
 }</string>
-       </property>
-       <layout class="QVBoxLayout" name="verticalLayout_2"/>
-      </widget>
+          </property>
+          <layout class="QVBoxLayout" name="verticalLayout_2"/>
+         </widget>
+        </widget>
+       </item>
+      </layout>
      </widget>
     </widget>
    </item>

weboob/capabilities/base.py

@@ -118,6 +118,12 @@ class CapBaseObject(object):
             for attrstr in self.FIELDS:
                 yield attrstr, getattr(self, attrstr)
 
+    def __eq__(self, obj):
+        if isinstance(obj, CapBaseObject):
+            return self.backend == obj.backend and self.id == obj.id
+        else:
+            return False
+
     class _AttribValue(object):
         def __init__(self, type, value):
             self.type = type