diff -ur qstardict-0.13.1.or/qstardict/keyboard.cpp qstardict-0.13.1/qstardict/keyboard.cpp --- qstardict-0.13.1.or/qstardict/keyboard.cpp 2009-02-10 15:33:30.000000000 +0300 +++ qstardict-0.13.1/qstardict/keyboard.cpp 2010-12-07 21:52:31.613898108 +0300 @@ -82,7 +82,28 @@ } // namespace -#endif // Q_WS_WIN +#elif defined(Q_WS_QWS) // Q_WS_WIN + +namespace +{ +const unsigned mAlt = 0010; +const unsigned mCtrl = 0004; +const unsigned mShift = 0001; +const unsigned mWin = 0100; +} + +namespace QStarDict +{ + +Qt::KeyboardModifiers Keyboard::activeModifiers() +{ + Qt::KeyboardModifiers result; + return result; +} + +} // namespace + +#endif // Q_WS_QWS // 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 21:57:26.863898280 +0300 @@ -1,190 +1,238 @@ - + + QStarDict::MainWindow - - + + 0 0 - 742 - 511 + 326 + 240 - + QStarDict - - + + :/icons/qstardict.png:/icons/qstardict.png - - - - 9 - - - 6 - - - - - 6 + + + + 214 + 130 + + + + + 320 + 240 + + + + + 0 + + + 0 + + + + + 0 - + 0 - - + + 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 + + + + 100 + 130 + + + + + 100 + 240 + + + + + + 0 + 5 + 100 + 190 + + + + + 100 + 130 + - - 6 + + + 100 + 240 + - - - - + - - + + 0 0 - 742 - 22 + 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 @@ -5,8 +5,8 @@ 0 0 - 463 - 498 + 320 + 240 @@ -45,8 +45,8 @@ 0 0 - 441 - 414 + 320 + 240 @@ -104,8 +104,8 @@ 0 0 - 441 - 414 + 320 + 240 @@ -282,8 +282,8 @@ 0 0 - 640 - 409 + 320 + 240 @@ -565,8 +565,8 @@ 0 0 - 640 - 409 + 320 + 240