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

List:       kde-commits
Subject:    KDE/kdepim/libkleo/ui
From:       Allen Winter <winter () kde ! org>
Date:       2010-08-16 17:57:53
Message-ID: 20100816175753.D724AAC854 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1164418 by winterz:

forward port SVN commit 1164344 by mutz:

Move the search-in-external-certificates button

Addendum to kolab/issue4484.
CCMAIL: mutz@kde.org


 M  +11 -4     keyselectiondialog.cpp  


--- trunk/KDE/kdepim/libkleo/ui/keyselectiondialog.cpp #1164417:1164418
@@ -343,7 +343,7 @@
     mCurrentContextMenuItem( 0 )
 {
   setCaption( title );
-  setButtons( Default|Ok|Cancel|Help|User1 );
+  setButtons( Default|Ok|Cancel|Help );
   setDefaultButton( Ok );
   setModal( modal );
   init( rememberChoice, extendedSelection, text, initialQuery );
@@ -367,7 +367,7 @@
     mCurrentContextMenuItem( 0 )
 {
   setCaption( title );
-  setButtons( Default|Ok|Cancel|Help|User1 );
+  setButtons( Default|Ok|Cancel|Help );
   setDefaultButton( Ok );
   setModal( modal );
   init( rememberChoice, extendedSelection, text, initialQuery );
@@ -402,6 +402,15 @@
 #endif
   }
 
+  QPushButton * const searchExternalPB =
+    new QPushButton( i18n( "Search for &External Certificates" ), page );
+  mTopLayout->addWidget( searchExternalPB, 0, Qt::AlignRight );
+  connect( searchExternalPB, SIGNAL(clicked()),
+           this, SLOT(slotStartSearchForExternalCertificates()) );
+  if ( initialQuery.isEmpty() ) {
+    searchExternalPB->hide();
+  }
+
   QHBoxLayout * hlay = new QHBoxLayout();
   mTopLayout->addLayout( hlay );
 
@@ -459,10 +468,8 @@
 
   setButtonText( KDialog::Default, i18n("&Reread Keys") );
   setButtonText( KDialog::Help, i18n("&Start Certificate Manager") );
-  setButtonText( KDialog::User1, i18n("Search for &External Certificates") );
   connect( this, SIGNAL(defaultClicked()), this, SLOT(slotRereadKeys()) );
   connect( this, SIGNAL(helpClicked()), this, SLOT(slotStartCertificateManager()) );
-  connect( this, SIGNAL(user1Clicked()), this, SLOT(slotStartSearchForExternalCertificates()) );
   connect( this, SIGNAL(okClicked()), this, SLOT(slotOk()));
   connect( this, SIGNAL(cancelClicked()),this,SLOT(slotCancel()));
   slotRereadKeys();
[prev in list] [next in list] [prev in thread] [next in thread]