the last day of my 10 days holidays and the size of
the patchs decreases ... :-)
some small bugfixes
please apply
Herbert
--
http://www.lyx.org/help/
Index: src/frontends/xforms/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/ChangeLog,v
retrieving revision 1.281
diff -u -r1.281 ChangeLog
--- src/frontends/xforms/ChangeLog 2002/02/06 17:15:27 1.281
+++ src/frontends/xforms/ChangeLog 2002/02/07 22:28:11
@@ -1,3 +1,10 @@
+2002-02-08 Herbert Voss <[EMAIL PROTECTED]>
+
+ * xforms_helpers.h: change unit "%" to t%
+
+ * FormGraphics.C: fiy bug when BB is read from file and the
+ unit is always "pt"
+
2002-02-06 Angus Leeming <[EMAIL PROTECTED]>
Stabilise the tooltip interface and get Jürgen's patch to work ;-)
Index: src/frontends/xforms/FormGraphics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormGraphics.C,v
retrieving revision 1.45
diff -u -r1.45 FormGraphics.C
--- src/frontends/xforms/FormGraphics.C 2002/02/05 18:43:27 1.45
+++ src/frontends/xforms/FormGraphics.C 2002/02/07 22:28:12
@@ -486,10 +486,14 @@
string bb = controller().readBB(fileWithAbsPath);
lyxerr << "getBB::BoundingBox = " << bb << "\n";
if (!bb.empty()) {
- fl_set_input(bbox_->input_bb_x0, token(bb,' ',0).c_str());
- fl_set_input(bbox_->input_bb_y0, token(bb,' ',1).c_str());
- fl_set_input(bbox_->input_bb_x1, token(bb,' ',2).c_str());
- fl_set_input(bbox_->input_bb_y1, token(bb,' ',3).c_str());
+ updateWidgetsFromLengthString(bbox_->input_bb_x0,
+bbox_->choice_bb_x0,
+ token(bb,' ',0), "pt");
+ updateWidgetsFromLengthString(bbox_->input_bb_y0,
+bbox_->choice_bb_y0,
+ token(bb,' ',1), "pt");
+ updateWidgetsFromLengthString(bbox_->input_bb_x1,
+bbox_->choice_bb_x1,
+ token(bb,' ',2), "pt");
+ updateWidgetsFromLengthString(bbox_->input_bb_y1,
+bbox_->choice_bb_y1,
+ token(bb,' ',3), "pt");
}
controller().bbChanged = false;
}
Index: src/frontends/xforms/xforms_helpers.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/xforms_helpers.h,v
retrieving revision 1.16
diff -u -r1.16 xforms_helpers.h
--- src/frontends/xforms/xforms_helpers.h 2002/01/29 09:26:23 1.16
+++ src/frontends/xforms/xforms_helpers.h 2002/02/07 22:28:12
@@ -18,7 +18,7 @@
// what we always need for lengths
string const choice_Length_All =
- "cm|mm|in|%%|c%%|p%%|l%%|ex|em|pt|sp|bp|dd|pc|cc|mu";
+ "cm|mm|in|t%%|c%%|p%%|l%%|ex|em|pt|sp|bp|dd|pc|cc|mu";
string const choice_Length_WithUnit =
"cm|mm|in|ex|em|pt|sp|bp|dd|pc|cc|mu"; // all with a Unit
Index: src/insets/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.306
diff -u -r1.306 ChangeLog
--- src/insets/ChangeLog 2002/02/07 19:37:34 1.306
+++ src/insets/ChangeLog 2002/02/07 22:28:13
@@ -1,3 +1,8 @@
+2002-02-08 Herbert Voss <[EMAIL PROTECTED]>
+
+ * insetgraphic.C: prepareFile(): fix bug when file doesn't
+ exists, than return filename with extension
+
2002-02-06 Herbert Voss <[EMAIL PROTECTED]>
* insetgraphic.C: prepareFile(): don't convert the file, when
Index: src/insets/insetgraphics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetgraphics.C,v
retrieving revision 1.75
diff -u -r1.75 insetgraphics.C
--- src/insets/insetgraphics.C 2002/02/07 19:37:34 1.75
+++ src/insets/insetgraphics.C 2002/02/07 22:28:13
@@ -95,6 +95,7 @@
#include "graphics/GraphicsCacheItem.h"
#include "frontends/Dialogs.h"
+#include "frontends/Alert.h"
#include "LyXView.h"
#include "buffer.h"
#include "BufferView.h"
@@ -557,6 +558,11 @@
string const image_target = decideOutputImageFormat(extension);
if (extension == image_target)
return params.filename;
+ if (!IsFileReadable(params.filename)) {
+ Alert::alert(_("File") + params.filename,
+ _("isn't readable or doesn't exists!"));
+ return params.filename;
+ }
string outfile;
if (!buf->niceFile) {
string const temp = AddName(buf->tmppath, params.filename);
Index: src/support/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/ChangeLog,v
retrieving revision 1.62
diff -u -r1.62 ChangeLog
--- src/support/ChangeLog 2002/02/07 19:37:34 1.62
+++ src/support/ChangeLog 2002/02/07 22:28:13
@@ -1,3 +1,7 @@
+2002-02-08 Herbert Voss <[EMAIL PROTECTED]>
+
+ * filetools.[C]: (unzipFile) fix typo
+
2002-02-06 Herbert Voss <[EMAIL PROTECTED]>
* filetools.[Ch]: fix sume bugs for detecting zipped files
Index: src/support/filetools.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/filetools.C,v
retrieving revision 1.96
diff -u -r1.96 filetools.C
--- src/support/filetools.C 2002/02/07 19:37:34 1.96
+++ src/support/filetools.C 2002/02/07 22:28:14
@@ -1051,7 +1051,7 @@
string const file = ChangeExtension(zipped_file, string());
string const tempfile = lyx::tempName(string(), file);
// Run gunzip
- string const command = "gunzip -c "+file+" > "+tempfile;
+ string const command = "gunzip -c "+zipped_file+" > "+tempfile;
Systemcalls one(Systemcalls::System, command);
// test that command was executed successfully
return tempfile;
