-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 | |||
@@ -295,7 +295,7 @@ | |||
295 | { "External apps","Externe Applik." }, | 295 | { "External apps","Externe Applik." }, |
296 | { "Miscellaneous","Verschiedenes" }, | 296 | { "Miscellaneous","Verschiedenes" }, |
297 | { "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" }, | 297 | { "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" }, |
298 | { "edit category descriptions","Ändrere Kategoriebeschreibungen" }, | 298 | { "edit category descriptions","Ändere Label für Kategorie" }, |
299 | { "Close","Schließen" }, | 299 | { "Close","Schließen" }, |
300 | { "Category:","Category:" }, | 300 | { "Category:","Category:" }, |
301 | { "Text1 (Description):","Text1 (Beschreibung):" }, | 301 | { "Text1 (Description):","Text1 (Beschreibung):" }, |
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index ee5b44e..184d516 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp | |||
@@ -125,7 +125,8 @@ void JumpButtonBar::recreateButtons() | |||
125 | for ( it = ab->begin(); it != ab->end(); ++it ) { | 125 | for ( it = ab->begin(); it != ab->end(); ++it ) { |
126 | if ( !field->value( *it ).isEmpty() ) | 126 | if ( !field->value( *it ).isEmpty() ) |
127 | character = field->value( *it )[ 0 ].lower(); | 127 | character = field->value( *it )[ 0 ].lower(); |
128 | if ( !character.isEmpty() && !mCharacters.contains( character ) ) | 128 | if ( character != "!" ) |
129 | if ( !character.isEmpty() && !mCharacters.contains( character ) ) | ||
129 | mCharacters.append( character ); | 130 | mCharacters.append( character ); |
130 | } | 131 | } |
131 | if ( mCharacters.count() == 0 ) { | 132 | if ( mCharacters.count() == 0 ) { |
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 | |||
@@ -52,8 +52,10 @@ KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const ch | |||
52 | #ifdef DESKTOP_VERSION | 52 | #ifdef DESKTOP_VERSION |
53 | resize(640,480); | 53 | resize(640,480); |
54 | #else | 54 | #else |
55 | resize(640,480); | 55 | //resize(640,480); |
56 | setMaximumSize( KMIN(KGlobal::getDesktopWidth()-5, 640), KMIN(KGlobal::getDesktopHeight()-20, 480)); | 56 | //setMaximumSize( KMIN(KGlobal::getDesktopWidth()-5, 640), KMIN(KGlobal::getDesktopHeight()-20, 480)); |
57 | resize(800,800); | ||
58 | setMaximumSize( 800, 800 ); | ||
57 | //showMaximized(); | 59 | //showMaximized(); |
58 | #endif | 60 | #endif |
59 | 61 | ||
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 | |||
@@ -145,6 +145,7 @@ void editCategoryWnd::cancel_slot() | |||
145 | { | 145 | { |
146 | QString cat = categoryComboBox->currentText(); | 146 | QString cat = categoryComboBox->currentText(); |
147 | categorySelected ( cat ); | 147 | categorySelected ( cat ); |
148 | reject(); | ||
148 | } | 149 | } |
149 | 150 | ||
150 | void editCategoryWnd::setCurrCategory(const QString &cat) | 151 | void editCategoryWnd::setCurrCategory(const QString &cat) |