[qhanjoob] adapt qhandjoob to ICapJob update

weboob/applications/qhandjoob/main_window.py

@@ -57,19 +57,45 @@ class MainWindow(QtMainWindow):
         self.ui.jobFrame.hide()
 
         self.connect(self.ui.actionBackends, SIGNAL("triggered()"), self.backendsConfig)
+
         self.connect(self.ui.searchEdit, SIGNAL('returnPressed()'), self.doSearch)
         self.connect(self.ui.jobList, SIGNAL('currentItemChanged(QListWidgetItem*, QListWidgetItem*)'), self.jobSelected)
         self.connect(self.ui.searchButton, SIGNAL('clicked()'), self.doSearch)
 
+        self.connect(self.ui.refreshButton, SIGNAL('clicked()'), self.doAdvancedSearch)
+        self.connect(self.ui.queriesTabWidget, SIGNAL('currentChanged(int)'), self.tabChange)
+        self.connect(self.ui.jobListAdvancedSearch, SIGNAL('currentItemChanged(QListWidgetItem*, QListWidgetItem*)'), self.jobSelected)
+
+        self.connect(self.ui.idEdit, SIGNAL('returnPressed()'), self.openJob)
+
         if self.weboob.count_backends() == 0:
             self.backendsConfig()
 
+    def tabChange(self, index):
+        if index == 1:
+            self.doAdvancedSearch()
+
+    def doAdvancedSearch(self):
+        self.ui.jobListAdvancedSearch.clear()
+        self.process = QtDo(self.weboob, self.addJobAdvancedSearch)
+        self.process.do('advanced_search_job')
+
     def doSearch(self):
         pattern = unicode(self.ui.searchEdit.text())
         self.ui.jobList.clear()
-        self.process = QtDo(self.weboob, self.addJob)
+        self.process = QtDo(self.weboob, self.addJobSearch)
         self.process.do('search_job', pattern)
 
+    def addJobSearch(self, backend, job):
+        item = self.addJob(backend, job)
+        if item:
+            self.ui.jobList.addItem(item)
+
+    def addJobAdvancedSearch(self, backend, job):
+        item = self.addJob(backend, job)
+        if item:
+            self.ui.jobListAdvancedSearch.addItem(item)
+
     def addJob(self, backend, job):
         if not backend:
             self.process = None
@@ -80,7 +106,7 @@ class MainWindow(QtMainWindow):
 
         item = JobListWidgetItem(job)
         item.setAttrs(self.storage)
-        self.ui.jobList.addItem(item)
+        return item
 
     def closeEvent(self, event):
         QtMainWindow.closeEvent(self, event)
@@ -93,7 +119,7 @@ class MainWindow(QtMainWindow):
     def jobSelected(self, item, prev):
         if item is not None:
             job = item.job
-            self.ui.queriesFrame.setEnabled(False)
+            self.ui.queriesTabWidget.setEnabled(False)
 
             self.process = QtDo(self.weboob, self.gotJob)
             self.process.do('fillobj', job, backends=job.backend)
@@ -106,9 +132,24 @@ class MainWindow(QtMainWindow):
         if prev:
             prev.setAttrs(self.storage)
 
+    def openJob(self):
+        url = unicode(self.ui.idEdit.text())
+        if not url:
+            return
+
+        for backend in self.weboob.iter_backends():
+            job = backend.get_job_advert(url)
+            if job:
+                self.process = QtDo(self.weboob, self.gotJob)
+                self.process.do('fillobj', job, backends=job.backend)
+                break
+
+        self.setJob(job)
+        self.ui.idEdit.clear()
+
     def gotJob(self, backend, job):
         if not backend:
-            self.ui.queriesFrame.setEnabled(True)
+            self.ui.queriesTabWidget.setEnabled(True)
             self.process = None
             return
 
@@ -118,7 +159,7 @@ class MainWindow(QtMainWindow):
         if job:
             self.ui.descriptionEdit.setText("%s" % job.description)
             self.ui.titleLabel.setText("<h1>%s</h1>" % job.title)
-            self.ui.backendLabel.setText("%s" % job.backend)
+            self.ui.idLabel.setText("%s" % job.id)
             self.ui.jobNameLabel.setText("%s" % job.job_name)
             self.ui.publicationDateLabel.setText("%s" % job.publication_date)
             self.ui.societyNameLabel.setText("%s" % job.society_name)

weboob/applications/qhandjoob/ui/main_window.ui

@@ -20,57 +20,109 @@
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
-      <widget class="QFrame" name="queriesFrame">
+      <widget class="QTabWidget" name="queriesTabWidget">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="frameShape">
+       <property name="currentIndex">
-        <enum>QFrame::StyledPanel</enum>
+        <number>1</number>
        </property>
