summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/pwmanager/germantranslation.txt2
-rw-r--r--kaddressbook/jumpbuttonbar.cpp3
-rw-r--r--microkde/kutils/kcmultidialog.cpp6
-rw-r--r--pwmanager/pwmanager/editcategory.cpp1
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
@@ -274,49 +274,49 @@
274{ "Hashing:","Hashing:" }, 274{ "Hashing:","Hashing:" },
275{ "SHA-160, SHA1 (160 bit)","SHA-160, SHA1 (160 bit)" }, 275{ "SHA-160, SHA1 (160 bit)","SHA-160, SHA1 (160 bit)" },
276{ "SHA-256 (256 bit)","SHA-256 (256 bit)" }, 276{ "SHA-256 (256 bit)","SHA-256 (256 bit)" },
277{ "SHA-384 (384 bit)","SHA-384 (384 bit)" }, 277{ "SHA-384 (384 bit)","SHA-384 (384 bit)" },
278{ "SHA-512 (512 bit)","SHA-512 (512 bit)" }, 278{ "SHA-512 (512 bit)","SHA-512 (512 bit)" },
279{ "MD5 (128 bit)","MD5 (128 bit)" }, 279{ "MD5 (128 bit)","MD5 (128 bit)" },
280{ "RIPE-MD-160 (160 bit)","RIPE-MD-160 (160 bit)" }, 280{ "RIPE-MD-160 (160 bit)","RIPE-MD-160 (160 bit)" },
281{ "Tiger (192 bit)","Tiger (192 bit)" }, 281{ "Tiger (192 bit)","Tiger (192 bit)" },
282{ "Permissions:","Zugriffsrechte:" }, 282{ "Permissions:","Zugriffsrechte:" },
283{ "Make backup before saving","Mache Backup vor dem Speichern" }, 283{ "Make backup before saving","Mache Backup vor dem Speichern" },
284{ "Password timeout\n(timeout to hold password in\nmemory,so you don't have to\nre-enter it,if you\nalready have entered it)\n[set to 0 to disable]:","Passwort Timeout\n(Timeout um das Passwort\nim Speicher zu halten,\nso dass es nicht noch mal\neingegeben werden muß.)\n[Setze auf 0 zum deaktivieren]:" }, 284{ "Password timeout\n(timeout to hold password in\nmemory,so you don't have to\nre-enter it,if you\nalready have entered it)\n[set to 0 to disable]:","Passwort Timeout\n(Timeout um das Passwort\nim Speicher zu halten,\nso dass es nicht noch mal\neingegeben werden muß.)\n[Setze auf 0 zum deaktivieren]:" },
285{ "Auto-lock timeout\n(auto lock document after this\namount of seconds)\n[set to 0 to disable]:","(Total-)Sperr-Timeout\n(Sperre Dokument total nach\ndieser Anzahl Sekunden)\n[Setze auf 0 zum deaktivieren]:" }, 285{ "Auto-lock timeout\n(auto lock document after this\namount of seconds)\n[set to 0 to disable]:","(Total-)Sperr-Timeout\n(Sperre Dokument total nach\ndieser Anzahl Sekunden)\n[Setze auf 0 zum deaktivieren]:" },
286{ "deep-lock on autolock","Sperre total beim Sperr-Timeout" }, 286{ "deep-lock on autolock","Sperre total beim Sperr-Timeout" },
287{ "open deeplocked","Öffne total gesperrt" }, 287{ "open deeplocked","Öffne total gesperrt" },
288{ "Favourite browser:","Bevorzugter Browser:" }, 288{ "Favourite browser:","Bevorzugter Browser:" },
289{ "Favourite x-terminal:","Bevorzugtes x-terminal:" }, 289{ "Favourite x-terminal:","Bevorzugtes x-terminal:" },
290{ "Open document with passwords unlocked","Öffne Dokument mit Passwort ungesperrt" }, 290{ "Open document with passwords unlocked","Öffne Dokument mit Passwort ungesperrt" },
291{ "Look && feel","Aussehen" }, 291{ "Look && feel","Aussehen" },
292{ "File","Datei" }, 292{ "File","Datei" },
293{ "Timeout","Timeout" }, 293{ "Timeout","Timeout" },
294{ "Autostart","Autostart" }, 294{ "Autostart","Autostart" },
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):" },
302{ "Text2 (Username):","Text2 (Benutzername):" }, 302{ "Text2 (Username):","Text2 (Benutzername):" },
303{ "Text3 (Password):","Text3 (Passwort):" }, 303{ "Text3 (Password):","Text3 (Passwort):" },
304{ "edit/add a password entry","Ändere/hinzufüge Passwort Eintrag" }, 304{ "edit/add a password entry","Ändere/hinzufüge Passwort Eintrag" },
305{ "Description:","Beschreibung:" }, 305{ "Description:","Beschreibung:" },
306{ "Username:","Benutzername:" }, 306{ "Username:","Benutzername:" },
307{ "Password:","Passwort:" }, 307{ "Password:","Passwort:" },
308{ "&Reveal","&Offen zeigen" }, 308{ "&Reveal","&Offen zeigen" },
309{ "&Generate","&Generiere" }, 309{ "&Generate","&Generiere" },
310{ "&Password","&Passwort" }, 310{ "&Password","&Passwort" },
311{ "&Comments","Kommentare" }, 311{ "&Comments","Kommentare" },
312{ "Launcher:","Launcher:" }, 312{ "Launcher:","Launcher:" },
313{ "$d = Description","$d = Beschreibung" }, 313{ "$d = Description","$d = Beschreibung" },
314{ "$n = Username","$n = Benutzername" }, 314{ "$n = Username","$n = Benutzername" },
315{ "$c = Comment","$c = Kommentar" }, 315{ "$c = Comment","$c = Kommentar" },
316{ "$u = URL","$u = URL" }, 316{ "$u = URL","$u = URL" },
317{ "$p = Password","$p = Passwort" }, 317{ "$p = Password","$p = Passwort" },
318{ "&Launcher","&Launcher" }, 318{ "&Launcher","&Launcher" },
319{ "Password generator","Passwort Generator" }, 319{ "Password generator","Passwort Generator" },
320{ "Character set:","Buchstaben Set:" }, 320{ "Character set:","Buchstaben Set:" },
321{ "Lowercase (abc)","Klein (abc)" }, 321{ "Lowercase (abc)","Klein (abc)" },
322{ "Uppercase (ABC)","Groß (ABC)" }, 322{ "Uppercase (ABC)","Groß (ABC)" },
diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp
index ee5b44e..184d516 100644
--- a/kaddressbook/jumpbuttonbar.cpp
+++ b/kaddressbook/jumpbuttonbar.cpp
@@ -104,49 +104,50 @@ void JumpButtonBar::letterClicked()
104} 104}
105 105
106void JumpButtonBar::recreateButtons() 106void JumpButtonBar::recreateButtons()
107{ 107{
108 // the easiest way to remove all buttons ;) 108 // the easiest way to remove all buttons ;)
109 //mButtons.setAutoDelete( true ); 109 //mButtons.setAutoDelete( true );
110 //mButtons.clear(); 110 //mButtons.clear();
111 //mButtons.setAutoDelete( false ); 111 //mButtons.setAutoDelete( false );
112 mCharacters.clear(); 112 mCharacters.clear();
113 113
114 QString character; 114 QString character;
115 115
116 KABC::AddressBook *ab = mCore->addressBook(); 116 KABC::AddressBook *ab = mCore->addressBook();
117 KABC::AddressBook::Iterator it; 117 KABC::AddressBook::Iterator it;
118 KABC::Field *field = mCore->currentSearchField(); 118 KABC::Field *field = mCore->currentSearchField();
119 if ( field ) { 119 if ( field ) {
120 setEnabled( true ); 120 setEnabled( true );
121 } else { 121 } else {
122 setEnabled( false ); 122 setEnabled( false );
123 return; 123 return;
124 } 124 }
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 ) {
132 setEnabled( false ); 133 setEnabled( false );
133 return; 134 return;
134 } 135 }
135 136
136 int maxRows = mCharacters.count() / 2; // we use 2 columns 137 int maxRows = mCharacters.count() / 2; // we use 2 columns
137 if ( mCharacters.count() % 2 ) 138 if ( mCharacters.count() % 2 )
138 maxRows++; 139 maxRows++;
139 int fixwid = 20; 140 int fixwid = 20;
140 sortListLocaleAware( mCharacters ); 141 sortListLocaleAware( mCharacters );
141 bool skip2 = false; 142 bool skip2 = false;
142 int skipcount = 0; 143 int skipcount = 0;
143 int maxHei = 25; 144 int maxHei = 25;
144 if ( QApplication::desktop()->width() < 480 && mCharacters.count() > 13) { 145 if ( QApplication::desktop()->width() < 480 && mCharacters.count() > 13) {
145 skipcount = mCharacters.count()-13; 146 skipcount = mCharacters.count()-13;
146 maxHei = (QApplication::desktop()->height()-65)/13; 147 maxHei = (QApplication::desktop()->height()-65)/13;
147 } 148 }
148 else { 149 else {
149 fixwid = 30; 150 fixwid = 30;
150 if ( mCharacters.count() > 20 ) 151 if ( mCharacters.count() > 20 )
151 skipcount = mCharacters.count()- 20; 152 skipcount = mCharacters.count()- 20;
152 maxHei = (QApplication::desktop()->height()-120)/(mCharacters.count()-skipcount); 153 maxHei = (QApplication::desktop()->height()-120)/(mCharacters.count()-skipcount);
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
@@ -31,50 +31,52 @@
31#include <kmessagebox.h> 31#include <kmessagebox.h>
32//US #include <klibloader.h> 32//US #include <klibloader.h>
33#include <krun.h> 33#include <krun.h>
34#include <kprocess.h> 34#include <kprocess.h>
35 35
36#include "kcmultidialog.h" 36#include "kcmultidialog.h"
37//US #include "kcmultidialog.moc" 37//US #include "kcmultidialog.moc"
38//US #include "kcmoduleloader.h" 38//US #include "kcmoduleloader.h"
39 39
40KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const char *name, bool modal) 40KCMultiDialog::KCMultiDialog(const QString& baseGroup, QWidget *parent, const char *name, bool modal)
41 : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok, 41 : KDialogBase(IconList, i18n("Configure"), Default |Cancel | Apply | Ok, Ok,
42 parent, name, modal, true), d(0L) 42 parent, name, modal, true), d(0L)
43{ 43{
44 enableButton(Apply, false); 44 enableButton(Apply, false);
45 //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *))); 45 //connect(this, SIGNAL(aboutToShowPage(QWidget *)), this, SLOT(slotAboutToShow(QWidget *)));
46 46
47 connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) ); 47 connect( this, SIGNAL( defaultClicked() ), SLOT( slotDefault() ) );
48 48
49 _baseGroup = baseGroup; 49 _baseGroup = baseGroup;
50 mMainWidget = new KJanusWidget( this, "JanusWidget", KJanusWidget::Tabbed ); 50 mMainWidget = new KJanusWidget( this, "JanusWidget", KJanusWidget::Tabbed );
51 setMainWidget(mMainWidget ); 51 setMainWidget(mMainWidget );
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
60} 62}
61 63
62KCMultiDialog::~KCMultiDialog() 64KCMultiDialog::~KCMultiDialog()
63{ 65{
64//US moduleDict.setAutoDelete(true); 66//US moduleDict.setAutoDelete(true);
65} 67}
66 68
67void KCMultiDialog::slotDefault() 69void KCMultiDialog::slotDefault()
68{ 70{
69 71
70 int curPageIndex = activePageIndex(); 72 int curPageIndex = activePageIndex();
71 73
72 QPtrListIterator<KCModule> it(modules); 74 QPtrListIterator<KCModule> it(modules);
73 for (; it.current(); ++it) 75 for (; it.current(); ++it)
74 { 76 {
75 if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex) 77 if (pageIndex((QWidget *)(*it)->parent()) == curPageIndex)
76 { 78 {
77 (*it)->defaults(); 79 (*it)->defaults();
78 clientChanged(true); 80 clientChanged(true);
79 return; 81 return;
80 } 82 }
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
@@ -124,48 +124,49 @@ void editCategoryWnd::slotApply()
124 QString cat = categoryComboBox->currentText(); 124 QString cat = categoryComboBox->currentText();
125 125
126 unsigned int idx; 126 unsigned int idx;
127 bool found = doc->findCategory(cat, &idx); 127 bool found = doc->findCategory(cat, &idx);
128 128
129 if (found == true) 129 if (found == true)
130 { 130 {
131 PwMCategoryItem* catitem = doc->getCategoryEntry(idx); 131 PwMCategoryItem* catitem = doc->getCategoryEntry(idx);
132 132
133 catitem->desc_text = descLineEdit->text().latin1(); 133 catitem->desc_text = descLineEdit->text().latin1();
134 catitem->name_text = usernameLineEdit->text().latin1(); 134 catitem->name_text = usernameLineEdit->text().latin1();
135 catitem->pw_text = pwLineEdit->text().latin1(); 135 catitem->pw_text = pwLineEdit->text().latin1();
136 enableButton( KDialogBase::Apply, false ); 136 enableButton( KDialogBase::Apply, false );
137 return; 137 return;
138 } 138 }
139 139
140 BUG(); 140 BUG();
141 141
142} 142}
143 143
144void editCategoryWnd::cancel_slot() 144void 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
150void editCategoryWnd::setCurrCategory(const QString &cat) 151void editCategoryWnd::setCurrCategory(const QString &cat)
151{ 152{
152 int i, count = categoryComboBox->count(); 153 int i, count = categoryComboBox->count();
153 154
154 for (i = 0; i < count; ++i) { 155 for (i = 0; i < count; ++i) {
155 if (categoryComboBox->text(i) == cat) { 156 if (categoryComboBox->text(i) == cat) {
156 categoryComboBox->setCurrentItem(i); 157 categoryComboBox->setCurrentItem(i);
157 categorySelected ( cat ); 158 categorySelected ( cat );
158 return; 159 return;
159 } 160 }
160 } 161 }
161 BUG(); 162 BUG();
162} 163}
163 164
164void editCategoryWnd::categorySelected ( const QString & string ) 165void editCategoryWnd::categorySelected ( const QString & string )
165{ 166{
166 unsigned int idx; 167 unsigned int idx;
167 bool found = doc->findCategory(string, &idx); 168 bool found = doc->findCategory(string, &idx);
168 169
169 if (found == true) 170 if (found == true)
170 { 171 {
171 PwMCategoryItem* catitem = doc->getCategoryEntry(idx); 172 PwMCategoryItem* catitem = doc->getCategoryEntry(idx);