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

diff --git a/Status.15x b/Status.15x
index 882cf5d0920a315692a7f5fe380cf87137472212..fc61b279fc5ac45f23100051beb99421ea0c0588 100644 (file)
--- 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 6696e69f84f3ea7766c2ecb88f78bedab982a5e3..ac09c8edda1ba540c5b95212f5cb2be662dbad5c 100644 (file)
--- 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 a1da43712b1e6f8a426576949d49bd275f2e27f8..c4fb5317d730b8260e6826ee683468f9afa50c6e 100644 (file)
--- a/src/frontends/qt4/GuiView.h
+++ b/src/frontends/qt4/GuiView.h
@@ -26,9 +26,8 @@
 #include <QCloseEvent>
 
 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);