Refs #95. Removed context menu from WebLoginDialog (and others).

introlab · Oct 9, 2024 · 2d6519a · 2d6519a
1 parent c4d4051
commit 2d6519a
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 7 deletions.
diff --git a/client/src/dialogs/AboutDialog.cpp b/client/src/dialogs/AboutDialog.cpp
@@ -9,6 +9,7 @@ AboutDialog::AboutDialog(ComManager* comManager, QWidget *parent) :
 
     // Initialize web engine view
     m_webEngine = new QWebEngineView(ui->wdgWebView);
+    m_webEngine->setContextMenuPolicy(Qt::NoContextMenu);
     m_webPage = new AboutDialogPage();
     m_webEngine->setPage(m_webPage);
 
@@ -53,11 +54,14 @@ void AboutDialog::on_lblAbout_clicked()
 {
     if (m_webEngine){
         m_webEngine->setUrl(QUrl("chrome://dino"));
-        ui->wdgWebView->setFocus();
-
     }
 }
 
+void AboutDialog::onPageLoaded()
+{
+    ui->wdgWebView->setFocus();
+}
+
 void AboutDialog::processServerSettings(QVariantHash settings)
 {
     if (settings.contains(WEB_QUERY_DEVICE_REGISTER_KEY)){
@@ -69,5 +73,6 @@ void AboutDialog::processServerSettings(QVariantHash settings)
 
 void AboutDialog::connectSignals()
 {
+    connect(m_webEngine, &QWebEngineView::loadFinished, this, &AboutDialog::onPageLoaded);
     connect(m_comManager, &ComManager::serverSettingsReceived, this, &AboutDialog::processServerSettings);
 }
diff --git a/client/src/dialogs/AboutDialog.h b/client/src/dialogs/AboutDialog.h
@@ -23,6 +23,7 @@ class AboutDialog : public QDialog
 private slots:
     void on_btnOk_clicked();
     void on_lblAbout_clicked();
+    void onPageLoaded();
 
     void processServerSettings(QVariantHash settings);
 

diff --git a/client/src/dialogs/AboutDialog.ui b/client/src/dialogs/AboutDialog.ui
@@ -10,6 +10,9 @@
     <height>300</height>
    </rect>
   </property>
+  <property name="focusPolicy">
+   <enum>Qt::FocusPolicy::StrongFocus</enum>
+  </property>
   <property name="windowTitle">
    <string>À propos d'OpenTera...</string>
   </property>
@@ -33,9 +36,6 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="focusPolicy">
-      <enum>Qt::StrongFocus</enum>
-     </property>
     </widget>
    </item>
    <item>
@@ -64,14 +64,14 @@
         <string>Inconnue</string>
        </property>
        <property name="textInteractionFlags">
-        <set>Qt::TextSelectableByMouse</set>
+        <set>Qt::TextInteractionFlag::TextSelectableByMouse</set>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+        <enum>Qt::Orientation::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>

diff --git a/client/src/dialogs/AboutDialogPage.cpp b/client/src/dialogs/AboutDialogPage.cpp
@@ -1,5 +1,6 @@
 #include "AboutDialogPage.h"
 #include <QWebEngineCertificateError>
+#include <QDesktopServices>
 
 AboutDialogPage::AboutDialogPage()
 {
@@ -15,3 +16,15 @@ void AboutDialogPage::onCertificateError(const QWebEngineCertificateError &certi
     auto mutableError = const_cast<QWebEngineCertificateError&>(certificateError);
     mutableError.acceptCertificate();
 }
+
+bool AboutDialogPage::acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame)
+{
+    if (type == NavigationTypeLinkClicked){
+        // Open links in external browser
+        QDesktopServices::openUrl(url);
+
+        return false;
+    }
+
+    return true;
+}
diff --git a/client/src/dialogs/AboutDialogPage.h b/client/src/dialogs/AboutDialogPage.h
@@ -13,6 +13,10 @@ class AboutDialogPage : public QWebEnginePage
 protected slots:
 
     void onCertificateError(const QWebEngineCertificateError &certificateError);
+
+    // QWebEnginePage interface
+protected:
+    bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame) override;
 };
 
 #endif // ABOUTDIALOGPAGE_H
diff --git a/client/src/dialogs/WebLoginDialog.cpp b/client/src/dialogs/WebLoginDialog.cpp
@@ -17,6 +17,7 @@ WebLoginDialog::WebLoginDialog(ConfigManagerClient *config, QWidget *parent)
 
     //Create Web View
     m_webView = new QWebEngineView(ui->centralWidget);
+    m_webView->setContextMenuPolicy(Qt::NoContextMenu);
     ui->lblError->hide();
     ui->centralWidget->hide();
 

diff --git a/client/src/kit/KitVideoRehabWidget.cpp b/client/src/kit/KitVideoRehabWidget.cpp
@@ -54,6 +54,7 @@ void KitVideoRehabWidget::initUi()
     m_loadingIcon->start();
 
     m_webEngine = new QWebEngineView(ui->wdgWebEngine);
+    m_webEngine->setContextMenuPolicy(Qt::NoContextMenu);
     connect(m_webEngine, &QWebEngineView::loadFinished, this, &KitVideoRehabWidget::webPageLoaded);
 
     // Create a new page

diff --git a/client/src/services/VideoRehabService/VideoRehabSetupWidget.cpp b/client/src/services/VideoRehabService/VideoRehabSetupWidget.cpp
@@ -51,6 +51,7 @@ void VideoRehabSetupWidget::initUI()
 
     //// Web engine setup
     m_webEngine = new QWebEngineView(ui->wdgWebEngine);
+    m_webEngine->setContextMenuPolicy(Qt::NoContextMenu);
     connect(m_webEngine, &QWebEngineView::loadFinished, this, &VideoRehabSetupWidget::webPageLoaded);
 
     //Create a new page

diff --git a/client/src/services/VideoRehabService/VideoRehabWidget.cpp b/client/src/services/VideoRehabService/VideoRehabWidget.cpp
@@ -52,6 +52,7 @@ void VideoRehabWidget::initUI()
     m_loadingIcon->start();
 
     m_webEngine = new QWebEngineView(/*ui->wdgWebEngine*/);
+    m_webEngine->setContextMenuPolicy(Qt::NoContextMenu);
     connect(m_webEngine, &QWebEngineView::loadFinished, this, &VideoRehabWidget::webPageLoaded);
 
     // Create a new page