← Back to branch summary

~ken-vandine/ubuntu-system-settings/no_s_i_d

« back to all changes in this revision

Viewing changes to plugins/time-date/PageComponent.qml

  • Committer: Bileto Bot
  • Author(s): Ken VanDine
  • Date: 2016-07-22 14:38:13 UTC
  • mfrom: (1556.3.32 slotsLayout)
  • Revision ID: ci-train-bot@canonical.com-20160722143813-ht9e4766lm0ie5fa
Ported to use Slots layout and updated visuals (LP: #1596529)

Approved by: Jonas G. Drange

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/time-date/PageComponent.qml
1
1
/*
2
2
 * This file is part of system-settings
3
3
 *
4
 
 * Copyright (C) 2013 Canonical Ltd.
 
4
 * Copyright (C) 2013-2016 Canonical Ltd.
5
5
 *
6
6
 * Contact: Iain Lane <iain.lane@canonical.com>
7
7
 *
20
20
 
21
21
import QtQuick 2.4
22
22
import SystemSettings 1.0
 
23
import SystemSettings.ListItems 1.0 as SettingsListItems
23
24
import Ubuntu.Components 1.3
24
 
import Ubuntu.Components.ListItems 1.3 as ListItem
 
25
import Ubuntu.Components.ListItems 1.3 as ListItems
25
26
import Ubuntu.Components.Popups 1.3
26
27
import Ubuntu.SystemSettings.TimeDate 1.1
27
28
 
62
63
 
63
64
            SettingsItemTitle { text: i18n.tr ("Time zone:") }
64
65
 
65
 
            ListItem.SingleValue {
 
66
            SettingsListItems.SingleValueProgression {
66
67
                objectName: "timeZone"
67
68
                id: timeZone
68
69
                text: timeDatePanel.timeZoneName
69
70
                value: getUTCOffset()
70
 
                progression: true
71
71
                onClicked: pageStack.push(Qt.resolvedUrl("ChooseTimeZone.qml"), {
72
72
                    timeDatePanel: timeDatePanel
73
73
                })
77
77
                text: i18n.tr ("Set the time and date:")
78
78
            }
79
79
 
80
 
            ListItem.ItemSelector {
 
80
            ListItems.ItemSelector {
81
81
                id: setTimeAutomatically
82
82
                objectName: "timeItemSelector"
83
83
                model: [ i18n.tr("Automatically") , i18n.tr("Manually")]
108
108
                TimePicker {}
109
109
            }
110
110
 
111
 
            ListItem.Standard {
 
111
            SettingsListItems.StandardProgression {
112
112
                id: currentTime
113
113
                objectName: "currentTime"
114
 
                progression: setTimeAutomatically.selectedIndex === 1 // Manually
115
 
                enabled: progression
 
114
                progressionVisible: setTimeAutomatically.selectedIndex === 1 // Manually
 
115
                enabled: progressionVisible
116
116
                onClicked: {
117
117
                    Qt.inputMethod.hide()
118
118
                    var popupObj = PopupUtils.open(timePicker);