From 7a3b8bb16c90265b26907c90a04da79d3c694f0e Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Fri, 23 Nov 2018 00:14:36 +0100
Subject: Add About and Run actions to plugin submenu

- Remove plugin list from About dialog
---
 src/mainwindow/mainwindow.cpp | 20 ++++----------------
 src/mainwindow/mainwindow.h   |  1 -
 src/mainwindow/mainwindow.ui  | 19 +++++++++++++------
 3 files changed, 17 insertions(+), 23 deletions(-)

(limited to 'src/mainwindow')

diff --git a/src/mainwindow/mainwindow.cpp b/src/mainwindow/mainwindow.cpp
index e465a4f..8f635c9 100644
--- a/src/mainwindow/mainwindow.cpp
+++ b/src/mainwindow/mainwindow.cpp
@@ -9,10 +9,14 @@
 #include "mainwindow.h"
 #include "addressbar.h"
 #include "browser.h"
+#include "config.h"
+#include "configuration.h"
+#include "profilemanager.h"
 #include "session.h"
 #include "subwindow/subwindow.h"
 #include "ui_mainwindow.h"
 #include "webengine/webview.h"
+#include "webprofile.h"
 #include "widgets/dockwidget.h"
 #include "widgets/navigationbar.h"
 #include "widgets/searchform.h"
@@ -34,10 +38,6 @@
 #include <QToolBar>
 #include <QUrl>
 #include <QVBoxLayout>
-#include "configuration.h"
-#include "profilemanager.h"
-#include "webprofile.h"
-#include "config.h"
 #ifdef CONFIG_PLASMA_BLUR
 #include <KWindowEffects>
 #endif
@@ -285,18 +285,6 @@ MainWindow::~MainWindow()
     disconnect(addressBar);
 }
 
-void MainWindow::addAction(ActionLocation where, QAction *action)
-{
-    switch(where) {
-    case ToolsMenu:
-        ui->menuTools->addAction(action);
-        break;
-    default:
-        QMainWindow::addAction(action);
-        break;
-    }
-}
-
 void MainWindow::addDockWidget(Qt::DockWidgetArea area, QWidget *widget)
 {
     QDockWidget *lastDock = nullptr;
diff --git a/src/mainwindow/mainwindow.h b/src/mainwindow/mainwindow.h
index 6ce61b5..296a73e 100644
--- a/src/mainwindow/mainwindow.h
+++ b/src/mainwindow/mainwindow.h
@@ -43,7 +43,6 @@ public:
     Q_DISABLE_COPY(MainWindow)
     ~MainWindow() override;
 
-    void addAction(ActionLocation where, QAction *action);
     void addDockWidget(Qt::DockWidgetArea area, QWidget *widget);
     void removeDockWidget(QWidget *widget);
 
diff --git a/src/mainwindow/mainwindow.ui b/src/mainwindow/mainwindow.ui
index ad213c6..587b4fd 100644
--- a/src/mainwindow/mainwindow.ui
+++ b/src/mainwindow/mainwindow.ui
@@ -55,12 +55,9 @@
     <property name="title">
      <string>Too&amp;ls</string>
     </property>
-    <widget class="QMenu" name="menuPlugins">
-     <property name="title">
-      <string>&amp;Plugins</string>
-     </property>
-    </widget>
-    <addaction name="menuPlugins"/>
+    <addaction name="actionBookmarks"/>
+    <addaction name="actionDownloads"/>
+    <addaction name="separator"/>
    </widget>
    <widget class="QMenu" name="menuPage">
     <property name="title">
@@ -155,6 +152,16 @@
     <string>&amp;Developer Tools</string>
    </property>
   </action>
+  <action name="actionBookmarks">
+   <property name="text">
+    <string>Bookmarks</string>
+   </property>
+  </action>
+  <action name="actionDownloads">
+   <property name="text">
+    <string>Downloads</string>
+   </property>
+  </action>
  </widget>
  <resources/>
  <connections/>
-- 
cgit v1.2.1