~canonical-platform-qa/ubuntu-system-settings-online-accounts/launch

~canonical-platform-qa/ubuntu-system-settings-online-accounts/launch_fixture

Viewing changes to src/module/RemovalConfirmation.qml

Committer: CI bot
Author(s): Alberto Mardegan
Date: 2014-05-30 13:30:01 UTC
mfrom: (107.1.13 master)
Revision ID: ps-jenkins@lists.canonical.com-20140530133001-an9lfy1dc1pfkifd

Release development branch

Features landing with this branch:
- Updating the ACL when applications are enabled/disabled in System Settings
- Write profile information in the XML files installed by click hooks
- Run tests with Python 3 autopilot.
- Merge signon-ui into online-accounts-ui

files added:
click-hooks/main.cpp

src/browser-request.cpp

src/browser-request.h

src/com.canonical.indicators.webcredentials.service.in

src/com.canonical.indicators.webcredentials.xml

src/com.nokia.singlesignonui.service.in

src/dialog.cpp

src/dialog.h

src/indicator-service.cpp

src/indicator-service.h

src/module/KeyboardRectangle.qml

src/module/StandardAnimation.qml

src/module/WebView.qml

src/reauthenticator.cpp

src/reauthenticator.h

src/request-handler.cpp

src/request-handler.h

src/request-manager.cpp

src/request-manager.h

src/signonui-request.cpp

src/signonui-request.h

src/signonui-service.cpp

src/signonui-service.h

tests/click-hooks

tests/click-hooks/click-hooks.pro

tests/click-hooks/tst_online_accounts_hooks.cpp

tests/online-accounts-ui/tst_application_manager.cpp

tests/online-accounts-ui/tst_application_manager.pro

files removed:
src/com.canonical.OnlineAccountsUi.service.in

src/com.canonical.OnlineAccountsUi.xml

src/signon-ui

src/signon-ui/Page.qml

src/signon-ui/signon-ui.pro

files renamed:
click-hooks/account-application.hook => click-hooks/account-application.hook.in

click-hooks/account-provider.hook => click-hooks/account-provider.hook.in

click-hooks/account-service.hook => click-hooks/account-service.hook.in

files modified:
.bzrignore

click-hooks/click-hooks.pro

debian/control

debian/rules

debian/tests/autopilot

debian/tests/control

debian/ubuntu-system-settings-online-accounts.install

src/application-manager.cpp

src/application-manager.h

src/globals.h

src/main.cpp

src/module/OAuth.qml

src/module/RemovalConfirmation.qml

src/module/ServiceItem.qml

src/module/ServiceSwitches.qml

src/module/module.pro

src/online-accounts-ui.pro

src/panel-request.cpp

src/provider-request.cpp

src/qml/MainPage.qml

src/qml/ProviderRequest.qml

src/request.cpp

src/request.h

src/service.cpp

src/service.h

src/src.pro

system-settings-plugin/plugin.cpp

tests/autopilot/autopilot.pro

tests/autopilot/online_accounts_ui/emulators/items.py

tests/autopilot/online_accounts_ui/tests/test_online_accounts_ui.py

tests/online-accounts-ui/online-accounts-ui.pro

tests/online-accounts-ui/tst_service.cpp

tests/online-accounts-ui/tst_service.pro

tests/tests.pro

Show diffs side-by-side

added added

removed removed

src/module/RemovalConfirmation.qml

title: i18n.dtr("ubuntu-system-settings-online-accounts", "Remove account")

text: i18n.dtr("ubuntu-system-settings-online-accounts", "The %1 account will be removed only from your phone. You can add it again later.").arg(accountName)

onVisibleChanged: if (!visible) closed()

Button {

text: i18n.dtr("ubuntu-system-settings-online-accounts", "Remove")

onClicked: setConfirmed(true)

function setConfirmed(isConfirmed) {

confirmed = isConfirmed

PopupUtils.close(root)

closed()

}

Older »