Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml

Conflicts:
	src/mdictionary/mdictionary.pro

diff --git a/src/mdictionary/mdictionary.pro b/src/mdictionary/mdictionary.pro
index d2b6f46..b790af9 100644 (file)
--- a/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@ -95,6 +95,7 @@ OTHER_FILES += \
     qml/TranslationView.qml \
     qml/FlickableWebView.qml \
     qml/ScrollBar.qml \
+    qml/SpinBox.qml
     qml/Checkbox.qml
 
 target.path = $$BIN_DIR

diff --git a/src/mdictionary/qml/AboutWidget.qml b/src/mdictionary/qml/AboutWidget.qml
index 500508e..9821576 100644 (file)
--- a/src/mdictionary/qml/AboutWidget.qml
+++ b/src/mdictionary/qml/AboutWidget.qml
@@ -44,7 +44,7 @@ Rectangle {
         onLinkActivated: linkClicked(link);
     }
 
-     Text {
+    Text {
         id: text4
         y: 290
         anchors.horizontalCenter: parent.horizontalCenter
@@ -52,4 +52,10 @@ Rectangle {
         anchors.horizontalCenterOffset: 0
         onLinkActivated: linkClicked(link);
     }
+
+    SpinBox{
+        id: test;
+        x:100;
+        y:100;
+    }
 }

diff --git a/src/mdictionary/qml/TranslationView.qml b/src/mdictionary/qml/TranslationView.qml
index b366c1d..809e4c8 100644 (file)
--- a/src/mdictionary/qml/TranslationView.qml
+++ b/src/mdictionary/qml/TranslationView.qml
@@ -11,7 +11,7 @@ Rectangle {
 
     function setUrl(string){
         webView.url = "file:///home/test.html";
-        webView.url = "file:///home/jakub/.mdictionary/html.html";
+        webView.url = string;
     }
 
     FlickableWebView {