From 97dedd97de783a17d1050eef572328a54a98ec9d Mon Sep 17 00:00:00 2001 From: John Levon Date: Mon, 25 Nov 2002 03:18:27 +0000 Subject: [PATCH] small fixes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5709 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 8 + src/frontends/qt2/QPrefs.C | 8 + src/frontends/qt2/qscreen.C | 2 +- src/frontends/qt2/ui/QPrefKeyboardModule.ui | 40 +++- src/frontends/qt2/ui/QPrefUIModule.ui | 214 +++++++------------- 5 files changed, 127 insertions(+), 145 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index b331f92c25..4c635136c8 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,11 @@ +2002-11-25 John Levon + + * qscreen.C: use LColor::cursor properly + + * QPrefs.C: + * ui/QPrefKeyboardModule.ui: + * ui/QPrefUIModule.ui: UI fixes + 2002-11-25 Herbert Voss * QVCLog.C (update_contents): fix USE_BOOST_FORMAT diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C index fa59b0a9af..be7e7282a5 100644 --- a/src/frontends/qt2/QPrefs.C +++ b/src/frontends/qt2/QPrefs.C @@ -47,6 +47,7 @@ #include #include #include +#include #include "qcoloritem.h" using std::vector; @@ -339,6 +340,13 @@ void QPrefs::update_contents() // FIXME: can derive CB from the two EDs keymod->keymapCB->setChecked(rc.use_kbmap); + // no idea why we need these. Fscking Qt. + keymod->firstKeymapED->setEnabled(rc.use_kbmap); + keymod->firstKeymapPB->setEnabled(rc.use_kbmap); + keymod->firstKeymapLA->setEnabled(rc.use_kbmap); + keymod->secondKeymapED->setEnabled(rc.use_kbmap); + keymod->secondKeymapPB->setEnabled(rc.use_kbmap); + keymod->secondKeymapLA->setEnabled(rc.use_kbmap); keymod->firstKeymapED->setText(rc.primary_kbmap.c_str()); keymod->secondKeymapED->setText(rc.secondary_kbmap.c_str()); diff --git a/src/frontends/qt2/qscreen.C b/src/frontends/qt2/qscreen.C index 183ce5f6f6..8aae6ae4a1 100644 --- a/src/frontends/qt2/qscreen.C +++ b/src/frontends/qt2/qscreen.C @@ -99,7 +99,7 @@ void QScreen::showManualCursor(LyXText const * text, int x, int y, bitBlt(nocursor_pixmap_.get(), 0, 0, owner_.getPixmap(), cursor_x_, cursor_y_, cursor_w_, cursor_h_); - owner_.getPainter().line(x, y1, x, y2); + owner_.getPainter().line(x, y1, x, y2, LColor::cursor); switch (shape) { case BAR_SHAPE: break; diff --git a/src/frontends/qt2/ui/QPrefKeyboardModule.ui b/src/frontends/qt2/ui/QPrefKeyboardModule.ui index c4cfd5cb81..45d9887871 100644 --- a/src/frontends/qt2/ui/QPrefKeyboardModule.ui +++ b/src/frontends/qt2/ui/QPrefKeyboardModule.ui @@ -13,7 +13,7 @@ 0 0 - 342 + 338 253 @@ -138,6 +138,44 @@ + + + keymapCB + toggled(bool) + firstKeymapLA + setEnabled(bool) + + + keymapCB + toggled(bool) + secondKeymapLA + setEnabled(bool) + + + keymapCB + toggled(bool) + firstKeymapED + setEnabled(bool) + + + keymapCB + toggled(bool) + secondKeymapED + setEnabled(bool) + + + keymapCB + toggled(bool) + firstKeymapPB + setEnabled(bool) + + + keymapCB + toggled(bool) + secondKeymapPB + setEnabled(bool) + + keymapCB firstKeymapED diff --git a/src/frontends/qt2/ui/QPrefUIModule.ui b/src/frontends/qt2/ui/QPrefUIModule.ui index 37d1bd73c2..4c6cdeb51d 100644 --- a/src/frontends/qt2/ui/QPrefUIModule.ui +++ b/src/frontends/qt2/ui/QPrefUIModule.ui @@ -13,13 +13,13 @@ 0 0 - 329 - 250 + 436 + 213 caption - Screen Fonts + UI @@ -117,7 +117,7 @@ QLayoutWidget name - Layout15 + Layout16 @@ -151,7 +151,7 @@ QLayoutWidget name - Layout14 + Layout9 @@ -203,64 +203,41 @@ - - - name - Spacer30 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - - QLayoutWidget - - name - Layout17 - - - - margin - 0 - - - spacing - 6 - - QLayoutWidget + QGroupBox name - Layout12 + documentsGB + + + title + Documents margin - 0 + 11 spacing 6 + + QCheckBox + + name + autoSaveCB + + + text + B&ackup documents + + QLayoutWidget name - Layout10 + Layout11 @@ -271,79 +248,10 @@ spacing 6 - - QLayoutWidget - - name - Layout9 - - - - margin - 0 - - - spacing - 6 - - - QCheckBox - - name - autoSaveCB - - - text - B&ackup documents - - - - QLabel - - name - autoSaveLA - - - text - every - - - buddy - autoSaveSB - - - - QSpinBox - - name - autoSaveSB - - - maxValue - 300 - - - minValue - 1 - - - - QLabel - - name - TextLabel1 - - - text - minutes - - - - name - Spacer4 + Spacer6 orientation @@ -351,23 +259,64 @@ sizeType - Expanding + Fixed sizeHint - 20 + 21 20 + + QLabel + + name + autoSaveLA + + + text + every + + + buddy + autoSaveSB + + + + QSpinBox + + name + autoSaveSB + + + maxValue + 300 + + + minValue + 1 + + + + QLabel + + name + TextLabel1 + + + text + minutes + + QLayoutWidget name - Layout1 + Layout12 @@ -404,27 +353,6 @@ 20 - - - name - Spacer9 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - @@ -432,7 +360,7 @@ name - Spacer31 + Spacer8 orientation @@ -455,7 +383,7 @@ name - Spacer2 + Spacer7 orientation