From 4ad4929165d54d9176fe6281e927ad25d685a721 Mon Sep 17 00:00:00 2001 From: Sacha Date: Fri, 26 Jun 2015 12:33:04 +1000 Subject: [PATCH] Bump version number and disable per-app backup until it is fixed. --- Sachesi.pro | 2 +- qml/generic/Backup.qml | 8 ++++++-- src/installer.cpp | 8 ++++---- src/sachesi.cpp | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Sachesi.pro b/Sachesi.pro index b7f9bf7..4f75c67 100644 --- a/Sachesi.pro +++ b/Sachesi.pro @@ -4,7 +4,7 @@ TARGET="Sachesi" win32: RC_ICONS += assets/sachesi.ico else:mac: ICON = assets/sachesi.icns else: ICON = assets/sachesi.png -VERSION = 2.0.1 +VERSION = 2.0.2 # Global specific CONFIG += c++11 diff --git a/qml/generic/Backup.qml b/qml/generic/Backup.qml index 78735c8..e730f5b 100644 --- a/qml/generic/Backup.qml +++ b/qml/generic/Backup.qml @@ -100,9 +100,10 @@ Item { Component { id: sectionHeading RowLayout{ - CheckBox { + // Try to do a per-mode backup first? + /*CheckBox { checked: true - } + }*/ Rectangle { //width: container.width @@ -172,9 +173,12 @@ Item { width: Math.min(implicitWidth, parent.width - sizeText.width) clip: true checked: isMarked + // Per-app backup wasn't working when > 1 app selected + enabled: false onCheckedChanged: isMarked = checked onClicked: { + console.log(size) if (checked) appData.selectedSize += size; else diff --git a/src/installer.cpp b/src/installer.cpp index 5a5fa8b..161b01b 100644 --- a/src/installer.cpp +++ b/src/installer.cpp @@ -1373,12 +1373,12 @@ void InstallNet::restoreReply() if (_back.rev() == 2) { postData.addQueryItem("opt", "rev2"); - if (_back.curMode() == "app") { + //if (_back.curMode() == "app") { // Select app by pkgid: - postData.addQueryItem("pkgid", "gYABgGhMIKEe6t-zx-otuOtK1JM"); + //postData.addQueryItem("pkgid", "gYABgGhMIKEe6t-zx-otuOtK1JM"); // Select apps by pkgtype (system, bin, data): - postData.addQueryItem("pkgtype", "data"); - } + //postData.addQueryItem("pkgtype", "data"); + //} } reply = manager->post(setData("backup.cgi", "x-www-form-urlencoded"), postData.encodedQuery()); diff --git a/src/sachesi.cpp b/src/sachesi.cpp index d452b40..ce3ba9a 100644 --- a/src/sachesi.cpp +++ b/src/sachesi.cpp @@ -61,7 +61,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) app.setOrganizationName("Qtness"); app.setOrganizationDomain("qtness.com"); app.setApplicationName("Sachesi"); - app.setApplicationVersion("2.0.1"); + app.setApplicationVersion("2.0.2"); // Use system proxy except where not possible QNetworkProxyFactory::setUseSystemConfiguration(true);