Revert "Show toolbar context menu only when clicking on the toolbar"

[features.git] / src / frontends / qt / GuiView.cpp

diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp
index f939573a87958d7f9f8939e343255b567fd0e97a..948deb9a756c8378faa666f9974db143287037bd 100644 (file)
--- a/src/frontends/qt/GuiView.cpp
+++ b/src/frontends/qt/GuiView.cpp
@@ -95,6 +95,7 @@
 #include <QDropEvent>
 #include <QFuture>
 #include <QFutureWatcher>
+#include <QGroupBox>
 #include <QLabel>
 #include <QList>
 #include <QMenu>
@@ -117,7 +118,7 @@
 #include <QTimer>
 #include <QToolBar>
 #include <QUrl>
-
+#include <QWindowStateChangeEvent>
 
 
 // sync with GuiAlert.cpp
@@ -745,7 +746,7 @@ QVector<GuiWorkArea*> GuiView::GuiViewPrivate::guiWorkAreas()
 static void handleExportStatus(GuiView * view, Buffer::ExportStatus status,
        string const & format)
 {
-       docstring const fmt = theFormats().prettyName(format);
+       docstring const fmt = translateIfPossible(theFormats().prettyName(format));
        docstring msg;
        switch (status) {
        case Buffer::ExportSuccess:
@@ -1401,6 +1402,49 @@ bool GuiView::event(QEvent * e)
        //case QEvent::Drop:
        //      break;
 
+       case QEvent::WindowStateChange: {
+               QWindowStateChangeEvent * ev = (QWindowStateChangeEvent*)e;
+               bool ofstate = (ev->oldState() & Qt::WindowFullScreen);
+               bool result = QMainWindow::event(e);
+               bool nfstate = (windowState() & Qt::WindowFullScreen);
+               if (!ofstate && nfstate) {
+                       LYXERR(Debug::DEBUG, "GuiView: WindowStateChange(): full-screen " << nfstate);
+                       // switch to full-screen state
+                       if (lyxrc.full_screen_statusbar)
+                               statusBar()->hide();
+                       if (lyxrc.full_screen_menubar)
+                               menuBar()->hide();
+                       if (lyxrc.full_screen_toolbars) {
+                               ToolbarMap::iterator end = d.toolbars_.end();
+                               for (ToolbarMap::iterator it = d.toolbars_.begin(); it != end; ++it)
+                                       if (it->second->isVisibiltyOn() && it->second->isVisible())
+                                               it->second->hide();
+                       }
+                       for (int i = 0; i != d.splitter_->count(); ++i)
+                               d.tabWorkArea(i)->setFullScreen(true);
+                       setContentsMargins(-2, -2, -2, -2);
+                       // bug 5274
+                       hideDialogs("prefs", nullptr);
+               } else if (ofstate && !nfstate) {
+                       LYXERR(Debug::DEBUG, "GuiView: WindowStateChange(): full-screen " << nfstate);
+                       // switch back from full-screen state
+                       if (lyxrc.full_screen_statusbar && !statusBar()->isVisible())
+                               statusBar()->show();
+                       if (lyxrc.full_screen_menubar && !menuBar()->isVisible())
+                               menuBar()->show();
+                       if (lyxrc.full_screen_toolbars) {
+                               ToolbarMap::iterator end = d.toolbars_.end();
+                               for (ToolbarMap::iterator it = d.toolbars_.begin(); it != end; ++it)
+                                       if (it->second->isVisibiltyOn() && !it->second->isVisible())
+                                               it->second->show();
+                               //updateToolbars();
+                       }
+                       for (int i = 0; i != d.splitter_->count(); ++i)
+                               d.tabWorkArea(i)->setFullScreen(false);
+                       setContentsMargins(0, 0, 0, 0);
+               }
+               return result;
+               }
        case QEvent::WindowActivate: {
                GuiView * old_view = guiApp->currentView();
                if (this == old_view) {
@@ -2327,6 +2371,10 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
                flag.setOnOff(lyxrc.spellcheck_continuously);
                break;
 
+       case LFUN_CITATION_OPEN:
+               enable = true;
+               break;
+
        default:
                return false;
        }
@@ -2488,7 +2536,7 @@ static bool import(GuiView * lv, FileName const & filename,
                if (loader_format.empty()) {
                        frontend::Alert::error(_("Couldn't import file"),
                                         bformat(_("No information for importing the format %1$s."),
-                                        theFormats().prettyName(format)));
+                                        translateIfPossible(theFormats().prettyName(format))));
                        return false;
                }
        } else
@@ -2535,13 +2583,13 @@ void GuiView::importDocument(string const & argument)
                }
 
                docstring const text = bformat(_("Select %1$s file to import"),
-                       theFormats().prettyName(format));
+                       translateIfPossible(theFormats().prettyName(format)));
 
                FileDialog dlg(toqstr(text));
                dlg.setButton1(qt_("D&ocuments"), toqstr(lyxrc.document_path));
                dlg.setButton2(qt_("&Examples"), toqstr(lyxrc.example_path));
 
