diff --git a/qstardict/patches/001-qstardict.patch b/qstardict/patches/001-qstardict.patch index 87de60f..1cffd27 100644 --- a/qstardict/patches/001-qstardict.patch +++ b/qstardict/patches/001-qstardict.patch @@ -31,57 +31,220 @@ diff -ur qstardict-0.13.1.or/qstardict/keyboard.cpp qstardict-0.13.1/qstardict/k // vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab cindent textwidth=120 formatoptions=tc +diff -ur qstardict-0.13.1.or/qstardict/mainwindow.cpp qstardict-0.13.1/qstardict/mainwindow.cpp +--- qstardict-0.13.1.or/qstardict/mainwindow.cpp 2009-02-10 15:33:30.000000000 +0300 ++++ qstardict-0.13.1/qstardict/mainwindow.cpp 2010-12-08 22:05:16.400898587 +0300 +@@ -93,7 +93,7 @@ + setVisible(config.value("MainWindow/visible", true).toBool()); + wordsListDock->setFloating(config.value("MainWindow/wordsListDock/floating", wordsListDock->isFloating()).toBool()); + wordsListDock->setGeometry(config.value("MainWindow/wordsListDock/geometry", wordsListDock->geometry()).toRect()); +- setInstantSearch(config.value("MainWindow/instantSearch", true).toBool()); ++ setInstantSearch(config.value("MainWindow/instantSearch", false).toBool()); + setDefaultStyleSheet(config.value("MainWindow/defaultStyleSheet", defaultStyleSheet()).toString()); + } + +Только в qstardict-0.13.1/qstardict: mainwindow.cpp~ diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/mainwindow.ui --- qstardict-0.13.1.or/qstardict/mainwindow.ui 2009-02-10 15:33:30.000000000 +0300 -+++ qstardict-0.13.1/qstardict/mainwindow.ui 2010-12-08 16:40:21.843773360 +0300 -@@ -5,8 +5,8 @@ ++++ qstardict-0.13.1/qstardict/mainwindow.ui 2010-12-08 21:57:26.863898280 +0300 +@@ -1,190 +1,238 @@ +- ++ ++ + QStarDict::MainWindow +- +- ++ ++ 0 0 - 742 - 511 -+ 320 ++ 326 + 240 - -@@ -19,15 +19,15 @@ - - - +- ++ + QStarDict + +- +- ++ ++ + :/icons/qstardict.png:/icons/qstardict.png + +- +- +- - 9 -+ 0 - - +- +- - 6 -+ 0 - - - - +- +- +- +- - 6 ++ ++ ++ ++ 214 ++ 130 ++ ++ ++ ++ ++ 320 ++ 240 ++ ++ ++ ++ ++ 0 ++ ++ ++ 0 ++ ++ ++ ++ + 0 - +- ++ 0 -@@ -90,17 +90,16 @@ + + +- +- ++ ++ + Clear the search box + +- ++ + Clear + +- +- ++ ++ + :/icons/clear-right.png:/icons/clear-right.png + +- ++ + Qt::ToolButtonIconOnly + + + + +- ++ + + +- +- ++ ++ + Fuzzy query + +- ++ + Search + +- +- ++ ++ + :/icons/search-filter.png:/icons/search-filter.png + +- ++ + Qt::ToolButtonTextBesideIcon + + + + + +- +- ++ ++ + + + +- +- +- QDockWidget::AllDockWidgetFeatures ++ ++ ++ ++ 100 ++ 155 ++ ++ ++ ++ ++ 100 ++ 240 ++ ++ ++ ++ QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable + +- ++ + Qt::NoDockWidgetArea + +- ++ + Words list + +- ++ 1 - +- - - - 9 -- -- -- 6 -+ ++ ++ ++ ++ 100 ++ 130 ++ ++ ++ ++ ++ 100 ++ 240 ++ ++ ++ + + -+ 9 -+ 9 -+ 185 -+ 184 ++ 0 ++ 5 ++ 100 ++ 190 + ++ ++ ++ ++ 100 ++ 130 ++ + +- +- 6 ++ ++ ++ 100 ++ 240 ++ - - @@ -90,18 +253,183 @@ diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/ + - -@@ -108,8 +107,8 @@ +- +- ++ ++ 0 0 - 742 - 22 -+ 320 -+ 18 ++ 326 ++ 27 - +- +- ++ ++ + &File + +- ++ + +- +- ++ ++ + &Help + +- +- +- ++ ++ ++ + +- +- ++ ++ + &Settings + +- +- ++ ++ + +- +- +- ++ ++ ++ + +- +- +- ++ ++ ++ + :/icons/application-exit.png:/icons/application-exit.png + +- ++ + &Quit + +- ++ + Ctrl+Q + + +- +- ++ ++ + &About + + +- +- ++ ++ + About &Qt + + +- +- +- ++ ++ ++ + :/icons/configure.png:/icons/configure.png + +- ++ + &Configure QStarDict + + +- +- ++ ++ + true + +- ++ + &Scan + + +- +- +- ++ ++ ++ + :/icons/help-contents.png:/icons/help-contents.png + +- ++ + QStarDict &Help + +- ++ + F1 + + +@@ -203,7 +251,7 @@ + searchClearButton + + +- ++ + + + +@@ -212,11 +260,11 @@ + searchBox + clear() + +- ++ + 315 + 59 + +- ++ + 647 + 61 + +@@ -228,11 +276,11 @@ + searchBox + setFocus() + +- ++ + 315 + 59 + +- ++ + 647 + 61 + +@@ -244,11 +292,11 @@ + queryButton + click() + +- ++ + 438 + 50 + +- ++ + 661 + 51 + +Только в qstardict-0.13.1/qstardict: mainwindow.ui~ diff -ur qstardict-0.13.1.or/qstardict/settingsdialog.ui qstardict-0.13.1/qstardict/settingsdialog.ui --- qstardict-0.13.1.or/qstardict/settingsdialog.ui 2009-02-10 15:33:30.000000000 +0300 +++ qstardict-0.13.1/qstardict/settingsdialog.ui 2010-12-08 10:27:03.160773247 +0300