dislog size fixes

4 files changed, 8 insertions, 4 deletions

diff --git a/bin/kdepim/pwmanager/germantranslation.txt b/bin/kdepim/pwmanager/germantranslation.txt
index 5941c2a..a47b123 100644
--- a/bin/kdepim/pwmanager/germantranslation.txt
+++ b/bin/kdepim/pwmanager/germantranslation.txt
@@ -292,13 +292,13 @@
 { "File","Datei" },

 { "Timeout","Timeout" },

 { "Autostart","Autostart" },

 { "External apps","Externe Applik." },

 { "Miscellaneous","Verschiedenes" },

 { "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },

-{ "edit category descriptions","Ändrere Kategoriebeschreibungen" },

+{ "edit category descriptions","Ändere Label für Kategorie" },

 { "Close","Schließen" },

 { "Category:","Category:" },

 { "Text1 (Description):","Text1 (Beschreibung):" },

 { "Text2 (Username):","Text2 (Benutzername):" },

 { "Text3 (Password):","Text3 (Passwort):" },

 { "edit/add a password entry","Ändere/hinzufüge Passwort Eintrag" },

diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index ee5b44e..184d516 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -122,13 +122,14 @@ void JumpButtonBar::recreateButtons()
       setEnabled( false );
       return;
   }
   for ( it = ab->begin(); it != ab->end(); ++it ) {
       if ( !field->value( *it ).isEmpty() )
           character = field->value( *it )[ 0 ].lower();
-      if ( !character.isEmpty() && !mCharacters.contains( character ) )
+      if ( character != "!" )
+          if ( !character.isEmpty() && !mCharacters.contains( character )  )
           mCharacters.append( character );
   }
   if ( mCharacters.count() == 0 ) {
       setEnabled( false );
       return;
   }
diff --git a/microkde/kutils/kcmultidialog.cpp b/microkde/kutils/kcmultidialog.cpp
index 248476f..4daa4ff 100644
--- a/microkde/kutils/kcmultidialog.cpp
+++ b/microkde/kutils/kcmultidialog.cpp
@@ -49,14 +49,16 @@ KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const ch
   _baseGroup = baseGroup;
   mMainWidget = new KJanusWidget( this, "JanusWidget", KJanusWidget::Tabbed );
   setMainWidget(mMainWidget );
 #ifdef DESKTOP_VERSION
     resize(640,480);
 #else
-    resize(640,480);
-    setMaximumSize( KMIN(KGlobal::getDesktopWidth()-5, 640), KMIN(KGlobal::getDesktopHeight()-20, 480));
+    //resize(640,480);
+    //setMaximumSize( KMIN(KGlobal::getDesktopWidth()-5, 640), KMIN(KGlobal::getDesktopHeight()-20, 480));
+    resize(800,800);
+    setMaximumSize( 800, 800 );
     //showMaximized();
 #endif
 
 }
 
 KCMultiDialog::~KCMultiDialog()
diff --git a/pwmanager/pwmanager/editcategory.cpp b/pwmanager/pwmanager/editcategory.cpp
index 4e55de8..4e2378c 100644
--- a/pwmanager/pwmanager/editcategory.cpp
+++ b/pwmanager/pwmanager/editcategory.cpp
@@ -142,12 +142,13 @@ void editCategoryWnd::slotApply()
 }
 
 void editCategoryWnd::cancel_slot()
 {   
   QString cat = categoryComboBox->currentText();
   categorySelected ( cat );
+  reject();
 }
 
 void editCategoryWnd::setCurrCategory(const QString &cat)
 {
         int i, count = categoryComboBox->count();