-               docstring filter = theFormats().prettyName(format);
+               docstring filter = translateIfPossible(theFormats().prettyName(format));
                filter += " (*.{";
                // FIXME UNICODE
                filter += from_utf8(theFormats().extensions(format));
@@ -4576,6 +4624,16 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                        dr.screenUpdate(Update::Force);
                        break;
 
+               case LFUN_CITATION_OPEN: {
+                       string pdfv, psv;
+                       if (theFormats().getFormat("pdf"))
+                               pdfv = theFormats().getFormat("pdf")->viewer();
+                       if (theFormats().getFormat("ps"))
+                               psv = theFormats().getFormat("ps")->viewer();
+                       frontend::showTarget(argument, pdfv, psv);
+                       break;
+               }
+
                default:
                        // The LFUN must be for one of BufferView, Buffer or Cursor;
                        // let's try that:
@@ -4641,35 +4699,7 @@ bool GuiView::lfunUiToggle(string const & ui_component)
 
 void GuiView::toggleFullScreen()
 {
-       if (isFullScreen()) {
-               for (int i = 0; i != d.splitter_->count(); ++i)
-                       d.tabWorkArea(i)->setFullScreen(false);
-               setContentsMargins(0, 0, 0, 0);
-               setWindowState(windowState() ^ Qt::WindowFullScreen);
-               restoreLayout();
-               menuBar()->show();
-               statusBar()->show();
-       } else {
-               // bug 5274
-               hideDialogs("prefs", nullptr);
-               for (int i = 0; i != d.splitter_->count(); ++i)
-                       d.tabWorkArea(i)->setFullScreen(true);
-               setContentsMargins(-2, -2, -2, -2);
-               saveLayout();
-               setWindowState(windowState() ^ Qt::WindowFullScreen);
-               if (lyxrc.full_screen_statusbar)
-                       statusBar()->hide();
-               if (lyxrc.full_screen_menubar)
-                       menuBar()->hide();
-               if (lyxrc.full_screen_toolbars) {
-                       ToolbarMap::iterator end = d.toolbars_.end();
-                       for (ToolbarMap::iterator it = d.toolbars_.begin(); it != end; ++it)
-                               it->second->hide();
-               }
-       }
-
-       // give dialogs like the TOC a chance to adapt
-       updateDialogs();
+       setWindowState(windowState() ^ Qt::WindowFullScreen);
 }
 
 
@@ -4771,6 +4801,19 @@ void GuiView::resetDialogs()
 }
 
 
+void GuiView::flatGroupBoxes(const QObject * widget, bool flag)
+{
+       for (QObject * child: widget->children()) {
+               if (child->inherits("QGroupBox")) {
+                       QGroupBox * box = (QGroupBox*) child;
+                       box->setFlat(flag);
+               } else {
+                       flatGroupBoxes(child, flag);
+               }
+       }
+}
+
+
 Dialog * GuiView::findOrBuild(string const & name, bool hide_it)
 {
        if (!isValidName(name))
@@ -4786,6 +4829,11 @@ Dialog * GuiView::findOrBuild(string const & name, bool hide_it)
 
        Dialog * dialog = build(name);
        d.dialogs_[name].reset(dialog);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+       // Force a uniform style for group boxes
+       // On Mac non-flat works better, on Linux flat is standard
+       flatGroupBoxes(dialog->asQWidget(), guiApp->platformName() != "cocoa");
+#endif
        if (lyxrc.allow_geometry_session)
                dialog->restoreSession();
        if (hide_it)