some fixes from Herbert Voss

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5556 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 27750be16ee6fb7a158e9dc25b8c76ac0ce060b9..9ff458d913d89fdb2669cf64f54de404f4b1ec9f 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -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>
 
        * ui/QTabularDialog.ui: initial UI from Juergen Spitzmueller

diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C
index 8ced02f2aef4834a29fa381efb9dbba07c4b09d6..57e1a937988cbf49aea42b848f0c435ff9ebb509 100644 (file)
--- 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 a60bf191403ddaac1499e52d94ce623ee39d61b0..0559b5ec3b9402e8ceeacbaf61beb420941f6ec6 100644 (file)
--- a/src/frontends/qt2/ui/QGraphicsDialog.ui
+++ b/src/frontends/qt2/ui/QGraphicsDialog.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>430</width>
+            <width>426</width>
             <height>484</height>
         </rect>
     </property>
@@ -590,11 +590,15 @@
                                 <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>TextLabel4_2_2</cstring>
+                                    <cstring>displayscaleL</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>enabled</name>
-                                    <bool>false</bool>
+                                    <bool>true</bool>
+                                </property>
+                                <property stdset="1">
+                                    <name>focusPolicy</name>
+                                    <enum>NoFocus</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
@@ -1485,7 +1489,7 @@
     </connection>
     <connection>
         <sender>origin</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>activated(int)</signal>
         <receiver>QGraphicsDialogBase</receiver>
         <slot>change_adaptor()</slot>
     </connection>