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

Conflicts:
	qml/qwp/content/Config.qml
	qtc_packaging/debian_fremantle/changelog
	qtc_packaging/debian_fremantle/control
	qwp.pro.user

diff --combined qml/qwp/content/Config.qml
index b60890b,9af5ce4..0d4e8cf
--- 1/qml/qwp/content/Config.qml
--- 2/qml/qwp/content/Config.qml
+++ b/qml/qwp/content/Config.qml
@@@ -6,11 -6,53 +6,60 @@@ 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
@@@ -18,6 -60,7 +67,10 @@@
          anchors.topMargin: 5
          Text {
              text: "Language:"
++<<<<<<< HEAD
++=======
+             //font.pixelSize: 16;
++>>>>>>> 35062d3928ada7bfcb8f08201897545f91b7731b
              font.bold: true; color: "white"; style: Text.Raised; styleColor: "black"
              horizontalAlignment: Qt.AlignRight
          }
@@@ -29,8 -72,21 +82,26 @@@
              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
          }
@@@ -42,43 -98,51 +113,92 @@@
              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 ; }
 +    }
 +
++=======
+ 
+ 
+ 
+     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

diff --combined qtc_packaging/debian_fremantle/changelog
index c92fa4a,12e4fcc..af4cf2d
--- 1/qtc_packaging/debian_fremantle/changelog
--- 2/qtc_packaging/debian_fremantle/changelog
+++ b/qtc_packaging/debian_fremantle/changelog
@@@ -1,4 -1,4 +1,8 @@@
- qwp (0.0.2) unstable; urgency=low
++<<<<<<< HEAD
+ qwp (0.0.1) unstable; urgency=low
++=======
++qwp (0.0.1) unstable; urgency=low
++>>>>>>> 35062d3928ada7bfcb8f08201897545f91b7731b
  
    * Initial Release.
  

diff --combined qtc_packaging/debian_fremantle/control
index a32a7db,5033c2b..0eabc1b
--- 1/qtc_packaging/debian_fremantle/control
--- 2/qtc_packaging/debian_fremantle/control
+++ b/qtc_packaging/debian_fremantle/control
@@@ -11,4 -11,3 +11,7 @@@ Architecture: an
  Depends: ${shlibs:Depends}, ${misc:Depends}, mcsp
  Description: QML Search tool for Wikipedia on N900
   QML Search tool for Wikipedia on N900
++<<<<<<< HEAD
 +XB-Maemo-Icon-26: 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
++=======
++>>>>>>> 35062d3928ada7bfcb8f08201897545f91b7731b