Improvements to layout. Release version 1.8.1

xsacha · Sep 11, 2014 · a71f318 · a71f318
1 parent 5d086b2
commit a71f318
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 76 deletions.
diff --git a/Sachesi.pro b/Sachesi.pro
@@ -4,7 +4,7 @@ TARGET="Sachesi"
 win32: RC_ICONS += assets/sachesi-114.ico
 else:mac: ICON = assets/sachesi-114.icns
 else: ICON = assets/sachesi-114.png
-VERSION = 1.8.0
+VERSION = 1.8.1
 
 # Global specific
 CONFIG += c++11

diff --git a/qml/generic/Search.qml b/qml/generic/Search.qml
@@ -266,88 +266,88 @@ Item {
         id: versionLookup
     }
 
-    ColumnLayout {
-        anchors {top: parent.top; bottom: urlLinks.top; left: variables.right; right: parent.right; margins: 30; }
-        TextArea {
-            id: updateMessage
-            Layout.fillWidth: true
-            text: p.updateMessage
-            readOnly: true
-            textFormat: TextEdit.RichText
-            selectByKeyboard: true
-        }
-        ScrollView {
-            id: updateAppMessage
-            Layout.fillHeight: true
-            Layout.fillWidth: true
-            ListView {
-                id: appView
-                anchors.fill: parent
-                spacing: 3
-                clip: true
-                model: p.updateAppList
-                Menu {
-                    id: options_menu
-                    signal checkAll()
-                    signal uncheckAll()
-                    title: "Options"
-                    MenuItem {
-                        enabled: p.updateCheckedCount != p.updateAppCount
-                        text: "Check All"
-                        onTriggered: {
-                            options_menu.checkAll();
-                            for (var i = 0; i < p.updateAppCount; i++)
-                                p.updateAppList[i].isMarked = true;
-                        }
+    TextArea {
+        id: updateMessage
+        anchors {top: parent.top; left: variables.right; right: parent.right; margins: 15; }
+        Layout.fillWidth: true
+        height: parent.height / 10
+        text: p.updateMessage
+        readOnly: true
+        textFormat: TextEdit.RichText
+        selectByKeyboard: true
+    }
+    ScrollView {
+        id: updateAppMessage
+        anchors {top: updateMessage.bottom; bottom: urlLinks.top; left: variables.right; right: parent.right; margins: 15; }
+        Layout.fillHeight: true
+        Layout.fillWidth: true
+        ListView {
+            id: appView
+            anchors.fill: parent
+            spacing: 3
+            clip: true
+            model: p.updateAppList
+            Menu {
+                id: options_menu
+                signal checkAll()
+                signal uncheckAll()
+                title: "Options"
+                MenuItem {
+                    enabled: p.updateCheckedCount != p.updateAppCount
+                    text: "Check All"
+                    onTriggered: {
+                        options_menu.checkAll();
+                        for (var i = 0; i < p.updateAppCount; i++)
+                            p.updateAppList[i].isMarked = true;
                     }
-                    MenuItem {
-                        enabled: p.updateCheckedCount > 0
-                        text: "Uncheck All"
-                        onTriggered: {
-                            options_menu.uncheckAll()
-                            for (var i = 0; i < p.updateAppCount; i++)
-                                p.updateAppList[i].isMarked = false;
-                        }
+                }
+                MenuItem {
+                    enabled: p.updateCheckedCount > 0
+                    text: "Uncheck All"
+                    onTriggered: {
+                        options_menu.uncheckAll()
+                        for (var i = 0; i < p.updateAppCount; i++)
+                            p.updateAppList[i].isMarked = false;
                     }
                 }
+            }
 
-                MouseArea {
-                    acceptedButtons: Qt.RightButton
-                    onClicked: options_menu.popup()
+            MouseArea {
+                acceptedButtons: Qt.RightButton
+                onClicked: options_menu.popup()
+                anchors.fill: parent
+            }
+            delegate: Item {
+                visible: type !== "";
+                width: parent.width - 3
+                height: type === "" ? 0 : 26
+                Rectangle {
                     anchors.fill: parent
-                }
-                delegate: Item {
-                    visible: type !== "";
-                    width: parent.width - 3
-                    height: type === "" ? 0 : 26
-                    Rectangle {
-                        anchors.fill: parent
-                        color: { switch(type) {
-                            case "os": return "red";
-                            case "radio": return "maroon";
-                            case "application": if (friendlyName.indexOf("sys.data") === 0) return "purple"; else  return "steelblue";
-                            default: return "transparent";
-                            }
+                    color: { switch(type) {
+                        case "os": return "red";
+                        case "radio": return "maroon";
+                        case "application": if (friendlyName.indexOf("sys.data") === 0) return "purple"; else  return "steelblue";
+                        default: return "transparent";
                         }
-                        opacity: 0.2
                     }
-                    CheckBox {
-                        id: delegateBox
-                        text: friendlyName
-                        checked: isMarked
-                        onCheckedChanged: isMarked = checked;
-                        Connections {
-                            target: options_menu
-                            onCheckAll: delegateBox.checked = true;
-                            onUncheckAll: delegateBox.checked = false;
-                        }
-                    }
-                    Label {
-                        anchors.right: parent.right
-                        text: (size / 1024 / 1024).toFixed(1) + " MB"
-                        font.pointSize: 12;
+                    opacity: 0.2
+                }
+                CheckBox {
+                    id: delegateBox
+                    text: friendlyName
+                    checked: isMarked
+                    onCheckedChanged: isMarked = checked;
+                    Connections {
+                        target: options_menu
+                        onCheckAll: delegateBox.checked = true;
+                        onUncheckAll: delegateBox.checked = false;
                     }
                 }
+                Label {
+                    anchors.right: parent.right
+                    text: (size / 1024 / 1024).toFixed(1) + " MB"
+                    font.pointSize: 12;
+                }
             }
         }
     }

diff --git a/qml/generic/Title.qml b/qml/generic/Title.qml
@@ -54,7 +54,7 @@ ApplicationWindow {
         width: parent.width
         anchors {top: title.bottom; bottom: parent.bottom }
         // Workaround for index moving on startup for Windows
-        onCountChanged: if (count == 4 + p.hasBootAccess) titleRow.currentIndex = 1 + p.hasBootAccess
+        onCountChanged: { titleRow.currentIndex = 0; if (count == 4 + p.hasBootAccess) titleRow.currentIndex = 1 + p.hasBootAccess; }
 
         Tab {
             title: "Extract";

diff --git a/src/main.cpp b/src/main.cpp
@@ -51,7 +51,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     app.setOrganizationName("Qtness");
     app.setOrganizationDomain("qtness.com");
     app.setApplicationName("Sachesi");
-    app.setApplicationVersion("1.8.0");
+    app.setApplicationVersion("1.8.1");
     QNetworkProxyFactory::setUseSystemConfiguration(true);
 
     QQmlApplicationEngine engine;