Remove the Alert popups from the graphics cache.

Sometimes, these Alerts are displayed with only part of the background
greyed out, which smacks of "wierd xforms bug".

I can obtain this when loading a buffer from the command line "lyx buffer.lyx".
It appears that xforms isn't happy if the goodie is displayed before the
main window. Just a guess though...

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

diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog
index af276a35d8a40e904d13f44040ede15abd051ee3..c1c9564dce067dcb073d679e5b6471510fc9d3c4 100644 (file)
--- a/src/graphics/ChangeLog
+++ b/src/graphics/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-16  Angus Leeming  <a.leeming@ic.ac.uk>
+
+       * GraphicsCacheItem.C (convertToDisplayFormat):
+       * GraphicsConverter.C (build_script): remove the Alerts when things go
+       wrong as the inset displays the message anyway. Moreover, Alert seems
+       pretty temperamemtal at the moment.
+
 2002-04-16  Rob Lahaye  <lahaye@users.sourceforge.net>
        * GraphicsImageXPM.C: fix clipping for boundingbox y-coordinates
 

diff --git a/src/graphics/GraphicsCacheItem.C b/src/graphics/GraphicsCacheItem.C
index f209b3a95bbec5d4a32d8e73e745599091257aa0..b829cdeae8b566e73b69dda6018d9cce75a308ff 100644 (file)
--- a/src/graphics/GraphicsCacheItem.C
+++ b/src/graphics/GraphicsCacheItem.C
@@ -26,7 +26,6 @@
 #include "lyx_main.h" // for global dispatch method
 #include "support/LAssert.h"
 #include "support/filetools.h"
-#include "frontends/Alert.h"
 
 // Very, Very UGLY!
 extern BufferView * current_view;
@@ -485,9 +484,6 @@ void GCacheItem::convertToDisplayFormat()
                << "The file contains " << from << " format data." << endl;
 
        if (to.empty()) {
-               Alert::alert(_("Unable to convert file ") +
-                            displayed_filename +
-                            _(" to a loadable format."));
                setStatus(ErrorConverting);
                return;
        }

diff --git a/src/graphics/GraphicsConverter.C b/src/graphics/GraphicsConverter.C
index 028e24d775db800b5930e3d8cd8352b827510de2..7887a1639beed0e34d2fe93c0778638a3d7d286e 100644 (file)
--- a/src/graphics/GraphicsConverter.C
+++ b/src/graphics/GraphicsConverter.C
@@ -18,8 +18,6 @@
 #include "debug.h"
 #include "gettext.h"
 
-#include "frontends/Alert.h"
-
 #include "support/filetools.h"
 #include "support/forkedcall.h"
 #include "support/path.h"
@@ -174,10 +172,6 @@ bool GConverter::build_script(string const & from_file,
        EdgePath edgepath = converters.getPath(from_format, to_format);
 
        if (edgepath.empty()) {
-               Alert::alert(_("Cannot convert file"),
-                          _("No information for converting from ")
-                          + formats.prettyName(from_format) + _(" to ")
-                          + formats.prettyName(to_format));
                return false;
        }