author | eilers <eilers> | 2003-08-08 14:45:49 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-08-08 14:45:49 (UTC) |
commit | 14d394e6c107b037a09a31a92605034fe50f7813 (patch) (side-by-side diff) | |
tree | 800699cf4dc9681c3eb023340634dd6a15fd04c8 /library/password.cpp | |
parent | dbc6ea35f5535a1f69deb7ebbafc0f721721dbf2 (diff) | |
download | opie-14d394e6c107b037a09a31a92605034fe50f7813.zip opie-14d394e6c107b037a09a31a92605034fe50f7813.tar.gz opie-14d394e6c107b037a09a31a92605034fe50f7813.tar.bz2 |
Merged branches from BRANCH_1_0
-rw-r--r-- | library/password.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/library/password.cpp b/library/password.cpp index 6d126c4..25fb1b8 100644 --- a/library/password.cpp +++ b/library/password.cpp @@ -80,9 +80,9 @@ PasswordDialog::PasswordDialog( QWidget* parent, const char* name, WFlags fl ) setFont( f ); f.setPointSize( 12 ); prompt->setFont( f ); } - + button_0->installEventFilter( this ); button_1->installEventFilter( this ); button_2->installEventFilter( this ); button_3->installEventFilter( this ); @@ -215,14 +215,15 @@ public: }; class OwnerDlg : public QDialog { + Q_OBJECT public: OwnerDlg( QWidget *parent, const char * name, Contact c, bool modal, bool fullscreen = FALSE ) - : QDialog( parent, name, modal, - fullscreen ? + : QDialog( parent, name, modal, + fullscreen ? WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop : 0 ) { if ( fullscreen ) { QRect desk = qApp->desktop()->geometry(); @@ -241,9 +242,9 @@ public: void resizeEvent( QResizeEvent * ) { tv->resize( size() ); } - + bool eventFilter(QObject *o, QEvent *e) { if (e->type() == QEvent::KeyPress || e->type() == QEvent::MouseButtonPress ) { accept(); @@ -288,18 +289,18 @@ QString Password::getPassword( const QString& prompt ) Return if a prompt for the user's passcode is needed. If \a at_poweron is TRUE, the dialog is only used if the user's preference request it at poweron - + Opie extension to speed up suspend/resume. */ bool Password::needToAuthenticate(bool at_poweron) { Config cfg("Security"); cfg.setGroup("Passcode"); QString passcode = cfg.readEntry("passcode"); - + return ( !passcode.isEmpty() && (!at_poweron || cfg.readNumEntry("passcode_poweron",0)) ); } @@ -323,9 +324,9 @@ void Password::authenticate(bool at_poweron) PasswdDlg pd(0,0,TRUE,TRUE); // see if there is contact information. OwnerDlg *oi = 0; - QString vfilename = Global::applicationFileName("addressbook", + QString vfilename = Global::applicationFileName("addressbook", "businesscard.vcf"); if (QFile::exists(vfilename)) { Contact c; c = Contact::readVCard( vfilename )[0]; |