Revert "GMO for BG"

This reverts commit 5b84f11f80d1ec160dbfa312bc2358cfd7abec72.

diff --git a/po/bg.gmo b/po/bg.gmo
deleted file mode 100644 (file)
index e0b4543..0000000
Binary files a/po/bg.gmo and /dev/null differ

diff --git a/po/cs.gmo b/po/cs.gmo
index b860e8dac0ca31257c0de5c2f49f65f88a9cd282..0b26f6fca120abf5bc0a890f7dbf98f71aaf1079 100644 (file)
Binary files a/po/cs.gmo and b/po/cs.gmo differ

diff --git a/po/de.gmo b/po/de.gmo
index 596893654be122eeb60aa7259ad28f6e1af8c09c..66e0183271f70111162dae58cb4775d5328eaf29 100644 (file)
Binary files a/po/de.gmo and b/po/de.gmo differ

diff --git a/po/sk.gmo b/po/sk.gmo
index b34d27d6bb24e04ab020e8a6d09e1a7534db538d..e42ad6a5ac269e91876cd573b11969c6bba2e5db 100644 (file)
Binary files a/po/sk.gmo and b/po/sk.gmo differ

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 220197ca57782beac24ca86e1f976b84df7ac2b2..98dba1dfa5544be735f2d36e1ee2bfb0b1de8f8d 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -305,26 +305,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 +610,7 @@ GuiView::GuiView(int id)
        setAcceptDrops(true);
 
        // add busy indicator to statusbar
-       QClickableLabel * busylabel = new QClickableLabel(statusBar());
+       QLabel * busylabel = new QLabel(statusBar());
        statusBar()->addPermanentWidget(busylabel);
        search_mode mode = theGuiApp()->imageSearchMode();
        QString fn = toqstr(lyx::libFileSearch("images", "busy", "gif", mode).absFileName());
@@ -643,7 +623,6 @@ GuiView::GuiView(int id)
                busylabel, SLOT(show()));
        connect(&d.processing_thread_watcher_, SIGNAL(finished()),
                busylabel, SLOT(hide()));
-       connect(busylabel, SIGNAL(clicked()), this, SLOT(checkKillBackground()));
 
        QFontMetrics const fm(statusBar()->fontMetrics());
        int const iconheight = max(int(d.normalIconSize), fm.height());
@@ -734,17 +713,6 @@ void GuiView::disableShellEscape()
 }
 
 
-void GuiView::checkKillBackground()
-{
-       docstring const ttl = _("Cancel background process?");
-       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)
-               Systemcall::killscript();
-}
-
-
 QVector<GuiWorkArea*> GuiView::GuiViewPrivate::guiWorkAreas()
 {
        QVector<GuiWorkArea*> areas;

diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h
index 56b11fe6e5787b18ca3e8c9a47f25d85495b85f2..fa36f7ff8b79406883897e6ca3c02c9d1a7e19c0 100644 (file)
--- a/src/frontends/qt4/GuiView.h
+++ b/src/frontends/qt4/GuiView.h
@@ -231,8 +231,6 @@ public Q_SLOTS:
        void updateWindowTitle(GuiWorkArea * wa);
        ///
        void disableShellEscape();
-       ///
-       void checkKillBackground();
 
 private Q_SLOTS:
        ///

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 7e6b34f9d2fa9f2de804b6b48af71ea1f4438a76..e2e3e1ce5e7aab126dbcef3f3b1977c3fb732aa8 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -197,7 +197,6 @@ MOCHEADER = \
        GuiChanges.h \
        GuiCharacter.h \
        GuiCitation.h \
-       GuiClickableLabel.h \
        GuiClipboard.h \
        GuiCommandBuffer.h \
        GuiCommandEdit.h \