on xenial help sign in
Merge from wizard-plugin
commit8219b023acefbb208695b9fdc312f5d77841d6d2 authorMichael Terry <michael.terry@canonical.com> dateFri 28 Nov 2014, 10:15 (12 years ago) parent06abbb0ae2f1e4
4 files changed+10−17
plugins/Wizard/plugin.h−2 qml/Wizard/Pages.qml+7−10 qml/Wizard/Wizard.qml+2−4 tests/mocks/AccountsService/AccountsService.cpp+1−1
plugins/Wizard/plugin.h−2
@@ -12,8 +12,6 @@
1212 *
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
1715 */
1816
1917#ifndef WIZARD_PLUGIN_H
qml/Wizard/Pages.qml+7−10
@@ -21,18 +21,15 @@ import Wizard 0.1
2121import "../Components"
2222
2323Item {
24+ id: root
25+ objectName: "wizardPages"
26+ focus: true
27+
2428 // The background wallpaper to use
2529 property string background
2630
2731 signal quit()
2832
29− ////
30−
31− id: root
32− objectName: "wizardPages"
33− focus: true
34− anchors.fill: parent
35−
3633 // These should be set by a security page and we apply the settings when
3734 // the user exits the wizard.
3835 property int passwordMethod: UbuntuSecurityPrivacyPanel.Passcode
@@ -113,10 +110,10 @@ Item {
113110
114111 // Check for immediate skip or not. We may have to wait for
115112 // skipValid to be assigned (see Connections object below)
116− _checkSkip()
113+ checkSkip()
117114 }
118115
119− function _checkSkip() {
116+ function checkSkip() {
120117 if (!currentPage) { // may have had a parse error
121118 next()
122119 } else if (currentPage.skipValid) {
@@ -131,7 +128,7 @@ Item {
131128
132129 Connections {
133130 target: pageStack.currentPage
134− onSkipValidChanged: pageStack._checkSkip()
131+ onSkipValidChanged: pageStack.checkSkip()
135132 }
136133
137134 Component.onCompleted: next()
qml/Wizard/Wizard.qml+2−4
@@ -20,15 +20,13 @@ import Wizard 0.1
2020import "../Components"
2121
2222Showable {
23+ id: root
24+
2325 // The background wallpaper to use
2426 property string background
2527
2628 readonly property alias active: loader.active
2729
28− ////
29−
30− id: root
31−
3230 hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
3331
3432 onRequiredChanged: {
tests/mocks/AccountsService/AccountsService.cpp+1−1
@@ -29,7 +29,7 @@ AccountsService::AccountsService(QObject* parent)
2929 m_failedLogins(0),
3030 m_demoEdges(false),
3131 m_hereEnabled(false),
32− m_hereLicensePath()
32+ m_hereLicensePath("")
3333{
3434}
3535