Correction des bugs des fenêtres, et ajout d'un système de 'nouvel on…

…glet'
OlopTech · Sep 30, 2023 · 0a8f93d · 0a8f93d
1 parent cf741e5
commit 0a8f93d
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 4 deletions.
diff --git a/Olop b/Olop
diff --git a/Olop.pro.user b/Olop.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 11.0.2, 2023-09-16T09:50:57. -->
+<!-- Written by QtCreator 11.0.2, 2023-09-30T15:58:18. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -251,7 +251,6 @@
     <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:/home/superatraction/Documents/Qt C++/Olop/Olop.pro</value>
     <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/home/superatraction/Documents/Qt C++/Olop/Olop.pro</value>
-    <value type="QString" key="RunConfiguration.Arguments">--server 2555</value>
     <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
     <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
     <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>

diff --git a/assets/Olop.js b/assets/Olop.js
@@ -353,7 +353,8 @@ function createWindowElement(icon, title, content, isnotif, id, useIframe) {
     windowElement.ready(function() {
         windowElement.draggable({
             handle: ".window-title-bar",
-            containment: "window"
+            containment: "window",
+    iframeFix: true
         });
 
         updateMinSize(windowElement, useIframe);

diff --git a/assets/index.html b/assets/index.html
@@ -419,6 +419,7 @@ <h1>Olop</h1>
         <ul>
             <li onclick="loadPage('home')">Accueil</li>
             <li onclick="loadPage('Library')">Bibliothèque</li>
+            <li><a href="https://minecraft.fr">LIEN</A></li>
         </ul>
         <div id="info1" style="display: none;">
             <div id="button-update"></div>
@@ -441,4 +442,4 @@ <h1>Olop</h1>
         <button type="button" onclick="toggleMenu()" class="menu-button">&#9776;</button>
     </div>
 </body>
-</html>
+</html>
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -1,6 +1,7 @@
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "olop.hpp"
+#include <QDesktopServices>
 
 MainWindow::MainWindow(QWidget *parent, QString url) :
     QMainWindow(parent),
@@ -33,6 +34,10 @@ MainWindow::MainWindow(QWidget *parent, QString url) :
     connect(ui->Web, &QWebEngineView::loadFinished, this, [=](bool ok) {
         onLoadingHtmlFinished(ok, "http://localhost:"+url+"/");
     });
+    connect(static_cast<CustomWebEnginePage*>(ui->Web->page()), &CustomWebEnginePage::urlRequested, this,
+            [=](const QUrl& url) {
+                QDesktopServices::openUrl(url);
+            });
     // Initialisation de UiInstance
     uiInstance = new Ui::UiInstance(ui->Web->page(), url);
 

diff --git a/mainwindow.h b/mainwindow.h
@@ -7,6 +7,8 @@
 #include <QtCore>
 #include <QFile>
 #include <QLocalServer>
+#include <QWebEngineProfile>
+#include <QDesktopServices>
 
 namespace Ui {
 class UiInstance : public QObject {
@@ -65,13 +67,27 @@ class CustomWebEnginePage : public QWebEnginePage
     CustomWebEnginePage(QObject* parent = nullptr) : QWebEnginePage(parent) {}
 
 signals:
+    void requestCreateWindow(QWebEnginePage::WebWindowType type);  // Ajoutez ce signal
     void customJavaScriptConsoleMessage(QWebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID);
+    void urlRequested(const QUrl& url);
 
 protected:
     virtual void javaScriptConsoleMessage(QWebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message, int lineNumber, const QString &sourceID) override
     {
         emit customJavaScriptConsoleMessage(level, message, lineNumber, sourceID);
     }
+
+    virtual QWebEnginePage* createWindow(WebWindowType type) override {
+        if (type == QWebEnginePage::WebBrowserTab || type == QWebEnginePage::WebBrowserWindow) {
+            CustomWebEnginePage* newPage = new CustomWebEnginePage(this);
+            connect(newPage, &QWebEnginePage::urlChanged, this, [this, newPage](const QUrl& url) {
+                emit urlRequested(url);
+                newPage->deleteLater();
+            });
+            return newPage;
+        }
+        return nullptr;
+    }
 };
 
 #endif // MAINWINDOW_H