Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-14 02:52:12 +01:00
Code Releases Activity

Add a section for CertificateManager in Preferences

Browse Source
This commit is contained in:
Javier Llorente 2023-04-24 23:07:56 +02:00 committed by Juraj Oravec
parent 1ba9863b66
commit 1a3d66857f
3 changed files with 265 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/preferences/preferences.cpp
View File

@ -44,6 +44,7 @@
#include "registerqappassociation.h" #include "registerqappassociation.h"
#include "profilemanager.h" #include "profilemanager.h"
#include "html5permissions/html5permissionsdialog.h" #include "html5permissions/html5permissionsdialog.h"
#include "certificatemanager.h"
#include "searchenginesdialog.h" #include "searchenginesdialog.h"
#include "webscrollbarmanager.h" #include "webscrollbarmanager.h"
#include "protocolhandlerdialog.h" #include "protocolhandlerdialog.h"
@ -517,6 +518,7 @@ Preferences::Preferences(BrowserWindow* window)
connect(ui->uaManager, &QAbstractButton::clicked, this, &Preferences::openUserAgentManager); connect(ui->uaManager, &QAbstractButton::clicked, this, &Preferences::openUserAgentManager);
connect(ui->jsOptionsButton, &QAbstractButton::clicked, this, &Preferences::openJsOptions); connect(ui->jsOptionsButton, &QAbstractButton::clicked, this, &Preferences::openJsOptions);
connect(ui->searchEngines, &QAbstractButton::clicked, this, &Preferences::openSearchEnginesManager); connect(ui->searchEngines, &QAbstractButton::clicked, this, &Preferences::openSearchEnginesManager);
connect(ui->certificateManager, &QAbstractButton::clicked, this, &Preferences::openCertificateManager);
connect(ui->protocolHandlers, &QAbstractButton::clicked, this, &Preferences::openProtocolHandlersManager); connect(ui->protocolHandlers, &QAbstractButton::clicked, this, &Preferences::openProtocolHandlersManager);
connect(ui->listWidget, &QListWidget::currentItemChanged, this, &Preferences::showStackedPage); connect(ui->listWidget, &QListWidget::currentItemChanged, this, &Preferences::showStackedPage);
@ -738,6 +740,12 @@ void Preferences::openSearchEnginesManager()
dialog->open(); dialog->open();
} }
void Preferences::openCertificateManager()
{
auto *dialog = new CertificateManager(this);
dialog->open();
}
void Preferences::openProtocolHandlersManager() void Preferences::openProtocolHandlersManager()
{ {
auto *dialog = new ProtocolHandlerDialog(this); auto *dialog = new ProtocolHandlerDialog(this);

1
src/lib/preferences/preferences.h
View File

@ -64,6 +64,7 @@ private Q_SLOTS:
void openUserAgentManager(); void openUserAgentManager();
void openJsOptions(); void openJsOptions();
void openSearchEnginesManager(); void openSearchEnginesManager();
void openCertificateManager();
void openProtocolHandlersManager(); void openProtocolHandlersManager();
void searchFromAddressBarChanged(bool state); void searchFromAddressBarChanged(bool state);

445
src/lib/preferences/preferences.ui
View File

@ -2460,198 +2460,68 @@
</widget> </widget>
<widget class="QWidget" name="otherPage"> <widget class="QWidget" name="otherPage">
<layout class="QGridLayout" name="gridLayout_13"> <layout class="QGridLayout" name="gridLayout_13">
<item row="15" column="2"> <item row="4" column="0" colspan="6">
<widget class="MacToolButton" name="chooseUserStylesheet">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="9" column="0" colspan="4">
<widget class="QLabel" name="label_66">
<property name="text">
<string>&lt;b&gt;Manage search engines&lt;/b&gt;</string>
</property>
</widget>
</item>
<item row="13" column="0" colspan="4">
<widget class="QLabel" name="label_9">
<property name="text">
<string>&lt;b&gt;User Style Sheet&lt;/b&gt;</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<spacer name="horizontalSpacer_24">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="preferredLanguages">
<property name="text">
<string>Languages</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="7" column="0" colspan="4">
<widget class="QLabel" name="label_60">
<property name="text">
<string>&lt;b&gt;Change browser identification&lt;/b&gt;</string>
</property>
</widget>
</item>
<item row="12" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<spacer name="horizontalSpacer_28">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="protocolHandlers">
<property name="text">
<string>Protocol Handlers Manager</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_34">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="10" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_25">
<item>
<spacer name="horizontalSpacer_31">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="searchEngines">
<property name="text">
<string>Search Engines Manager</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_32">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="5" column="3">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="16" column="0">
<spacer name="verticalSpacer_15">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="14" column="0" colspan="4">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Style Sheet automatically loaded with all websites: </string>
</property>
</widget>
</item>
<item row="15" column="1">
<widget class="QLineEdit" name="userStyleSheet"/>
</item>
<item row="4" column="0" colspan="4">
<widget class="QLabel" name="label_36"> <widget class="QLabel" name="label_36">
<property name="text"> <property name="text">
<string>&lt;b&gt;Preferred language for web sites&lt;/b&gt;</string> <string>&lt;b&gt;Preferred language for web sites&lt;/b&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0" colspan="2"> <item row="16" column="0" colspan="6">
<widget class="QLabel" name="label_7">
<property name="text">
<string>&lt;b&gt;Manage protocol handlers&lt;/b&gt;</string>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="label_8">
<property name="text">
<string>&lt;b&gt;Certificate manager&lt;/b&gt;</string>
</property>
</widget>
</item>
<item row="12" column="0" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<spacer name="horizontalSpacer_35">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="certificateManager">
<property name="text">
<string>Certificate Manager</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_36">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="8" column="0" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_17"> <layout class="QHBoxLayout" name="horizontalLayout_17">
<item> <item>
<spacer name="horizontalSpacer_26"> <spacer name="horizontalSpacer_26">
@ -2691,13 +2561,210 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="11" column="0" colspan="4"> <item row="26" column="0">
<widget class="QLabel" name="label_7"> <spacer name="verticalSpacer_15">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="17" column="0" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<spacer name="horizontalSpacer_28">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="protocolHandlers">
<property name="text">
<string>Protocol Handlers Manager</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_34">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="9" column="0" colspan="6">
<widget class="QLabel" name="label_66">
<property name="text"> <property name="text">
<string>&lt;b&gt;Manage protocol handlers&lt;/b&gt;</string> <string>&lt;b&gt;Manage search engines&lt;/b&gt;</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="19" column="0" colspan="6">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Style Sheet automatically loaded with all websites: </string>
</property>
</widget>
</item>
<item row="10" column="0" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_25">
<item>
<spacer name="horizontalSpacer_31">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="searchEngines">
<property name="text">
<string>Search Engines Manager</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_32">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="5" column="5">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="18" column="0" colspan="6">
<widget class="QLabel" name="label_9">
<property name="text">
<string>&lt;b&gt;User Style Sheet&lt;/b&gt;</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<spacer name="horizontalSpacer_24">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="preferredLanguages">
<property name="text">
<string>Languages</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="7" column="0" colspan="6">
<widget class="QLabel" name="label_60">
<property name="text">
<string>&lt;b&gt;Change browser identification&lt;/b&gt;</string>
</property>
</widget>
</item>
<item row="21" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_13">
<item>
<spacer name="horizontalSpacer_37">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLineEdit" name="userStyleSheet"/>
</item>
<item>
<widget class="MacToolButton" name="chooseUserStylesheet">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>