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
@@ -286,25 +286,25 @@
 { "deep-lock on autolock","Sperre total beim Sperr-Timeout" },

 { "open deeplocked","Öffne total gesperrt" },

 { "Favourite browser:","Bevorzugter Browser:" },

 { "Favourite x-terminal:","Bevorzugtes x-terminal:" },

 { "Open document with passwords unlocked","Öffne Dokument mit Passwort ungesperrt" },

 { "Look && feel","Aussehen" },

 { "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" },

 { "Description:","Beschreibung:" },

 { "Username:","Benutzername:" },

 { "Password:","Passwort:" },

 { "&Reveal","&Offen zeigen" },

 { "&Generate","&Generiere" },

 { "&Password","&Passwort" },

diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index ee5b44e..184d516 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -116,25 +116,26 @@ void JumpButtonBar::recreateButtons()
   KABC::AddressBook *ab = mCore->addressBook();
   KABC::AddressBook::Iterator it;
   KABC::Field *field = mCore->currentSearchField();
   if ( field ) {
       setEnabled( true );
   } else {
       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;
   }
   
   int maxRows = mCharacters.count() / 2; // we use 2 columns
   if ( mCharacters.count() % 2 )
     maxRows++;
   int fixwid = 20;
   sortListLocaleAware( mCharacters );
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
@@ -43,26 +43,28 @@ KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const ch
 {
     enableButton(Apply, false);
     //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *)));
 
   connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) );
 
   _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()
 {
 //US    moduleDict.setAutoDelete(true);
 }
 
 void KCMultiDialog::slotDefault()
 {
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
@@ -136,24 +136,25 @@ void editCategoryWnd::slotApply()
       enableButton( KDialogBase::Apply, false );
       return;
     }
 
   BUG();
 
 }
 
 void editCategoryWnd::cancel_slot()
 {   
   QString cat = categoryComboBox->currentText();
   categorySelected ( cat );
+  reject();
 }
 
 void editCategoryWnd::setCurrCategory(const QString &cat)
 {
         int i, count = categoryComboBox->count();
 
         for (i = 0; i < count; ++i) {
                 if (categoryComboBox->text(i) == cat) {
                         categoryComboBox->setCurrentItem(i);
                         categorySelected ( cat );
                         return;
                 }