summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/TODO7
-rw-r--r--core/pim/addressbook/ablabel.cpp43
-rw-r--r--core/pim/addressbook/abtable.cpp45
-rw-r--r--core/pim/addressbook/abtable.h7
-rw-r--r--core/pim/addressbook/addressbook.cpp70
-rw-r--r--core/pim/addressbook/addressbook.h7
-rw-r--r--core/pim/addressbook/picker.cpp24
-rw-r--r--core/pim/addressbook/picker.h3
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
@@ -7,8 +7,9 @@ Urgent:
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..
@@ -31,3 +32,5 @@ Fixed:
- 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
@@ -48,6 +48,43 @@ 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
@@ -131,4 +131,5 @@ AbTable::AbTable( const QValueList<int> *order, QWidget *parent, const char *nam
currFindRow( -1 ),
mCat( 0 ),
+ m_inSearch (false),
m_contactdb ("addressbook", 0l, 0l, false) // Handle syncing myself.. !
{
@@ -261,12 +262,38 @@ void AbTable::keyPressEvent( QKeyEvent *e )
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 );
+ }
}
}
@@ -684,5 +711,5 @@ void AbTable::slotDoFind( const QString &findString, bool caseSensitive, bool us
else
emit signalNotFound();
-
+
wrapAround = !wrapAround;
} else {
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
@@ -99,4 +99,7 @@ public:
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,
@@ -107,4 +110,6 @@ signals:
void signalNotFound();
void signalWrapAround();
+ void signalSearchBackward(); // Signalled if backward search is requested
+ void signalSearchNext(); // Singalled if forward search is requested
protected:
@@ -149,4 +154,6 @@ private:
bool columnVisible;
+ bool m_inSearch;
+
OContactAccess m_contactdb;
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
@@ -79,5 +79,5 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
abEditor(0),
useRegExp(false),
- DoSignalWrapAround(false),
+ doNotifyWrapAround(true),
caseSensitive(false),
bAbEditFirstTime(TRUE),
@@ -86,4 +86,11 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
isLoading = true;
+ // Read Config settings
+ Config cfg("AddressBook");
+ cfg.setGroup("Search");
+ useRegExp = cfg.readBoolEntry( "useRegExp" );
+ caseSensitive = cfg.readBoolEntry( "caseSensitive" );
+ doNotifyWrapAround = cfg.readBoolEntry( "doNotifyWrapAround" );
+
initFields();
@@ -162,5 +169,5 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
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 );
@@ -224,5 +231,11 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
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;
@@ -259,11 +272,4 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
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;
@@ -276,5 +282,5 @@ void AddressbookWindow::slotConfig()
dlg -> setUseRegExp ( useRegExp );
dlg -> setBeCaseSensitive( caseSensitive );
- dlg -> setSignalWrapAround( DoSignalWrapAround );
+ dlg -> setSignalWrapAround( doNotifyWrapAround );
dlg -> showMaximized();
if ( dlg -> exec() ) {
@@ -282,5 +288,5 @@ void AddressbookWindow::slotConfig()
useRegExp = dlg -> useRegExp();
caseSensitive = dlg -> beCaseSensitive();
- DoSignalWrapAround = dlg -> signalWrapAround();
+ doNotifyWrapAround = dlg -> signalWrapAround();
}
@@ -374,5 +380,5 @@ AddressbookWindow::~AddressbookWindow()
cfg.writeEntry("useRegExp", useRegExp);
cfg.writeEntry("caseSensitive", caseSensitive);
- cfg.writeEntry("signalWrapAround", DoSignalWrapAround);
+ cfg.writeEntry("doNotifyWrapAround", doNotifyWrapAround);
}
@@ -657,7 +663,5 @@ void AddressbookWindow::slotPersonalView()
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();
@@ -929,4 +933,5 @@ void AddressbookWindow::slotFindOpen()
{
searchBar->show();
+ abList -> inSearch();
searchEdit->setFocus();
}
@@ -934,4 +939,5 @@ void AddressbookWindow::slotFindClose()
{
searchBar->hide();
+ abList -> offSearch();
abList->setFocus();
}
@@ -941,10 +947,18 @@ void AddressbookWindow::slotFindNext()
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() )
@@ -960,4 +974,22 @@ void AddressbookWindow::slotFind()
}
+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 )
{
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
@@ -63,4 +63,6 @@ public slots:
void appMessage(const QCString &, const QByteArray &);
void setDocument( const QString & );
+ void slotFindNext();
+ void slotFindPrevious();
#ifdef __DEBUG_RELEASE
void slotSave();
@@ -88,5 +90,6 @@ private slots:
void slotFindClose();
void slotFind();
- void slotFindNext();
+ void slotNotFound();
+ void slotWrapAround();
void slotConfig();
@@ -113,5 +116,5 @@ private:
QLineEdit* searchEdit;
bool useRegExp;
- bool DoSignalWrapAround;
+ bool doNotifyWrapAround;
bool caseSensitive;
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
@@ -76,5 +76,14 @@ void PickerLabel::clearLetter()
}
-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;
@@ -85,7 +94,7 @@ void PickerLabel::mouseReleaseEvent( QMouseEvent *e )
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;
@@ -102,7 +111,7 @@ void PickerLabel::mouseReleaseEvent( QMouseEvent *e )
tmpStr = "<qt>";
tmpStr += letter1;
- tmpStr += "<font color=\"#7F0000\">";
+ tmpStr += "<u><font color=\"#7F0000\">";
tmpStr += letter2;
- tmpStr += "</font>";
+ tmpStr += "</font></u>";
tmpStr += letter3;
tmpStr += "</qt>";
@@ -119,7 +128,7 @@ void PickerLabel::mouseReleaseEvent( QMouseEvent *e )
tmpStr += letter1;
tmpStr += letter2;
- tmpStr += "<font color=\"#7F0000\">";
+ tmpStr += "<u><font color=\"#7F0000\">";
tmpStr += letter3;
- tmpStr += "</font></qt>";
+ tmpStr += "</font></u></qt>";
setText(tmpStr);
@@ -225,4 +234,5 @@ 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
@@ -32,4 +32,5 @@ Q_OBJECT
void mouseReleaseEvent( QMouseEvent *e );
+ void mousePressEvent( QMouseEvent *e );
private:
@@ -49,4 +50,5 @@ Q_OBJECT
LetterPicker( QWidget *parent = 0, const char *name = 0 );
~LetterPicker();
+
public slots:
@@ -58,4 +60,5 @@ Q_OBJECT
private:
PickerLabel *lblABC, *lblDEF, *lblGHI, *lblJKL, *lblMNO, *lblPQR, *lblSTU, *lblVWX, *lblYZ;
+ PickerLabel *lastLabel;
private slots: