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
This commit is contained in:
Peter Kümmel 2006-11-08 23:10:46 +00:00
parent ef2fda7500
commit 3ae92a71ed
3 changed files with 17 additions and 6 deletions

View File

@ -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)

View File

@ -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()
{

View File

@ -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);