Commit emails of the iDok project

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

Author: huebner
Date: Thu Aug 21 14:07:25 2008
New Revision: 180

Log:
A custom signal is now used to clear the text in the searchComboBox

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

Modified: trunk/java/ch/idok/qtgui/MainWindow.java
==============================================================================
--- trunk/java/ch/idok/qtgui/MainWindow.java    (original)
+++ trunk/java/ch/idok/qtgui/MainWindow.java    Thu Aug 21 14:07:25 2008
@@ -37,6 +37,7 @@
 import com.trolltech.qt.core.QPoint;
 import com.trolltech.qt.core.QUrl;
 import com.trolltech.qt.core.Qt;
+import com.trolltech.qt.core.Qt.FocusPolicy;
 import com.trolltech.qt.gui.QAction;
 import com.trolltech.qt.gui.QApplication;
 import com.trolltech.qt.gui.QCheckBox;
@@ -45,6 +46,7 @@
 import com.trolltech.qt.gui.QDialog;
 import com.trolltech.qt.gui.QDialogButtonBox;
 import com.trolltech.qt.gui.QFileDialog;
+import com.trolltech.qt.gui.QFocusEvent;
 import com.trolltech.qt.gui.QGridLayout;
 import com.trolltech.qt.gui.QInputDialog;
 import com.trolltech.qt.gui.QMainWindow;
@@ -54,6 +56,7 @@
 import com.trolltech.qt.gui.QScrollArea;
 import com.trolltech.qt.gui.QToolBar;
 import com.trolltech.qt.gui.QTreeWidgetItem;
+import com.trolltech.qt.gui.QWidget;
 import com.trolltech.qt.gui.QKeySequence.StandardKey;
 
 /**
@@ -107,7 +110,7 @@
 
     private QTreeWidgetItem selectedDocItem_;
 
-    private QComboBox searchComboBox_;
+    private myQComboBox searchComboBox_;
 
     private QAction searchAction_;
 
@@ -528,7 +531,7 @@
                 .setToolTip(tr("Display pending modifications"));
         showPendingChangesAction_.setEnabled(false);
 
-        searchComboBox_ = new QComboBox(this);
+        searchComboBox_ = new myQComboBox(this);
         searchComboBox_.setMaxCount(20);
         searchComboBox_.setMaxVisibleItems(10);
         searchComboBox_.setFixedWidth(400);
@@ -537,7 +540,8 @@
         searchComboBox_.setInsertPolicy(QComboBox.InsertPolicy.InsertAtTop);
 
         searchComboBox_.setEditText(tr("Enter search expression..."));
-        searchComboBox_.editTextChanged.connect(this, "clearSearchBox()");
+        searchComboBox_.setFocusPolicy(FocusPolicy.StrongFocus);
+        searchComboBox_.mySig.connect(this, "clearSearchBox()");
         firstSearchChange_ = true;
 
         searchAction_ = new QAction(Icons.SEARCHICON, "Search", this);
@@ -557,11 +561,21 @@
 
     }
     
+    static class myQComboBox extends QComboBox{
+        public myQComboBox(QWidget widget) {
+            super(widget);
+        }
+        public Signal0 mySig = new Signal0();
+        protected void focusInEvent(QFocusEvent arg__1){
+            mySig.emit();   
+            super.focusInEvent(arg__1); 
+        }
+    }
+    
+
     private void clearSearchBox(){
-        if (firstSearchChange_ && 
!searchComboBox_.currentText().contains("relpath")) {
-            String temp = 
searchComboBox_.currentText().substring(searchComboBox_.currentText().length()-1);
+        if (firstSearchChange_) {
             searchComboBox_.clearEditText();
-            searchComboBox_.setEditText(temp);
             firstSearchChange_ = false;
         }
     }