Merge pull request 'WuChengBo' (#7) from WuChengBo into main

Reviewed-on: #7

Src/RescueLoad/RescueLoad.pri

@@ -17,4 +17,10 @@ RESOURCES += \
 INCLUDEPATH += $$PWD/map/tianditu/include
 
 # 指定库文件的路径
-LIBS += -L$$PWD/map/tianditu/lib -lTianDiTu
+CONFIG(debug, debug|release){
+    LIBS += -L$$PWD/map/tianditu/lib -lTianDiTud
+}
+else
+{
+    LIBS += -L$$PWD/map/tianditu/lib -lTianDiTu
+}

Src/WebPage/cwebengineview.cpp

@@ -2,24 +2,24 @@
 
 #include "CWebEngineView.h"
 
+#include <QWebEngineHistory>
 #include <QWidget>
 
-CWebEngineView::CWebEngineView(QWidget* parent)
+CWebEngineView::CWebEngineView(QWidget *parent) : QWebEngineView(parent) {}
-    : QWebEngineView(parent)
-{
-}
 
-CWebEngineView::~CWebEngineView()
+CWebEngineView::~CWebEngineView() {
-{
+  QWebEnginePage *page = this->page();
+  if (page != nullptr) {
+    delete page;
+  }
 }
 
-QWebEngineView* CWebEngineView::createWindow(QWebEnginePage::WebWindowType type)
+QWebEngineView *
-{
+CWebEngineView::createWindow(QWebEnginePage::WebWindowType type) {
-    if (type == QWebEnginePage::WebBrowserTab)
+  if (type == QWebEnginePage::WebBrowserTab) {
-    {
+    QWebEnginePage *new_page =
-        QWebEnginePage* new_page = new QWebEnginePage(this->page()->profile(), this);
+        new QWebEnginePage(this->page()->profile(), this);
-        this->setPage(new_page);
+    this->setPage(new_page);
-    }
+  }
-
+  return this;
-    return this;
 }

Src/WebPage/cwebengineview.h

@@ -5,17 +5,16 @@
 
 class QWidget;
 
-class CWebEngineView : public QWebEngineView
+class CWebEngineView : public QWebEngineView {
-{
+  Q_OBJECT
-    Q_OBJECT
 
 public:
-    CWebEngineView(QWidget* parent = nullptr);
+  CWebEngineView(QWidget *parent = nullptr);
-    ~CWebEngineView();
+  ~CWebEngineView();
 
 protected:
-    // 解决错误：qt No RenderWidgetHost exists with id 10 in process 3
+  // 解决错误：qt No RenderWidgetHost exists with id 10 in process 3
-    virtual QWebEngineView* createWindow(QWebEnginePage::WebWindowType type);
+  virtual QWebEngineView *createWindow(QWebEnginePage::WebWindowType type);
 };
 
 #endif // CWEBENGINEVIEW_H

Src/WebPage/qweb.cpp

@@ -1,21 +1,13 @@
 #include "qweb.h"
 #include "ui_qweb.h"
 
-QWeb::QWeb(QWidget *parent)
+QWeb::QWeb(QWidget *parent) : QWidget(parent), ui(new Ui::QWeb) {
-    : QWidget(parent)
+  ui->setupUi(this);
-    , ui(new Ui::QWeb)
-{
-    ui->setupUi(this);
-
-    mWeb = new QWebEngineView(this);
-
-    ui->verticalLayout->addWidget(mWeb);
-    mWeb->load(QUrl("https://www.baidu.com"));
 
+  mWeb = new QWebEngineView(this);
 
+  ui->verticalLayout->addWidget(mWeb);
+  mWeb->load(QUrl("https://www.baidu.com"));
 }
 
-QWeb::~QWeb()
+QWeb::~QWeb() { delete ui; }
-{
-    delete ui;
-}

mainwindow.cpp

@@ -32,7 +32,6 @@ MainWindow::MainWindow(QWidget *parent)
     // qDebug()<<style;
     file.close();
   } else {
-
     qDebug() << "Open  file fail " << Qt::endl;
   }
 
@@ -45,11 +44,14 @@ MainWindow::~MainWindow() {
   delete m_SDFPDlg;
   delete m_GDDCdlg;
   delete m_HomePagedlg;
-  delete mWeb;
   delete process;
-  delete ui;
+  delete mWeb;
+  delete lLinkWeb;
+  delete adHocNetworkWeb;
+  delete satelliteCommWeb;
   if (m_ModelCameraDlg != nullptr)
     delete m_ModelCameraDlg;
+  delete ui;
 }
 /**
  * @brief MainWindow::initFile 初始化配置文件 .ini

res/Qss/qss.qss

@@ -59,7 +59,7 @@ QComboBox:hover
 QComboBox:on
 {
     border-radius:3px;
-    background-color:rgba(35,35,35);
+    background-color:rgba(35,35,35,100);
     font: 75 10pt "微软雅黑";
     color:rgb(255,255,255);
     border:1px solid rgb(31,156,220) ;