-rw-r--r-- | pwmanager/pwmanager/getmasterpwwnd_emb.cpp | 11 | ||||
-rw-r--r-- | pwmanager/pwmanager/main.cpp | 1 | ||||
-rw-r--r-- | pwmanager/pwmanager/pwminit.cpp | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/pwmanager/pwmanager/getmasterpwwnd_emb.cpp b/pwmanager/pwmanager/getmasterpwwnd_emb.cpp index 7f4ccef..8b6dfbc 100644 --- a/pwmanager/pwmanager/getmasterpwwnd_emb.cpp +++ b/pwmanager/pwmanager/getmasterpwwnd_emb.cpp | |||
@@ -59,18 +59,20 @@ getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name) | |||
59 | pwLineEdit->setEchoMode( QLineEdit::Password ); | 59 | pwLineEdit->setEchoMode( QLineEdit::Password ); |
60 | 60 | ||
61 | QLabel* textLabel1 = new QLabel( pwLineEdit, i18n("Please enter the master-password:"), page, "textLabel1" ); | 61 | QLabel* textLabel1 = new QLabel( pwLineEdit, i18n("Please enter the master-password:"), page, "textLabel1" ); |
62 | textLabel1->setAlignment( int( QLabel::WordBreak | QLabel::AlignCenter ) ); | 62 | textLabel1->setAlignment( int( QLabel::WordBreak | QLabel::AlignCenter ) ); |
63 | pageLayout->addWidget(textLabel1); | 63 | pageLayout->addWidget(textLabel1); |
64 | pageLayout->addWidget(pwLineEdit); | 64 | pageLayout->addWidget(pwLineEdit); |
65 | 65 | ||
66 | QWidget* numberBox = new QWidget( page ); | 66 | QWidget* numberBox = new QWidget( page ); |
67 | numberBox->setFixedHeight(100); | 67 | #ifndef DESKTOP_VERSION |
68 | numberBox->setFixedWidth(100); | 68 | numberBox->setFixedHeight(150); |
69 | numberBox->setFixedWidth(150); | ||
70 | #endif | ||
69 | 71 | ||
70 | QGridLayout* numberLayout = new QGridLayout( numberBox, 4, 3 ); | 72 | QGridLayout* numberLayout = new QGridLayout( numberBox, 4, 3 ); |
71 | numberLayout->setMargin( 0 ); | 73 | numberLayout->setMargin( 0 ); |
72 | numberLayout->setSpacing( 0 ); | 74 | numberLayout->setSpacing( 0 ); |
73 | 75 | ||
74 | QPushButton* p1 = new QPushButton( i18n("1"), numberBox ); | 76 | QPushButton* p1 = new QPushButton( i18n("1"), numberBox ); |
75 | numberLayout->addWidget( p1, 0, 0 ); | 77 | numberLayout->addWidget( p1, 0, 0 ); |
76 | QPushButton* p2 = new QPushButton( i18n("2"), numberBox ); | 78 | QPushButton* p2 = new QPushButton( i18n("2"), numberBox ); |
@@ -93,18 +95,21 @@ getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name) | |||
93 | numberLayout->addWidget( clear, 3, 0 ); | 95 | numberLayout->addWidget( clear, 3, 0 ); |
94 | QPushButton* p0 = new QPushButton( i18n("0"), numberBox ); | 96 | QPushButton* p0 = new QPushButton( i18n("0"), numberBox ); |
95 | numberLayout->addWidget( p0, 3, 1 ); | 97 | numberLayout->addWidget( p0, 3, 1 ); |
96 | QPushButton* backspace = new QPushButton( i18n("-"), numberBox ); | 98 | QPushButton* backspace = new QPushButton( i18n("-"), numberBox ); |
97 | numberLayout->addWidget( backspace, 3, 2 ); | 99 | numberLayout->addWidget( backspace, 3, 2 ); |
98 | 100 | ||
99 | 101 | ||
100 | pageLayout->addWidget(numberBox); | 102 | pageLayout->addWidget(numberBox); |
101 | 103 | #ifdef DESKTOP_VERSION | |
104 | resize( sizeHint() ); | ||
105 | #else | ||
102 | resize( 200,sizeHint().height() ); | 106 | resize( 200,sizeHint().height() ); |
107 | #endif | ||
103 | 108 | ||
104 | connect( p0, SIGNAL( clicked() ), this, SLOT( add0() ) ); | 109 | connect( p0, SIGNAL( clicked() ), this, SLOT( add0() ) ); |
105 | connect( p1, SIGNAL( clicked() ), this, SLOT( add1() ) ); | 110 | connect( p1, SIGNAL( clicked() ), this, SLOT( add1() ) ); |
106 | connect( p2, SIGNAL( clicked() ), this, SLOT( add2() ) ); | 111 | connect( p2, SIGNAL( clicked() ), this, SLOT( add2() ) ); |
107 | connect( p3, SIGNAL( clicked() ), this, SLOT( add3() ) ); | 112 | connect( p3, SIGNAL( clicked() ), this, SLOT( add3() ) ); |
108 | connect( p4, SIGNAL( clicked() ), this, SLOT( add4() ) ); | 113 | connect( p4, SIGNAL( clicked() ), this, SLOT( add4() ) ); |
109 | connect( p5, SIGNAL( clicked() ), this, SLOT( add5() ) ); | 114 | connect( p5, SIGNAL( clicked() ), this, SLOT( add5() ) ); |
110 | connect( p6, SIGNAL( clicked() ), this, SLOT( add6() ) ); | 115 | connect( p6, SIGNAL( clicked() ), this, SLOT( add6() ) ); |
diff --git a/pwmanager/pwmanager/main.cpp b/pwmanager/pwmanager/main.cpp index 9d1d863..3f2d055 100644 --- a/pwmanager/pwmanager/main.cpp +++ b/pwmanager/pwmanager/main.cpp | |||
@@ -198,17 +198,16 @@ int main(int argc, char *argv[]) | |||
198 | #ifndef DESKTOP_VERSION | 198 | #ifndef DESKTOP_VERSION |
199 | a.showMainWidget( &m ); | 199 | a.showMainWidget( &m ); |
200 | #else | 200 | #else |
201 | a.setMainWidget( &m ); | 201 | a.setMainWidget( &m ); |
202 | m.resize (640, 480 ); | 202 | m.resize (640, 480 ); |
203 | m.show(); | 203 | m.show(); |
204 | #endif | 204 | #endif |
205 | */ | 205 | */ |
206 | qDebug("exec "); | ||
207 | a.exec(); | 206 | a.exec(); |
208 | 207 | ||
209 | } | 208 | } |
210 | qDebug("PWMPI: Bye! "); | 209 | qDebug("PWMPI: Bye! "); |
211 | 210 | ||
212 | #endif | 211 | #endif |
213 | 212 | ||
214 | } | 213 | } |
diff --git a/pwmanager/pwmanager/pwminit.cpp b/pwmanager/pwmanager/pwminit.cpp index ea9e330..9238c8c 100644 --- a/pwmanager/pwmanager/pwminit.cpp +++ b/pwmanager/pwmanager/pwminit.cpp | |||
@@ -124,30 +124,29 @@ PwMInit::~PwMInit() | |||
124 | Randomizer::cleanup(); | 124 | Randomizer::cleanup(); |
125 | #ifndef PWM_EMBEDDED | 125 | #ifndef PWM_EMBEDDED |
126 | Configuration::cleanup(); | 126 | Configuration::cleanup(); |
127 | #endif | 127 | #endif |
128 | } | 128 | } |
129 | 129 | ||
130 | void PwMInit::initializeApp() | 130 | void PwMInit::initializeApp() |
131 | { | 131 | { |
132 | qDebug("PwMInit::initializeApp() "); | 132 | //qDebug("PwMInit::initializeApp() "); |
133 | PWM_ASSERT(runStatus == unknown); | 133 | PWM_ASSERT(runStatus == unknown); |
134 | runStatus = init; | 134 | runStatus = init; |
135 | initPosixSignalHandler(); | 135 | initPosixSignalHandler(); |
136 | Randomizer::init(); | 136 | Randomizer::init(); |
137 | #ifndef PWM_EMBEDDED | 137 | #ifndef PWM_EMBEDDED |
138 | Configuration::init(); | 138 | Configuration::init(); |
139 | #endif | 139 | #endif |
140 | initDCOP(); | 140 | initDCOP(); |
141 | initKWalletEmu(); | 141 | initKWalletEmu(); |
142 | initKeycard(); | 142 | initKeycard(); |
143 | initTray(); | 143 | initTray(); |
144 | handleCmdLineArgs(); | 144 | handleCmdLineArgs(); |
145 | qDebug("handle "); | ||
146 | bool openDeeplocked = false; | 145 | bool openDeeplocked = false; |
147 | if (conf()->confGlobAutostartDeepLocked() || | 146 | if (conf()->confGlobAutostartDeepLocked() || |
148 | savedCmd.open_deeplocked) | 147 | savedCmd.open_deeplocked) |
149 | openDeeplocked = true; | 148 | openDeeplocked = true; |
150 | if ( false ){ | 149 | if ( false ){ |
151 | // LR is not working | 150 | // LR is not working |
152 | //if (conf()->confWndAutoMinimizeOnStart() || | 151 | //if (conf()->confWndAutoMinimizeOnStart() || |
153 | // savedCmd.minToTray) { | 152 | // savedCmd.minToTray) { |
@@ -287,17 +286,16 @@ void PwMInit::removeTrayAndQuit() | |||
287 | } | 286 | } |
288 | 287 | ||
289 | PwM * PwMInit::createMainWnd(const QString &loadFile, | 288 | PwM * PwMInit::createMainWnd(const QString &loadFile, |
290 | bool loadFileDeepLocked, | 289 | bool loadFileDeepLocked, |
291 | bool virginity, | 290 | bool virginity, |
292 | PwMDoc *doc, | 291 | PwMDoc *doc, |
293 | bool minimized) | 292 | bool minimized) |
294 | { | 293 | { |
295 | qDebug("PwMInit::createMainWnd "); | ||
296 | PwM *newWnd; | 294 | PwM *newWnd; |
297 | if (!doc) | 295 | if (!doc) |
298 | doc = createDoc(); | 296 | doc = createDoc(); |
299 | newWnd = new PwM(this, doc, virginity); | 297 | newWnd = new PwM(this, doc, virginity); |
300 | #ifndef PWM_EMBEDDED | 298 | #ifndef PWM_EMBEDDED |
301 | _mainWndList.push_back(newWnd); | 299 | _mainWndList.push_back(newWnd); |
302 | #else | 300 | #else |
303 | _mainWndList.append(newWnd); | 301 | _mainWndList.append(newWnd); |