diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 27750be16e..9ff458d913 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2002-10-30 John Levon + + * QGraphics.C: + * ui/QGraphicsDialog.ui: some fixes from Herbert + 2002-10-30 John Levon * ui/QTabularDialog.ui: initial UI from Juergen Spitzmueller diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C index 8ced02f2ae..57e1a93798 100644 --- a/src/frontends/qt2/QGraphics.C +++ b/src/frontends/qt2/QGraphics.C @@ -121,12 +121,9 @@ void QGraphics::update_contents() dialog_->filename->setText(igp.filename.c_str()); - // set the bounding box values, if exists. First we need the whole - // path, because the controller knows nothing about the doc-dir controller().bbChanged = false; if (igp.bb.empty()) { - string const fileWithAbsPath(MakeAbsPath(igp.filename, OnlyPath(igp.filename))); - string const bb(controller().readBB(fileWithAbsPath)); + string const bb(controller().readBB(igp.filename)); if (!bb.empty()) { // get the values from the file // in this case we always have the point-unit @@ -274,8 +271,7 @@ void QGraphics::get() { string const filename(dialog_->filename->text()); if (!filename.empty()) { - string const fileWithAbsPath(MakeAbsPath(filename, OnlyPath(filename))); - string const bb(controller().readBB(fileWithAbsPath)); + string const bb(controller().readBB(filename)); if (!bb.empty()) { dialog_->lbX->setText(token(bb, ' ', 0).c_str()); dialog_->lbY->setText(token(bb, ' ', 1).c_str()); @@ -290,5 +286,6 @@ void QGraphics::get() bool QGraphics::isValid() { // FIXME: we need more here. + // why?? LaTeX needs a filename, the rest is user-specific (Herbert) return !string(dialog_->filename->text().latin1()).empty(); } diff --git a/src/frontends/qt2/ui/QGraphicsDialog.ui b/src/frontends/qt2/ui/QGraphicsDialog.ui index a60bf19140..0559b5ec3b 100644 --- a/src/frontends/qt2/ui/QGraphicsDialog.ui +++ b/src/frontends/qt2/ui/QGraphicsDialog.ui @@ -13,7 +13,7 @@ 0 0 - 430 + 426 484 @@ -590,11 +590,15 @@ QLabel name - TextLabel4_2_2 + displayscaleL enabled - false + true + + + focusPolicy + NoFocus text @@ -1485,7 +1489,7 @@ origin - textChanged(const QString&) + activated(int) QGraphicsDialogBase change_adaptor()