Some usability updates in picker and find..

8 files changed, 164 insertions, 42 deletions

diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO
index 4daa2a8..796dc49 100644
--- a/core/pim/addressbook/TODO
+++ b/core/pim/addressbook/TODO
@@ -5,12 +5,13 @@ Urgent:
 - Font menu is invisible using german translation
 
 Important:
 
-- Picker: Activated letter schould be more visible
+- Cursor keys should work in detail-view (ablabel)
 - "What's this" should be added
 - Store last settings of combo-boxes
 - Mail-Icon is missing
+- Overview window cleanup needed..
 - Finishing of new View functions (List, Phonebook...)
 - The names of the countries are sorted by there english names, only..
   Even if they are translated.. :S
 - Reload if contacts were changed externally
@@ -29,5 +30,7 @@ Should be Fixed (not absolute sure, need further validation):
 Fixed:
 - Syncing: abtable not reloaded after sync.
 - Find widget should be replaced by something like 
   qpdf has.
-- Adding a configuration dialog
\ No newline at end of file
+- Adding a configuration dialog
+- Picker: Activated letter schould be more visible
+- Advanced handling of cursor keys (search..)
diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index cf1e39f..ea80700 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -46,8 +46,45 @@ void AbLabel::sync()
 }
 
 void AbLabel::keyPressEvent( QKeyEvent *e )
 {
-    if ( e->key() == Qt::Key_F33 ) {
-	emit okPressed();
-    }
+	// Commonly handled keys
+	switch( e->key() ) {
+	case Qt::Key_Left:
+		qWarning( "Left..");
+	case Qt::Key_F33:
+		qWarning( "OK..");
+		emit okPressed();
+		break;
+	}
+
+
+	if ( /* m_inSearch */ false ) {
+		// Running in seach-mode, therefore we will interprete
+		// some key differently
+		qWarning("Received key in search mode");
+		switch( e->key() ) {
+		case Qt::Key_Up:
+			qWarning("a");
+			// emit signalSearchBackward();
+			break;
+		case Qt::Key_Down:
+			qWarning("b");
+			// emit signalSearchNext();
+			break;
+		}
+		
+	} else {
+		qWarning("Received key in NON search mode");
+		
+		switch( e->key() ) {
+		case Qt::Key_Up:
+			qWarning("a");
+			// emit signalSearchBackward();
+			break;
+		case Qt::Key_Down:
+			qWarning("b");
+			// emit signalSearchNext();
+			break;
+		}
+	}
 }
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index d4dcf7b..97b26db 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -129,8 +129,9 @@ AbTable::AbTable( const QValueList<int> *order, QWidget *parent, const char *nam
 		 asc( TRUE ),
 		 intFields( order ),
 		 currFindRow( -1 ),
 		 mCat( 0 ),
+		 m_inSearch (false),
 		 m_contactdb ("addressbook", 0l, 0l, false) // Handle syncing myself.. !
 {
 	mCat.load( categoryFileName() );
 	setSelectionMode( NoSelection );
@@ -259,16 +260,42 @@ void AbTable::keyPressEvent( QKeyEvent *e )
 	
 	if ( key >= 'A' && key <= 'Z' )
 		moveTo( key );
 	
-	switch( e->key() ) {
-	case Qt::Key_Space:
-	case Qt::Key_Return:
-	case Qt::Key_Enter:
-		emit details();
-		break;
-	default:
-		QTable::keyPressEvent( e );
+	if ( m_inSearch ) {
+		// Running in seach-mode, therefore we will interprete
+		// some key differently
+		qWarning("Received key in search mode");
+		switch( e->key() ) {
+		case Qt::Key_Space:
+		case Qt::Key_Return:
+		case Qt::Key_Enter:
+			emit details();
+			break;
+		case Qt::Key_Up:
+			qWarning("a");
+			emit signalSearchBackward();
+			break;
+		case Qt::Key_Down:
+			qWarning("b");
+			emit signalSearchNext();
+			break;
+		default:
+			QTable::keyPressEvent( e );
+		}
+		
+	} else {
+		qWarning("Received key in NON search mode");
+
+		switch( e->key() ) {
+		case Qt::Key_Space:
+		case Qt::Key_Return:
+		case Qt::Key_Enter:
+			emit details();
+			break;
+		default:
+			QTable::keyPressEvent( e );
+		}
 	}
 }
 
 void AbTable::moveTo( char c )
@@ -682,9 +709,9 @@ void AbTable::slotDoFind( const QString &findString, bool caseSensitive, bool us
 		if ( wrapAround )
 			emit signalWrapAround();
 		else
 			emit signalNotFound();
-		
+
 		wrapAround = !wrapAround;
 	} else {
 		currFindRow = row;
 		QTableSelection foundSelection;
diff --git a/core/pim/addressbook/abtable.h b/core/pim/addressbook/abtable.h
index b445874..35a1e9e 100644
--- a/core/pim/addressbook/abtable.h
+++ b/core/pim/addressbook/abtable.h
@@ -97,16 +97,21 @@ public:
     void setPaintingEnabled( bool e );
 
     QString showBook() const;
 
+    void inSearch()  { m_inSearch = true; }
+    void offSearch() { m_inSearch = false; }
+
 public slots:
     void slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, bool backwards,
                      QString category = QString::null );
 signals:
     void empty( bool );
     void details();
     void signalNotFound();
     void signalWrapAround();
+    void signalSearchBackward(); // Signalled if backward search is requested
+    void signalSearchNext();    // Singalled if forward search is requested
 
 protected:
     virtual void keyPressEvent( QKeyEvent *e );
 
@@ -147,8 +152,10 @@ private:
 
     QString showBk;
     bool columnVisible;
 
+    bool m_inSearch;
+
     OContactAccess m_contactdb;
 
 };
 #endif // ABTABLE_H
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index f7e4c95..3466801 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -77,15 +77,22 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 				      WFlags f )
 	: QMainWindow( parent, name, f ),
 	  abEditor(0),
 	  useRegExp(false),
