qrc

diff --git a/data/progressBar/background.png b/data/progressBar/background.png
new file mode 100644 (file)
index 0000000..9044226
Binary files /dev/null and b/data/progressBar/background.png differ

diff --git a/src/mdictionary/gui/AboutWidget.cpp b/src/mdictionary/gui/AboutWidget.cpp
index b422a39..6a3fd9b 100644 (file)
--- a/src/mdictionary/gui/AboutWidget.cpp
+++ b/src/mdictionary/gui/AboutWidget.cpp
@@ -33,14 +33,22 @@ AboutWidget::AboutWidget(GUIInterface *parent): QDialog(parent)
 
 #ifndef Q_WS_MAEMO_5
     resize(380,450);
-    mainLayout = new QVBoxLayout;
+
     view= new QDeclarativeView();
-    mainLayout->addWidget(view);
     view->setSource(QUrl("src/mdictionary/qml/AboutWidget.qml"));
     view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
     view->setAlignment(Qt::AlignCenter);
     view->show();
 
+    QDeclarativeView *view2 = new QDeclarativeView();
+    view2->setSource(QUrl("src/mdictionary/qml/TranslationView.qml"));
+    view2->setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    view2->setAlignment(Qt::AlignCenter);
+    view2->show();
+
+    mainLayout = new QVBoxLayout;
+    mainLayout->addWidget(view);
+
     QGraphicsObject *rootObject = view->rootObject();
     connect(rootObject, SIGNAL(linkClicked(QString)), this, SLOT(openUrl(QString)));
     this->setLayout(mainLayout);

diff --git a/src/mdictionary/gui/SearchBarWidget.cpp b/src/mdictionary/gui/SearchBarWidget.cpp
index 81795d5..88645b1 100644 (file)
--- a/src/mdictionary/gui/SearchBarWidget.cpp
+++ b/src/mdictionary/gui/SearchBarWidget.cpp
@@ -371,7 +371,7 @@ void SearchBarWidget::setBusy() {
     if(busy) return;
 
 #ifndef Q_WS_MAEMO_5
-    busyTimer->start(500);
+    busyTimer->start(50);
     emit setButtonText(tr("Stop"));
     this->setMaximumHeight(88);
     progressBar->show();
@@ -399,7 +399,7 @@ void SearchBarWidget::updateBusyTimer(){
         emit progresSetValue2(100);
         progressMax=true;
     }
-    busyTimer->start(500);
+    busyTimer->start(50);
 }
 
 void SearchBarWidget::setIdle() {

diff --git a/src/mdictionary/mdictionary.pro b/src/mdictionary/mdictionary.pro
index 8701e4e..8ee4658 100644 (file)
--- a/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@ -89,7 +89,8 @@ OTHER_FILES += \
     qml/ElementsListView.qml \
     qml/DictTypeSelectDialog.qml \
     qml/DictManagerWidget.qml \
-    qml/WordListWidget.qml
+    qml/WordListWidget.qml \
+    qml/TranslationView.qml
 
 target.path = $$BIN_DIR
 INSTALLS += target
@@ -189,6 +190,7 @@ unix {
         qmls.files += ./qml/DictTypeSelectDialog.qml
         qmls.files += ./qml/DictManagerWidget.qml
         qmls.files += ./qml/WordListWidget.qml
+        qmls.files += ./qml/TranslationView.qml
     }
        
     INSTALLS += desktop icon64 shared service css css_images qmls

diff --git a/src/mdictionary/qml/ProgressBar.qml b/src/mdictionary/qml/ProgressBar.qml
index a36bda2..2e102c3 100644 (file)
--- a/src/mdictionary/qml/ProgressBar.qml
+++ b/src/mdictionary/qml/ProgressBar.qml
@@ -44,7 +44,7 @@ Rectangle {
             SequentialAnimation{
                 loops: Animation.Infinite
                 SmoothedAnimation { velocity: 450; to: progressBar.width - 96}
-                SmoothedAnimation { velocity: 450; to: 0 }
+                SmoothedAnimation { velocity: 450; to: 6 }
             }
         }