Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
0b65fe8
Olf0 strings rework (#1)
Olf0 Jan 11, 2022
541dedc
Update settings-patchmanager.ts
Olf0 Jan 11, 2022
2d02ee2
Update AboutPage.qml
Olf0 Jan 11, 2022
4918b23
Update AboutPage.qml
Olf0 Jan 11, 2022
00e6df8
Update UnifiedPatchPage.qml
Olf0 Jan 11, 2022
00c328d
Update PatchManagerPage.qml
Olf0 Jan 11, 2022
85f2df3
Update WebCatalogPage.qml
Olf0 Jan 11, 2022
fa59a27
Update PatchManagerPage.qml
Olf0 Jan 11, 2022
bb457f8
Update WebPatchPage.qml
Olf0 Jan 11, 2022
2377e0e
Update WebCatalogPage.qml
Olf0 Jan 11, 2022
dfb9019
Update RestartServicesDialog.qml
Olf0 Jan 11, 2022
c5d26b8
Update WebCatalogPage.qml
Olf0 Jan 11, 2022
ad635c5
Update WebPatchPage.qml
Olf0 Jan 11, 2022
097f867
Update SettingsPage.qml
Olf0 Jan 11, 2022
bacbb83
Update SettingsPage.qml
Olf0 Jan 11, 2022
ae19c38
Update SettingsPage.qml
Olf0 Jan 11, 2022
61fede8
Update settings-patchmanager.ts
Olf0 Jan 11, 2022
c184082
Update SettingsPage.qml
Olf0 Jan 11, 2022
22d6184
Update settings-patchmanager.ts
Olf0 Jan 11, 2022
0f2ce90
Update AboutPage.qml
Olf0 Jan 11, 2022
9b57b6d
Update settings-patchmanager.ts
Olf0 Jan 11, 2022
ec713b7
Update AboutPage.qml
Olf0 Jan 11, 2022
5478d8c
Update PatchManagerPage.qml
Olf0 Jan 11, 2022
2fcb75d
Update RestartServicesDialog.qml
Olf0 Jan 11, 2022
7a27232
Update UnifiedPatchPage.qml
Olf0 Jan 11, 2022
43fe685
Update WebPatchPage.qml
Olf0 Jan 11, 2022
18b6f49
Update settings-patchmanager.ts
Olf0 Jan 11, 2022
f57defa
Update settings-patchmanager.ts
Olf0 Jan 12, 2022
85a8f1c
Update WebPatchPage.qml
Olf0 Jan 12, 2022
6776286
Update WebPatchPage.qml
Olf0 Jan 12, 2022
51555b9
Update WebCatalogPage.qml
Olf0 Jan 12, 2022
38fe551
Update UnifiedPatchPage.qml
Olf0 Jan 12, 2022
1e9a2b2
Update SettingsPage.qml
Olf0 Jan 12, 2022
2f66c63
Update RestartServicesDialog.qml
Olf0 Jan 12, 2022
99020b8
Update PatchManagerPage.qml
Olf0 Jan 12, 2022
d5d8e63
Update PatchManagerPage.qml
Olf0 Jan 12, 2022
8a2d558
Update AboutPage.qml
Olf0 Jan 12, 2022
168da29
Update AboutPage.qml
Olf0 Jan 12, 2022
053bce6
Update UnifiedPatchPage.qml
Olf0 Jan 12, 2022
a2856b3
Update settings-patchmanager.ts
Olf0 Jan 12, 2022
9920e91
Fix typo in license
Olf0 Jan 12, 2022
b304a19
Update AboutPage.qml
Olf0 Jan 12, 2022
153631e
Update DevelopersPage.qml
Olf0 Jan 12, 2022
91932c1
Update PatchManagerPage.qml
Olf0 Jan 12, 2022
aec730b
Update PatchObject.cpp
Olf0 Jan 12, 2022
f7d9921
Update SettingsPage.qml
Olf0 Jan 12, 2022
c7a6d02
Update UnifiedPatchPage.qml
Olf0 Jan 12, 2022
14696a8
Update WebCatalogPage.qml
Olf0 Jan 12, 2022
b76512e
Update WebPatchPage.qml
Olf0 Jan 12, 2022
76b3c9c
Update dialog.qml
Olf0 Jan 12, 2022
17d91e6
Update patchmanagerobject.cpp
Olf0 Jan 12, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 44 additions & 9 deletions src/bin/dialog/dialog.qml
Original file line number Diff line number Diff line change
@@ -1,3 +1,38 @@
/*
* Copyright (C) 2016 Andrey Kozhevnikov <[email protected]>
* Copyright (c) 2021, Patchmanager for SailfishOS contributors:
* - olf "Olf0" <https://github.com/Olf0>
* - Peter G. "nephros" <[email protected]>
*
* You may use this file under the terms of the 3-clause BSD license,
* as follows:
*
* "Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* * The names of its contributors may not be used to endorse or promote
* products derived from this software without specific prior written
* permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
*/

import QtQuick 2.0
import Sailfish.Silica 1.0
import org.nemomobile.dbus 2.0
Expand All @@ -18,15 +53,15 @@ ApplicationWindow {
' </interface>\n'

function show() {
console.warn("Function show is called!")
console.warn("Function show is called.")
}
}
initialPage: Component {
Page {
onStatusChanged: {
if (status == PageStatus.Active && !appWindow.remorseItem) {
remorse.execute(button, qsTranslate("", "Applying patches"), function() {
console.info("Accepted applying patches.")
remorse.execute(button, qsTranslate("", "Activate all Patches marked active"), function() {
console.info("Accepted activation of all Patches marked active.")
dbusPm.call("loadRequest", [true])
}, 10000)
appWindow.remorseItem = remorse
Expand All @@ -42,15 +77,15 @@ ApplicationWindow {
width: parent.width

PageHeader {
title: qsTranslate("", "Apply patches")
title: qsTranslate("", "Activate all Patches marked active")
}

Label {
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: Theme.horizontalPageMargin
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
text: qsTranslate("", "Patchmanager will automatically apply all patches in 10 seconds.")
text: qsTranslate("", "Patchmanager will activate all Patches marked active in 10 seconds.")
}

Item {
Expand All @@ -63,14 +98,14 @@ ApplicationWindow {
id: button
width: parent.width
height: parent.height
text: qsTranslate("", "Exit")
text: qsTranslate("", "Quit")
onClicked: Qt.quit()
enabled: false

RemorseItem {
id: remorse
onCanceled: {
console.info("Cancelled applying patches.")
console.info("Cancelled activation of all Patches marked active.")
dbusPm.call("loadRequest", [false])
Qt.quit()
}
Expand Down Expand Up @@ -133,8 +168,8 @@ ApplicationWindow {
function autoApplyingFinished(success) {
console.info(success)
button.enabled = true
progress.label = success ? qsTranslate("", "Applied patches successfully.")
: qsTranslate("", "Failed to apply patches!")
progress.label = success ? qsTranslate("", "Successfully activated all Patches marked active.")
: qsTranslate("", "Failed to activate all Patches marked active!")
}
}
}
Expand Down
Loading