Merge branch 'master' of ssh://drop.maemo.org/git/qwp

[qwp] / qml / qwp / content / Config.qml

diff --git a/qml/qwp/content/Config.qml b/qml/qwp/content/Config.qml
index 9af5ce4..0d4e8cf 100644 (file)
--- a/qml/qwp/content/Config.qml
+++ b/qml/qwp/content/Config.qml
@@ -6,6 +6,9 @@ ShadowRectangle {
     opacity: 1
     width: parent.width
     height: wrappersc.height
+<<<<<<< HEAD
+    color: "#7d7b97"
+=======
  /*   gradient: Gradient {
         GradientStop {
             position: 0 */
@@ -48,11 +51,15 @@ ShadowRectangle {
 */
 
 
+>>>>>>> 35062d3928ada7bfcb8f08201897545f91b7731b
 
     Flow {
         id: wrappersc
         flow: Flow.TopToBottom
+<<<<<<< HEAD
+=======
         //width: menu.width-10
+>>>>>>> 35062d3928ada7bfcb8f08201897545f91b7731b
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
         spacing:  10
@@ -60,7 +67,10 @@ ShadowRectangle {
         anchors.topMargin: 5
         Text {
             text: "Language:"
+<<<<<<< HEAD
+=======
             //font.pixelSize: 16;
+>>>>>>> 35062d3928ada7bfcb8f08201897545f91b7731b
             font.bold: true; color: "white"; style: Text.Raised; styleColor: "black"
             horizontalAlignment: Qt.AlignRight
         }
@@ -72,6 +82,10 @@ ShadowRectangle {
             focus: true
             text: schModel.from
         }
+<<<<<<< HEAD
+        Text {
+            text: "Search:"
+=======
         /*
         Text {
             text: "In reply to:"
@@ -87,6 +101,7 @@ ShadowRectangle {
         Text {
             text: "Search:"
             //font.pixelSize: 16;
+>>>>>>> 35062d3928ada7bfcb8f08201897545f91b7731b
             font.bold: true; color: "white"; style: Text.Raised; styleColor: "black"
             horizontalAlignment: Qt.AlignRight
         }
@@ -98,6 +113,43 @@ ShadowRectangle {
             text: schModel.phrase
         }
 
+<<<<<<< HEAD
+        Button {
+            x: 2
+            width: menu.width-4
+            height: menu.height
+            id: searchbutton
+            keyUsing: true;
+            opacity: 1
+            text: "Go"
+            KeyNavigation.tab: fromIn
+            Keys.onReturnPressed: searchbutton.doSearch();
+            Keys.onEnterPressed: searchbutton.doSearch();
+            Keys.onSelectPressed: searchbutton.doSearch();
+            Keys.onSpacePressed: searchbutton.doSearch();
+            onClicked: searchbutton.doSearch();
+
+            function doSearch() {
+                // Search ! allowed
+                if (wrappersc.state=="invalidinput")
+                    return;
+
+                schModel.from=fromIn.text;
+                schModel.phrase = phraseIn.text;
+                fond.focus = true;
+                fond.state = ""
+            }
+        }
+    }
+
+    states:
+        State {
+        name: "invalidinput"
+        when: fromIn.text=="" // && phraseIn.text==""
+        PropertyChanges { target: searchbutton ; opacity: 0.6 ; }
+    }
+
+=======
 
 
 
@@ -137,12 +189,16 @@ ShadowRectangle {
         when: fromIn.text=="" && toIn.text=="" && phraseIn.text==""
         PropertyChanges { target: searchbutton ; opacity: 0.6 ; }
     } */
+>>>>>>> 35062d3928ada7bfcb8f08201897545f91b7731b
     transitions:
         Transition {
         NumberAnimation { target: searchbutton; property: "opacity"; duration: 200 }
     }
 }
+<<<<<<< HEAD
+=======
 
 
 
 
+>>>>>>> 35062d3928ada7bfcb8f08201897545f91b7731b