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

List:       kde-commits
Subject:    kdenetwork/kopete
From:       Olivier Goffart <ogoffart () kde ! org>
Date:       2005-03-15 22:08:28
Message-ID: 20050315220828.7702412E73 () office ! kde ! org
[Download RAW message or body]

CVS commit by ogoffart: 

Mark remove dialog as Dangerous, which is supposed to make them default to cancel, 
but it seems it is not yet correctly implemented in kdelibs (it's impossible to mark \
the cancel button as default one)


  M +2 -1      kopete/config/accounts/kopeteaccountconfig.cpp   1.24
  M +3 -2      kopete/contactlist/kopetecontactlistview.cpp   1.134
  M +2 -1      libkopete/kopetecontact.cpp   1.231


--- kdenetwork/kopete/kopete/config/accounts/kopeteaccountconfig.cpp  #1.23:1.24
@@ -229,5 +229,6 @@ void KopeteAccountConfig::slotRemoveAcco
         Kopete::Account *i = lvi->account();
         if ( KMessageBox::warningContinueCancel( this, i18n( "Are you sure you want \
                to remove the account \"%1\"?" ).arg( i->accountLabel() ),
-                i18n( "Remove Account" ), KGuiItem(i18n( "Remove Account" \
),"editdelete") ) == KMessageBox::Continue ) +                i18n( "Remove Account" \
), KGuiItem(i18n( "Remove Account" ), "editdelete"), +                 \
"askRemoveAccount", KMessageBox::Notify | KMessageBox::Dangerous ) == \
KMessageBox::Continue )  {
                 Kopete::AccountManager::self()->removeAccount( i );

--- kdenetwork/kopete/kopete/contactlist/kopetecontactlistview.cpp  #1.133:1.134
@@ -1555,5 +1555,6 @@ void KopeteContactListView::slotRemove()
                         return; // this should never happen
 
-                if( KMessageBox::warningContinueCancel( this, msg, i18n( "Remove" ), \
KGuiItem(i18n("Remove"),"editdelete") ) != +                if( \
KMessageBox::warningContinueCancel( this, msg, i18n( "Remove" ), \
KGuiItem(i18n("Remove"),"editdelete") , +                 "askRemovingContactOrGroup" \
, KMessageBox::Notify | KMessageBox::Dangerous ) !=  KMessageBox::Continue )
                 {
@@ -1571,5 +1572,5 @@ void KopeteContactListView::slotRemove()
                 if( KMessageBox::warningContinueCancelList( this, msg, items, \
                i18n("Remove"),
                         KGuiItem(i18n("Remove"),"editdelete"), \
                "askRemovingContactOrGroup" )
-                        != KMessageBox::Continue )
+                        != KMessageBox::Continue, KMessageBox::Notify | \
KMessageBox::Dangerous )  {
                         return;

--- kdenetwork/kopete/libkopete/kopetecontact.cpp  #1.230:1.231
@@ -477,5 +477,6 @@ void Contact::slotDelete()
         if ( KMessageBox::warningContinueCancel( Kopete::UI::Global::mainWidget(),
                 i18n( "Are you sure you want to remove the contact  '%1' from your \
                contact list?" ).
-                arg( d->contactId ), i18n( "Remove Contact" ), \
KGuiItem(i18n("Remove"), QString::fromLatin1("editdelete") ) ) +                arg( \
d->contactId ), i18n( "Remove Contact" ), KGuiItem(i18n("Remove"), \
QString::fromLatin1("editdelete") ), +                \
QString::fromLatin1("askRemoveContact"), KMessageBox::Notify | KMessageBox::Dangerous \
)  == KMessageBox::Continue )
         {


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