From ef4420254ca983e0b0c64a496a52d6f7fb089f9c Mon Sep 17 00:00:00 2001
From: educa33e <educa33e@gmail.com>
Date: Tue, 1 Feb 2011 23:45:14 +0100
Subject: [PATCH] Git test

---
 qml/qwp/content/Config.qml |  120 --------------------------------------------
 1 file changed, 120 deletions(-)

diff --git a/qml/qwp/content/Config.qml b/qml/qwp/content/Config.qml
index 0d4e8cf..2798010 100644
--- a/qml/qwp/content/Config.qml
+++ b/qml/qwp/content/Config.qml
@@ -6,60 +6,11 @@ ShadowRectangle {
     opacity: 1
     width: parent.width
     height: wrappersc.height
-<<<<<<< HEAD
     color: "#7d7b97"
-=======
- /*   gradient: Gradient {
-        GradientStop {
-            position: 0 */
-            color: "#7d7b97"
-/*        }
-
-        GradientStop {
-            position: 1
-            color: "#313f4d"
-        }
-    } */
-//    border.color: "black"
-//    border.width: 2
-    /*
-    MouseArea {
-        anchors.fill: parent
-        onClicked: { fond.state = '' }
-    }
-    /*
-    Text {
-        id: text2
-        height: 20
-        text: "Panneau gauche"
-        anchors.right: parent.right
-        anchors.rightMargin: 5
-        font.pixelSize: 12
-        anchors.top: parent.top
-        anchors.topMargin: 5
-    }
-
-    TextInput {
-        id: cfgType
-        x: 151
-        y: 76
-        width: 80
-        height: 20
-        text: "new|edit"
-        font.pixelSize: 12
-    }
-*/
-
-
->>>>>>> 35062d3928ada7bfcb8f08201897545f91b7731b
 
     Flow {
         id: wrappersc
         flow: Flow.TopToBottom
-<<<<<<< HEAD
-=======
-        //width: menu.width-10
->>>>>>> 35062d3928ada7bfcb8f08201897545f91b7731b
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.verticalCenter: parent.verticalCenter
         spacing:  10
@@ -67,10 +18,6 @@ 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
         }
@@ -82,26 +29,8 @@ ShadowRectangle {
             focus: true
             text: schModel.from
         }
-<<<<<<< HEAD
-        Text {
-            text: "Search:"
-=======
-        /*
-        Text {
-            text: "In reply to:"
-            font.pixelSize: 16; font.bold: true; color: "white"; style: Text.Raised; styleColor: "black"
-            horizontalAlignment: Qt.AlignRight
-        }
-        Input{
-            id: toIn
-            KeyNavigation.backtab: fromIn
-            KeyNavigation.tab:phraseIn
-            onAccepted:searchbutton.doSearch();
-        } */
         Text {
             text: "Search:"
-            //font.pixelSize: 16;
->>>>>>> 35062d3928ada7bfcb8f08201897545f91b7731b
             font.bold: true; color: "white"; style: Text.Raised; styleColor: "black"
             horizontalAlignment: Qt.AlignRight
         }
@@ -113,7 +42,6 @@ ShadowRectangle {
             text: schModel.phrase
         }
 
-<<<<<<< HEAD
         Button {
             x: 2
             width: menu.width-4
@@ -133,7 +61,6 @@ ShadowRectangle {
                 // Search ! allowed
                 if (wrappersc.state=="invalidinput")
                     return;
-
                 schModel.from=fromIn.text;
                 schModel.phrase = phraseIn.text;
                 fond.focus = true;
@@ -149,56 +76,9 @@ ShadowRectangle {
         PropertyChanges { target: searchbutton ; opacity: 0.6 ; }
     }
 
-=======
-
-
-
-    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.to= toIn.text;
-                schModel.phrase = phraseIn.text;
-                fond.focus = true;
-                fond.state = ""
-
-        }
-    }
-    }
-/*
-    states:
-        State {
-        name: "invalidinput"
-        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
-- 
1.7.9.5