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

List:       kde-commits
Subject:    kdenonbeta/kopete
From:       Olivier Goffart <ogoffart () tiscalinet ! be>
Date:       2003-08-24 14:33:55
[Download RAW message or body]

CVS commit by ogoffart: 

Allow the user to move a contact to a new metacontact


  M +1 -0      ChangeLog   1.31
  M +18 -3     libkopete/kopetecontact.cpp   1.144


--- kdenonbeta/kopete/ChangeLog  #1.30:1.31
@@ -16,4 +16,5 @@
           a chat window. (Will)
         o Allow to use customs icon for groups and metacontacts (Stephan / Olivier)
+        o Allow the user to move a contact to a new metacontact (Olivier)
 
 

--- kdenonbeta/kopete/libkopete/kopetecontact.cpp  #1.143:1.144
@@ -21,10 +21,7 @@
 
 #include <qapplication.h>
-#include <qlabel.h>
-#include <qvbox.h>
 
 #include <kdebug.h>
 #include <klineeditdlg.h>
-#include <klistview.h>
 #include <klocale.h>
 #include <kpopupmenu.h>
@@ -40,4 +37,13 @@
 #include "kopetemetacontact.h"
 
+
+//For the moving to another metacontact dialog
+#include <qlabel.h>
+#include <qvbox.h>
+#include <klistview.h>
+#include <qcheckbox.h>
+#include <qwhatsthis.h>
+
+
 // FIXME: What are these doing here and why are they #defines and not const ints? - \
Martijn  #define EMAIL_WINDOW 0
@@ -311,8 +317,17 @@ void KopeteContact::slotChangeMetaContac
         selectMetaContactListBox->sort();
 
+        QCheckBox *chkCreateNew=new QCheckBox(i18n( "Or create a new empty \
metacontact to contains it" ), w ); +        QWhatsThis::add( chkCreateNew , i18n( \
"If you select this option, a new metacontact will be created at top-level with the \
name of this contact. And the contact will be moved on it." ) ); +        \
QObject::connect( chkCreateNew , SIGNAL( toggled(bool) ) ,  selectMetaContactListBox \
, SLOT ( setDisabled(bool) ) ) ; +
         moveDialog->setMainWidget( w );
         if( moveDialog->exec() == QDialog::Accepted )
         {
                 KopeteMetaContact *mc = \
map[selectMetaContactListBox->currentItem()]; +                \
if(chkCreateNew->isChecked()) +                {
+                        mc=new KopeteMetaContact();
+                        KopeteContactList::contactList()->addMetaContact(mc);
+                }
                 if( mc )
                 {


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