summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleks Kissinger <aleks0@gmail.com>2018-10-18 11:27:52 +0200
committerAleks Kissinger <aleks0@gmail.com>2018-10-18 11:28:00 +0200
commit375621b09d85ee3430659c8278c8ebb56d9a4507 (patch)
treee116b5cb1caf6e5e8fe611e31436e32e13fedec7
parent30669ac45c9d6a7dd752ac7cb707b98151e822ad (diff)
added docks to View menu (closes #29)
-rw-r--r--src/gui/mainmenu.cpp8
-rw-r--r--src/gui/mainmenu.h1
-rw-r--r--src/gui/mainwindow.cpp2
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()