← Back to branch summary

~pieq/checkbox/fix-1484872-env-variables-forced-to-non-international

« back to all changes in this revision

Viewing changes to checkbox-touch/components/ManualIntroPage.qml

  • Committer: Zygmunt Krynicki
  • Date: 2014-12-19 12:11:52 UTC
  • mto: This revision was merged to the branch mainline in revision 3516.
  • Revision ID: zygmunt.krynicki@canonical.com-20141219121152-y9vtxajhrd6e1c3l
cep: merge CEPs in to trunk

This patch merges CEPs (aka Checkbox Enhancement Proposals) into trunk.
Those lived on separately for a while as lp:checkbox/cep but in
retrospective nobody knows about them and this should give them some
more exposure. In addition, the move allows new features to land a CEP
document along, making review of complex new features easier to make as
their specification can be seen alongside the patches that implement it.

Due to bazaar limitations in merging separate repositories together I've
discarded history entries (not that there were many) and just added
those files in directly.

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

Show diffs side-by-side

added added

removed removed

Lines of Context:
checkbox-touch/components/ManualIntroPage.qml
28
28
import QtQuick 2.0
29
29
import Ubuntu.Components 1.1
30
30
import QtQuick.Layouts 1.1
31
 
import Ubuntu.Components.Popups 0.1
32
31
import "ConfirmationLogic.js" as ConfirmationLogic
33
32
 
34
33
Page {
35
34
    id: manualIntroPage
36
 
    objectName: "manualIntroPage"
37
35
    property var test: { "name": "", "description": "", "test_number": 0, "tests_count": 0}
38
36
 
39
37
    signal continueClicked();
40
38
    signal testDone(var test);
41
39
 
 
40
    objectName: "manualIntroPage"
42
41
    title: i18n.tr("Test Description")
43
42
    head {
44
43
        actions: [
45
44
            Action {
46
 
                id: addCommentAction
47
 
                iconName: "document-new-symbolic"
48
 
                text: i18n.tr("Add comment")
49
 
                onTriggered: {
50
 
                    commentsDialog.commentDefaultText = test["comments"] || "";
51
 
                    commentsDialog.commentAdded.connect(function(comment) {
52
 
                        test["comments"] = comment;
53
 
                    });
54
 
                    PopupUtils.open(commentsDialog.dialogComponent);
55
 
                }
56
 
            },
57
 
            Action {
58
45
                id: skipAction
59
 
                objectName: "skip"
60
46
                iconName: "media-seek-forward"
61
47
                text: i18n.tr("Skip")
62
48
                onTriggered: {
78
64
 
79
65
    ColumnLayout {
80
66
        spacing: units.gu(3)
81
 
        anchors {
82
 
            fill: parent
83
 
            topMargin: units.gu(3)
84
 
            bottomMargin: units.gu(3)
85
 
            leftMargin: units.gu(1)
86
 
            rightMargin: units.gu(1)
87
 
        }
 
67
        anchors.fill: parent
 
68
        anchors.margins: units.gu(3)
88
69
 
89
70
        Label {
90
71
            fontSize: "large"