| author | ulf69 <ulf69> | 2004-09-24 19:51:43 (UTC) |
|---|---|---|
| committer | ulf69 <ulf69> | 2004-09-24 19:51:43 (UTC) |
| commit | a884dac6f756b3702a10ae97aa8782e4d2a84b20 (patch) (side-by-side diff) | |
| tree | 08e50146a3176848455db29e0c0ff0309c6f7b4c /pwmanager/pwmanager/pwmdocui.cpp | |
| parent | ae069aa892b29a96a923e49254cc89e65d0393eb (diff) | |
| download | kdepimpi-a884dac6f756b3702a10ae97aa8782e4d2a84b20.zip kdepimpi-a884dac6f756b3702a10ae97aa8782e4d2a84b20.tar.gz kdepimpi-a884dac6f756b3702a10ae97aa8782e4d2a84b20.tar.bz2 | |
*** empty log message ***
Diffstat (limited to 'pwmanager/pwmanager/pwmdocui.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | pwmanager/pwmanager/pwmdocui.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pwmanager/pwmanager/pwmdocui.cpp b/pwmanager/pwmanager/pwmdocui.cpp index 3993fa8..e42dd9d 100644 --- a/pwmanager/pwmanager/pwmdocui.cpp +++ b/pwmanager/pwmanager/pwmdocui.cpp @@ -79,9 +79,11 @@ QString PwMDocUi::requestMpw(bool chipcard) no_keycard_support_msg_box(currentView); #endif // CONFIG_KEYCARD } else { - GetMasterPwWndImpl pwWnd; #ifndef PWM_EMBEDDED + GetMasterPwWndImpl pwWnd; KWin::setState(pwWnd.winId(), NET::StaysOnTop); +#else + GetMasterPwWndImpl pwWnd; #endif if (pwWnd.exec() != 1) return ""; @@ -96,13 +98,13 @@ QString PwMDocUi::requestNewMpw(bool *chipcard) QString pw; SetMasterPwWndImpl pwWnd(currentView); pwWnd.setPwMKeyCard(keyCard); -#ifndef PWM_EMBEDDED if (!chipcard) { +#ifndef PWM_EMBEDDED pwWnd.mainTab->removePage(pwWnd.mainTab->page(1)); - } #else - qDebug("PwMDocUi::requestNewMpw must be implemented"); + pwWnd.mainTab->removePage(pwWnd.tab_2); #endif + } if (pwWnd.exec() != 1) return ""; @@ -137,7 +139,7 @@ void PwMDocUi::wrongMpwMsgBox(bool chipcard, QString prefix, QString postfix) if (chipcard) { msg += i18n("Wrong key-card!\n" - "Please try again with the " + "Please try again with the\n" "correct key-card."); } else { msg += i18n("Wrong master-password!\n" @@ -163,7 +165,7 @@ void PwMDocUi::noMpwMsgBox(bool chipcard, QString prefix, QString postfix) if (chipcard) { msg += i18n("No key-card found!\n" - "Please insert the " + "Please insert the\n" "correct key-card."); } else { msg += i18n("No master-password given!"); @@ -360,6 +362,7 @@ bool PwMDocUi::openDocUi(PwMDoc *doc, } } ret = doc->openDoc(&filename, lockStat); + qDebug("pwmdocui::OpenDocui %i", ret); if (ret != e_success) { if (ret == e_readFile || ret == e_openFile) { KMessageBox::error(getCurrentView(), |