better context menu

Author: ddmitov

src/webengine-page.cpp

@@ -74,7 +74,7 @@ bool QPage::acceptNavigationRequest(const QUrl &url,
                                     bool isMainFrame)
 {
     // Handle filesystem dialogs:
-    if ((url.scheme() == "file" or url.authority() == "localhost") and
+    if ((url.scheme() == "file" or url.host() == "localhost") and
             type == QWebEnginePage::NavigationTypeLinkClicked and
             url.fileName().contains(".dialog") and
             isMainFrame == true) {

src/webengine-view.h

@@ -80,21 +80,12 @@ public slots:
 
             QMenu menu;
 
-            if (!contextMenuTest.isContentEditable()) {
-                if (contextMenuTest.selectedText().length() == 0) {
-                    QAction *selectAllAct = menu
-                            .addAction(
-                                qApp->property("selectAllLabel").toString());
-                    QObject::connect(selectAllAct, SIGNAL(triggered()),
-                                     this, SLOT(qSelectAllAction()));
-                }
-
-                if (contextMenuTest.selectedText().length() > 0) {
-                    QAction *copyAct = menu
-                            .addAction(qApp->property("copyLabel").toString());
-                    QObject::connect(copyAct, SIGNAL(triggered()),
-                                     this, SLOT(qCopyAction()));
-                }
+            if (!contextMenuTest.isContentEditable() and
+                    contextMenuTest.selectedText().length() > 0) {
+                QAction *copyAct = menu
+                        .addAction(qApp->property("copyLabel").toString());
+                QObject::connect(copyAct, SIGNAL(triggered()),
+                                 this, SLOT(qCopyAction()));
             }
 
             if (contextMenuTest.isContentEditable()) {

src/webkit-page.h

@@ -440,7 +440,7 @@ public slots:
 
         // Handle filesystem dialogs:
         if ((request.url().scheme() == "file" or
-             request.url().authority() == "localhost") and
+             request.url().host() == "localhost") and
                 navigationType == QWebPage::NavigationTypeLinkClicked and
                 request.url().fileName().contains(".dialog")) {
             qHandleDialogs(request.url().fileName().replace(".dialog", ""));

src/webkit-view.h

@@ -79,40 +79,27 @@ public slots:
 
             QMenu menu;
 
-            if (!contextMenuTest.isContentEditable()) {
-                if (!contextMenuTest.isContentSelected()) {
-                    QAction *selectAllAct =
-                            menu.addAction(
-                                qApp->property("selectAllLabel").toString());
-                    QObject::connect(selectAllAct, SIGNAL(triggered()),
-                                     this, SLOT(qSelectAllAction()));
-                }
-
-                if (contextMenuTest.isContentSelected()) {
-                    QAction *copyAct =
-                            menu.addAction(
-                                qApp->property("copyLabel").toString());
-                    QObject::connect(copyAct, SIGNAL(triggered()),
-                                     this, SLOT(qCopyAction()));
-                }
+            if (!contextMenuTest.isContentEditable() and
+                    contextMenuTest.isContentSelected()) {
+                QAction *copyAct =
+                        menu.addAction(qApp->property("copyLabel").toString());
+                QObject::connect(copyAct, SIGNAL(triggered()),
+                                 this, SLOT(qCopyAction()));
             }
 
             if (contextMenuTest.isContentEditable()) {
                 QAction *cutAct =
-                        menu.addAction(
-                            qApp->property("cutLabel").toString());
+                        menu.addAction(qApp->property("cutLabel").toString());
                 QObject::connect(cutAct, SIGNAL(triggered()),
                                  this, SLOT(qCutAction()));
 
                 QAction *copyAct =
-                        menu.addAction(
-                            qApp->property("copyLabel").toString());
+                        menu.addAction(qApp->property("copyLabel").toString());
                 QObject::connect(copyAct, SIGNAL(triggered()),
                                  this, SLOT(qCopyAction()));
 
                 QAction *pasteAct =
-                        menu.addAction(
-                            qApp->property("pasteLabel").toString());
+                        menu.addAction(qApp->property("pasteLabel").toString());
                 QObject::connect(pasteAct, SIGNAL(triggered()),
                                  this, SLOT(qPasteAction()));