anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-30 05:12:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

some fixes from Herbert Voss

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5556 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-10-30 17:13:09 +00:00
parent eb2352f227
commit fd00d0282b
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,8 @@
2002-10-30 John Levon <levon@movementarian.org>
* QGraphics.C:
* ui/QGraphicsDialog.ui: some fixes from Herbert
2002-10-30 John Levon <levon@movementarian.org> 2002-10-30 John Levon <levon@movementarian.org>
* ui/QTabularDialog.ui: initial UI from Juergen Spitzmueller * ui/QTabularDialog.ui: initial UI from Juergen Spitzmueller

9
src/frontends/qt2/QGraphics.C
View File

@ -121,12 +121,9 @@ void QGraphics::update_contents()
dialog_->filename->setText(igp.filename.c_str()); 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; controller().bbChanged = false;
if (igp.bb.empty()) { if (igp.bb.empty()) {
string const fileWithAbsPath(MakeAbsPath(igp.filename, OnlyPath(igp.filename))); string const bb(controller().readBB(igp.filename));
string const bb(controller().readBB(fileWithAbsPath));
if (!bb.empty()) { if (!bb.empty()) {
// get the values from the file // get the values from the file
// in this case we always have the point-unit // in this case we always have the point-unit
@ -274,8 +271,7 @@ void QGraphics::get()
{ {
string const filename(dialog_->filename->text()); string const filename(dialog_->filename->text());
if (!filename.empty()) { if (!filename.empty()) {
string const fileWithAbsPath(MakeAbsPath(filename, OnlyPath(filename))); string const bb(controller().readBB(filename));
string const bb(controller().readBB(fileWithAbsPath));
if (!bb.empty()) { if (!bb.empty()) {
dialog_->lbX->setText(token(bb, ' ', 0).c_str()); dialog_->lbX->setText(token(bb, ' ', 0).c_str());
dialog_->lbY->setText(token(bb, ' ', 1).c_str()); dialog_->lbY->setText(token(bb, ' ', 1).c_str());
@ -290,5 +286,6 @@ void QGraphics::get()
bool QGraphics::isValid() bool QGraphics::isValid()
{ {
// FIXME: we need more here. // FIXME: we need more here.
// why?? LaTeX needs a filename, the rest is user-specific (Herbert)
return !string(dialog_->filename->text().latin1()).empty(); return !string(dialog_->filename->text().latin1()).empty();
} }

12
src/frontends/qt2/ui/QGraphicsDialog.ui
View File

@ -13,7 +13,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>430</width> <width>426</width>
<height>484</height> <height>484</height>
</rect> </rect>
</property> </property>
@ -590,11 +590,15 @@
<class>QLabel</class> <class>QLabel</class>
<property stdset="1"> <property stdset="1">
<name>name</name> <name>name</name>
<cstring>TextLabel4_2_2</cstring> <cstring>displayscaleL</cstring>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>enabled</name> <name>enabled</name>
<bool>false</bool> <bool>true</bool>
</property>
<property stdset="1">
<name>focusPolicy</name>
<enum>NoFocus</enum>
</property> </property>
<property stdset="1"> <property stdset="1">
<name>text</name> <name>text</name>
@ -1485,7 +1489,7 @@
</connection> </connection>
<connection> <connection>
<sender>origin</sender> <sender>origin</sender>
<signal>textChanged(const QString&amp;)</signal> <signal>activated(int)</signal>
<receiver>QGraphicsDialogBase</receiver> <receiver>QGraphicsDialogBase</receiver>
<slot>change_adaptor()</slot> <slot>change_adaptor()</slot>
</connection> </connection>