Generalize out ratio considerations

Change-Id: Ia121cb93b75cd9971f882914b4396d90ec040ef4

qml/cascade/Cascade.qml

@@ -24,10 +24,7 @@ Item {
     Settings {
         id: cascadeSettings
         category: "Cascade"
-        property int columnCount: 6
         property int initialFeedRate: 500
-        property real ratio: 1.25
-        property bool useGoldenRatio: true
     }
 
     QtObject {
@@ -35,8 +32,7 @@ Item {
         property int feedrate: populated ? globalUtil.adjustedInterval : cascadeSettings.initialFeedRate
         property bool populated: false
         property bool paused: false
-        property real goldenRatio: 1.61803398875
-        property real columnRatio: cascadeSettings.useGoldenRatio ? goldenRatio : cascadeSettings.ratio
+        property real columnRatio: globalSettings.useGoldenRatio ? globalVars.goldenRatio : globalSettings.lessGoldenRatio
         property real pace: 1.0/30.0
         property real columnWidth: root.width*goldenBeast(globalSettings.columnCount)
 

qml/main.qml

@@ -20,6 +20,7 @@ Window {
 
     QtObject {
         id: globalVars
+        property real goldenRatio: 1.61803398875
         property real imageWidthOverride: -1
     }
 
@@ -93,6 +94,9 @@ Window {
         property bool randomTapestryColour: false
         property bool fadeInImages: true
 
+        property bool useGoldenRatio: true
+        property real lessGoldenRatio: 1.25
+
         onColumnCountChanged: globalUtil.reset()
         Component.onCompleted: loader.source = globalSettings.view.toLowerCase() + "/" + globalSettings.view + ".qml"
     }