summaryrefslogtreecommitdiff
path: root/core
authoreilers <eilers>2004-12-20 14:19:24 (UTC)
committer eilers <eilers>2004-12-20 14:19:24 (UTC)
commit29f05e7138a05c2c32cad8b40fd432cd383964a9 (patch) (side-by-side diff)
tree2f80ace57f99ce24ac8c1e8a556c08e07ca18019 /core
parent18e47153532d016d878f47e0ce11cb1a9716218e (diff)
downloadopie-29f05e7138a05c2c32cad8b40fd432cd383964a9.zip
opie-29f05e7138a05c2c32cad8b40fd432cd383964a9.tar.gz
opie-29f05e7138a05c2c32cad8b40fd432cd383964a9.tar.bz2
Fix for Bug #1269 and use of new sorted of the pim libary
Diffstat (limited to 'core') (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/abview.cpp27
-rw-r--r--core/pim/addressbook/addressbook.cpp7
-rw-r--r--core/pim/addressbook/addressbook.h2
-rw-r--r--core/pim/addressbook/version.h2
4 files changed, 28 insertions, 10 deletions
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 7abb45c..6be19f8 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -154,20 +154,28 @@ void AbView::load()
{
odebug << "AbView::Load data" << oendl;
// Letter Search is stopped at this place
emit signalClearLetterPicker();
- if ( m_inPersonal )
- // VCard Backend does not sort..
- m_list = m_contactdb->allRecords();
- else{
- m_list = m_contactdb->sorted( true, 0, 0, 0 );
- if ( m_curr_category != -1 )
- clearForCategory();
+ if ( m_curr_category == 0 ) {
+ // Show unfiled
+ m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName,
+ Opie::OPimContactAccess::DoNotShowWithCategory, 0 );
+ } else if ( m_curr_category != -1 ){
+ // Just show selected category
+ m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName,
+ Opie::OPimBase::FilterCategory, m_curr_category );
+ } else {
+ // Show all categories
+ m_list = m_contactdb->sorted( true, Opie::OPimContactAccess::SortFileAsName,
+ Opie::OPimBase::FilterOff, 0 );
}
+
+// if ( m_curr_category != -1 )
+// clearForCategory();
odebug << "Number of contacts: " << m_list.count() << oendl;
updateView( true );
}
@@ -234,13 +242,16 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
if ( c == 0 ){
load();
return;
}else{
// If the current Backend is unable to solve the query, we will
// ignore the request ..
- if ( ! m_contactdb->hasQuerySettings( Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase ) ){
+ if ( ! m_contactdb->hasQuerySettings( Opie::OPimContactAccess::WildCards |
+ Opie::OPimContactAccess::IgnoreCase ) ){
+ owarn << "Tried to access queryByExample which is not supported by the current backend!!" << oendl;
+ owarn << "I have to ignore this access!" << oendl;
return;
}
switch( mode ){
case AbConfig::LastName:
query.setLastName( QString("%1*").arg(c) );
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 835038a..0654e1a 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -349,12 +349,19 @@ void AddressbookWindow::exportvCard()
}
void AddressbookWindow::setDocument( const QString &filename )
{
odebug << "void AddressbookWindow::setDocument( " << filename << " )" << oendl;
+ // Switch to default backend. This should avoid to import into
+ // the personal database accidently.
+ if ( actionPersonal->isOn() ){
+ actionPersonal->setOn( false );
+ slotPersonalView();
+ }
+
if ( filename.find(".vcf") != int(filename.length()) - 4 ){
switch( QMessageBox::information( this, tr ( "Right file type ?" ),
tr( "The selected file \n does not end with \".vcf\".\n Do you really want to open it?" ),
diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h
index 9217e95..7cc61bf 100644
--- a/core/pim/addressbook/addressbook.h
+++ b/core/pim/addressbook/addressbook.h
@@ -61,13 +61,13 @@ protected:
bool save();
public slots:
void flush();
void reload();
void appMessage(const QCString &, const QByteArray &);
- void setDocument( const QString & );
+ void setDocument( const QString & ); // Called by obex receiver and internally!
#ifdef __DEBUG_RELEASE
// void slotSave();
#endif
private slots:
void importvCard();
diff --git a/core/pim/addressbook/version.h b/core/pim/addressbook/version.h
index 790aa95..7ce9752 100644
--- a/core/pim/addressbook/version.h
+++ b/core/pim/addressbook/version.h
@@ -1,10 +1,10 @@
#ifndef _VERSION_H_
#define _VERSION_H_
#define MAINVERSION "1"
#define SUBVERSION "1"
-#define PATCHVERSION "0"
+#define PATCHVERSION "1"
#define APPNAME "OPIE_ADDRESSBOOK"
#endif