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

List:       kde-commits
Subject:    kdepim/certmanager/lib
From:       David Faure <faure () kde ! org>
Date:       2004-03-16 17:11:59
Message-ID: 20040316171159.177B89959 () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Auto accel management in crypto config dialog; improved a warning.


  M +2 -1      backends/qgpgme/qgpgmecryptoconfig.cpp   1.17
  M +8 -1      ui/cryptoconfigdialog.cpp   1.2
  M +1 -4      ui/cryptoconfigmodule.cpp   1.4


--- kdepim/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp  #1.16:1.17
@@ -421,5 +421,6 @@ QVariant QGpgMECryptoConfigEntry::string
         }
         else if ( unescape ) {
-          Q_ASSERT( val[0] == '"' ); // see README.gpgconf
+          if( val[0] != '"' ) // see README.gpgconf
+            kdWarning(5150) << "String value should start with '\"' : " << val << \
endl;  val = val.mid( 1 );
         }

--- kdepim/certmanager/lib/ui/cryptoconfigdialog.cpp  #1.1:1.2
@@ -33,7 +33,11 @@
 #include "cryptoconfigmodule.h"
 #include <klocale.h>
+#include <kaccelmanager.h>
 
 Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, QWidget \
                *parent, const char* name )
-  : KDialogBase( parent, name, true /*modal*/,
+  : KDialogBase( Swallow,
+                 // Remove the "whats's this" button since we have no support for it
+                 WStyle_Customize | WStyle_DialogBorder | WStyle_Maximize | \
WStyle_Title | WStyle_SysMenu, +                 parent, name, true /*modal*/,
                  i18n( "Configure" ), Default|Cancel|Apply|Ok|User1,
                  Ok, true /*separator*/, KGuiItem( i18n( "&Reset" ), "undo" ) )
@@ -43,4 +47,7 @@ Kleo::CryptoConfigDialog::CryptoConfigDi
   connect( mMainWidget, SIGNAL( changed() ), SLOT( slotChanged() ) );
   enableButton( Apply, false );
+
+  // Automatically assign accelerators
+  KAcceleratorManager::manage( this );
 }
 

--- kdepim/certmanager/lib/ui/cryptoconfigmodule.cpp  #1.3:1.4
@@ -132,7 +132,4 @@ Kleo::CryptoConfigComponentGUI::CryptoCo
     mGroupGUIs.append( gg );
   }
-
-  // TODO accel (some auto-accel-manager)
-
 }
 
@@ -355,5 +352,5 @@ void Kleo::CryptoConfigEntrySpinBox::doS
 void Kleo::CryptoConfigEntrySpinBox::doLoad()
 {
-  int value;
+  int value = 0;
   switch ( mKind ) {
   case ListOfNone:


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