Commit 36510691 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Use new api

parent b0f0337b
Pipeline #47312 canceled with stage
......@@ -67,7 +67,7 @@ option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE)
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets)
set(LIBGRAVATAR_VERSION "5.16.40")
set(MAILCOMMON_LIB_VERSION "5.16.40")
set(MESSAGELIB_LIB_VERSION "5.16.41")
set(MESSAGELIB_LIB_VERSION "5.16.42")
set(LIBKLEO_LIB_VERSION "5.16.40")
set(PIMCOMMON_LIB_VERSION "5.16.40")
set(LIBKDEPIM_LIB_VERSION "5.16.40")
......
......@@ -6,11 +6,11 @@
<rect>
<x>0</x>
<y>0</y>
<width>818</width>
<height>602</height>
<width>921</width>
<height>663</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox">
<property name="sizePolicy">
......@@ -22,8 +22,8 @@
<property name="title">
<string>HTML Messages</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="labelWarnHTML">
<property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum>
......@@ -39,7 +39,7 @@
</property>
</widget>
</item>
<item>
<item row="1" column="0">
<widget class="QCheckBox" name="mHtmlMailCheck">
<property name="whatsThis">
<string>&lt;qt&gt;&lt;p&gt;Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.&lt;/p&gt;&lt;p&gt;Displaying the HTML part makes the message look better, but at the same time increases the risk of security holes being exploited.&lt;/p&gt;&lt;p&gt;Displaying the plain text part loses much of the message's formatting, but makes it almost &lt;em&gt;impossible&lt;/em&gt; to exploit security holes in the HTML renderer (QtWebEngine).&lt;/p&gt;&lt;p&gt;The option below guards against one common misuse of HTML messages, but it cannot guard against security issues that were not known at the time this version of KMail was written.&lt;/p&gt;&lt;p&gt;It is therefore advisable to &lt;em&gt;not&lt;/em&gt; prefer HTML to plain text.&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; You can set this option on a per-folder basis from the &lt;i&gt;Folder&lt;/i&gt; menu of KMail's main window.&lt;/p&gt;&lt;/qt&gt;</string>
......@@ -49,7 +49,7 @@
</property>
</widget>
</item>
<item>
<item row="2" column="0">
<widget class="QCheckBox" name="mExternalReferences">
<property name="whatsThis">
<string>&lt;qt&gt;&lt;p&gt;Some mail advertisements are in HTML and contain references to, for example, images that the advertisers employ to find out that you have read their message (&amp;quot;web bugs&amp;quot;).&lt;/p&gt;&lt;p&gt;There is no valid reason to load images off the Internet like this, since the sender can always attach the required images directly to the message.&lt;/p&gt;&lt;p&gt;To guard from such a misuse of the HTML displaying feature of KMail, this option is &lt;em&gt;disabled&lt;/em&gt; by default.&lt;/p&gt;&lt;p&gt;However, if you wish to, for example, view images in HTML messages that were not attached to it, you can enable this option, but you should be aware of the possible problem.&lt;/p&gt;&lt;/qt&gt;</string>
......@@ -59,6 +59,26 @@
</property>
</widget>
</item>
<item row="2" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>312</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="2">
<widget class="QPushButton" name="mConfigureExternalReference">
<property name="text">
<string>Exceptions</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
......@@ -99,7 +119,30 @@
</widget>
</item>
<item>
<widget class="PimCommon::SimpleStringListEditor" name="scamWhiteList"/>
<widget class="PimCommon::SimpleStringListEditor" name="scamWhiteList" native="true"/>
</item>
</layout>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_5">
<property name="title">
<string>Safe Browsing</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="mCheckUrl">
<property name="text">
<string>Check URL With Phishing Google System</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="mCheckMailUrlTracking">
<property name="text">
<string>Scan emails for tracking URLs</string>
</property>
</widget>
</item>
</layout>
</widget>
......@@ -148,29 +191,6 @@
</layout>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_5">
<property name="title">
<string>Safe Browsing</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="mCheckUrl">
<property name="text">
<string>Check URL With Phishing Google System</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="mCheckMailUrlTracking">
<property name="text">
<string>Scan emails for tracking URLs</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<customwidgets>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment