Use <cstdint> instead of <boost/cstdint.hpp>

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

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 220197ca57782beac24ca86e1f976b84df7ac2b2..6e87f007f93151b27ab99bf45d5fce837529f9a4 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -19,6 +19,7 @@
 #include "FileDialog.h"
 #include "FontLoader.h"
 #include "GuiApplication.h"
+#include "GuiClickableLabel.h"
 #include "GuiCommandBuffer.h"
 #include "GuiCompleter.h"
 #include "GuiKeySymbol.h"
@@ -275,7 +276,7 @@ private:
        }
 
        qreal fontSize() const {
-               return toqstr(lyxrc.font_sizes[FONT_SIZE_NORMAL]).toDouble();
+               return toqstr(lyxrc.font_sizes[NORMAL_SIZE]).toDouble();
        }
 
        QPointF textPosition(bool const heading) const {
@@ -305,26 +306,6 @@ typedef map<string, GuiToolbar *> ToolbarMap;
 
 typedef shared_ptr<Dialog> DialogPtr;
 
-
-// see https://wiki.qt.io/Clickable_QLabel
-class QClickableLabel : public QLabel {
-       Q_OBJECT
-public:
-       explicit QClickableLabel(QWidget * parent)
-               : QLabel(parent)
-       {}
-
-       ~QClickableLabel() {}
-
-Q_SIGNALS:
-       void clicked();
-
-protected:
-       void mousePressEvent(QMouseEvent *) {
-               Q_EMIT clicked();
-       }
-};
-
 } // namespace
 
 
@@ -630,7 +611,7 @@ GuiView::GuiView(int id)
        setAcceptDrops(true);
 
        // add busy indicator to statusbar
-       QClickableLabel * busylabel = new QClickableLabel(statusBar());
+       GuiClickableLabel * busylabel = new GuiClickableLabel(statusBar());
        statusBar()->addPermanentWidget(busylabel);
        search_mode mode = theGuiApp()->imageSearchMode();
        QString fn = toqstr(lyx::libFileSearch("images", "busy", "gif", mode).absFileName());
@@ -643,7 +624,7 @@ GuiView::GuiView(int id)
                busylabel, SLOT(show()));
        connect(&d.processing_thread_watcher_, SIGNAL(finished()),
                busylabel, SLOT(hide()));
-       connect(busylabel, SIGNAL(clicked()), this, SLOT(checkKillBackground()));
+       connect(busylabel, SIGNAL(clicked()), this, SLOT(checkCancelBackground()));
 
        QFontMetrics const fm(statusBar()->fontMetrics());
        int const iconheight = max(int(d.normalIconSize), fm.height());
@@ -734,13 +715,14 @@ void GuiView::disableShellEscape()
 }
 
 
-void GuiView::checkKillBackground()
+void GuiView::checkCancelBackground()
 {
-       docstring const ttl = _("Cancel background process?");
+       docstring const ttl = _("Cancel Export?");
        docstring const msg = _("Do you want to cancel the background export process?");
-       const int decision =
-               Alert::prompt(ttl, msg, 1, 1, _("&Cancel Export"), _("Conti&nue"));
-       if (decision == 0)
+       int const ret =
+               Alert::prompt(ttl, msg, 1, 1,
+                       _("&Cancel export"), _("Co&ntinue"));
+       if (ret == 0)
                Systemcall::killscript();
 }