Forssim

Merge lp:~daniel-stehn/forssim/touchscreen_numericpad_merge into lp:forssim

  1. touchscreen_numericpad_merge
  2. Merge into development
Proposed by Daniel Stehn
Status: Needs review
Proposed branch: lp:~daniel-stehn/forssim/touchscreen_numericpad_merge
Merge into: lp:forssim
Diff against target: 864 lines (+538/-230)
3 files modified
FsWisdom/RegisterUserWindow.cpp (+126/-0)
FsWisdom/RegisterUserWindow.h (+20/-1)
FsWisdom/RegisterUserWindow.ui (+392/-229)
To merge this branch: bzr merge lp:~daniel-stehn/forssim/touchscreen_numericpad_merge
Reviewer Review Type Date Requested Status
Martin Flodin Needs Information
Review via email: mp+16008@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Stehn (daniel-stehn) wrote :

This branch replaces touchScreenUI_NumericPad. It is a merge of the numericPad logic and the latest code.

Reply
Revision history for this message
Martin Flodin (mflodin) wrote :

Has anything changed in FsWisdom/RegisterUserWindow.ui? Is it just whitespace changes?

review: Needs Information
Reply
Revision history for this message
Daniel Stehn (daniel-stehn) wrote :

I simply took the RegisterUserWindow.ui that was in the branch touchScreenUI_numericPad. All I have done with it is fixed/changed the taborder.

Reply
Revision history for this message
Martin Flodin (mflodin) wrote :

I figured as much, but thought I'd check. It's sad that the diff can't show exactly where the change is, but instead shows the entire row (or even section) as changed.

Just a thought - perhaps we should change the "Del" to "Clear" or "Clr" since that's what it actually does.

Otherwise everything looks good, and works a lot better than the old implementation.

Reply

Unmerged revisions

357. By Daniel Stehn

