Fix for Bug #1269 and use of new sorted of the pim libary

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
@@ -144,40 +144,48 @@ Opie::OPimContact AbView::currentEntry()
 }
 
 bool AbView::save()
 {
                 //odebug << "AbView::Save data" << oendl;
 
         return m_contactdb->save();
 }
 
 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 );
+                } elseif ( 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 );
 
 }
 
 void AbView::reload()
 {
         odebug << "AbView::::reload()" << oendl;
 
         m_contactdb->reload();
         load();
 }
 
 void AbView::clear()
@@ -224,33 +232,36 @@ void AbView::setShowToView( Views view )
 
 }
 
 void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
 {
         odebug << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl;
 
         assert( mode < AbConfig::LASTELEMENT );
 
         Opie::OPimContact query;
         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) );
                         break;
                 case AbConfig::FileAs:
                         query.setFileAs( QString("%1*").arg(c) );
                         break;
                 default:
                         owarn << "Unknown Searchmode for AbView::setShowByLetter ! -> " << mode << oendl
                                                         << "I will ignore it.." << oendl;
                         return;
                 }
                 m_list = m_contactdb->queryByExample( query, Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase );
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
@@ -339,32 +339,39 @@ void AddressbookWindow::exportvCard()
                                 access->save();
                         }
                         delete access;
                 }else
                         QMessageBox::critical( 0, "Export VCard",
                            QString( tr( "You have to select a contact !") ) );
 
         }else
                 QMessageBox::critical( 0, "Export VCard",
                                        QString( tr( "You have to set a filename !") ) );
 }
 
 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?" ),
                                                   tr( "&Yes" ), tr( "&No" ), QString::null,
                                                   0,      // Enter == button 0
                                                   2 ) ) { // Escape == button 2
                 case 0:
                         odebug << "YES clicked" << oendl;
                         break;
                 case 1:
                         odebug << "NO clicked" << oendl;
                         return;
                         break;
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
@@ -51,33 +51,33 @@ public:
         static QString appName() { return QString::fromLatin1("addressbook"); }
         AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
         ~AddressbookWindow();
 
 protected:
         void resizeEvent( QResizeEvent * e );
 
         void editPersonal();
         void editEntry( EntryMode );
         void closeEvent( QCloseEvent *e );
         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();
         void exportvCard();
         void slotListNew();
         /* void slotListView(); */
         void slotListDelete();
         void slotViewBack();
         void slotViewEdit();
         void slotPersonalView();
         void listIsEmpty( bool );
         /*  void slotSettings();  */
         void writeMail();
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