[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenetwork/kopete/kopete/contactlist
From:       Will Stephenson <lists () stevello ! free-online ! co ! uk>
Date:       2005-04-18 9:28:51
Message-ID: 20050418092851.B98A5625 () office ! kde ! org
[Download RAW message or body]

CVS commit by wstephens: 

Allow re-export of already linked contacts from Kopete to the kde address book, \
breaking existing link.  Fix a couple of untranslated strings. \
CCMAIL:yagami@netcabo.pt


  M +7 -6      kabcexport.cpp   1.2
  M +6 -0      kabcexport_base.ui   1.3


--- kdenetwork/kopete/kopete/contactlist/kabcexport.cpp  #1.1:1.2
@@ -26,4 +26,5 @@
 #include <qmap.h>
 
+#include <klocale.h>
 #include <kabc/addressbook.h>
 #include <kabc/resource.h>
@@ -78,6 +79,6 @@ KabcExportWizard::KabcExportWizard( QWid
         if ( counter == 0 )
         {
-                m_addrBooks->insertItem( "No writeable addressbook resource found." \
                );
-                m_addrBooks->insertItem( "Add or enable one using the KDE Control \
Centre." ); +                m_addrBooks->insertItem( i18n( "No writeable addressbook \
resource found." ) ); +                m_addrBooks->insertItem( i18n( "Add or enable \
one using the KDE Control Centre." ) );  m_addrBooks->setEnabled( false );
         }
@@ -86,9 +87,9 @@ KabcExportWizard::KabcExportWizard( QWid
                 m_addrBooks->setSelected( 0, true );
         
-        
         // fill contact list
         QPtrList<Kopete::MetaContact> contacts = \
Kopete::ContactList::self()->metaContacts();  QPtrListIterator<Kopete::MetaContact> \
it( contacts );  counter = 0;
+        QString alreadyIn = i18n( " (already in address book)" );
         for (; it.current(); ++it)
         {
@@ -103,5 +104,5 @@ KabcExportWizard::KabcExportWizard( QWid
                 }
                 else
-                        lvi->setEnabled( false );
+                        lvi->setText( 0, lvi->text( 0 ) + alreadyIn );
         }
 }
@@ -157,5 +158,5 @@ void KabcExportWizard::accept()
                         if ( item->isEnabled() && item->isOn() )
                         {
-                                kdDebug() << "creating addressee " << \
item->mc->displayName() << " in address book " << selectedResource->resourceName() << \
endl; +                                kdDebug( 14000 ) << "creating addressee " << \
item->mc->displayName() << " in address book " << selectedResource->resourceName() << \
                endl;
                                 // create a new addressee in the selected resource
                                 KABC::Addressee addr;

--- kdenetwork/kopete/kopete/contactlist/kabcexport_base.ui  #1.2:1.3
@@ -127,4 +127,10 @@
                     <cstring>m_contactList</cstring>
                 </property>
+                <property name="allColumnsShowFocus">
+                    <bool>true</bool>
+                </property>
+                <property name="resizeMode">
+                    <enum>AllColumns</enum>
+                </property>
             </widget>
             <widget class="QLayoutWidget">


[prev in list] [next in list] [prev in thread] [next in thread]