diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/mainmenu.cpp | 8 | ||||
-rw-r--r-- | src/gui/mainmenu.h | 1 | ||||
-rw-r--r-- | src/gui/mainwindow.cpp | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/src/gui/mainmenu.cpp b/src/gui/mainmenu.cpp index c159981..7d74fbe 100644 --- a/src/gui/mainmenu.cpp +++ b/src/gui/mainmenu.cpp @@ -26,6 +26,14 @@ MainMenu::MainMenu() ui.setupUi(this); } +void MainMenu::addDocks(QMenu *m) +{ + ui.menuView->addSeparator(); + foreach (QAction *a, m->actions()) { + if (!a->isSeparator()) ui.menuView->addAction(a); + } +} + // File void MainMenu::on_actionNew_triggered() { diff --git a/src/gui/mainmenu.h b/src/gui/mainmenu.h index c4079bf..82c447e 100644 --- a/src/gui/mainmenu.h +++ b/src/gui/mainmenu.h @@ -28,6 +28,7 @@ class MainMenu : public QMenuBar Q_OBJECT public: MainMenu(); + void addDocks(QMenu *m); private: Ui::MainMenu ui; diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 806d634..acbad69 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -44,7 +44,6 @@ MainWindow::MainWindow(QWidget *parent) : // TODO: check if each window should have a menu _menu = new MainMenu(); _menu->setParent(this); - setMenuBar(_menu); QVariant geom = settings.value("geometry-main"); @@ -70,6 +69,7 @@ MainWindow::MainWindow(QWidget *parent) : _tikzDocument->refreshTikz(); connect(_tikzDocument->undoStack(), SIGNAL(cleanChanged(bool)), this, SLOT(updateFileName())); + _menu->addDocks(createPopupMenu()); } MainWindow::~MainWindow() |