← 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/ChooseTimeZone.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/ChooseTimeZone.qml
1
1
/*
2
2
 * This file is part of system-settings
3
3
 *
4
 
 * Copyright (C) 2013-2014 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
25
import Ubuntu.Components.ListItems 1.3 as ListItem
25
26
import Ubuntu.SystemSettings.TimeDate 1.1
52
53
        visible: showAllUI
53
54
    }
54
55
 
55
 
    ListItem.Standard {
 
56
    SettingsListItems.Standard {
56
57
        anchors.top: setTimeZoneSelector.bottom
57
58
        text: timeDatePanel.timeZoneName
58
59
        enabled: false
96
97
 
97
98
        model: timeDatePanel.timeZoneModel
98
99
        visible: setTimeZoneSelector.selectedIndex == 1 && count > 0
99
 
        delegate: ListItem.Standard {
 
100
        delegate: SettingsListItems.Standard {
100
101
            text: displayName
101
102
            // If a timezone is manually selected, record which one so that
102
103
            // we highlight that one only. Usually all cities in that timezone