From 5d704f511865a5bd454f88e47c8a4fdd6c69e79b Mon Sep 17 00:00:00 2001 From: kyak Date: Thu, 9 Dec 2010 21:36:48 +0300 Subject: [PATCH] qstardict: disable mouse, fit Setting dialogue to 320x240 --- qstardict/patches/001-qstardict.patch | 952 ++++++++++++++++++++++++-- 1 file changed, 902 insertions(+), 50 deletions(-) diff --git a/qstardict/patches/001-qstardict.patch b/qstardict/patches/001-qstardict.patch index 1cffd27..d9b9c78 100644 --- a/qstardict/patches/001-qstardict.patch +++ b/qstardict/patches/001-qstardict.patch @@ -31,6 +31,30 @@ 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/main.cpp qstardict-0.13.1/qstardict/main.cpp +--- qstardict-0.13.1.or/qstardict/main.cpp 2009-02-10 15:33:30.000000000 +0300 ++++ qstardict-0.13.1/qstardict/main.cpp 2010-12-09 21:29:28.240008646 +0300 +@@ -35,6 +35,10 @@ + #include + #endif // QSTARDICT_WITH_TRANSLATIONS + ++#ifdef Q_WS_QWS ++#include ++#endif ++ + int main(int argc, char *argv[]) + { + QStarDict::Application app(argc, argv); +@@ -61,6 +65,9 @@ + } + #endif // Q_OS_WIN + ++#ifdef Q_WS_QWS ++ QWSServer::setCursorVisible(false); ++#endif + + return app.exec(); + } 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 @@ -43,11 +67,10 @@ diff -ur qstardict-0.13.1.or/qstardict/mainwindow.cpp qstardict-0.13.1/qstardict 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-0.13.1/qstardict/mainwindow.ui 2010-12-09 21:31:59.423898167 +0300 +@@ -1,190 +1,241 @@ - + + @@ -66,6 +89,9 @@ diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/ - ++ ++ BlankCursor ++ + QStarDict @@ -190,11 +216,11 @@ diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/ + 100 + 240 + -+ -+ -+ QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable - ++ ++ QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable ++ + Qt::NoDockWidgetArea @@ -378,7 +404,7 @@ diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/ F1 -@@ -203,7 +251,7 @@ +@@ -203,7 +254,7 @@ searchClearButton @@ -387,7 +413,7 @@ diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/ -@@ -212,11 +260,11 @@ +@@ -212,11 +263,11 @@ searchBox clear() @@ -401,7 +427,7 @@ diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/ 647 61 -@@ -228,11 +276,11 @@ +@@ -228,11 +279,11 @@ searchBox setFocus() @@ -415,7 +441,7 @@ diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/ 647 61 -@@ -244,11 +292,11 @@ +@@ -244,11 +295,11 @@ queryButton click() @@ -429,11 +455,18 @@ diff -ur qstardict-0.13.1.or/qstardict/mainwindow.ui qstardict-0.13.1/qstardict/ 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 @@ ++++ qstardict-0.13.1/qstardict/settingsdialog.ui 2010-12-09 21:31:59.432865593 +0300 +@@ -1,84 +1,67 @@ +- ++ ++ + QStarDict::SettingsDialog +- +- ++ ++ 0 0 @@ -443,48 +476,867 @@ diff -ur qstardict-0.13.1.or/qstardict/settingsdialog.ui qstardict-0.13.1/qstard + 240 - -@@ -45,8 +45,8 @@ - - 0 - 0 +- ++ ++ ++ 0 ++ 0 ++ ++ ++ ++ BlankCursor ++ ++ + QStarDict Settings + +- ++ + + +- +- +- 9 +- +- +- 6 +- +- +- +- +- Qt::Horizontal +- +- +- QDialogButtonBox::Cancel|QDialogButtonBox::Ok +- +- +- false +- +- +- +- +- +- ++ ++ ++ ++ + 0 + +- +- +- +- 0 +- 0 - 441 - 414 -+ 320 -+ 240 - - - -@@ -104,8 +104,8 @@ - - 0 - 0 +- +- +- ++ ++ + Global settings + +- ++ + +- +- ++ ++ + Instant search + + + + +- +- ++ ++ + 6 + +- ++ + 0 + + +- +- ++ ++ + Pronounce words using this command: + + + + +- +- +- Enter cmd for the speaching program.<br>If cmd contains "%s" it will be replaced to word, else word will be writen to stdin of speech process. ++ ++ ++ Enter cmd for the speaching program.<br>If cmd contains "%s" it will be replaced to word, else word will be writen to stdin of speech process. + + + +@@ -86,104 +69,96 @@ + + + +- ++ + Qt::Vertical + +- ++ + +- 369 +- 171 ++ 320 ++ 240 + + + + + + +- +- +- +- 0 +- 0 - 441 - 414 -+ 320 -+ 240 - - - -@@ -282,8 +282,8 @@ - - 0 - 0 +- +- +- ++ ++ + Dictionaries + +- ++ + +- +- ++ ++ + Dictionaries + +- ++ + +- +- ++ ++ + QAbstractItemView::NoEditTriggers + +- ++ + QAbstractItemView::SingleSelection + +- ++ + QAbstractItemView::SelectRows + +- ++ + false + + + + +- ++ + +- +- ++ ++ + Move up + +- ++ + Up + +- +- ++ ++ + :/icons/arrow-up.png:/icons/arrow-up.png + + + + +- +- ++ ++ + Move down + +- ++ + Down + +- +- ++ ++ + :/icons/arrow-down.png:/icons/arrow-down.png + + + + +- +- ++ ++ + Show information about dictionary + +- ++ + Show info + +- +- ++ ++ + :/icons/dialog-information.png:/icons/dialog-information.png + + + + + +- ++ + Qt::Horizontal + +- ++ + + 40 + 20 +@@ -196,73 +171,80 @@ + + + ++ ++ ++ ++ ++ Plugins ++ ++ + +- +- ++ ++ + + 16777215 +- 196 ++ 16777215 + + +- ++ + Plugins + +- ++ + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + +- ++ + +- +- ++ ++ + QAbstractItemView::NoEditTriggers + +- ++ + QAbstractItemView::SingleSelection + +- ++ + QAbstractItemView::SelectRows + +- ++ + false + + + + +- ++ + +- +- ++ ++ + Show information about plugin + +- ++ + Info + +- +- ++ ++ + :/icons/dialog-information.png:/icons/dialog-information.png + + + + +- +- ++ ++ + Configure plugin + +- ++ + Configure + +- +- ++ ++ + :/icons/configure.png:/icons/configure.png + + + + + +- ++ + Qt::Horizontal + +- ++ + + 40 + 20 +@@ -277,136 +259,128 @@ + + + +- +- +- +- 0 +- 0 - 640 - 409 -+ 320 -+ 240 - - - -@@ -565,8 +565,8 @@ - - 0 - 0 +- +- +- +- Popup window ++ ++ ++ Behaviour + +- +- ++ ++ + 9 + +- ++ + 6 + +- +- +- ++ ++ ++ + Behavior + +- +- ++ ++ + 9 + +- ++ + 6 + +- +- +- ++ ++ ++ + 6 + +- ++ + 0 + + +- +- ++ ++ + Pronounce the word + + + + + +- +- +- ++ ++ ++ + 6 + +- ++ + 0 + + +- +- ++ ++ + Timeout before hide after mouse over + + + + +- +- ++ ++ + Don't hide + +- ++ + sec + +- ++ + 1 + +- ++ + 0.000000000000000 + +- ++ + 10.000000000000000 + +- ++ + 0.100000000000000 + +- ++ + 0.500000000000000 + + + + + +- +- +- ++ ++ ++ + 6 + +- ++ + 0 + + +- +- ++ ++ + true + +- ++ + Show only if modifier pressed + + + + +- +- ++ ++ + false + + +- ++ + Alt + + + +- ++ + Control + + + +- ++ + Shift + + + +- ++ + Win + + +@@ -414,19 +388,19 @@ + + + +- +- +- ++ ++ ++ + Scan selection + +- ++ + true + + + +- +- +- ++ ++ ++ + Show if word not found + + +@@ -434,108 +408,128 @@ + + + +- +- +- +- Apperance ++ ++ ++ ++ Qt::Vertical ++ ++ ++ ++ 20 ++ 101 ++ + +- +- ++ ++ ++ ++ ++ ++ ++ View ++ ++ ++ ++ ++ ++ View ++ ++ ++ + 9 + +- ++ + 6 + +- +- +- ++ ++ ++ + 6 + +- ++ + 0 + + +- +- ++ ++ + Opacity + + + + +- +- ++ ++ + % + +- ++ + + +- ++ + 1 + +- ++ + 100 + +- ++ + 100 + + + + + +- +- +- ++ ++ ++ + 6 + +- ++ + 0 + + +- +- ++ ++ + Default width + + + + +- +- ++ ++ + 96 + +- ++ + 9999 + +- ++ + 320 + + + + + +- +- +- ++ ++ ++ + 6 + +- ++ + 0 + + +- +- ++ ++ + Default height + + + + +- +- ++ ++ + 96 + +- ++ + 9999 + +- ++ + 240 + + +@@ -545,41 +539,40 @@ + + + +- +- +- +- Qt::Vertical +- +- +- +- 20 +- 101 +- +- +- +- + + +- +- +- +- 0 +- 0 - 640 - 409 -+ 320 -+ 240 - - - +- +- +- ++ ++ + Apperance + +- +- +- ++ ++ ++ ++ ++ ++ 0 ++ 0 ++ ++ ++ + + + + + ++ ++ ++ ++ Qt::Horizontal ++ ++ ++ QDialogButtonBox::Cancel|QDialogButtonBox::Ok ++ ++ ++ false ++ ++ ++ + + + +@@ -599,21 +592,16 @@ + dictsMoveUpButton + dictsMoveDownButton + dictsShowInfoButton +- pluginsTableView +- pluginsShowInfoButton +- pluginsConfigureButton + useScanBox + showIfNotFoundBox + useScanModifierBox + modifierKeyBox + timeoutBeforeHideSpin + pronounceWordBox +- popupDefaultWidthSpin +- popupDefaultHeightSpin +- popupOpacitySpin + + +- ++ ++ + + + +@@ -622,11 +610,11 @@ + QStarDict::SettingsDialog + accept() + +- +- 330 +- 587 ++ ++ 310 ++ 230 + +- ++ + 410 + 299 + +@@ -638,11 +626,11 @@ + QStarDict::SettingsDialog + reject() + +- +- 406 +- 587 ++ ++ 310 ++ 230 + +- ++ + 410 + 299 + +@@ -654,13 +642,13 @@ + modifierKeyBox + setEnabled(bool) + +- +- 165 +- 140 ++ ++ 194 ++ 85 + +- +- 273 +- 137 ++ ++ 289 ++ 85 + + +