version v0.6

source-linux/qml/configqml/ConfigPage.qml

@@ -38,40 +38,42 @@ import "qrc:/qml/configqml"
 import "qrc:/qml/genericqml"
 
 Page{
-       //anchors.fill: parent
+    //anchors.fill: parent
     width:root.width
     height:root.height
 
     Rectangle{
-        x: 4*mm; y:13.5*mm; width: parent.width - 14*mm; height: 5*mm;
-        color:"light grey"
+        x: root.fontFactor*osSettings.bigFontSize; y:4*root.fontFactor*osSettings.bigFontSize;
+        width: parent.width - 6*root.fontFactor*osSettings.bigFontSize; height: 2*root.fontFactor*osSettings.bigFontSize
+        color:"#F3F3F3"
         radius: 0.5*mm
         Text{
             anchors.fill: parent
-            font.pixelSize:3*mm
+            font.pointSize: osSettings.bigFontSize
             text:qsTr("Sync")
         }
         MouseArea{
             anchors.fill:parent
-            onClicked:root.push("qrc:qml/configqml/SyncConfig.qml");
+            onClicked:rootstackView.push("qrc:qml/configqml/SyncConfig.qml");
         }
     }
 
     Text {
         text: qsTr("News as")
-        font.pixelSize:3*mm
-        x: 4*mm; y: 20*mm
+        font.pointSize:osSettings.systemFontSize
+        x: root.fontFactor*osSettings.bigFontSize; y: 8*root.fontFactor*osSettings.bigFontSize
     }
 
     Rectangle{
-         x: 4*mm; y: 23.5*mm; width: newsTypeField.contentWidth+2*mm; height: 5*mm;
-         color:"light grey"
-         radius: 0.5*mm
-         Text{
-             id: newsTypeField
-             anchors.fill: parent
-             font.pixelSize:3*mm
-             text:qsTr("Conversations")
+        x: root.fontFactor*osSettings.bigFontSize; y: 10*root.fontFactor*osSettings.bigFontSize;
+        width: newsTypeField.contentWidth+2*mm; height: 2*root.fontFactor*osSettings.bigFontSize
+        color:"#F3F3F3"
+        radius: 0.5*mm
+        Text{
+            id: newsTypeField
+            anchors.fill: parent
+            font.pointSize:osSettings.bigFontSize
+            text:qsTr("Conversations")
         }
         MouseArea{
             anchors.fill:parent
@@ -80,38 +82,43 @@ Page{
     }
     Menu {
         id:newstypemenu
+        width:8*root.fontFactor*osSettings.bigFontSize
         MenuItem {
-            font.pixelSize: 3*mm
+            font.pointSize: osSettings.bigFontSize
             text: qsTr("Timeline")
             onTriggered: {newsTypeField.text=qsTr("Timeline");
                 Service.updateglobaloptions(root.db,"newsViewType","Timeline");}
-            }
+        }
         MenuItem {
-            font.pixelSize: 3*mm
+            font.pointSize: osSettings.bigFontSize
             text: qsTr("Conversations")
             onTriggered: {newsTypeField.text=qsTr("Conversations");
                 Service.updateglobaloptions(root.db,"newsViewType","Conversations");}
-            }
+        }
     }
 
 
     Text {
         text: qsTr("Max. News")
-        font.pixelSize:3*mm
-        x: 4*mm; y:30*mm
+        font.pointSize: osSettings.systemFontSize
+        x: root.fontFactor*osSettings.bigFontSize; y:14*root.fontFactor*osSettings.bigFontSize
     }
 
     Slider{ id: maxNews
-        x:19*mm; y: 33.5*mm;width: root.width/2;height:5*mm
+        x:6*root.fontFactor*osSettings.bigFontSize; y: 16*root.fontFactor*osSettings.bigFontSize;
+        width: root.width/2;height:2*root.fontFactor*osSettings.bigFontSize
         from: 0;to:2000; stepSize: 100
         value:  root.globaloptions.hasOwnProperty("max_news")?root.globaloptions.max_news:1000
     }
 
-    Rectangle{color: "light grey"; x: 4*mm; y: 33.5*mm; width: 9*mm; height: 5*mm;
+    Rectangle{
+        color: "#F3F3F3";
+        x: root.fontFactor*osSettings.bigFontSize; y: 16*root.fontFactor*osSettings.bigFontSize;
+        width: 4*root.fontFactor*osSettings.bigFontSize; height: 2*root.fontFactor*osSettings.bigFontSize;
         radius: 0.5*mm
         TextEdit{id:maxNewsText;
             anchors.fill: parent
-            font.pixelSize:3*mm
+            font.pointSize: osSettings.bigFontSize
             verticalAlignment:TextEdit.AlignRight
             text:maxNews.value
             selectByMouse: true
@@ -125,10 +132,9 @@ Page{
 
     CheckBox{
         id: nsfwCheckbox
-        x: 4*mm
-        y: 43.5*mm
-        font.pixelSize: 3*mm
-        //width:5*mm
+        x: root.fontFactor*osSettings.bigFontSize
+        y: 20*root.fontFactor*osSettings.bigFontSize
+        font.pointSize: osSettings.bigFontSize
         text: qsTr("Hide #nsfw?")
         checked:(globaloptions["hide_nsfw"]==1)?true:false
         onClicked: {
@@ -146,24 +152,24 @@ Page{
     MButton {
         anchors.right: closeButton.left; anchors.rightMargin: mm;
         anchors.top: parent.top
-        anchors.topMargin: 1*mm
-        width: 8*mm; height: 6*mm;
+        anchors.topMargin:root.fontFactor*osSettings.bigFontSize
+        width: 2*root.fontFactor*osSettings.bigFontSize;
         text: "?"
-        font.pixelSize: 3*mm
+        font.pointSize: osSettings.bigFontSize
         onClicked:{
-                    root.push("qrc:/qml/configqml/InfoBox.qml");
-           }
-         }
+            rootstackView.push("qrc:/qml/configqml/InfoBox.qml");
+        }
+    }
     MButton{
-         id:closeButton
-         height: 6*mm
-         width :8*mm
-         anchors.top: parent.top
-         anchors.topMargin: 1*mm
-         anchors.right: parent.right
-         anchors.rightMargin: 1*mm
-         text:   "\uf057"
-         font.pixelSize: 3*mm
-         onClicked:{root.pop()}
+        id:closeButton
+        //         height: 2*root.fontFactor*osSettings.bigFontSize
+        width: 2*root.fontFactor*osSettings.bigFontSize;
+        anchors.top: parent.top
+        anchors.topMargin:root.fontFactor*osSettings.bigFontSize
+        anchors.right: parent.right
+        anchors.rightMargin: 1*mm
+        text:   "\uf057"
+        font.pointSize: osSettings.bigFontSize
+        onClicked:{rootstackView.pop()}
     }
 }