From 3ae92a71ed58d069c0b5dcab190d739bb6d35420 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Wed, 8 Nov 2006 23:10:46 +0000 Subject: [PATCH] disable toolbar popup menu, this is better than the current state git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15809 a592a061-630c-0410-9148-cb99ea01b6c8 --- Status.15x | 12 ++++++++---- src/frontends/qt4/GuiView.C | 6 ++++++ src/frontends/qt4/GuiView.h | 5 +++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Status.15x b/Status.15x index 882cf5d092..fc61b279fc 100644 --- a/Status.15x +++ b/Status.15x @@ -113,9 +113,8 @@ TOOLBARS & MINIBUFFER pixels compared to 1.4. This makes the images look jagged and the initial window size has also become to small to show the whole toolbar (Joost 4/11/06). - -* When changing the toolbar settings in the right-button context menu of a - visible toolbar, the modified settings are not considered for session management + +* TODO toolbar popup menu, currently disabled (Kuemmel 9/11/06) * M-x is broken (does not bring up the minibuffer). @@ -308,4 +307,9 @@ CREDITS: FIXED (MGerz 2006-11-07). I added shortcut whereever possible. - +* When changing the toolbar settings in the right-button context menu of a + visible toolbar, the modified settings are not considered for session management + + REPLACED with a new entry, popup disabled (Kuemmel 2006-11-09) + + \ No newline at end of file diff --git a/src/frontends/qt4/GuiView.C b/src/frontends/qt4/GuiView.C index 6696e69f84..ac09c8edda 100644 --- a/src/frontends/qt4/GuiView.C +++ b/src/frontends/qt4/GuiView.C @@ -136,6 +136,12 @@ void GuiView::close() QMainWindow::close(); } +QMenu* GuiView::createPopupMenu() +{ + // disable toolbar popup menu + // Qt docs: Ownership of the popup menu is transferred to the caller. + return new QMenu; +} void GuiView::init() { diff --git a/src/frontends/qt4/GuiView.h b/src/frontends/qt4/GuiView.h index a1da43712b..c4fb5317d7 100644 --- a/src/frontends/qt4/GuiView.h +++ b/src/frontends/qt4/GuiView.h @@ -26,9 +26,8 @@ #include class QToolBar; -//class FuncRequest; +class QMenu; -//class string; namespace lyx { namespace frontend { @@ -82,6 +81,8 @@ public: void initTab(QWidget* workArea); + QMenu* createPopupMenu(); + Q_SIGNALS: void closing(int); -- 2.39.2