2 files changed, 2 insertions, 8 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index c506e98..58fbccf 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -240,195 +240,193 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         connect(m_abView, SIGNAL( signalClearLetterPicker() ), pLabel, SLOT( clear() ) );
 
         vb->addWidget( pLabel );
 
         // Category Menu
         catMenu = new QPopupMenu( this );
         catMenu->setCheckable( TRUE );
         connect( catMenu, SIGNAL(activated(int)), this, SLOT(slotSetCategory(int)) );
         populateCategories();
         mbList->insertItem( tr("View"), catMenu );
         
          defaultFont = new QFont( m_abView->font() );
          slotSetFont(m_config.fontSize());
         m_curFontSize = m_config.fontSize();
         
         setCentralWidget(listContainer);
         
         //    qDebug("adressbook contrsuction: t=%d", t.elapsed() );
 
         
         isLoading = false;
 }
 
 
 void AddressbookWindow::slotConfig()
 {
         ConfigDlg* dlg = new ConfigDlg( this, "Config" );
         dlg -> setConfig( m_config );
         dlg -> showMaximized();
         if ( dlg -> exec() ) {
                 qWarning ("Config Dialog accepted !");
                 m_config = dlg -> getConfig();
                 if ( m_curFontSize != m_config.fontSize() ){
                         qWarning("Font was changed!");
                         m_curFontSize = m_config.fontSize();
                         emit slotSetFont( m_curFontSize );
                 }
                 m_abView -> setListOrder( m_config.orderList() );
         }
 
         delete dlg;
 }
 
 
 void AddressbookWindow::slotSetFont( int size ) 
 {
         qWarning("void AddressbookWindow::slotSetFont( %d )", size);
         
         if (size > 2 || size < 0)
                 size = 1;
         
         m_config.setFontSize( size );
         
         QFont *currentFont;
         
         switch (size) {
         case 0:
                 m_abView->setFont( QFont( defaultFont->family(), defaultFont->pointSize() - 2 ) );
                 currentFont = new QFont (m_abView->font());
                 // abList->resizeRows(currentFont->pixelSize() + 7); :SX
                 // abList->resizeRows();
                 break;
         case 1:
                 m_abView->setFont( *defaultFont );
                 currentFont = new QFont (m_abView->font());
         //      // abList->resizeRows(currentFont->pixelSize() + 7);
         //      abList->resizeRows();
                 break;
         case 2:
                 m_abView->setFont( QFont( defaultFont->family(), defaultFont->pointSize() + 2 ) );
                 currentFont = new QFont (m_abView->font());
         //      //abList->resizeRows(currentFont->pixelSize() + 7);
         //      abList->resizeRows();
                 break;
         }
 }
 
 
 
 void AddressbookWindow::importvCard() {
         QString str = OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
         if(!str.isEmpty() ){
                 setDocument((const QString&) str );
         }
         
 }
 
 void AddressbookWindow::setDocument( const QString &filename )
 {
         qWarning( "void AddressbookWindow::setDocument( %s )", filename.latin1() );
 
         if ( filename.find(".vcf") != int(filename.length()) - 4 ){ 
 
 
 
                 switch( QMessageBox::information( this, tr ( "Right file type ?" ),
-                                                  tr( "The selected File" ) + ( "\n" ) +
-                                                  tr ("does not end with \".vcf\" ") + ( "\n" ) +
-                                                  tr ( "Do you really want to open it?" ),
+                                                  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: 
                         qWarning("YES clicked");
                         break;
                 case 1: 
                         qWarning("NO clicked");
                         return;
                         break;
                 }
         }
 
         OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, 
                                                                          filename );
         OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true );
         OContactAccess::List allList = access->allRecords();
 
         OContactAccess::List::Iterator it;
         for ( it = allList.begin(); it != allList.end(); ++it ){
                 m_abView->addEntry( *it );
         }
         
         delete access;
 }
 
 void AddressbookWindow::resizeEvent( QResizeEvent *e )
 {
         QMainWindow::resizeEvent( e );
         
 
 }
 
 AddressbookWindow::~AddressbookWindow()
 {
         ToolBarDock dock;
         int dummy;
         bool bDummy;
         getLocation ( listTools, dock, dummy, bDummy, dummy );
         m_config.setToolBarDock( dock );
         m_config.save();
 }
 
 void AddressbookWindow::slotUpdateToolbar()
 {
          OContact ce = m_abView->currentEntry();
         actionMail->setEnabled( !ce.defaultEmail().isEmpty() );
 }
 
 void AddressbookWindow::slotListNew()
 {
         OContact cnt;
         if( !syncing ) {
                 editEntry( NewEntry );
         } else {
                 QMessageBox::warning(this, tr("OContacts"),
                                      tr("Can not edit data, currently syncing"));
         }
 }
 
 // void AddressbookWindow::slotListView()
 // {
         // m_abView -> init( abList->currentEntry() );
         // // :SX mView->sync();
         //      //:SXshowView();
 // }
 
 void AddressbookWindow::slotListDelete()
 {
         if(!syncing) {
                 OContact tmpEntry = m_abView ->currentEntry();
                 
                 // get a name, do the best we can...
                 QString strName = tmpEntry.fullName();
                 if ( strName.isEmpty() ) {
                         strName = tmpEntry.company();
                         if ( strName.isEmpty() )
                                 strName = "No Name";
                 }
                 
                 
                 if ( QPEMessageBox::confirmDelete( this, tr( "Contacts" ),
                                                    strName ) ) {
                         m_abView->removeEntry( tmpEntry.uid() );
                 }
         } else {
                 QMessageBox::warning( this, tr("Contacts"),
                                       tr("Can not edit data, currently syncing") );
         }
 }
 
 void AddressbookWindow::slotFindOpen()
 {
         searchBar->show();
         m_abView -> inSearch();
         searchEdit->setFocus();
@@ -716,193 +714,193 @@ void AddressbookWindow::slotPersonalView()
         // XXX need to disable some QActions.
         actionNew->setEnabled(FALSE);
         actionTrash->setEnabled(FALSE);
         actionFind->setEnabled(FALSE);
         actionMail->setEnabled(FALSE);
         
         setCaption( tr("Contacts - My Personal Details") );
 
         m_abView->showPersonal( true );
         
 }
 
 
 void AddressbookWindow::listIsEmpty( bool empty )
 {
         if ( !empty ) {
                 deleteButton->setEnabled( TRUE );
         }
 }
 
 void AddressbookWindow::reload()
 {
         syncing = FALSE;
         m_abView->clear();
         m_abView->reload();
 }
 
 void AddressbookWindow::flush()
 {
         syncing = TRUE;
         m_abView->save();
 }
 
 
 void AddressbookWindow::closeEvent( QCloseEvent *e )
 {
         
         if(syncing) {
                 /* shouldn't we save, I hear you say? well its already been set
                    so that an edit can not occur during a sync, and we flushed
                    at the start of the sync, so there is no need to save
                    Saving however itself would cause problems. */
                 e->accept();
                 return;
         }
         //################## shouldn't always save
         // True, but the database handles this automatically ! (se)
         if ( save() )
                 e->accept();
         else
                 e->ignore();
 }
 
 /*
   Returns TRUE if it is OK to exit
 */
 
 bool AddressbookWindow::save()
 {
         if ( !m_abView->save() ) {
                 if ( QMessageBox::critical( 0, tr( "Out of space" ),
                                             tr("Unable to save information.\n"
                                                "Free up some space\n"
                                                "and try again.\n"
                                                "\nQuit anyway?"),
                                             QMessageBox::Yes|QMessageBox::Escape,
                                             QMessageBox::No|QMessageBox::Default )
                      != QMessageBox::No )
                         return TRUE;
                 else
                         return FALSE;
         }
         return TRUE;
 }
 
 #ifdef __DEBUG_RELEASE
 void AddressbookWindow::slotSave()
 {
         save();
 }
 #endif
 
 
 void AddressbookWindow::slotNotFound()
 {
         qWarning("Got notfound signal !");
         QMessageBox::information( this, tr( "Not Found" ),
                                   tr( "Unable to find a contact for this \n 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" );
+        //                                tr( "End of list. Wrap around now...!" ) + "\n" );
                 
 }
 
 void AddressbookWindow::slotSetCategory( int c )
 {
         qWarning( "void AddressbookWindow::slotSetCategory( %d ) from %d", c, catMenu->count() );
         
         QString cat, book;
         AbView::Views  view = AbView::TableView;
         
         if ( c <= 0 )
                 return;
         
         // Checkmark Book Menu Item Selected 
         if ( c < 3 )
                 for ( unsigned int i = 1; i < 3; i++ )
                         catMenu->setItemChecked( i, c == (int)i );
         // Checkmark Category Menu Item Selected 
         else
                 for ( unsigned int i = 3; i < catMenu->count(); i++ )
                         catMenu->setItemChecked( i, c == (int)i );
         
         for ( unsigned int i = 1; i < catMenu->count(); i++ ) {
                 if (catMenu->isItemChecked( i )) {
                         if ( i == 1 ){ // default List view
                                 book = QString::null;
                                 view = AbView::TableView;
                         }else if ( i == 2 ){
                                 book = tr( "Cards" );
                                 view = AbView::CardView;
         //              }else if ( i == 3 ){
         //                      book = tr( "Personal" );
         //                      view = AbView:: PersonalView;
                         }else if ( i == 3 ){ // default All Categories
                                 cat = QString::null;
                         }else if ( i == (unsigned int)catMenu->count() - 1 ){ // last menu option (seperator is counted, too) will be Unfiled
                                 cat = "Unfiled";
                                 qWarning ("Unfiled selected!!!");
                         }else{
                                 cat = m_abView->categories()[i - 4];
                         }
                 }
         }
         
         slotViewSwitched( view );
 
         m_abView -> setShowByCategory( view, cat );
 
         if ( book.isEmpty() )
                 book = "List";
         if ( cat.isEmpty() )
                 cat = "All";
         
         setCaption( tr( "Contacts" ) + " - " + book + " - " + tr( cat ) );
 }
 
 void AddressbookWindow::slotViewSwitched( int view )
 {
         qWarning( "void AddressbookWindow::slotViewSwitched( %d )", view );
         int menu = 0;
         switch ( view ){
         case AbView::TableView:
                 menu = 1;
                 m_tableViewButton->setOn(true);
                 m_cardViewButton->setOn(false);
                 break;
         case AbView::CardView:
                 menu = 2;
                 m_tableViewButton->setOn(false);
                 m_cardViewButton->setOn(true);
                 break;
         // case AbView::PersonalView:
         //      menu = 3;
         //      break;
         // case AbView::CompanyBook:
         //      menu = 3;
         //      break;
         // case AbView::EmailBook:
         //      menu = 4;
         //      break;
         }
         for ( unsigned int i = 1; i < 3; i++ ){
                 if ( catMenu )
                         catMenu->setItemChecked( i, menu == (int)i );
         }
 }
 
 
 void AddressbookWindow::slotListView()
 {
         emit slotSetCategory( AbView::TableView +1 );
 }
 
 void AddressbookWindow::slotCardView()
 {
         emit slotSetCategory( AbView::CardView +1 );
diff --git a/core/pim/addressbook/configdlg_base.ui b/core/pim/addressbook/configdlg_base.ui
index 66414f5..408bfa6 100644
--- a/core/pim/addressbook/configdlg_base.ui
+++ b/core/pim/addressbook/configdlg_base.ui
@@ -1,126 +1,122 @@
 <!DOCTYPE UI><UI>
 <class>ConfigDlg_Base</class>
 <author>Stefan Eilers</author>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>Configuration</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
             <width>276</width>
             <height>327</height>
         </rect>
     </property>
     <property stdset="1">
         <name>sizePolicy</name>
         <sizepolicy>
             <hsizetype>5</hsizetype>
             <vsizetype>5</vsizetype>
         </sizepolicy>
     </property>
     <property stdset="1">
-        <name>caption</name>
-        <string>MyDialog1</string>
-    </property>
-    <property stdset="1">
         <name>sizeGripEnabled</name>
         <bool>true</bool>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <vbox>
         <property stdset="1">
             <name>margin</name>
             <number>1</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>6</number>
         </property>
         <widget>
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>configDlg_base</cstring>
             </property>
             <property stdset="1">
                 <name>sizePolicy</name>
                 <sizepolicy>
                     <hsizetype>7</hsizetype>
                     <vsizetype>7</vsizetype>
                 </sizepolicy>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>Widget5</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Misc</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
                         <number>5</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>6</number>
                     </property>
                     <widget>
                         <class>QGroupBox</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>GroupBox2</cstring>
                         </property>
                         <property stdset="1">
                             <name>title</name>
                             <string>Search Settings</string>
                         </property>
                         <vbox>
                             <property stdset="1">
                                 <name>margin</name>
                                 <number>11</number>
                             </property>
                             <property stdset="1">
                                 <name>spacing</name>
                                 <number>6</number>
                             </property>
                             <widget>
                                 <class>QButtonGroup</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>ButtonGroup1</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>title</name>
                                     <string>Query Style</string>
                                 </property>
                                 <vbox>
                                     <property stdset="1">
                                         <name>margin</name>
                                         <number>11</number>
                                     </property>
                                     <property stdset="1">
                                         <name>spacing</name>
                                         <number>6</number>
                                     </property>
                                     <widget>
                                         <class>QRadioButton</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>m_useRegExp</cstring>