merged with touchscreenUI numericpad

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'FsWisdom/RegisterUserWindow.cpp'
2--- FsWisdom/RegisterUserWindow.cpp 2009-11-05 09:43:32 +0000
3+++ FsWisdom/RegisterUserWindow.cpp 2009-12-11 10:13:12 +0000
4@@ -8,15 +8,33 @@
5 {
6 this->applicationNode = applicationNode;
7 ui.setupUi(this);
8+ m_bUserNameIsActive = true;
9
10
11 QObject::connect(ui.buttonBox, SIGNAL(rejected ()), applicationNode, SLOT(Quit()));
12 QObject::connect(ui.buttonBox, SIGNAL(accepted ()), applicationNode, SLOT(OnAcceptUserData()));
13 QObject::connect(ui.usernameLineEdit, SIGNAL(returnPressed ()), applicationNode, SLOT(OnAcceptUserData()));
14 QObject::connect(ui.passwordLineEdit, SIGNAL(returnPressed ()), applicationNode, SLOT(OnAcceptUserData()));
15+ QObject::connect(ui.pushButton_1, SIGNAL(clicked ()), this, SLOT(ConsumeButton1()));
16+ QObject::connect(ui.pushButton_2, SIGNAL(clicked ()), this, SLOT(ConsumeButton2()));
17+ QObject::connect(ui.pushButton_3, SIGNAL(clicked ()), this, SLOT(ConsumeButton3()));
18+ QObject::connect(ui.pushButton_4, SIGNAL(clicked ()), this, SLOT(ConsumeButton4()));
19+ QObject::connect(ui.pushButton_5, SIGNAL(clicked ()), this, SLOT(ConsumeButton5()));
20+ QObject::connect(ui.pushButton_6, SIGNAL(clicked ()), this, SLOT(ConsumeButton6()));
21+ QObject::connect(ui.pushButton_7, SIGNAL(clicked ()), this, SLOT(ConsumeButton7()));
22+ QObject::connect(ui.pushButton_8, SIGNAL(clicked ()), this, SLOT(ConsumeButton8()));
23+ QObject::connect(ui.pushButton_9, SIGNAL(clicked ()), this, SLOT(ConsumeButton9()));
24+ QObject::connect(ui.pushButton_0, SIGNAL(clicked ()), this, SLOT(ConsumeButton0()));
25+ QObject::connect(ui.pushButton_Del, SIGNAL(clicked ()), this, SLOT(ConsumeButtonDel()));
26+ QObject::connect(ui.pushButton_U, SIGNAL(clicked ()), this, SLOT(ConsumeButtonU()));
27+ QObject::connect(static_cast<QApplication *>(QCoreApplication::instance()),
28+ SIGNAL(focusChanged (QWidget *, QWidget *)), this, SLOT(OnFocusChanged(QWidget *, QWidget *)));
29+
30 string temp = "v";
31 temp = temp + PRODUCTVER;
32 ui.versionNo->setText(QString(temp.c_str()));
33+ ui.usernameLineEdit->setFocus();
34+
35 }
36
37 RegisterUserWindow::~RegisterUserWindow()
38@@ -25,6 +43,21 @@
39 QObject::disconnect(ui.buttonBox, SIGNAL(accepted ()));
40 QObject::disconnect(ui.usernameLineEdit, SIGNAL(returnPressed ()));
41
42+ QObject::disconnect(ui.pushButton_1, SIGNAL(clicked ()));
43+ QObject::disconnect(ui.pushButton_2, SIGNAL(clicked ()));
44+ QObject::disconnect(ui.pushButton_3, SIGNAL(clicked ()));
45+ QObject::disconnect(ui.pushButton_4, SIGNAL(clicked ()));
46+ QObject::disconnect(ui.pushButton_5, SIGNAL(clicked ()));
47+ QObject::disconnect(ui.pushButton_6, SIGNAL(clicked ()));
48+ QObject::disconnect(ui.pushButton_7, SIGNAL(clicked ()));
49+ QObject::disconnect(ui.pushButton_8, SIGNAL(clicked ()));
50+ QObject::disconnect(ui.pushButton_9, SIGNAL(clicked ()));
51+ QObject::disconnect(ui.pushButton_0, SIGNAL(clicked ()));
52+ QObject::disconnect(ui.pushButton_Del, SIGNAL(clicked ()));
53+ QObject::disconnect(ui.pushButton_U, SIGNAL(clicked ()));
54+ QObject::disconnect(static_cast<QApplication *>(QCoreApplication::instance()),
55+ SIGNAL(focusChanged (QWidget *, QWidget *)));
56+
57 cout << "Destroying RegisterUserWindow"<<endl;
58 }
59
60@@ -84,4 +117,97 @@
61 rPassword = ui.passwordLineEdit->text();
62 }
63
64+void RegisterUserWindow::ConsumeButton1()
65+{
66+ AddChar("1");
67+}
68+
69+void RegisterUserWindow::ConsumeButton2()
70+{
71+ AddChar("2");
72+}
73+
74+void RegisterUserWindow::ConsumeButton3()
75+{
76+ AddChar("3");
77+}
78+
79+void RegisterUserWindow::ConsumeButton4()
80+{
81+ AddChar("4");
82+}
83+
84+void RegisterUserWindow::ConsumeButton5()
85+{
86+ AddChar("5");
87+}
88+
89+void RegisterUserWindow::ConsumeButton6()
90+{
91+ AddChar("6");
92+}
93+
94+void RegisterUserWindow::ConsumeButton7()
95+{
96+ AddChar("7");
97+}
98+
99+void RegisterUserWindow::ConsumeButton8()
100+{
101+ AddChar("8");
102+}
103+
104+void RegisterUserWindow::ConsumeButton9()
105+{
106+ AddChar("9");
107+}
108+
109+void RegisterUserWindow::ConsumeButton0()
110+{
111+ AddChar("0");
112+}
113+
114+void RegisterUserWindow::ConsumeButtonU()
115+{
116+ AddChar("u");
117+}
118+
119+
120+void RegisterUserWindow::ConsumeButtonDel()
121+{
122+ if( m_bUserNameIsActive == true )
123+ {
124+ ui.usernameLineEdit->setText("");
125+ }
126+ else
127+ {
128+ ui.passwordLineEdit->setText("");
129+ }
130+ }
131+
132+
133+void RegisterUserWindow::OnFocusChanged( QWidget * pOld, QWidget * pNow )
134+{
135+ if( pNow == ui.usernameLineEdit )
136+ {
137+ m_bUserNameIsActive = true;
138+ }
139+ else if( pNow == ui.passwordLineEdit )
140+ {
141+ m_bUserNameIsActive = false;
142+ }
143+}
144+
145+void RegisterUserWindow::AddChar(QString c)
146+{
147+ if( m_bUserNameIsActive == true )
148+ {
149+ ui.usernameLineEdit->setText(ui.usernameLineEdit->text() + c);
150+ }
151+ else
152+ {
153+ ui.passwordLineEdit->setText(ui.passwordLineEdit->text() + c);
154+ }
155+}
156+
157
158
159=== modified file 'FsWisdom/RegisterUserWindow.h'
160--- FsWisdom/RegisterUserWindow.h 2009-11-05 09:43:32 +0000
161+++ FsWisdom/RegisterUserWindow.h 2009-12-11 10:13:12 +0000
162@@ -18,6 +18,9 @@
163 public:
164 RegisterUserWindow(ApplicationNode *applicationNode, QWidget* parent = 0);
165 ~RegisterUserWindow();
166+
167+ void AddChar(QString c);
168+
169 void showFullScreenAndClear();
170 void GetLoginCredentials( QString& rUsername, QString& rPassword );
171 void AskForCredentials();
172@@ -31,12 +34,28 @@
173 * Checks that the user has entered their name correctly and if so returns control to
174 * the application node via a call to its RegisterUser function
175 */
176- //void AcceptUserData();
177+ void ConsumeButton1();
178+ void ConsumeButton2();
179+ void ConsumeButton3();
180+ void ConsumeButton4();
181+ void ConsumeButton5();
182+ void ConsumeButton6();
183+ void ConsumeButton7();
184+ void ConsumeButton8();
185+ void ConsumeButton9();
186+ void ConsumeButton0();
187+ void ConsumeButtonU();
188+ void ConsumeButtonDel();
189+
190+ void OnFocusChanged( QWidget*,QWidget* );
191+
192
193 private:
194 void enableButtons(bool bEnable);
195 Ui::RegisterUserWindowClass ui;
196 ApplicationNode* applicationNode;
197+ bool m_bUserNameIsActive;
198+
199 };
200
201 }
202
203=== modified file 'FsWisdom/RegisterUserWindow.ui'
204--- FsWisdom/RegisterUserWindow.ui 2009-08-14 10:57:29 +0000
205+++ FsWisdom/RegisterUserWindow.ui 2009-12-11 10:13:12 +0000
206@@ -1,7 +1,8 @@
207-<ui version="4.0" >
208+<?xml version="1.0" encoding="UTF-8"?>
209+<ui version="4.0">
210 <class>RegisterUserWindowClass</class>
211- <widget class="QMainWindow" name="RegisterUserWindowClass" >
212- <property name="geometry" >
213+ <widget class="QMainWindow" name="RegisterUserWindowClass">
214+ <property name="geometry">
215 <rect>
216 <x>0</x>
217 <y>0</y>
218@@ -9,19 +10,19 @@
219 <height>600</height>
220 </rect>
221 </property>
222- <property name="windowTitle" >
223+ <property name="windowTitle">
224 <string>MainWindow</string>
225 </property>
226- <widget class="QWidget" name="centralwidget" >
227- <layout class="QHBoxLayout" name="horizontalLayout_2" >
228+ <widget class="QWidget" name="centralwidget">
229+ <layout class="QHBoxLayout" name="horizontalLayout_2">
230 <item>
231- <layout class="QVBoxLayout" name="verticalLayout" >
232+ <layout class="QVBoxLayout" name="verticalLayout">
233 <item>
234- <spacer name="verticalSpacer_3" >
235- <property name="orientation" >
236+ <spacer name="verticalSpacer_3">
237+ <property name="orientation">
238 <enum>Qt::Vertical</enum>
239 </property>
240- <property name="sizeHint" stdset="0" >
241+ <property name="sizeHint" stdset="0">
242 <size>
243 <width>20</width>
244 <height>40</height>
245@@ -30,229 +31,374 @@
246 </spacer>
247 </item>
248 <item>
249- <widget class="QLabel" name="label" >
250- <property name="text" >
251- <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
252-&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
253+ <widget class="QLabel" name="label">
254+ <property name="text">
255+ <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
256+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
257 p, li { white-space: pre-wrap; }
258-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
259-&lt;p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-size:28pt;">Welcome to&lt;/span>&lt;/p>
260-&lt;p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:48pt;">&lt;span style=" font-style:italic;">FS&lt;/span> Wisdom&lt;/p>&lt;/body>&lt;/html></string>
261+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
262+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:28pt;&quot;&gt;Welcome to&lt;/span&gt;&lt;/p&gt;
263+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:48pt;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;FS&lt;/span&gt; Wisdom&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
264 </property>
265 </widget>
266 </item>
267 <item>
268- <spacer name="verticalSpacer_4" >
269- <property name="orientation" >
270- <enum>Qt::Vertical</enum>
271- </property>
272- <property name="sizeHint" stdset="0" >
273- <size>
274- <width>20</width>
275- <height>40</height>
276- </size>
277- </property>
278- </spacer>
279- </item>
280- <item>
281- <layout class="QHBoxLayout" name="horizontalLayout" >
282- <item>
283- <spacer name="horizontalSpacer_4" >
284- <property name="orientation" >
285- <enum>Qt::Horizontal</enum>
286- </property>
287- <property name="sizeHint" stdset="0" >
288- <size>
289- <width>40</width>
290- <height>20</height>
291- </size>
292- </property>
293- </spacer>
294- </item>
295- <item>
296- <layout class="QVBoxLayout" name="verticalLayout_4" >
297- <item>
298- <spacer name="verticalSpacer" >
299- <property name="orientation" >
300- <enum>Qt::Vertical</enum>
301- </property>
302- <property name="sizeHint" stdset="0" >
303- <size>
304- <width>20</width>
305- <height>40</height>
306- </size>
307- </property>
308- </spacer>
309- </item>
310- <item>
311- <layout class="QGridLayout" name="gridLayout" >
312- <property name="rightMargin" >
313- <number>100</number>
314- </property>
315- </layout>
316- </item>
317- <item>
318- <layout class="QHBoxLayout" name="horizontalLayout_3" >
319- <item>
320- <widget class="QLabel" name="label_4" >
321- <property name="sizePolicy" >
322- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
323- <horstretch>0</horstretch>
324- <verstretch>0</verstretch>
325- </sizepolicy>
326- </property>
327- <property name="text" >
328- <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
329-&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
330-p, li { white-space: pre-wrap; }
331-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
332-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">User name: &lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
333- </property>
334- </widget>
335- </item>
336- <item>
337- <widget class="QLineEdit" name="usernameLineEdit" />
338- </item>
339- </layout>
340- </item>
341- <item>
342- <layout class="QHBoxLayout" name="horizontalLayout_6" >
343- <property name="spacing" >
344- <number>17</number>
345- </property>
346- <property name="rightMargin" >
347- <number>0</number>
348- </property>
349- <property name="bottomMargin" >
350- <number>0</number>
351- </property>
352- <item>
353- <widget class="QLabel" name="label_2" >
354- <property name="text" >
355- <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
356-&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
357-p, li { white-space: pre-wrap; }
358-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
359-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Password:&lt;/span>&lt;/p>&lt;/body>&lt;/html></string>
360- </property>
361- </widget>
362- </item>
363- <item>
364- <widget class="QLineEdit" name="passwordLineEdit" >
365- <property name="echoMode" >
366- <enum>QLineEdit::Password</enum>
367- </property>
368- </widget>
369- </item>
370- </layout>
371- </item>
372- <item>
373- <layout class="QHBoxLayout" name="horizontalLayout_4" >
374- <item>
375- <spacer name="horizontalSpacer" >
376- <property name="orientation" >
377- <enum>Qt::Horizontal</enum>
378- </property>
379- <property name="sizeHint" stdset="0" >
380- <size>
381- <width>40</width>
382- <height>20</height>
383- </size>
384- </property>
385- </spacer>
386- </item>
387- <item>
388- <widget class="QLabel" name="label_3" >
389- <property name="text" >
390- <string>Please enter your user name and password</string>
391- </property>
392- </widget>
393- </item>
394- <item>
395- <spacer name="horizontalSpacer_2" >
396- <property name="orientation" >
397- <enum>Qt::Horizontal</enum>
398- </property>
399- <property name="sizeHint" stdset="0" >
400- <size>
401- <width>40</width>
402- <height>20</height>
403- </size>
404- </property>
405- </spacer>
406- </item>
407- </layout>
408- </item>
409- <item>
410- <spacer name="horizontalSpacer_6" >
411- <property name="orientation" >
412- <enum>Qt::Horizontal</enum>
413- </property>
414- <property name="sizeHint" stdset="0" >
415- <size>
416- <width>40</width>
417- <height>20</height>
418- </size>
419- </property>
420- </spacer>
421- </item>
422- <item>
423- <layout class="QHBoxLayout" name="horizontalLayout_5" >
424- <item>
425- <spacer name="horizontalSpacer_3" >
426- <property name="orientation" >
427- <enum>Qt::Horizontal</enum>
428- </property>
429- <property name="sizeHint" stdset="0" >
430- <size>
431- <width>40</width>
432- <height>20</height>
433- </size>
434- </property>
435- </spacer>
436- </item>
437- <item>
438- <widget class="QDialogButtonBox" name="buttonBox" >
439- <property name="standardButtons" >
440- <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
441- </property>
442- </widget>
443- </item>
444- </layout>
445- </item>
446- </layout>
447- </item>
448- <item>
449- <spacer name="horizontalSpacer_5" >
450- <property name="orientation" >
451- <enum>Qt::Horizontal</enum>
452- </property>
453- <property name="sizeHint" stdset="0" >
454- <size>
455- <width>40</width>
456- <height>20</height>
457- </size>
458- </property>
459- </spacer>
460- </item>
461- </layout>
462- </item>
463- <item>
464- <spacer name="verticalSpacer_2" >
465- <property name="orientation" >
466- <enum>Qt::Vertical</enum>
467- </property>
468- <property name="sizeHint" stdset="0" >
469- <size>
470- <width>20</width>
471- <height>40</height>
472- </size>
473- </property>
474- </spacer>
475- </item>
476- <item>
477- <widget class="QLabel" name="versionNo" >
478- <property name="text" >
479+ <spacer name="verticalSpacer">
480+ <property name="orientation">
481+ <enum>Qt::Vertical</enum>
482+ </property>
483+ <property name="sizeHint" stdset="0">
484+ <size>
485+ <width>20</width>
486+ <height>40</height>
487+ </size>
488+ </property>
489+ </spacer>
490+ </item>
491+ <item>
492+ <layout class="QGridLayout" name="gridLayout_3">
493+ <item row="6" column="2">
494+ <widget class="QPushButton" name="pushButton_0">
495+ <property name="text">
496+ <string>0</string>
497+ </property>
498+ </widget>
499+ </item>
500+ <item row="0" column="3">
501+ <widget class="QPushButton" name="pushButton_3">
502+ <property name="text">
503+ <string>3</string>
504+ </property>
505+ </widget>
506+ </item>
507+ <item row="0" column="2">
508+ <widget class="QPushButton" name="pushButton_2">
509+ <property name="text">
510+ <string>2</string>
511+ </property>
512+ </widget>
513+ </item>
514+ <item row="3" column="1">
515+ <widget class="QPushButton" name="pushButton_4">
516+ <property name="text">
517+ <string>4</string>
518+ </property>
519+ </widget>
520+ </item>
521+ <item row="3" column="2">
522+ <widget class="QPushButton" name="pushButton_5">
523+ <property name="text">
524+ <string>5</string>
525+ </property>
526+ </widget>
527+ </item>
528+ <item row="3" column="3">
529+ <widget class="QPushButton" name="pushButton_6">
530+ <property name="text">
531+ <string>6</string>
532+ </property>
533+ </widget>
534+ </item>
535+ <item row="5" column="1">
536+ <widget class="QPushButton" name="pushButton_7">
537+ <property name="text">
538+ <string>7</string>
539+ </property>
540+ </widget>
541+ </item>
542+ <item row="5" column="2">
543+ <widget class="QPushButton" name="pushButton_8">
544+ <property name="text">
545+ <string>8</string>
546+ </property>
547+ </widget>
548+ </item>
549+ <item row="5" column="3">
550+ <widget class="QPushButton" name="pushButton_9">
551+ <property name="text">
552+ <string>9</string>
553+ </property>
554+ </widget>
555+ </item>
556+ <item row="6" column="3">
557+ <widget class="QPushButton" name="pushButton_U">
558+ <property name="maximumSize">
559+ <size>
560+ <width>1024</width>
561+ <height>768</height>
562+ </size>
563+ </property>
564+ <property name="text">
565+ <string>u</string>
566+ </property>
567+ </widget>
568+ </item>
569+ <item row="6" column="1">
570+ <widget class="QPushButton" name="pushButton_Del">
571+ <property name="text">
572+ <string>Del</string>
573+ </property>
574+ </widget>
575+ </item>
576+ <item row="0" column="1">
577+ <widget class="QPushButton" name="pushButton_1">
578+ <property name="text">
579+ <string>1</string>
580+ </property>
581+ </widget>
582+ </item>
583+ <item row="3" column="4">
584+ <spacer name="horizontalSpacer_6">
585+ <property name="orientation">
586+ <enum>Qt::Horizontal</enum>
587+ </property>
588+ <property name="sizeHint" stdset="0">
589+ <size>
590+ <width>40</width>
591+ <height>20</height>
592+ </size>
593+ </property>
594+ </spacer>
595+ </item>
596+ <item row="3" column="0">
597+ <spacer name="horizontalSpacer_7">
598+ <property name="orientation">
599+ <enum>Qt::Horizontal</enum>
600+ </property>
601+ <property name="sizeHint" stdset="0">
602+ <size>
603+ <width>40</width>
604+ <height>20</height>
605+ </size>
606+ </property>
607+ </spacer>
608+ </item>
609+ </layout>
610+ </item>
611+ <item>
612+ <spacer name="verticalSpacer_4">
613+ <property name="orientation">
614+ <enum>Qt::Vertical</enum>
615+ </property>
616+ <property name="sizeHint" stdset="0">
617+ <size>
618+ <width>20</width>
619+ <height>40</height>
620+ </size>
621+ </property>
622+ </spacer>
623+ </item>
624+ <item>
625+ <layout class="QHBoxLayout" name="horizontalLayout"/>
626+ </item>
627+ <item>
628+ <layout class="QVBoxLayout" name="verticalLayout_4">
629+ <item>
630+ <layout class="QGridLayout" name="gridLayout">
631+ <property name="rightMargin">
632+ <number>100</number>
633+ </property>
634+ </layout>
635+ </item>
636+ <item>
637+ <layout class="QHBoxLayout" name="horizontalLayout_3">
638+ <item>
639+ <spacer name="horizontalSpacer_8">
640+ <property name="orientation">
641+ <enum>Qt::Horizontal</enum>
642+ </property>
643+ <property name="sizeHint" stdset="0">
644+ <size>
645+ <width>40</width>
646+ <height>20</height>
647+ </size>
648+ </property>
649+ </spacer>
650+ </item>
651+ <item>
652+ <widget class="QLabel" name="label_4">
653+ <property name="sizePolicy">
654+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
655+ <horstretch>0</horstretch>
656+ <verstretch>0</verstretch>
657+ </sizepolicy>
658+ </property>
659+ <property name="text">
660+ <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
661+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
662+p, li { white-space: pre-wrap; }
663+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
664+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;User name: &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
665+ </property>
666+ </widget>
667+ </item>
668+ <item>
669+ <widget class="QLineEdit" name="usernameLineEdit"/>
670+ </item>
671+ <item>
672+ <spacer name="horizontalSpacer_4">
673+ <property name="orientation">
674+ <enum>Qt::Horizontal</enum>
675+ </property>
676+ <property name="sizeHint" stdset="0">
677+ <size>
678+ <width>40</width>
679+ <height>20</height>
680+ </size>
681+ </property>
682+ </spacer>
683+ </item>
684+ </layout>
685+ </item>
686+ <item>
687+ <layout class="QHBoxLayout" name="horizontalLayout_6">
688+ <property name="spacing">
689+ <number>17</number>
690+ </property>
691+ <property name="rightMargin">
692+ <number>0</number>
693+ </property>
694+ <property name="bottomMargin">
695+ <number>0</number>
696+ </property>
697+ <item>
698+ <spacer name="horizontalSpacer_9">
699+ <property name="orientation">
700+ <enum>Qt::Horizontal</enum>
701+ </property>
702+ <property name="sizeHint" stdset="0">
703+ <size>
704+ <width>40</width>
705+ <height>20</height>
706+ </size>
707+ </property>
708+ </spacer>
709+ </item>
710+ <item>
711+ <widget class="QLabel" name="label_2">
712+ <property name="text">
713+ <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
714+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
715+p, li { white-space: pre-wrap; }
716+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
717+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Password:&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
718+ </property>
719+ </widget>
720+ </item>
721+ <item>
722+ <widget class="QLineEdit" name="passwordLineEdit">
723+ <property name="echoMode">
724+ <enum>QLineEdit::Password</enum>
725+ </property>
726+ </widget>
727+ </item>
728+ <item>
729+ <spacer name="horizontalSpacer_5">
730+ <property name="orientation">
731+ <enum>Qt::Horizontal</enum>
732+ </property>
733+ <property name="sizeHint" stdset="0">
734+ <size>
735+ <width>40</width>
736+ <height>20</height>
737+ </size>
738+ </property>
739+ </spacer>
740+ </item>
741+ </layout>
742+ </item>
743+ <item>
744+ <layout class="QHBoxLayout" name="horizontalLayout_4">
745+ <item>
746+ <spacer name="horizontalSpacer">
747+ <property name="orientation">
748+ <enum>Qt::Horizontal</enum>
749+ </property>
750+ <property name="sizeHint" stdset="0">
751+ <size>
752+ <width>40</width>
753+ <height>20</height>
754+ </size>
755+ </property>
756+ </spacer>
757+ </item>
758+ <item>
759+ <widget class="QLabel" name="label_3">
760+ <property name="text">
761+ <string>Please enter your user name and password</string>
762+ </property>
763+ </widget>
764+ </item>
765+ <item>
766+ <spacer name="horizontalSpacer_2">
767+ <property name="orientation">
768+ <enum>Qt::Horizontal</enum>
769+ </property>
770+ <property name="sizeHint" stdset="0">
771+ <size>
772+ <width>40</width>
773+ <height>20</height>
774+ </size>
775+ </property>
776+ </spacer>
777+ </item>
778+ </layout>
779+ </item>
780+ <item>
781+ <layout class="QHBoxLayout" name="horizontalLayout_5">
782+ <item>
783+ <spacer name="horizontalSpacer_10">
784+ <property name="orientation">
785+ <enum>Qt::Horizontal</enum>
786+ </property>
787+ <property name="sizeHint" stdset="0">
788+ <size>
789+ <width>40</width>
790+ <height>20</height>
791+ </size>
792+ </property>
793+ </spacer>
794+ </item>
795+ <item>
796+ <widget class="QDialogButtonBox" name="buttonBox">
797+ <property name="standardButtons">
798+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
799+ </property>
800+ </widget>
801+ </item>
802+ <item>
803+ <spacer name="horizontalSpacer_3">
804+ <property name="orientation">
805+ <enum>Qt::Horizontal</enum>
806+ </property>
807+ <property name="sizeHint" stdset="0">
808+ <size>
809+ <width>40</width>
810+ <height>20</height>
811+ </size>
812+ </property>
813+ </spacer>
814+ </item>
815+ </layout>
816+ </item>
817+ </layout>
818+ </item>
819+ <item>
820+ <spacer name="verticalSpacer_2">
821+ <property name="orientation">
822+ <enum>Qt::Vertical</enum>
823+ </property>
824+ <property name="sizeHint" stdset="0">
825+ <size>
826+ <width>20</width>
827+ <height>40</height>
828+ </size>
829+ </property>
830+ </spacer>
831+ </item>
832+ <item>
833+ <widget class="QLabel" name="versionNo">
834+ <property name="text">
835 <string/>
836 </property>
837 </widget>
838@@ -261,8 +407,25 @@
839 </item>
840 </layout>
841 </widget>
842- <widget class="QStatusBar" name="statusbar" />
843+ <widget class="QStatusBar" name="statusbar"/>
844 </widget>
845+ <tabstops>
846+ <tabstop>pushButton_1</tabstop>
847+ <tabstop>pushButton_2</tabstop>
848+ <tabstop>pushButton_3</tabstop>
849+ <tabstop>pushButton_4</tabstop>
850+ <tabstop>pushButton_5</tabstop>
851+ <tabstop>pushButton_6</tabstop>
852+ <tabstop>pushButton_7</tabstop>
853+ <tabstop>pushButton_8</tabstop>
854+ <tabstop>pushButton_9</tabstop>
855+ <tabstop>pushButton_Del</tabstop>
856+ <tabstop>pushButton_0</tabstop>
857+ <tabstop>pushButton_U</tabstop>
858+ <tabstop>usernameLineEdit</tabstop>
859+ <tabstop>passwordLineEdit</tabstop>
860+ <tabstop>buttonBox</tabstop>
861+ </tabstops>
862 <resources/>
863 <connections/>
864 </ui>

Subscribers

People subscribed via source and target branches