anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

John's msg3.diff

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3775 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2002-03-19 09:47:34 +00:00
parent bb7657f64a
commit 9fd0b17bd4
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/insets/ChangeLog
View File

@ -3,6 +3,14 @@
* insetgraphics.C: Clean up Baruch's comments a little. * insetgraphics.C: Clean up Baruch's comments a little.
(c-tor): remove code setting id_, as it's set in the Inset c-tor. (c-tor): remove code setting id_, as it's set in the Inset c-tor.
2002-03-14 John Levon <moz@compsoc.man.ac.uk>
* insettabular.C:
* insettheorem.C: wrap warnings
* insetgraphics.C: improve messages, move cached_status_
setting to safer place
2002-03-18 Juergen Vigna <jug@sad.it> 2002-03-18 Juergen Vigna <jug@sad.it>
* insettabular.C (unlockInsetInInset): removed unneeded showCursor * insettabular.C (unlockInsetInInset): removed unneeded showCursor

6
src/insets/insetgraphics.C
View File

@ -198,7 +198,7 @@ string const InsetGraphics::statusMessage() const
msg = _("Error scaling etc"); msg = _("Error scaling etc");
break; break;
case grfx::ErrorUnknown: case grfx::ErrorUnknown:
msg = _("No image associated with this inset is in the cache!"); msg = _("No image");
break; break;
case grfx::Loaded: case grfx::Loaded:
msg = _("Loaded but not displaying"); msg = _("Loaded but not displaying");
@ -278,6 +278,7 @@ void InsetGraphics::draw(BufferView * bv, LyXFont const & font,
int baseline, float & x, bool) const int baseline, float & x, bool) const
{ {
int oasc = old_asc; int oasc = old_asc;
grfx::ImageStatus old_status_ = cached_status_;
int ldescent = descent(bv, font); int ldescent = descent(bv, font);
int lascent = ascent(bv, font); int lascent = ascent(bv, font);
@ -306,7 +307,6 @@ void InsetGraphics::draw(BufferView * bv, LyXFont const & font,
// This will draw the graphics. If the graphics has not been loaded yet, // This will draw the graphics. If the graphics has not been loaded yet,
// we draw just a rectangle. // we draw just a rectangle.
Painter & paint = bv->painter(); Painter & paint = bv->painter();
grfx::ImageStatus old_status_ = cached_status_;
if (drawImage()) { if (drawImage()) {
// lyxerr << "IG(" << this << "): " << old_x << endl; // lyxerr << "IG(" << this << "): " << old_x << endl;
@ -690,7 +690,7 @@ int InsetGraphics::ascii(Buffer const *, ostream & os, int) const
// 1. Convert file to ascii using gifscii // 1. Convert file to ascii using gifscii
// 2. Read ascii output file and add it to the output stream. // 2. Read ascii output file and add it to the output stream.
// at least we send the filename // at least we send the filename
os << '<' << _("Graphicfile:") << params().filename << ">\n"; os << '<' << _("Graphic file:") << params().filename << ">\n";
return 0; return 0;
} }

2
src/insets/insettabular.C
View File

@ -1510,7 +1510,9 @@ int InsetTabular::getCellXPos(int cell) const
void InsetTabular::resetPos(BufferView * bv) const void InsetTabular::resetPos(BufferView * bv) const
{ {
#ifdef WITH_WARNINGS
#warning This should be fixed in the right manner (20011128 Jug) #warning This should be fixed in the right manner (20011128 Jug)
#endif
// fast hack to fix infinite repaintings! // fast hack to fix infinite repaintings!
if (in_reset_pos) if (in_reset_pos)
return; return;

2
src/insets/insettheorem.C
View File

@ -58,7 +58,9 @@ void InsetTheorem::write(Buffer const * buf, ostream & os) const
Inset * InsetTheorem::clone(Buffer const &, bool) const Inset * InsetTheorem::clone(Buffer const &, bool) const
{ {
#ifdef WITH_WARNINGS
#warning Is this inset used? If YES this is WRONG!!! (Jug) #warning Is this inset used? If YES this is WRONG!!! (Jug)
#endif
InsetTheorem * result = new InsetTheorem; InsetTheorem * result = new InsetTheorem;
result->collapsed_ = collapsed_; result->collapsed_ = collapsed_;