← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ubuntu-system-settings/utopic-proposed

« back to all changes in this revision

Viewing changes to plugins/system-update/PageComponent.qml

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, Ken VanDine, Martin Pitt, Sebastien Bacher
  • Date: 2014-09-11 21:08:06 UTC
  • mfrom: (1.1.168)
  • Revision ID: package-import@ubuntu.com-20140911210806-k7bovfrb4aix0mpp
Tags: 0.3+14.10.20140911.3-0ubuntu1
https://launchpad.net/bugs/1368294
https://launchpad.net/bugs/1368294
https://launchpad.net/bugs/1318008
https://launchpad.net/bugs/1318008
https://launchpad.net/bugs/1348580
https://launchpad.net/bugs/1368159
https://launchpad.net/bugs/1348579
[ Ken VanDine ]
* Fixed tests for the dialpad settings failing on mako
* Don't call downloadUpdate when we see a system update ready, the
  service does that for us (LP: #1368294) (LP: #1368294)
* Translate desktop file (LP: #1318008) (LP: #1318008)

[ Martin Pitt ]
* update POT

[ Sebastien Bacher ]
* [system-update] open the ubuntuone subpanel rather than the list
  (LP: #1348580)
* [security-privacy] use ngettext strings when needed (LP: #1368159)
* Increase vertical spacing in the settings grid (LP: #1348579)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/system-update/PageComponent.qml
26
26
import Ubuntu.Components 0.1
27
27
import Ubuntu.Components.ListItems 0.1 as ListItem
28
28
import Ubuntu.Components.Popups 0.1
 
29
import Ubuntu.OnlineAccounts.Client 0.1
29
30
import Ubuntu.SystemSettings.Update 1.0
30
31
 
31
32
 
80
81
        }
81
82
    }
82
83
 
 
84
    Setup {
 
85
        id: uoaConfig
 
86
        applicationId: "ubuntu-system-settings"
 
87
        providerId: "ubuntuone"
 
88
    }
 
89
 
83
90
    Component {
84
91
         id: dialogInstallComponent
85
92
         Dialog {
145
152
        }
146
153
    ]
147
154
 
148
 
    function open_online_accounts() {
149
 
        Qt.openUrlExternally("settings:///system/online-accounts");
150
 
    }
151
 
 
152
155
    UpdateManager {
153
156
        id: updateManager
154
157
        objectName: "updateManager"
482
485
                        leftMargin: units.gu(2)
483
486
                        rightMargin: units.gu(2)
484
487
                    }
485
 
                    onClicked: open_online_accounts()
 
488
                    onClicked: uoaConfig.exec()
486
489
                }
487
490
 
488
491
            }