← 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/AutomatedTestPage.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/AutomatedTestPage.qml
32
32
Page {
33
33
    id: automatedTestPage
34
34
 
35
 
    objectName: "automatedTestPage"
36
 
 
37
35
    property var test: { "name": "", "description": "", "test_number": 0, "tests_count": 0}
38
36
 
39
37
    title: i18n.tr("Automated test")
46
44
            top: parent.top
47
45
            left: parent.left
48
46
            right: parent.right
49
 
            topMargin: units.gu(3)
50
 
            bottomMargin: units.gu(3)
51
 
            leftMargin: units.gu(1)
52
 
            rightMargin: units.gu(1)
 
47
            margins: units.gu(3)
53
48
        }
54
49
 
55
50
        Label {
67
62
            text: test["description"]
68
63
        }
69
64
    }
70
 
    ColumnLayout {
 
65
    ActivityIndicator {
 
66
        id: activity
71
67
        anchors {
72
68
            bottom: parent.bottom
73
69
            left: parent.left
74
70
            right: parent.right
75
71
            bottomMargin: units.gu(4)
76
72
        }
77
 
        ActivityIndicator {
78
 
            Layout.alignment: Qt.AlignHCenter
79
 
            id: activity
80
 
            implicitHeight: units.gu(6)
81
 
            implicitWidth: units.gu(6)
82
 
        }
83
 
        Button {
84
 
            id: showOutputButton
85
 
            objectName: "showOutputButton"
86
 
            visible: ((test["command"]) ? true : false) && activity.running
87
 
            color: "white"
88
 
            Layout.fillWidth: true
89
 
            text: "Output"
90
 
            onClicked: {
91
 
                pageStack.push(commandOutputPage);
92
 
            }
93
 
        }
 
73
        implicitHeight: units.gu(6)
 
74
        implicitWidth: units.gu(6)
94
75
    }
95
76
    function startActivity() {
96
77
        activity.running = true;