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

Conflicts:
	src/mdictionary/qml/WordListWidget.qml

diff --cc src/mdictionary/qml/DictManagerWidget.qml
Simple merge

diff --cc src/mdictionary/qml/WordListWidget.qml
index 742cf49,f7e49f6..4cd5f97
--- 1/src/mdictionary/qml/WordListWidget.qml
--- 2/src/mdictionary/qml/WordListWidget.qml
+++ b/src/mdictionary/qml/WordListWidget.qml
@@@ -25,14 -25,15 +25,17 @@@
  import Qt 4.7
  
  Rectangle {
+     id: rectangle1
+     color: myPalette.base
+     anchors.fill: parent
  
      function changeWordState(nr, state) {
 -        console.log("LOOOOOL")
          wordList.currentIndex = nr
          wordModel.setModelProperty(wordList.currentIndex, state, "isBookmarked")
 +    }
  
 +    function changeWordStateByIndex() {
 +        wordModel.setModelPropertyByIndex(wordList.currentIndex, "isBookmarked")
      }
  
      function setEnabled(Boolean) { wordList.enabled = Boolean }
@@@ -42,7 -44,10 +45,8 @@@
      }
  
      signal wordSelected(string word);
 +    signal wordSelectedByIndex(int nr);
+     signal checkFocus();
  
      SystemPalette { id: myPalette; colorGroup: SystemPalette.Active }