On Linux show in crash message box the backtrace

[lyx.git] / src / frontends / qt4 / GuiApplication.cpp

diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp
index 6d703458560eb530be58e3258ee8903cf38b92f9..f6c8433141131732be85ac94fa9ab5dc642c366c 100644 (file)
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -70,6 +70,7 @@
 #include "support/Package.h"
 #include "support/PathChanger.h"
 #include "support/Systemcall.h"
+#include "support/TempFile.h"
 
 #ifdef Q_WS_MACX
 #include "support/AppleScript.h"
@@ -851,8 +852,19 @@ public:
                case QEvent::Show:
                case QEvent::Hide:
                case QEvent::Resize:
+               case QEvent::UpdateRequest:
+               case QEvent::CursorChange:
+               case QEvent::ActionChanged:
+               case QEvent::EnabledChange:
+               case QEvent::SockAct:
+               case QEvent::Timer:
+               case QEvent::Paint:
+               case QEvent::ToolTipChange:
+               case QEvent::LayoutRequest:
+               case QEvent::MetaCall:
                        return QObject::eventFilter(obj, event);
                default:
+                       // FIXME Blocking all these events is a bad idea.
                        QKeyEvent *keyEvent = dynamic_cast<QKeyEvent*>(event);
                        if (keyEvent && keyEvent->key() == Qt::Key_Escape)
                                pressed_ = true;
@@ -1241,6 +1253,14 @@ bool GuiApplication::getStatus(FuncRequest const & cmd, FuncStatus & flag) const
                break;
        }
 
+       case LFUN_DIALOG_SHOW: {
+               string const name = cmd.getArg(0);
+               return name == "aboutlyx"
+                       || name == "prefs"
+                       || name == "texinfo"
+                       || name == "progress"
+                       || name == "compare";
+       }
 
        default:
                return false;
@@ -1572,12 +1592,8 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                validateCurrentView();
                // FIXME: create a new method shared with LFUN_HELP_OPEN.
                string const fname = to_utf8(cmd.argument());
-               if (!FileName::isAbsolute(fname)) {
-                       dr.setError(true);
-                       dr.setMessage(_("Absolute filename expected."));
-                       break;
-               }               
-               bool const is_open = theBufferList().getBuffer(FileName(fname));
+               bool const is_open = FileName::isAbsolute(fname)
+                       && theBufferList().getBuffer(FileName(fname));
                if (d->views_.empty()
                    || (!lyxrc.open_buffers_in_tabs
                        && current_view_->documentBufferView() != 0
@@ -1676,7 +1692,18 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                }
 
                actOnUpdatedPrefs(lyxrc_orig, lyxrc);
-               resetGui();
+
+               // If the request comes from the minibuffer, then we can't reset
+               // the GUI, since that would destory the minibuffer itself and
+               // cause a crash, since we are currently in one of the methods of 
+               // GuiCommandBuffer. See bug #8540. 
+               if (cmd.origin() != FuncRequest::COMMANDBUFFER)
+                       resetGui();
+               // else
+               //   FIXME Unfortunately, that leaves a bug here, since we cannot
+               //   reset the GUI in this case. If the changes to lyxrc affected the
+               //   UI, then, nothing would happen. This seems fairly unlikely, but 
+               //   it definitely is a bug.
 
                break;
        }
@@ -1921,6 +1948,24 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                lyxerr.setLevel(Debug::value(to_utf8(cmd.argument())));
                break;
 
+       case LFUN_DIALOG_SHOW: {
+               string const name = cmd.getArg(0);
+
+               if ( name == "aboutlyx"
+                       || name == "prefs"
+                       || name == "texinfo"
+                       || name == "progress"
+                       || name == "compare")
+               {
+                       // work around: on Mac OS the application
+                       // is not terminated when closing the last view.
+                       // Create a new one to be able to dispatch the
+                       // LFUN_DIALOG_SHOW to this view.
+                       if (current_view_ == 0)
+                               createView();
+               }
+       }
+
        default:
                // The LFUN must be for one of GuiView, BufferView, Buffer or Cursor;
                // let's try that:
@@ -2783,14 +2828,14 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
 
        if (retval == FormatMismatch) {
                LYXERR(Debug::FILES, "Converting ui file to format " << LFUN_FORMAT);
-               FileName const tempfile = FileName::tempName("convert_ui");
+               TempFile tmp("convertXXXXXX.ui");
+               FileName const tempfile = tmp.name();
                bool const success = prefs2prefs(ui_path, tempfile, true);
                if (!success) {
                        LYXERR0("Unable to convert " << ui_path.absFileName() <<
                                " to format " << LFUN_FORMAT << ".");
                } else {
                        retval = readUIFile(tempfile);
-                       tempfile.removeFile();
                }
        }