Skip to content

Commit bf17d75

Browse files
committed
Plugins::WebBrowser: add chrome extension
1 parent 9c1e0f8 commit bf17d75

21 files changed

Lines changed: 2649 additions & 16 deletions

App/Client/mainwindow.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
14-
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
14+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
1515
<horstretch>0</horstretch>
1616
<verstretch>0</verstretch>
1717
</sizepolicy>
@@ -29,7 +29,7 @@
2929
<x>0</x>
3030
<y>0</y>
3131
<width>800</width>
32-
<height>20</height>
32+
<height>24</height>
3333
</rect>
3434
</property>
3535
<widget class="QMenu" name="menuHelp">

Plugins/WebBrowser/CMakeLists.txt

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set(CMAKE_AUTORCC ON)
99
set(CMAKE_CXX_STANDARD 17)
1010
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1111

12-
set(WebBrowser_QT_COMPONENTS Core Gui Widgets WebEngineWidgets WebEngineCore Sql Xml)
12+
set(WebBrowser_QT_COMPONENTS Core Gui Widgets Network WebEngineWidgets WebEngineCore Sql Xml)
1313
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS ${WebBrowser_QT_COMPONENTS})
1414
if(Qt${QT_VERSION_MAJOR}_FOUND)
1515
FOREACH(_COMPONENT ${WebBrowser_QT_COMPONENTS})
@@ -96,6 +96,22 @@ if(QT_VERSION VERSION_GREATER_EQUAL "6.7.0")
9696
)
9797
endif()
9898

99+
if(QT_VERSION VERSION_GREATER_EQUAL "6.10.0")
100+
list(APPEND WebBrowser_SOURCE_FILES
101+
Extension/FrmExtensionManager.cpp
102+
Extension/FrmExtensionStore.cpp
103+
)
104+
list(APPEND WebBrowser_HEADER_FILES
105+
Extension/FrmExtensionManager.h
106+
Extension/FrmExtensionStore.h
107+
)
108+
list(APPEND WebBrowser_UI_FILES
109+
Extension/FrmExtensionManager.ui
110+
Extension/FrmExtensionStore.ui
111+
)
112+
list(APPEND WebBrowser_INCLUDE_DIR $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Extension>)
113+
endif()
114+
99115
option(WITH_QtKEYCHAIN "With qtkeychain" ON)
100116
if(WITH_QtKEYCHAIN)
101117
find_package(Qt${QT_VERSION_MAJOR}Keychain)

Plugins/WebBrowser/DlgSettings.cpp

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,19 @@
22

33
#include <QFileDialog>
44
#include <QLoggingCategory>
5+
6+
#if QT_VERSION > QT_VERSION_CHECK(6, 10, 0)
7+
#include "FrmExtensionManager.h"
8+
#include "FrmExtensionStore.h"
9+
#endif
10+
#include "FrmWebBrowser.h"
511
#include "DlgSettings.h"
612
#include "ui_DlgSettings.h"
713

814
static Q_LOGGING_CATEGORY(log, "WebBrowser.Parameter")
9-
CDlgSettings::CDlgSettings(CParameterWebBrowser *para, QWidget *parent)
15+
CDlgSettings::CDlgSettings(QWebEngineProfile *pProfile,
16+
CParameterWebBrowser *para,
17+
QWidget *parent)
1018
: QDialog(parent)
1119
, ui(new Ui::CDlgSettings)
1220
, m_pPara(para)
@@ -48,6 +56,13 @@ CDlgSettings::CDlgSettings(CParameterWebBrowser *para, QWidget *parent)
4856
m_pMediaDevices = new CFrmMediaDevices(true, this);
4957
m_pMediaDevices->SetParameter(&m_pPara->m_MediaDevices.m_Para);
5058
ui->tabWidget->addTab(m_pMediaDevices, m_pMediaDevices->windowIcon(), m_pMediaDevices->windowTitle());
59+
60+
#if QT_VERSION > QT_VERSION_CHECK(6, 10, 0)
61+
CFrmExtensionManager* pExtension = new CFrmExtensionManager(pProfile);
62+
ui->tabWidget->addTab(pExtension, pExtension->windowIcon(), pExtension->windowTitle());
63+
CFrmExtensionStore* pStore = new CFrmExtensionStore();
64+
ui->tabWidget->addTab(pStore, pStore->windowIcon(), pStore->windowTitle());
65+
#endif
5166
}
5267

5368
CDlgSettings::~CDlgSettings()

Plugins/WebBrowser/DlgSettings.h

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
#pragma once
33
#include <QDialog>
44
#include <QStandardItemModel>
5+
#include <QWebEngineProfile>
6+
57
#include "ParameterWebBrowser.h"
68
#include "ParameterRecordUI.h"
79
#include "FrmMediaDevices.h"
810

11+
class CFrmWebBrowser;
912
namespace Ui {
1013
class CDlgSettings;
1114
}
@@ -15,7 +18,9 @@ class CDlgSettings : public QDialog
1518
Q_OBJECT
1619

1720
public:
18-
explicit CDlgSettings(CParameterWebBrowser* para, QWidget *parent = nullptr);
21+
explicit CDlgSettings(QWebEngineProfile* pProfile,
22+
CParameterWebBrowser* para,
23+
QWidget *parent = nullptr);
1924
~CDlgSettings();
2025

2126
public slots:

0 commit comments

Comments
 (0)