-       <property name="frameShadow">
+       <widget class="QWidget" name="SearchTab">
-        <enum>QFrame::Raised</enum>
+        <attribute name="title">
-       </property>
+         <string>Search</string>
-       <layout class="QVBoxLayout" name="verticalLayout_2">
+        </attribute>
-        <item>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
-          <item>
+          <layout class="QHBoxLayout" name="horizontalLayout">
-           <widget class="QLineEdit" name="searchEdit"/>
+           <item>
-          </item>
+            <widget class="QLineEdit" name="searchEdit"/>
-          <item>
+           </item>
-           <widget class="QToolButton" name="searchButton">
+           <item>
-            <property name="text">
+            <widget class="QToolButton" name="searchButton">
-             <string>search</string>
+             <property name="text">
-            </property>
+              <string>search</string>
-           </widget>
+             </property>
-          </item>
+            </widget>
-         </layout>
+           </item>
-        </item>
+          </layout>
-        <item>
+         </item>
-         <widget class="QListWidget" name="jobList">
+         <item>
-          <property name="sizePolicy">
+          <widget class="QListWidget" name="jobList">
-           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <property name="sizePolicy">
-            <horstretch>0</horstretch>
+            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-            <verstretch>0</verstretch>
+             <horstretch>0</horstretch>
-           </sizepolicy>
+             <verstretch>0</verstretch>
-          </property>
+            </sizepolicy>
-          <property name="editTriggers">
+           </property>
-           <set>QAbstractItemView::NoEditTriggers</set>
+           <property name="editTriggers">
-          </property>
+            <set>QAbstractItemView::NoEditTriggers</set>
-          <property name="iconSize">
+           </property>
-           <size>
+           <property name="iconSize">
-            <width>128</width>
+            <size>
-            <height>128</height>
+             <width>128</width>
-           </size>
+             <height>128</height>
-          </property>
+            </size>
-          <property name="sortingEnabled">
+           </property>
-           <bool>true</bool>
+           <property name="sortingEnabled">
-          </property>
+            <bool>true</bool>
-         </widget>
+           </property>
-        </item>
+          </widget>
-       </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <item>
+            <widget class="QLabel" name="label_2">
+             <property name="text">
+              <string> id : </string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLineEdit" name="idEdit"/>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="advancedSearchResult">
+        <attribute name="title">
+         <string>Advanced search</string>
+        </attribute>
+        <layout class="QVBoxLayout" name="verticalLayout_3">
+         <item>
+          <widget class="QListWidget" name="jobListAdvancedSearch">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="editTriggers">
+            <set>QAbstractItemView::NoEditTriggers</set>
+           </property>
+           <property name="iconSize">
+            <size>
+             <width>128</width>
+             <height>128</height>
+            </size>
+           </property>
+           <property name="sortingEnabled">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="refreshButton">
+           <property name="text">
+            <string>Refresh</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
       </widget>
       <widget class="QSplitter" name="splitter">
        <property name="orientation">
@@ -120,12 +172,12 @@
                     </font>
                    </property>
                    <property name="text">
-                    <string>Backend</string>
+                    <string>Id</string>
                    </property>
                   </widget>
                  </item>
                  <item row="0" column="1">
-                  <widget class="QLabel" name="backendLabel">
+                  <widget class="QLabel" name="idLabel">
                    <property name="text">
                     <string>Loading...</string>
                    </property>
@@ -336,15 +388,15 @@
                    <property name="text">
                     <string>Loading...</string>
                    </property>
-                   <property name="textInteractionFlags">
-                    <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-                   </property>
                    <property name="wordWrap">
                     <bool>true</bool>
                    </property>
                    <property name="openExternalLinks">
                     <bool>true</bool>
                    </property>
+                   <property name="textInteractionFlags">
+                    <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+                   </property>
                   </widget>
                  </item>
                 </layout>
@@ -375,8 +427,8 @@
               <horstretch>0</horstretch>
               <verstretch>50</verstretch>
              </sizepolicy>
-             </property>
+            </property>
-              <property name="readOnly">
+            <property name="readOnly">
              <bool>true</bool>
             </property>
            </widget>
@@ -395,7 +447,7 @@
      <x>0</x>
      <y>0</y>
      <width>709</width>
-     <height>24</height>
+     <height>23</height>
     </rect>
    </property>
   </widget>
@@ -419,7 +471,6 @@
   </action>
  </widget>
  <tabstops>
-  <tabstop>searchEdit</tabstop>
   <tabstop>searchButton</tabstop>
   <tabstop>jobList</tabstop>
  </tabstops>