-	  DoSignalWrapAround(false),
+	  doNotifyWrapAround(true),
 	  caseSensitive(false),
 	  bAbEditFirstTime(TRUE),
 	  syncing(FALSE)
 {
 	isLoading = true;
 
+	// Read Config settings
+	Config cfg("AddressBook");
+	cfg.setGroup("Search");
+	useRegExp = cfg.readBoolEntry( "useRegExp" );
+	caseSensitive = cfg.readBoolEntry( "caseSensitive" );
+	doNotifyWrapAround = cfg.readBoolEntry( "doNotifyWrapAround" );
+
 	initFields();
 	
 	setCaption( tr("Contacts") );
 	setIcon( Resource::loadPixmap( "AddressBook" ) );
@@ -160,9 +167,9 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 
 	a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
 	connect( a, SIGNAL( activated() ), this, SLOT( slotFindClose() ) );
 	a->addTo( searchBar );
-	
+
 	a = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "qtmail/reply" ),
 			 QString::null, 0, this, 0 );
 	//a->setEnabled( FALSE ); we got support for it now :) zecke
 	actionMail = a;
@@ -222,9 +229,15 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 	vb->addWidget(abList);
 	// abList->setHScrollBarMode( QScrollView::AlwaysOff );
 	connect( abList, SIGNAL( empty( bool ) ), this, SLOT( listIsEmpty( bool ) ) );
 	connect( abList, SIGNAL( details() ), this, SLOT( slotListView() ) );
-	connect( abList, SIGNAL(currentChanged(int,int)), this, SLOT(slotUpdateToolbar()) );
+	connect( abList, SIGNAL( currentChanged(int,int) ), this, SLOT( slotUpdateToolbar() ) );
+	connect( abList, SIGNAL( signalSearchNext() ), this, SLOT( slotFindNext() ) );
+	connect( abList, SIGNAL( signalSearchBackward() ), this, SLOT( slotFindPrevious() ) );
+	
+	// Maybe we should react on Wraparound and notfound ?
+	QObject::connect( abList, SIGNAL(signalNotFound()), this, SLOT(slotNotFound()) );
+	QObject::connect( abList, SIGNAL(signalWrapAround()), this, SLOT(slotWrapAround()) );
 	
 	mView = 0;
 	
 	abList->load();
@@ -257,15 +270,8 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 	
 	//    qDebug("adressbook contrsuction: t=%d", t.elapsed() );
 
 	abList->setCurrentCell( 0, 0 );
-
-	// Read Config settings
-	Config cfg("AddressBook");
-	cfg.setGroup("Search");
-	useRegExp = cfg.readBoolEntry( "useRegExp" );
-	caseSensitive = cfg.readBoolEntry( "caseSensitive" );
-	DoSignalWrapAround = cfg.readBoolEntry( "signalWrapAround" );
 	
 	isLoading = false;
 }
 
