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
=== modified file 'FsWisdom/RegisterUserWindow.cpp'
--- FsWisdom/RegisterUserWindow.cpp 2009-11-05 09:43:32 +0000
+++ FsWisdom/RegisterUserWindow.cpp 2009-12-11 10:13:12 +0000
@@ -8,15 +8,33 @@
8{8{
9 this->applicationNode = applicationNode;9 this->applicationNode = applicationNode;
10 ui.setupUi(this);10 ui.setupUi(this);
11 m_bUserNameIsActive = true;
1112
1213
13 QObject::connect(ui.buttonBox, SIGNAL(rejected ()), applicationNode, SLOT(Quit()));14 QObject::connect(ui.buttonBox, SIGNAL(rejected ()), applicationNode, SLOT(Quit()));
14 QObject::connect(ui.buttonBox, SIGNAL(accepted ()), applicationNode, SLOT(OnAcceptUserData()));15 QObject::connect(ui.buttonBox, SIGNAL(accepted ()), applicationNode, SLOT(OnAcceptUserData()));
15 QObject::connect(ui.usernameLineEdit, SIGNAL(returnPressed ()), applicationNode, SLOT(OnAcceptUserData()));16 QObject::connect(ui.usernameLineEdit, SIGNAL(returnPressed ()), applicationNode, SLOT(OnAcceptUserData()));
16 QObject::connect(ui.passwordLineEdit, SIGNAL(returnPressed ()), applicationNode, SLOT(OnAcceptUserData()));17 QObject::connect(ui.passwordLineEdit, SIGNAL(returnPressed ()), applicationNode, SLOT(OnAcceptUserData()));
18 QObject::connect(ui.pushButton_1, SIGNAL(clicked ()), this, SLOT(ConsumeButton1()));
19 QObject::connect(ui.pushButton_2, SIGNAL(clicked ()), this, SLOT(ConsumeButton2()));
20 QObject::connect(ui.pushButton_3, SIGNAL(clicked ()), this, SLOT(ConsumeButton3()));
21 QObject::connect(ui.pushButton_4, SIGNAL(clicked ()), this, SLOT(ConsumeButton4()));
22 QObject::connect(ui.pushButton_5, SIGNAL(clicked ()), this, SLOT(ConsumeButton5()));
23 QObject::connect(ui.pushButton_6, SIGNAL(clicked ()), this, SLOT(ConsumeButton6()));
24 QObject::connect(ui.pushButton_7, SIGNAL(clicked ()), this, SLOT(ConsumeButton7()));
25 QObject::connect(ui.pushButton_8, SIGNAL(clicked ()), this, SLOT(ConsumeButton8()));
26 QObject::connect(ui.pushButton_9, SIGNAL(clicked ()), this, SLOT(ConsumeButton9()));
27 QObject::connect(ui.pushButton_0, SIGNAL(clicked ()), this, SLOT(ConsumeButton0()));
28 QObject::connect(ui.pushButton_Del, SIGNAL(clicked ()), this, SLOT(ConsumeButtonDel()));
29 QObject::connect(ui.pushButton_U, SIGNAL(clicked ()), this, SLOT(ConsumeButtonU()));
30 QObject::connect(static_cast<QApplication *>(QCoreApplication::instance()),
31 SIGNAL(focusChanged (QWidget *, QWidget *)), this, SLOT(OnFocusChanged(QWidget *, QWidget *)));
32
17 string temp = "v";33 string temp = "v";
18 temp = temp + PRODUCTVER;34 temp = temp + PRODUCTVER;
19 ui.versionNo->setText(QString(temp.c_str()));35 ui.versionNo->setText(QString(temp.c_str()));
36 ui.usernameLineEdit->setFocus();
37
20}38}
2139
22RegisterUserWindow::~RegisterUserWindow()40RegisterUserWindow::~RegisterUserWindow()
@@ -25,6 +43,21 @@
25 QObject::disconnect(ui.buttonBox, SIGNAL(accepted ()));43 QObject::disconnect(ui.buttonBox, SIGNAL(accepted ()));
26 QObject::disconnect(ui.usernameLineEdit, SIGNAL(returnPressed ()));44 QObject::disconnect(ui.usernameLineEdit, SIGNAL(returnPressed ()));
2745
46 QObject::disconnect(ui.pushButton_1, SIGNAL(clicked ()));
47 QObject::disconnect(ui.pushButton_2, SIGNAL(clicked ()));
48 QObject::disconnect(ui.pushButton_3, SIGNAL(clicked ()));
49 QObject::disconnect(ui.pushButton_4, SIGNAL(clicked ()));
50 QObject::disconnect(ui.pushButton_5, SIGNAL(clicked ()));
51 QObject::disconnect(ui.pushButton_6, SIGNAL(clicked ()));
52 QObject::disconnect(ui.pushButton_7, SIGNAL(clicked ()));
53 QObject::disconnect(ui.pushButton_8, SIGNAL(clicked ()));
54 QObject::disconnect(ui.pushButton_9, SIGNAL(clicked ()));
55 QObject::disconnect(ui.pushButton_0, SIGNAL(clicked ()));
56 QObject::disconnect(ui.pushButton_Del, SIGNAL(clicked ()));
57 QObject::disconnect(ui.pushButton_U, SIGNAL(clicked ()));
58 QObject::disconnect(static_cast<QApplication *>(QCoreApplication::instance()),
59 SIGNAL(focusChanged (QWidget *, QWidget *)));
60
28 cout << "Destroying RegisterUserWindow"<<endl;61 cout << "Destroying RegisterUserWindow"<<endl;
29}62}
3063
@@ -84,4 +117,97 @@
84 rPassword = ui.passwordLineEdit->text();117 rPassword = ui.passwordLineEdit->text();
85}118}
86119
120void RegisterUserWindow::ConsumeButton1()
121{
122 AddChar("1");
123}
124
125void RegisterUserWindow::ConsumeButton2()
126{
127 AddChar("2");
128}
129
130void RegisterUserWindow::ConsumeButton3()
131{
132 AddChar("3");
133}
134
135void RegisterUserWindow::ConsumeButton4()
136{
137 AddChar("4");
138}
139
140void RegisterUserWindow::ConsumeButton5()
141{
142 AddChar("5");
143}
144
145void RegisterUserWindow::ConsumeButton6()
146{
147 AddChar("6");
148}
149
150void RegisterUserWindow::ConsumeButton7()
151{
152 AddChar("7");
153}
154
155void RegisterUserWindow::ConsumeButton8()
156{
157 AddChar("8");
158}
159
160void RegisterUserWindow::ConsumeButton9()
161{
162 AddChar("9");
163}
164
165void RegisterUserWindow::ConsumeButton0()
166{
167 AddChar("0");
168}
169
170void RegisterUserWindow::ConsumeButtonU()
171{
172 AddChar("u");
173}
174
175
176void RegisterUserWindow::ConsumeButtonDel()
177{
178 if( m_bUserNameIsActive == true )
179 {
180 ui.usernameLineEdit->setText("");
181 }
182 else
183 {
184 ui.passwordLineEdit->setText("");
185 }
186 }
187
188
189void RegisterUserWindow::OnFocusChanged( QWidget * pOld, QWidget * pNow )
190{
191 if( pNow == ui.usernameLineEdit )
192 {
193 m_bUserNameIsActive = true;
194 }
195 else if( pNow == ui.passwordLineEdit )
196 {
197 m_bUserNameIsActive = false;
198 }
199}
200
201void RegisterUserWindow::AddChar(QString c)
202{
203 if( m_bUserNameIsActive == true )
204 {
205 ui.usernameLineEdit->setText(ui.usernameLineEdit->text() + c);
206 }
207 else
208 {
209 ui.passwordLineEdit->setText(ui.passwordLineEdit->text() + c);
210 }
211}
212
87213
88214
=== modified file 'FsWisdom/RegisterUserWindow.h'
--- FsWisdom/RegisterUserWindow.h 2009-11-05 09:43:32 +0000
+++ FsWisdom/RegisterUserWindow.h 2009-12-11 10:13:12 +0000
@@ -18,6 +18,9 @@
18public:18public:
19 RegisterUserWindow(ApplicationNode *applicationNode, QWidget* parent = 0);19 RegisterUserWindow(ApplicationNode *applicationNode, QWidget* parent = 0);
20 ~RegisterUserWindow();20 ~RegisterUserWindow();
21
22 void AddChar(QString c);
23
21 void showFullScreenAndClear();24 void showFullScreenAndClear();
22 void GetLoginCredentials( QString& rUsername, QString& rPassword );25 void GetLoginCredentials( QString& rUsername, QString& rPassword );
23 void AskForCredentials();26 void AskForCredentials();
@@ -31,12 +34,28 @@
31 * Checks that the user has entered their name correctly and if so returns control to34 * Checks that the user has entered their name correctly and if so returns control to
32 * the application node via a call to its RegisterUser function35 * the application node via a call to its RegisterUser function
33 */36 */
34 //void AcceptUserData();37 void ConsumeButton1();
38 void ConsumeButton2();
39 void ConsumeButton3();
40 void ConsumeButton4();
41 void ConsumeButton5();
42 void ConsumeButton6();
43 void ConsumeButton7();
44 void ConsumeButton8();
45 void ConsumeButton9();
46 void ConsumeButton0();
47 void ConsumeButtonU();
48 void ConsumeButtonDel();
49
50 void OnFocusChanged( QWidget*,QWidget* );
51
3552
36private:53private:
37 void enableButtons(bool bEnable);54 void enableButtons(bool bEnable);
38 Ui::RegisterUserWindowClass ui;55 Ui::RegisterUserWindowClass ui;
39 ApplicationNode* applicationNode;56 ApplicationNode* applicationNode;
57 bool m_bUserNameIsActive;
58
40};59};
4160
42}61}
4362
=== modified file 'FsWisdom/RegisterUserWindow.ui'
--- FsWisdom/RegisterUserWindow.ui 2009-08-14 10:57:29 +0000
+++ FsWisdom/RegisterUserWindow.ui 2009-12-11 10:13:12 +0000
@@ -1,7 +1,8 @@
1<ui version="4.0" >1<?xml version="1.0" encoding="UTF-8"?>
2<ui version="4.0">
2 <class>RegisterUserWindowClass</class>3 <class>RegisterUserWindowClass</class>
3 <widget class="QMainWindow" name="RegisterUserWindowClass" >4 <widget class="QMainWindow" name="RegisterUserWindowClass">
4 <property name="geometry" >5 <property name="geometry">
5 <rect>6 <rect>
6 <x>0</x>7 <x>0</x>
7 <y>0</y>8 <y>0</y>
@@ -9,19 +10,19 @@
9 <height>600</height>10 <height>600</height>
10 </rect>11 </rect>
11 </property>12 </property>
12 <property name="windowTitle" >13 <property name="windowTitle">
13 <string>MainWindow</string>14 <string>MainWindow</string>
14 </property>15 </property>
15 <widget class="QWidget" name="centralwidget" >16 <widget class="QWidget" name="centralwidget">
16 <layout class="QHBoxLayout" name="horizontalLayout_2" >17 <layout class="QHBoxLayout" name="horizontalLayout_2">
17 <item>18 <item>
18 <layout class="QVBoxLayout" name="verticalLayout" >19 <layout class="QVBoxLayout" name="verticalLayout">
19 <item>20 <item>
20 <spacer name="verticalSpacer_3" >21 <spacer name="verticalSpacer_3">
21 <property name="orientation" >22 <property name="orientation">
22 <enum>Qt::Vertical</enum>23 <enum>Qt::Vertical</enum>
23 </property>24 </property>
24 <property name="sizeHint" stdset="0" >25 <property name="sizeHint" stdset="0">
25 <size>26 <size>
26 <width>20</width>27 <width>20</width>
27 <height>40</height>28 <height>40</height>
@@ -30,229 +31,374 @@
30 </spacer>31 </spacer>
31 </item>32 </item>
32 <item>33 <item>
33 <widget class="QLabel" name="label" >34 <widget class="QLabel" name="label">
34 <property name="text" >35 <property name="text">
35 <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">36 <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;
36&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">37&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;
37p, li { white-space: pre-wrap; }38p, li { white-space: pre-wrap; }
38&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">39&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;
39&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>40&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;
40&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>41&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>
41 </property>42 </property>
42 </widget>43 </widget>
43 </item>44 </item>
44 <item>45 <item>
45 <spacer name="verticalSpacer_4" >46 <spacer name="verticalSpacer">
46 <property name="orientation" >47 <property name="orientation">
47 <enum>Qt::Vertical</enum>48 <enum>Qt::Vertical</enum>
48 </property>49 </property>
49 <property name="sizeHint" stdset="0" >50 <property name="sizeHint" stdset="0">
50 <size>51 <size>
51 <width>20</width>52 <width>20</width>
52 <height>40</height>53 <height>40</height>
53 </size>54 </size>
54 </property>55 </property>
55 </spacer>56 </spacer>
56 </item>57 </item>
57 <item>58 <item>
58 <layout class="QHBoxLayout" name="horizontalLayout" >59 <layout class="QGridLayout" name="gridLayout_3">
59 <item>60 <item row="6" column="2">
60 <spacer name="horizontalSpacer_4" >61 <widget class="QPushButton" name="pushButton_0">
61 <property name="orientation" >62 <property name="text">
62 <enum>Qt::Horizontal</enum>63 <string>0</string>
63 </property>64 </property>
64 <property name="sizeHint" stdset="0" >65 </widget>
65 <size>66 </item>
66 <width>40</width>67 <item row="0" column="3">
67 <height>20</height>68 <widget class="QPushButton" name="pushButton_3">
68 </size>69 <property name="text">
69 </property>70 <string>3</string>
70 </spacer>71 </property>
71 </item>72 </widget>
72 <item>73 </item>
73 <layout class="QVBoxLayout" name="verticalLayout_4" >74 <item row="0" column="2">
74 <item>75 <widget class="QPushButton" name="pushButton_2">
75 <spacer name="verticalSpacer" >76 <property name="text">
76 <property name="orientation" >77 <string>2</string>
77 <enum>Qt::Vertical</enum>78 </property>
78 </property>79 </widget>
79 <property name="sizeHint" stdset="0" >80 </item>
80 <size>81 <item row="3" column="1">
81 <width>20</width>82 <widget class="QPushButton" name="pushButton_4">
82 <height>40</height>83 <property name="text">
83 </size>84 <string>4</string>
84 </property>85 </property>
85 </spacer>86 </widget>
86 </item>87 </item>
87 <item>88 <item row="3" column="2">
88 <layout class="QGridLayout" name="gridLayout" >89 <widget class="QPushButton" name="pushButton_5">
89 <property name="rightMargin" >90 <property name="text">
90 <number>100</number>91 <string>5</string>
91 </property>92 </property>
92 </layout>93 </widget>
93 </item>94 </item>
94 <item>95 <item row="3" column="3">
95 <layout class="QHBoxLayout" name="horizontalLayout_3" >96 <widget class="QPushButton" name="pushButton_6">
96 <item>97 <property name="text">
97 <widget class="QLabel" name="label_4" >98 <string>6</string>
98 <property name="sizePolicy" >99 </property>
99 <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >100 </widget>
100 <horstretch>0</horstretch>101 </item>
101 <verstretch>0</verstretch>102 <item row="5" column="1">
102 </sizepolicy>103 <widget class="QPushButton" name="pushButton_7">
103 </property>104 <property name="text">
104 <property name="text" >105 <string>7</string>
105 <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">106 </property>
106&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">107 </widget>
107p, li { white-space: pre-wrap; }108 </item>
108&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">109 <item row="5" column="2">
109&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>110 <widget class="QPushButton" name="pushButton_8">
110 </property>111 <property name="text">
111 </widget>112 <string>8</string>
112 </item>113 </property>
113 <item>114 </widget>
114 <widget class="QLineEdit" name="usernameLineEdit" />115 </item>
115 </item>116 <item row="5" column="3">
116 </layout>117 <widget class="QPushButton" name="pushButton_9">
117 </item>118 <property name="text">
118 <item>119 <string>9</string>
119 <layout class="QHBoxLayout" name="horizontalLayout_6" >120 </property>
120 <property name="spacing" >121 </widget>
121 <number>17</number>122 </item>
122 </property>123 <item row="6" column="3">
123 <property name="rightMargin" >124 <widget class="QPushButton" name="pushButton_U">
124 <number>0</number>125 <property name="maximumSize">
125 </property>126 <size>
126 <property name="bottomMargin" >127 <width>1024</width>
127 <number>0</number>128 <height>768</height>
128 </property>129 </size>
129 <item>130 </property>
130 <widget class="QLabel" name="label_2" >131 <property name="text">
131 <property name="text" >132 <string>u</string>
132 <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">133 </property>
133&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">134 </widget>
134p, li { white-space: pre-wrap; }135 </item>
135&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">136 <item row="6" column="1">
136&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>137 <widget class="QPushButton" name="pushButton_Del">
137 </property>138 <property name="text">
138 </widget>139 <string>Del</string>
139 </item>140 </property>
140 <item>141 </widget>
141 <widget class="QLineEdit" name="passwordLineEdit" >142 </item>
142 <property name="echoMode" >143 <item row="0" column="1">
143 <enum>QLineEdit::Password</enum>144 <widget class="QPushButton" name="pushButton_1">
144 </property>145 <property name="text">
145 </widget>146 <string>1</string>
146 </item>147 </property>
147 </layout>148 </widget>
148 </item>149 </item>
149 <item>150 <item row="3" column="4">
150 <layout class="QHBoxLayout" name="horizontalLayout_4" >151 <spacer name="horizontalSpacer_6">
151 <item>152 <property name="orientation">
152 <spacer name="horizontalSpacer" >153 <enum>Qt::Horizontal</enum>
153 <property name="orientation" >154 </property>
154 <enum>Qt::Horizontal</enum>155 <property name="sizeHint" stdset="0">
155 </property>156 <size>
156 <property name="sizeHint" stdset="0" >157 <width>40</width>
157 <size>158 <height>20</height>
158 <width>40</width>159 </size>
159 <height>20</height>160 </property>
160 </size>161 </spacer>
161 </property>162 </item>
162 </spacer>163 <item row="3" column="0">
163 </item>164 <spacer name="horizontalSpacer_7">
164 <item>165 <property name="orientation">
165 <widget class="QLabel" name="label_3" >166 <enum>Qt::Horizontal</enum>
166 <property name="text" >167 </property>
167 <string>Please enter your user name and password</string>168 <property name="sizeHint" stdset="0">
168 </property>169 <size>
169 </widget>170 <width>40</width>
170 </item>171 <height>20</height>
171 <item>172 </size>
172 <spacer name="horizontalSpacer_2" >173 </property>
173 <property name="orientation" >174 </spacer>
174 <enum>Qt::Horizontal</enum>175 </item>
175 </property>176 </layout>
176 <property name="sizeHint" stdset="0" >177 </item>
177 <size>178 <item>
178 <width>40</width>179 <spacer name="verticalSpacer_4">
179 <height>20</height>180 <property name="orientation">
180 </size>181 <enum>Qt::Vertical</enum>
181 </property>182 </property>
182 </spacer>183 <property name="sizeHint" stdset="0">
183 </item>184 <size>
184 </layout>185 <width>20</width>
185 </item>186 <height>40</height>
186 <item>187 </size>
187 <spacer name="horizontalSpacer_6" >188 </property>
188 <property name="orientation" >189 </spacer>
189 <enum>Qt::Horizontal</enum>190 </item>
190 </property>191 <item>
191 <property name="sizeHint" stdset="0" >192 <layout class="QHBoxLayout" name="horizontalLayout"/>
192 <size>193 </item>
193 <width>40</width>194 <item>
194 <height>20</height>195 <layout class="QVBoxLayout" name="verticalLayout_4">
195 </size>196 <item>
196 </property>197 <layout class="QGridLayout" name="gridLayout">
197 </spacer>198 <property name="rightMargin">
198 </item>199 <number>100</number>
199 <item>200 </property>
200 <layout class="QHBoxLayout" name="horizontalLayout_5" >201 </layout>
201 <item>202 </item>
202 <spacer name="horizontalSpacer_3" >203 <item>
203 <property name="orientation" >204 <layout class="QHBoxLayout" name="horizontalLayout_3">
204 <enum>Qt::Horizontal</enum>205 <item>
205 </property>206 <spacer name="horizontalSpacer_8">
206 <property name="sizeHint" stdset="0" >207 <property name="orientation">
207 <size>208 <enum>Qt::Horizontal</enum>
208 <width>40</width>209 </property>
209 <height>20</height>210 <property name="sizeHint" stdset="0">
210 </size>211 <size>
211 </property>212 <width>40</width>
212 </spacer>213 <height>20</height>
213 </item>214 </size>
214 <item>215 </property>
215 <widget class="QDialogButtonBox" name="buttonBox" >216 </spacer>
216 <property name="standardButtons" >217 </item>
217 <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>218 <item>
218 </property>219 <widget class="QLabel" name="label_4">
219 </widget>220 <property name="sizePolicy">
220 </item>221 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
221 </layout>222 <horstretch>0</horstretch>
222 </item>223 <verstretch>0</verstretch>
223 </layout>224 </sizepolicy>
224 </item>225 </property>
225 <item>226 <property name="text">
226 <spacer name="horizontalSpacer_5" >227 <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;
227 <property name="orientation" >228&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;
228 <enum>Qt::Horizontal</enum>229p, li { white-space: pre-wrap; }
229 </property>230&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;
230 <property name="sizeHint" stdset="0" >231&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>
231 <size>232 </property>
232 <width>40</width>233 </widget>
233 <height>20</height>234 </item>
234 </size>235 <item>
235 </property>236 <widget class="QLineEdit" name="usernameLineEdit"/>
236 </spacer>237 </item>
237 </item>238 <item>
238 </layout>239 <spacer name="horizontalSpacer_4">
239 </item>240 <property name="orientation">
240 <item>241 <enum>Qt::Horizontal</enum>
241 <spacer name="verticalSpacer_2" >242 </property>
242 <property name="orientation" >243 <property name="sizeHint" stdset="0">
243 <enum>Qt::Vertical</enum>244 <size>
244 </property>245 <width>40</width>
245 <property name="sizeHint" stdset="0" >246 <height>20</height>
246 <size>247 </size>
247 <width>20</width>248 </property>
248 <height>40</height>249 </spacer>
249 </size>250 </item>
250 </property>251 </layout>
251 </spacer>252 </item>
252 </item>253 <item>
253 <item>254 <layout class="QHBoxLayout" name="horizontalLayout_6">
254 <widget class="QLabel" name="versionNo" >255 <property name="spacing">
255 <property name="text" >256 <number>17</number>
257 </property>
258 <property name="rightMargin">
259 <number>0</number>
260 </property>
261 <property name="bottomMargin">
262 <number>0</number>
263 </property>
264 <item>
265 <spacer name="horizontalSpacer_9">
266 <property name="orientation">
267 <enum>Qt::Horizontal</enum>
268 </property>
269 <property name="sizeHint" stdset="0">
270 <size>
271 <width>40</width>
272 <height>20</height>
273 </size>
274 </property>
275 </spacer>
276 </item>
277 <item>
278 <widget class="QLabel" name="label_2">
279 <property name="text">
280 <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;
281&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;
282p, li { white-space: pre-wrap; }
283&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;
284&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>
285 </property>
286 </widget>
287 </item>
288 <item>
289 <widget class="QLineEdit" name="passwordLineEdit">
290 <property name="echoMode">
291 <enum>QLineEdit::Password</enum>
292 </property>
293 </widget>
294 </item>
295 <item>
296 <spacer name="horizontalSpacer_5">
297 <property name="orientation">
298 <enum>Qt::Horizontal</enum>
299 </property>
300 <property name="sizeHint" stdset="0">
301 <size>
302 <width>40</width>
303 <height>20</height>
304 </size>
305 </property>
306 </spacer>
307 </item>
308 </layout>
309 </item>
310 <item>
311 <layout class="QHBoxLayout" name="horizontalLayout_4">
312 <item>
313 <spacer name="horizontalSpacer">
314 <property name="orientation">
315 <enum>Qt::Horizontal</enum>
316 </property>
317 <property name="sizeHint" stdset="0">
318 <size>
319 <width>40</width>
320 <height>20</height>
321 </size>
322 </property>
323 </spacer>
324 </item>
325 <item>
326 <widget class="QLabel" name="label_3">
327 <property name="text">
328 <string>Please enter your user name and password</string>
329 </property>
330 </widget>
331 </item>
332 <item>
333 <spacer name="horizontalSpacer_2">
334 <property name="orientation">
335 <enum>Qt::Horizontal</enum>
336 </property>
337 <property name="sizeHint" stdset="0">
338 <size>
339 <width>40</width>
340 <height>20</height>
341 </size>
342 </property>
343 </spacer>
344 </item>
345 </layout>
346 </item>
347 <item>
348 <layout class="QHBoxLayout" name="horizontalLayout_5">
349 <item>
350 <spacer name="horizontalSpacer_10">
351 <property name="orientation">
352 <enum>Qt::Horizontal</enum>
353 </property>
354 <property name="sizeHint" stdset="0">
355 <size>
356 <width>40</width>
357 <height>20</height>
358 </size>
359 </property>
360 </spacer>
361 </item>
362 <item>
363 <widget class="QDialogButtonBox" name="buttonBox">
364 <property name="standardButtons">
365 <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
366 </property>
367 </widget>
368 </item>
369 <item>
370 <spacer name="horizontalSpacer_3">
371 <property name="orientation">
372 <enum>Qt::Horizontal</enum>
373 </property>
374 <property name="sizeHint" stdset="0">
375 <size>
376 <width>40</width>
377 <height>20</height>
378 </size>
379 </property>
380 </spacer>
381 </item>
382 </layout>
383 </item>
384 </layout>
385 </item>
386 <item>
387 <spacer name="verticalSpacer_2">
388 <property name="orientation">
389 <enum>Qt::Vertical</enum>
390 </property>
391 <property name="sizeHint" stdset="0">
392 <size>
393 <width>20</width>
394 <height>40</height>
395 </size>
396 </property>
397 </spacer>
398 </item>
399 <item>
400 <widget class="QLabel" name="versionNo">
401 <property name="text">
256 <string/>402 <string/>
257 </property>403 </property>
258 </widget>404 </widget>
@@ -261,8 +407,25 @@
261 </item>407 </item>
262 </layout>408 </layout>
263 </widget>409 </widget>
264 <widget class="QStatusBar" name="statusbar" />410 <widget class="QStatusBar" name="statusbar"/>
265 </widget>411 </widget>
412 <tabstops>
413 <tabstop>pushButton_1</tabstop>
414 <tabstop>pushButton_2</tabstop>
415 <tabstop>pushButton_3</tabstop>
416 <tabstop>pushButton_4</tabstop>
417 <tabstop>pushButton_5</tabstop>
418 <tabstop>pushButton_6</tabstop>
419 <tabstop>pushButton_7</tabstop>
420 <tabstop>pushButton_8</tabstop>
421 <tabstop>pushButton_9</tabstop>
422 <tabstop>pushButton_Del</tabstop>
423 <tabstop>pushButton_0</tabstop>
424 <tabstop>pushButton_U</tabstop>
425 <tabstop>usernameLineEdit</tabstop>
426 <tabstop>passwordLineEdit</tabstop>
427 <tabstop>buttonBox</tabstop>
428 </tabstops>
266 <resources/>429 <resources/>
267 <connections/>430 <connections/>
268</ui>431</ui>

Subscribers

People subscribed via source and target branches