Merge lp:~brendan-donegan/checkbox/bug1052506 into lp:checkbox

Proposed by Brendan Donegan
Status: Merged
Merged at revision: 1692
Proposed branch: lp:~brendan-donegan/checkbox/bug1052506
Merge into: lp:checkbox
Diff against target: 57 lines (+9/-2)
3 files modified
debian/changelog (+3/-0)
qt/frontend/qtfront.cpp (+2/-1)
qt/frontend/qtfront.ui (+4/-1)
To merge this branch: bzr merge lp:~brendan-donegan/checkbox/bug1052506
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+125257@code.launchpad.net

Description of the change

Make the Continue button the default and give it focus when Checkbox is loaded. Also I renamed the UI widget from 'friendlyTestsButton' to 'continueButton' as the previous name made little sense.

To post a comment you must log in.
1679. By Marc Tardif

Merged fix to bug #1052601 by bladernr.

1680. By Marc Tardif

Merged fix to bug #868643 by bladernr.

1681. By Marc Tardif

Merged fix to bug #990538 by bladernr.

1682. By Marc Tardif

Merged fix to bug #1053010 by bladernr.

1683. By Marc Tardif

Merged fix to bug #1053032 by bladernr.

1684. By Marc Tardif

Merged fix to bug #946184 by bladernr.

1685. By Marc Tardif

Merged fix to bug #1053033 by sylvain-pineau.

1686. By Brendan Donegan

qt/frontend/qtfront.ui, qt/frontend/qtfront.cpp - set focus to Continue
button and make it the default so that it can be 'clicked' using Enter,
as well as renaming it to 'continueButton' (LP: #1052506)

1687. By Brendan Donegan

Add UIFe to the commit message.

Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

Tested with the Spacebar and Enter keys, works perfectly.

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-09-20 15:54:26 +0000
+++ debian/changelog 2012-09-20 21:36:19 +0000
@@ -105,6 +105,9 @@
105 * jobs/wireless.txt.in - replace use of network_wireless_test in wireless_scanning105 * jobs/wireless.txt.in - replace use of network_wireless_test in wireless_scanning
106 with a simple Bash script using nmcli and delete network_wireless_test (LP: #900370)106 with a simple Bash script using nmcli and delete network_wireless_test (LP: #900370)
107 * jobs/audio.txt.in - fix description of audio/playback_hdmi (LP: #1052136)107 * jobs/audio.txt.in - fix description of audio/playback_hdmi (LP: #1052136)
108 * [UIFe] qt/frontend/qtfront.ui, qt/frontend/qtfront.cpp - set focus to Continue
109 button and make it the default so that it can be 'clicked' using Enter,
110 as well as renaming it to 'continueButton' (LP: #1052506)
108111
109 [Sylvain Pineau]112 [Sylvain Pineau]
110 * jobs/suspend.txt.in: Fixed suspend/suspend_advanced dependencies to avoid113 * jobs/suspend.txt.in: Fixed suspend/suspend_advanced dependencies to avoid
111114
=== modified file 'qt/frontend/qtfront.cpp'
--- qt/frontend/qtfront.cpp 2012-08-24 19:50:08 +0000
+++ qt/frontend/qtfront.cpp 2012-09-20 21:36:19 +0000
@@ -56,7 +56,7 @@
56 ui->radioTestTab->setVisible(false);56 ui->radioTestTab->setVisible(false);
57 ui->nextPrevButtons->setVisible(false);57 ui->nextPrevButtons->setVisible(false);
58 ui->treeView->verticalScrollBar()->setTracking(true);58 ui->treeView->verticalScrollBar()->setTracking(true);
59 connect(ui->friendlyTestsButton, SIGNAL(clicked()), this, SLOT(onFullTestsClicked()));59 connect(ui->continueButton, SIGNAL(clicked()), this, SLOT(onFullTestsClicked()));
60 connect(ui->deselectAllButton, SIGNAL(clicked()), this, SLOT(onDeselectAllClicked()));60 connect(ui->deselectAllButton, SIGNAL(clicked()), this, SLOT(onDeselectAllClicked()));
61 connect(ui->selectAllButton, SIGNAL(clicked()), this, SLOT(onSelectAllClicked()));61 connect(ui->selectAllButton, SIGNAL(clicked()), this, SLOT(onSelectAllClicked()));
62 connect(ui->buttonStartTesting, SIGNAL(clicked()), this, SLOT(onStartTestsClicked()));62 connect(ui->buttonStartTesting, SIGNAL(clicked()), this, SLOT(onStartTestsClicked()));
@@ -70,6 +70,7 @@
70 connect(ui->treeView, SIGNAL(expanded(QModelIndex)), this, SLOT(onJobItemChanged(QModelIndex)));70 connect(ui->treeView, SIGNAL(expanded(QModelIndex)), this, SLOT(onJobItemChanged(QModelIndex)));
71 connect(ui->treeView, SIGNAL(clicked(QModelIndex)), this, SLOT(onTestSelectionChanged()));71 connect(ui->treeView, SIGNAL(clicked(QModelIndex)), this, SLOT(onTestSelectionChanged()));
72 connect(this, SIGNAL(testSelectionChanged()), this, SLOT(onTestSelectionChanged()));72 connect(this, SIGNAL(testSelectionChanged()), this, SLOT(onTestSelectionChanged()));
73 ui->continueButton->setFocus();
73 ui->stepsFrame->setFixedHeight(0);74 ui->stepsFrame->setFixedHeight(0);
74 ui->buttonSubmitResults->setEnabled(false);75 ui->buttonSubmitResults->setEnabled(false);
75 ui->submissionDataLineEdit->setEnabled(false);76 ui->submissionDataLineEdit->setEnabled(false);
7677
=== modified file 'qt/frontend/qtfront.ui'
--- qt/frontend/qtfront.ui 2012-09-20 12:58:34 +0000
+++ qt/frontend/qtfront.ui 2012-09-20 21:36:19 +0000
@@ -187,7 +187,7 @@
187 <bool>true</bool>187 <bool>true</bool>
188 </property>188 </property>
189 </widget>189 </widget>
190 <widget class="QPushButton" name="friendlyTestsButton">190 <widget class="QPushButton" name="continueButton">
191 <property name="geometry">191 <property name="geometry">
192 <rect>192 <rect>
193 <x>20</x>193 <x>20</x>
@@ -204,6 +204,9 @@
204 <property name="text">204 <property name="text">
205 <string>Continue</string>205 <string>Continue</string>
206 </property>206 </property>
207 <property name="default">
208 <bool>true</bool>
209 </property>
207 </widget>210 </widget>
208 <widget class="Line" name="line_3">211 <widget class="Line" name="line_3">
209 <property name="geometry">212 <property name="geometry">

Subscribers

People subscribed via source and target branches