Skip to content

Commit a1805cd

Browse files
committed
Plugins::WebBrowser: modify extension manager
1 parent fde1dfd commit a1805cd

18 files changed

Lines changed: 725 additions & 937 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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@ endif()
9898

9999
if(QT_VERSION VERSION_GREATER_EQUAL "6.10.0")
100100
list(APPEND WebBrowser_SOURCE_FILES
101-
Extension/FrmChromeExtensionManager.cpp
101+
Extension/FrmExtensionManager.cpp
102102
Extension/FrmExtensionStore.cpp
103103
)
104104
list(APPEND WebBrowser_HEADER_FILES
105-
Extension/FrmChromeExtensionManager.h
105+
Extension/FrmExtensionManager.h
106106
Extension/FrmExtensionStore.h
107107
)
108108
list(APPEND WebBrowser_UI_FILES
109-
Extension/FrmChromeExtensionManager.ui
109+
Extension/FrmExtensionManager.ui
110110
Extension/FrmExtensionStore.ui
111111
)
112112
list(APPEND WebBrowser_INCLUDE_DIR $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Extension>)

Plugins/WebBrowser/DlgSettings.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@
44
#include <QLoggingCategory>
55

66
#if QT_VERSION > QT_VERSION_CHECK(6, 10, 0)
7-
#include "FrmChromeExtensionManager.h"
7+
#include "FrmExtensionManager.h"
88
#include "FrmExtensionStore.h"
99
#endif
10-
10+
#include "FrmWebBrowser.h"
1111
#include "DlgSettings.h"
1212
#include "ui_DlgSettings.h"
1313

1414
static Q_LOGGING_CATEGORY(log, "WebBrowser.Parameter")
15-
CDlgSettings::CDlgSettings(CParameterWebBrowser *para, QWidget *parent)
15+
CDlgSettings::CDlgSettings(QWebEngineProfile *pProfile,
16+
CParameterWebBrowser *para,
17+
QWidget *parent)
1618
: QDialog(parent)
1719
, ui(new Ui::CDlgSettings)
1820
, m_pPara(para)
@@ -56,7 +58,7 @@ CDlgSettings::CDlgSettings(CParameterWebBrowser *para, QWidget *parent)
5658
ui->tabWidget->addTab(m_pMediaDevices, m_pMediaDevices->windowIcon(), m_pMediaDevices->windowTitle());
5759

5860
#if QT_VERSION > QT_VERSION_CHECK(6, 10, 0)
59-
CFrmChromeExtensionManager* pExtension = new CFrmChromeExtensionManager();
61+
CFrmExtensionManager* pExtension = new CFrmExtensionManager(pProfile);
6062
ui->tabWidget->addTab(pExtension, pExtension->windowIcon(), pExtension->windowTitle());
6163
CFrmExtensionStore* pStore = new CFrmExtensionStore();
6264
ui->tabWidget->addTab(pStore, pStore->windowIcon(), pStore->windowTitle());

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)