diff options
author | Aqua-sama <aqua@iserlohn-fortress.net> | 2018-08-07 10:18:28 +0200 |
---|---|---|
committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2018-08-07 10:18:28 +0200 |
commit | e68dbcfd937a3de352152857ef9ad146a7c89bfc (patch) | |
tree | 751b0f1d6c7a223b19b06730fabc0cca478fa57d /src/mainwindow/mainwindow.cpp | |
parent | Fix fullscreen toggle (diff) | |
download | smolbote-e68dbcfd937a3de352152857ef9ad146a7c89bfc.tar.xz |
Move SubWindow to src/subwindow
Diffstat (limited to 'src/mainwindow/mainwindow.cpp')
-rw-r--r-- | src/mainwindow/mainwindow.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/mainwindow/mainwindow.cpp b/src/mainwindow/mainwindow.cpp index 6cf3f84..7f9cdcc 100644 --- a/src/mainwindow/mainwindow.cpp +++ b/src/mainwindow/mainwindow.cpp @@ -10,7 +10,7 @@ #include "ui_mainwindow.h" #include "addressbar/addressbar.h" #include "browser.h" -#include "subwindow.h" +#include "subwindow/subwindow.h" #include "webengine/webview.h" #include "widgets/dockwidget.h" #include "widgets/navigationbar.h" @@ -137,13 +137,11 @@ MainWindow::MainWindow(const std::unique_ptr<Configuration> &config, QWidget *pa // connect window menu { - connect(ui->actionTileWindows, &QAction::triggered, mdiArea, &QMdiArea::tileSubWindows); - config->setShortcut(ui->actionTileWindows, "mainwindow.shortcuts.tileWindows"); + connect(ui->actionTileSubwindows, &QAction::triggered, mdiArea, &QMdiArea::tileSubWindows); + config->setShortcut(ui->actionTileSubwindows, "mainwindow.shortcuts.tileWindows"); - connect(ui->actionCascadeWindows, &QAction::triggered, mdiArea, &QMdiArea::cascadeSubWindows); - config->setShortcut(ui->actionCascadeWindows, "mainwindow.shortcuts.cascadeWindows"); - - subWindowAction = ui->actionCurrentWindow; + connect(ui->actionCascadeSubwindows, &QAction::triggered, mdiArea, &QMdiArea::cascadeSubWindows); + config->setShortcut(ui->actionCascadeSubwindows, "mainwindow.shortcuts.cascadeWindows"); } // connect page menu @@ -205,16 +203,16 @@ MainWindow::MainWindow(const std::unique_ptr<Configuration> &config, QWidget *pa disconnect(viewChangedConnection); disconnect(searchBoxConnection); disconnect(statusBarConnection); - subWindowAction->setMenu(nullptr); + ui->actionCurrentSubwindow->setMenu(nullptr); auto *w = qobject_cast<SubWindow *>(window); if(w == nullptr) { // no current subwindow, clear everything setView(nullptr); - subWindowAction->setMenu(nullptr); + ui->actionCurrentSubwindow->setMenu(nullptr); } else { setView(w->currentView()); - subWindowAction->setMenu(w->systemMenu()); + ui->actionCurrentSubwindow->setMenu(w->systemMenu()); viewChangedConnection = connect(w, &SubWindow::currentViewChanged, this, &MainWindow::setView); statusBarConnection = connect(w, &SubWindow::showStatusMessage, statusBar(), &QStatusBar::showMessage); } |