Commit emails of the iDok project

["AFS account Florian Huebner" <huebner AT savannah.psi.ch>]

Author: huebner
Date: Tue Sep 23 17:10:59 2008
New Revision: 224

Log:
"Search within folder" and "Search since a given date within folder" will now 
display the folder/date after the search text input field

Modified:
   trunk/java/ch/idok/qtgui/MainWindow.java
   trunk/java/ch/idok/qtgui/SearchController.java

Modified: trunk/java/ch/idok/qtgui/MainWindow.java
==============================================================================
--- trunk/java/ch/idok/qtgui/MainWindow.java    (original)
+++ trunk/java/ch/idok/qtgui/MainWindow.java    Tue Sep 23 17:10:59 2008
@@ -35,6 +35,7 @@
 import ch.idok.common.repository.RepositoryPath;
 import ch.idok.common.util.RevisionInfo;
 
+import com.sun.corba.se.impl.encoding.OSFCodeSetRegistry.Entry;
 import com.trolltech.qt.core.QDateTime;
 import com.trolltech.qt.core.QObject;
 import com.trolltech.qt.core.QPoint;
@@ -269,16 +270,22 @@
         raise();
     }
     
+    
     public void displaySearchHint(String text){
         searchHintLabel_.setText(text);
+        searchHintLabel_.adjustSize();
         searchHintLabelAction_.setVisible(true);
-        searchComboBox_.setFixedWidth(200);
+        int searchBoxSize = 400 - searchHintLabel_.size().width();
+        if (searchBoxSize < 90)
+            searchBoxSize = 90;
+        searchComboBox_.setFixedWidth(searchBoxSize);
     }
     
     public void removeSearchHint(){
         searchHintLabel_.setText("");
         searchHintLabelAction_.setVisible(false);
         searchComboBox_.setFixedWidth(400);
+        searchComboBox_.setVisible(true);
     }
 
     private void defineMainWindowCornerBehaviour() {
@@ -421,10 +428,12 @@
     private void getFilesAndFolders(QTreeWidgetItem item) {
         if (item.parent() == null) {
             ft_.rootSetupDmsDirModel();
+            ft_.searchWithFolderTriggered.emit("");
             removeSearchHint();
         } else {
             ft_.getFilesAndFolders(item);
             item.setExpanded(true);
+            ft_.searchWithFolderTriggered.emit("");
             removeSearchHint();
         }
     }

Modified: trunk/java/ch/idok/qtgui/SearchController.java
==============================================================================
--- trunk/java/ch/idok/qtgui/SearchController.java      (original)
+++ trunk/java/ch/idok/qtgui/SearchController.java      Tue Sep 23 17:10:59 
2008
@@ -400,7 +400,7 @@
 //        }
 //        searchComboBox_.setEditText(searchString);
         searchFolder = folder;
-        searchHintSignal.emit(searchFolder);
+        searchHintSignal.emit("Search within : /" + 
searchFolder.split("/")[searchFolder.split("/").length-1] + "/");
         searchComboBox_.setFocus();
     }
 
@@ -416,6 +416,9 @@
 //        searchComboBox_.setEditText(searchString);
         searchFolder = folder;
         searchTime = searchString;
+
+        searchHintSignal.emit("Search within : /" + 
searchFolder.split("/")[searchFolder.split("/").length-1] + "/" + "   Since 
:"+ fromDate);
+
 //        searchComboBox_.setFocus();
         startSearch();
     }