@@ -274,15 +280,15 @@ void AddressbookWindow::slotConfig()
 {
 	ConfigDlg* dlg = new ConfigDlg( this, "Config" );
 	dlg -> setUseRegExp ( useRegExp );
 	dlg -> setBeCaseSensitive( caseSensitive );
-	dlg -> setSignalWrapAround( DoSignalWrapAround );
+	dlg -> setSignalWrapAround( doNotifyWrapAround );
 	dlg -> showMaximized();
 	if ( dlg -> exec() ) {
 		qWarning ("Config Dialog accepted !");
 		useRegExp = dlg -> useRegExp();
 		caseSensitive = dlg -> beCaseSensitive();
-		DoSignalWrapAround = dlg -> signalWrapAround();
+		doNotifyWrapAround = dlg -> signalWrapAround();
 	}
 
 	delete dlg;
 }
@@ -372,9 +378,9 @@ AddressbookWindow::~AddressbookWindow()
 
 	cfg.setGroup("Search");
 	cfg.writeEntry("useRegExp", useRegExp);
 	cfg.writeEntry("caseSensitive", caseSensitive);
-	cfg.writeEntry("signalWrapAround", DoSignalWrapAround);
+	cfg.writeEntry("doNotifyWrapAround", doNotifyWrapAround);
 }
 
 void AddressbookWindow::slotUpdateToolbar()
 {
@@ -655,11 +661,9 @@ void AddressbookWindow::slotPersonalView()
 		// we just turned it off
 		setCaption( tr("Contacts") );
 		actionNew->setEnabled(TRUE);
 		actionTrash->setEnabled(TRUE);
-#ifndef MAKE_FOR_SHARP_ROM
 		actionFind->setEnabled(TRUE);
-#endif
 		slotUpdateToolbar(); // maybe some of the above could be moved there
 		showList();
 		return;
 	}
@@ -927,26 +931,36 @@ AbLabel *AddressbookWindow::abView()
 
 void AddressbookWindow::slotFindOpen()
 {
 	searchBar->show();
+	abList -> inSearch();
 	searchEdit->setFocus();
 }
 void AddressbookWindow::slotFindClose()
 {
 	searchBar->hide();
+	abList -> offSearch();
 	abList->setFocus();
 }
 void AddressbookWindow::slotFindNext()
 {
 	if ( centralWidget() == abView() )
 		showList();
 
-	// Maybe we should react on Wraparound and notfound ?
-// 	QObject::connect( abList, SIGNAL(signalNotFound()), &frmFind, SLOT(slotNotFound()) );
-// 	QObject::connect( abList, SIGNAL(signalWrapAround()), &frmFind, SLOT(slotWrapAround()) );
-
 	abList->slotDoFind( searchEdit->text(), caseSensitive, useRegExp, false);
 	
+	searchEdit->clearFocus();
+	abList->setFocus();
+	if ( abList->numSelections() )
+		abList->clearSelection();
+
+}
+void AddressbookWindow::slotFindPrevious()
+{
+	if ( centralWidget() == abView() )
+		showList();
+
+	abList->slotDoFind( searchEdit->text(), caseSensitive, useRegExp, true);
 	
 	if ( abList->numSelections() )
 		abList->clearSelection();
 
@@ -958,8 +972,26 @@ void AddressbookWindow::slotFind()
 	abList->clearFindRow();
 	slotFindNext();
 }
 
+void AddressbookWindow::slotNotFound()
+{
+	qWarning("Got notfound signal !");
+	QMessageBox::information( this, tr( "Not Found" ),
+				  tr( "Unable to find a contact for this" ) + "\n"
+				  + tr( "search pattern !" ) );
+
+	
+}
+void AddressbookWindow::slotWrapAround()
+{
+	qWarning("Got wrap signal !");
+	if ( doNotifyWrapAround )
+		QMessageBox::information( this, tr( "End of list" ),
+					  tr( "End of list. Wrap around now.. !" ) + "\n" );
+		
+}
+
 void AddressbookWindow::slotSetCategory( int c )
 {
 	
 	QString cat, book;
diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h
index 18b083f..299ed70 100644
--- a/core/pim/addressbook/addressbook.h
+++ b/core/pim/addressbook/addressbook.h
@@ -61,8 +61,10 @@ public slots:
 	void flush();
 	void reload();
 	void appMessage(const QCString &, const QByteArray &);
 	void setDocument( const QString & );
+	void slotFindNext();
+	void slotFindPrevious();
 #ifdef __DEBUG_RELEASE
 	void slotSave();
 #endif
 
@@ -86,9 +88,10 @@ private slots:
 
 	void slotFindOpen();
 	void slotFindClose();
 	void slotFind();
-	void slotFindNext();
+	void slotNotFound();
+	void slotWrapAround();
 
 	void slotConfig();
 
 private:
@@ -111,9 +114,9 @@ private:
 	// Searching stuff
 	OFloatBar* searchBar;
 	QLineEdit* searchEdit;
 	bool useRegExp;
-	bool DoSignalWrapAround;
+	bool doNotifyWrapAround;
 	bool caseSensitive;
 
 	QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam, *actionPersonal, *actionMail;
 
diff --git a/core/pim/addressbook/picker.cpp b/core/pim/addressbook/picker.cpp
index a165451..7f4acb0 100644
--- a/core/pim/addressbook/picker.cpp
+++ b/core/pim/addressbook/picker.cpp
@@ -74,20 +74,29 @@ void PickerLabel::clearLetter()
 	currentLetter = 0;
 
 }
 
