From 8423e909001f746ef24bac8045cc00f4a5ea1d4b Mon Sep 17 00:00:00 2001 From: jakub Date: Thu, 23 Dec 2010 11:47:01 +0100 Subject: [PATCH] qrc --- data/progressBar/background.png | Bin 0 -> 426 bytes src/mdictionary/gui/AboutWidget.cpp | 12 ++++++++++-- src/mdictionary/gui/SearchBarWidget.cpp | 4 ++-- src/mdictionary/mdictionary.pro | 4 +++- src/mdictionary/qml/ProgressBar.qml | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 data/progressBar/background.png diff --git a/data/progressBar/background.png b/data/progressBar/background.png new file mode 100644 index 0000000000000000000000000000000000000000..9044226f855dbeb3d38a07aaa78639a229ae9171 GIT binary patch literal 426 zcmV;b0agBqP)X0ssI2CyhWc00001b5ch_0Itp) z=>Px#32;bRa{vGjIsgCLsrfwU$*#8Th-#N^{p9}{Hz*I;%krEL>ODLtLX<3#{2p9k`8jpLv-+F3t&NYl@ zjAgUg?efm*+Il84XGkf+FnI91>VBaddWidget(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 --- 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 --- 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 --- 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 } } } -- 1.7.9.5