| -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 @@ -296,5 +296,5 @@ { "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:" },
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index ee5b44e..184d516 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -126,5 +126,6 @@ void JumpButtonBar::recreateButtons() 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 ); } 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 @@ -53,6 +53,8 @@ KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const ch 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 @@ -146,4 +146,5 @@ void editCategoryWnd::cancel_slot() QString cat = categoryComboBox->currentText(); categorySelected ( cat ); + reject(); } |