From fc4c7943c79243ed027f7507c458d067a14bebb2 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Sun, 8 Jul 2018 11:10:48 +0200
Subject: Remove PageMenu

Move zoom widget to WebView context menu
Move the other page menu actions to main window menu
---
 lib/addressbar/addressbar.cpp  | 5 -----
 lib/addressbar/addressbar.h    | 1 -
 lib/addressbar/urllineedit.cpp | 3 ---
 lib/addressbar/urllineedit.h   | 2 --
 4 files changed, 11 deletions(-)

(limited to 'lib/addressbar')

diff --git a/lib/addressbar/addressbar.cpp b/lib/addressbar/addressbar.cpp
index 7d17462..d570507 100644
--- a/lib/addressbar/addressbar.cpp
+++ b/lib/addressbar/addressbar.cpp
@@ -71,11 +71,6 @@ void AddressBar::setProgress(int value) {
     progressBar->setValue(std::min(value, 100));
 }
 
-void AddressBar::setPageMenu(QMenu *menu)
-{
-    urlBar->pageMenu = menu;
-}
-
 void AddressBar::setToolsMenu(QMenu *menu)
 {
     urlBar->toolsMenu = menu;
diff --git a/lib/addressbar/addressbar.h b/lib/addressbar/addressbar.h
index e87f72e..f1d93c7 100644
--- a/lib/addressbar/addressbar.h
+++ b/lib/addressbar/addressbar.h
@@ -34,7 +34,6 @@ public slots:
     void setUrl(const QUrl &url);
     void setProgress(int value);
 
-    void setPageMenu(QMenu *menu);
     void setToolsMenu(QMenu *menu);
 
 private:
diff --git a/lib/addressbar/urllineedit.cpp b/lib/addressbar/urllineedit.cpp
index 29a14cd..c106ea4 100644
--- a/lib/addressbar/urllineedit.cpp
+++ b/lib/addressbar/urllineedit.cpp
@@ -60,9 +60,6 @@ UrlLineEdit::UrlLineEdit(QWidget *parent)
         menu->addActions(actions);
         menu->addSeparator();
 
-        if(pageMenu) {
-            menu->addMenu(pageMenu);
-        }
         if(toolsMenu) {
             menu->addMenu(toolsMenu);
         }
diff --git a/lib/addressbar/urllineedit.h b/lib/addressbar/urllineedit.h
index 56914c4..d5ab33d 100644
--- a/lib/addressbar/urllineedit.h
+++ b/lib/addressbar/urllineedit.h
@@ -30,8 +30,6 @@ public slots:
 
 public:
     QAction *menuAction = nullptr;
-    // pageMenu action: zoom, print
-    QMenu *pageMenu = nullptr;
     // devMenu action: scripts, etc
     QMenu *toolsMenu = nullptr;
 
-- 
cgit v1.2.1