-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 | |||
@@ -63,10 +63,12 @@ getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name) | |||
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 ); |
@@ -97,10 +99,13 @@ getMasterPwWnd::getMasterPwWnd( QWidget* parent, const char* name) | |||
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() ) ); |
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 | |||
@@ -202,9 +202,8 @@ int main(int argc, char *argv[]) | |||
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! "); |
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 | |||
@@ -128,9 +128,9 @@ PwMInit::~PwMInit() | |||
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(); |
@@ -141,9 +141,8 @@ void PwMInit::initializeApp() | |||
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; |
@@ -291,9 +290,8 @@ PwM * PwMInit::createMainWnd(const QString &loadFile, | |||
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); |