From: Richard Kimberly Heck Date: Mon, 13 May 2019 03:30:49 +0000 (-0400) Subject: Revert "GMO for BG" X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=559a2e2ff1bf42c270c91e1f15742330e5900917;p=features.git Revert "GMO for BG" This reverts commit 5b84f11f80d1ec160dbfa312bc2358cfd7abec72. --- diff --git a/po/bg.gmo b/po/bg.gmo deleted file mode 100644 index e0b4543c3e..0000000000 Binary files a/po/bg.gmo and /dev/null differ diff --git a/po/cs.gmo b/po/cs.gmo index b860e8dac0..0b26f6fca1 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/de.gmo b/po/de.gmo index 596893654b..66e0183271 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/sk.gmo b/po/sk.gmo index b34d27d6bb..e42ad6a5ac 100644 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 220197ca57..98dba1dfa5 100644 --- a/src/frontends/qt4/GuiView.cpp +++ b/src/frontends/qt4/GuiView.cpp @@ -305,26 +305,6 @@ typedef map ToolbarMap; typedef shared_ptr 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 GuiView::GuiViewPrivate::guiWorkAreas() { QVector areas; diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h index 56b11fe6e5..fa36f7ff8b 100644 --- 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 7e6b34f9d2..e2e3e1ce5e 100644 --- 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 \