-void PickerLabel::mouseReleaseEvent( QMouseEvent *e )
+void PickerLabel::mousePressEvent( QMouseEvent* e )
+{
+	// If one pickerlabel is was, and an other is now selected, we 
+	// have to simulate the releaseevent.. Otherwise the new label
+	// will not get a highlighted  letter.. 
+	// Maybe there is a more intelligent solution, but this works and I am tired.. (se)
+	if ( ( currentLetter == 0 ) && ( lastLetter != '\0' ) ) mouseReleaseEvent( e );
+} 
+
+void PickerLabel::mouseReleaseEvent( QMouseEvent* /* e */ )
 {
 	QString tmpStr;
 
 	if (lastLetter != letter1 && lastLetter != letter2 && lastLetter != letter3 && lastLetter != '\0')
 		QTimer::singleShot( 0, this, SLOT(emitClearSignal()) );
 	
 	switch (currentLetter) {
 		case 0:
-			tmpStr = "<qt><font color=\"#7F0000\">";
+			tmpStr = "<qt><u><font color=\"#7F0000\">";
 			tmpStr += letter1;
-			tmpStr += "</font>";
+			tmpStr += "</font></u>";
 			tmpStr += letter2;
 			tmpStr += letter3;
 			tmpStr += "</qt>";
 
@@ -100,11 +109,11 @@ void PickerLabel::mouseReleaseEvent( QMouseEvent *e )
 
 		case 1:
 			tmpStr = "<qt>";
 			tmpStr += letter1;
-			tmpStr += "<font color=\"#7F0000\">";
+			tmpStr += "<u><font color=\"#7F0000\">";
 			tmpStr += letter2;
-			tmpStr += "</font>";
+			tmpStr += "</font></u>";
 			tmpStr += letter3;
 			tmpStr += "</qt>";
 
 			setText(tmpStr);
@@ -117,11 +126,11 @@ void PickerLabel::mouseReleaseEvent( QMouseEvent *e )
 		case 2:
 			tmpStr = "<qt>";
 			tmpStr += letter1;
 			tmpStr += letter2;
-			tmpStr += "<font color=\"#7F0000\">";
+			tmpStr += "<u><font color=\"#7F0000\">";
 			tmpStr += letter3;
-			tmpStr += "</font></qt>";
+			tmpStr += "</font></u></qt>";
 
 			setText(tmpStr);
 
 			currentLetter++;
@@ -223,7 +232,8 @@ void LetterPicker::clear()
 }
 
 void LetterPicker::newLetter( char letter )
 {
+	qWarning("LetterClicked");
 	emit letterClicked( letter );
 
 }
diff --git a/core/pim/addressbook/picker.h b/core/pim/addressbook/picker.h
index de5bd9d..d76d582 100644
--- a/core/pim/addressbook/picker.h
+++ b/core/pim/addressbook/picker.h
@@ -30,8 +30,9 @@ Q_OBJECT
 
 	protected:
 
 		void mouseReleaseEvent( QMouseEvent *e );
+		void mousePressEvent( QMouseEvent *e );
 
 	private:
 
 		int currentLetter;
@@ -47,8 +48,9 @@ class LetterPicker: public QFrame {
 Q_OBJECT
 	public:
 		LetterPicker( QWidget *parent = 0, const char *name = 0 );
 		~LetterPicker();
+		
 
 	public slots:
 		void clear();
 	
@@ -56,8 +58,9 @@ Q_OBJECT
 		void letterClicked( char );
 
 	private:
 		PickerLabel *lblABC, *lblDEF, *lblGHI, *lblJKL, *lblMNO, *lblPQR, *lblSTU, *lblVWX, *lblYZ;
+		PickerLabel *lastLabel;
 
 	private slots:
 		void newLetter( char letter );
 };