[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kanagram] src/harmattan: Make the settings page flickable since it is not visible fully in landscap
From:       Laszlo Papp <ext-laszlo.papp () nokia ! com>
Date:       2012-02-01 0:41:46
Message-ID: 20120201004146.CA272A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit c2886a0cabc3dc554fd4bdf715610d472294954e by Laszlo Papp.
Committed on 01/02/2012 at 03:39.
Pushed by lpapp into branch 'master'.

Make the settings page flickable since it is not visible fully in landscape

M  +110  -102  src/harmattan/MainSettingsPage.qml

http://commits.kde.org/kanagram/c2886a0cabc3dc554fd4bdf715610d472294954e

diff --git a/src/harmattan/MainSettingsPage.qml b/src/harmattan/MainSettingsPage.qml
index 5ec47a8..84f587c 100644
--- a/src/harmattan/MainSettingsPage.qml
+++ b/src/harmattan/MainSettingsPage.qml
@@ -45,136 +45,144 @@ Page {
     }
 
     Rectangle {
+        id: settingsPageMainRectangle;
         color: "black";
         anchors.fill: parent;
 
-        Column {
-            anchors {
-                fill: parent;
-                margins: 5;
-            }
-
-            spacing: 10;
-
-            Label {
-                width: parent.width;
-                text: qsTr("Kanagram Settings");
-            }
-
-            Image {
-                id: separator1;
-                width: parent.width;
-                height: 2;
-                fillMode: Image.TileHorizontally;
-                source: "separator.png";
-            }
+        Flickable {
+            width: parent.width;
+            height: parent.height;
+            contentWidth: settingsPageMainColumn.width;
+            contentHeight: settingsPageMainColumn.height;
 
             Column {
-                width: parent.width;
-                spacing: 5;
+                id: settingsPageMainColumn;
+                width: settingsPageMainRectangle.width;
+                anchors {
+                    margins: 5;
+                }
+
+                spacing: 10;
 
                 Label {
-                    id: hintAppearanceLabel;
-                    anchors.left: parent.left;
-                    text: qsTr("Hint appearance [second(s)]");
+                    width: parent.width;
+                    text: qsTr("Kanagram Settings");
                 }
 
-                Slider {
-                    id: hintAppearanceSlider;
-                    width: parent.width - 10;
-                    stepSize: 1;
-                    valueIndicatorVisible: true;
-                    minimumValue: 0;
-                    maximumValue: 10;
-                    anchors.horizontalCenter: parent.horizontalCenter;
-                    value: kanagramEngineHelper.hintHideTime;
-
-                    onValueChanged: {
-                        kanagramEngineHelper.hintHideTime = value;
-                    }
+                Image {
+                    id: separator1;
+                    width: parent.width;
+                    height: 2;
+                    fillMode: Image.TileHorizontally;
+                    source: "separator.png";
                 }
-            }
 
-            Image {
-                id: separator2;
-                width: parent.width;
-                height: 2;
-                fillMode: Image.TileHorizontally;
-                source: "separator.png";
-            }
+                Column {
+                    width: parent.width;
+                    spacing: 5;
 
-            Column {
-                width: parent.width;
-                spacing: 5;
+                    Label {
+                        id: hintAppearanceLabel;
+                        anchors.left: parent.left;
+                        text: qsTr("Hint appearance [second(s)]");
+                    }
 
-                Label {
-                    id: resolveTimeLabel;
-                    anchors.left: parent.left;
-                    text: qsTr("Resolve time [second(s)]");
+                    Slider {
+                        id: hintAppearanceSlider;
+                        width: parent.width - 10;
+                        stepSize: 1;
+                        valueIndicatorVisible: true;
+                        minimumValue: 0;
+                        maximumValue: 10;
+                        anchors.horizontalCenter: parent.horizontalCenter;
+                        value: kanagramEngineHelper.hintHideTime;
+
+                        onValueChanged: {
+                            kanagramEngineHelper.hintHideTime = value;
+                        }
+                    }
                 }
 
-                Slider {
-                    id: resolveTimeSlider;
-                    width: parent.width - 10;
-                    stepSize: 15;
-                    valueIndicatorVisible: true;
-                    minimumValue: 15;
-                    maximumValue: 300;
-                    anchors.horizontalCenter: parent.horizontalCenter;
-                    value: kanagramEngineHelper.resolveTime;
-
-                    onValueChanged: {
-                        kanagramEngineHelper.resolveTime = value;
-                    }
+                Image {
+                    id: separator2;
+                    width: parent.width;
+                    height: 2;
+                    fillMode: Image.TileHorizontally;
+                    source: "separator.png";
                 }
-            }
 
-            Image {
-                id: separator3:;
-                width: parent.width;
-                height: 2;
-                fillMode: Image.TileHorizontally;
-                source: "separator.png";
-            }
+                Column {
+                    width: parent.width;
+                    spacing: 5;
 
-            Item {
-                width: parent.width;
-                height: childrenRect.height;
+                    Label {
+                        id: resolveTimeLabel;
+                        anchors.left: parent.left;
+                        text: qsTr("Resolve time [second(s)]");
+                    }
 
-                Label {
-                    anchors.left: parent.left;
-                    text: qsTr("Sounds");
+                    Slider {
+                        id: resolveTimeSlider;
+                        width: parent.width - 10;
+                        stepSize: 15;
+                        valueIndicatorVisible: true;
+                        minimumValue: 15;
+                        maximumValue: 300;
+                        anchors.horizontalCenter: parent.horizontalCenter;
+                        value: kanagramEngineHelper.resolveTime;
+
+                        onValueChanged: {
+                            kanagramEngineHelper.resolveTime = value;
+                        }
+                    }
+                }
+
+                Image {
+                    id: separator3;
+                    width: parent.width;
+                    height: 2;
+                    fillMode: Image.TileHorizontally;
+                    source: "separator.png";
                 }
 
-                Switch {
-                    id: soundsSwitch;
-                    anchors.right: parent.right;
-                    checked: kanagramEngineHelper.useSounds;
+                Item {
+                    width: parent.width;
+                    height: childrenRect.height;
 
-                    onCheckedChanged: {
-                        kanagramEngineHelper.useSounds = checked;
+                    Label {
+                        anchors.left: parent.left;
+                        text: qsTr("Sounds");
+                    }
+
+                    Switch {
+                        id: soundsSwitch;
+                        anchors.right: parent.right;
+                        checked: kanagramEngineHelper.useSounds;
+
+                        onCheckedChanged: {
+                            kanagramEngineHelper.useSounds = checked;
+                        }
                     }
                 }
-            }
 
-            ListItem {
-                iconSource: "preferences-desktop-locale.png";
-                titleText: qsTr("Language");
-                subtitleText: qsTr(selectedLanguage);
-                drillDownArrow: true;
-                mousePressed: languageSelectionMouseArea.pressed;
-
-                MouseArea {
-                    id: languageSelectionMouseArea;
-                    anchors.fill: parent;
-                    onClicked: {
-                        languageSelectionDialog.open();
-                   }
+                ListItem {
+                    iconSource: "preferences-desktop-locale.png";
+                    titleText: qsTr("Language");
+                    subtitleText: qsTr(selectedLanguage);
+                    drillDownArrow: true;
+                    mousePressed: languageSelectionMouseArea.pressed;
+
+                    MouseArea {
+                        id: languageSelectionMouseArea;
+                        anchors.fill: parent;
+                        onClicked: {
+                            languageSelectionDialog.open();
+                       }
+                    }
                 }
-            }
 
+            }
         }
-
     }
 
     tools: commonTools;
[prev in list] [next in list] [prev in thread] [next in thread]