| -rw-r--r-- | bin/kdepim/pwmanager/germantranslation.txt | 2 | ||||
| -rw-r--r-- | kaddressbook/jumpbuttonbar.cpp | 3 | ||||
| -rw-r--r-- | microkde/kutils/kcmultidialog.cpp | 6 | ||||
| -rw-r--r-- | pwmanager/pwmanager/editcategory.cpp | 1 |
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 @@ -294,9 +294,9 @@ { "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):" },
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index ee5b44e..184d516 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -124,9 +124,10 @@ void JumpButtonBar::recreateButtons() } 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 ); 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 @@ -51,10 +51,12 @@ KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const ch 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 } 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 @@ -144,8 +144,9 @@ void editCategoryWnd::slotApply() void editCategoryWnd::cancel_slot() { QString cat = categoryComboBox->currentText(); categorySelected ( cat ); + reject(); } void editCategoryWnd::setCurrCategory(const QString &cat) { |