mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 10:46:35 +01:00
Fixed building & added plugins translations into resources.
- removed obsolete "Dont save icons" entry in preferences
This commit is contained in:
parent
02d3f2ceea
commit
9ed4a89ca0
@ -21,6 +21,7 @@
|
|||||||
#include "speeddial.h"
|
#include "speeddial.h"
|
||||||
#include "settings.h"
|
#include "settings.h"
|
||||||
|
|
||||||
|
#include <iostream>
|
||||||
#include <QPluginLoader>
|
#include <QPluginLoader>
|
||||||
#include <QDir>
|
#include <QDir>
|
||||||
|
|
||||||
|
@ -1017,30 +1017,23 @@
|
|||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0" colspan="2">
|
<item row="2" column="0" colspan="2">
|
||||||
<layout class="QGridLayout" name="gridLayout_3">
|
<layout class="QGridLayout" name="gridLayout_3">
|
||||||
<item row="0" column="0" colspan="3">
|
<item row="0" column="0" colspan="3">
|
||||||
<widget class="QCheckBox" name="storeIcons">
|
|
||||||
<property name="text">
|
|
||||||
<string>Allow storing web icons</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item row="1" column="0" colspan="3">
|
|
||||||
<widget class="QCheckBox" name="saveHistory">
|
<widget class="QCheckBox" name="saveHistory">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Allow saving history</string>
|
<string>Allow saving history</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="1">
|
<item row="1" column="1">
|
||||||
<widget class="QCheckBox" name="deleteHistoryOnClose">
|
<widget class="QCheckBox" name="deleteHistoryOnClose">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Delete history on close</string>
|
<string>Delete history on close</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="0">
|
<item row="1" column="0">
|
||||||
<spacer name="horizontalSpacer_4">
|
<spacer name="horizontalSpacer_4">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
@ -1056,21 +1049,21 @@
|
|||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item row="3" column="0" colspan="3">
|
<item row="2" column="0" colspan="3">
|
||||||
<widget class="QCheckBox" name="html5storage">
|
<widget class="QCheckBox" name="html5storage">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Allow local storage of HTML5 web content</string>
|
<string>Allow local storage of HTML5 web content</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="4" column="1">
|
<item row="3" column="1">
|
||||||
<widget class="QCheckBox" name="deleteHtml5storageOnClose">
|
<widget class="QCheckBox" name="deleteHtml5storageOnClose">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Delete locally stored HTML5 web content on close</string>
|
<string>Delete locally stored HTML5 web content on close</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="2">
|
<item row="1" column="2">
|
||||||
<spacer name="horizontalSpacer_21">
|
<spacer name="horizontalSpacer_21">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Horizontal</enum>
|
<enum>Qt::Horizontal</enum>
|
||||||
@ -1083,7 +1076,7 @@
|
|||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
<item row="4" column="2">
|
<item row="3" column="2">
|
||||||
<widget class="QPushButton" name="deleteHtml5storage">
|
<widget class="QPushButton" name="deleteHtml5storage">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||||
@ -1098,7 +1091,7 @@
|
|||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="0">
|
<item row="3" column="0">
|
||||||
<spacer name="verticalSpacer_11">
|
<spacer name="verticalSpacer_11">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
<enum>Qt::Vertical</enum>
|
<enum>Qt::Vertical</enum>
|
||||||
@ -1111,6 +1104,22 @@
|
|||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
|
<item row="1" column="0" colspan="2">
|
||||||
|
<spacer name="verticalSpacer">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeType">
|
||||||
|
<enum>QSizePolicy::Fixed</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>20</width>
|
||||||
|
<height>10</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QWidget" name="tab_3">
|
<widget class="QWidget" name="tab_3">
|
||||||
@ -2235,7 +2244,6 @@
|
|||||||
<tabstop>showBackForward</tabstop>
|
<tabstop>showBackForward</tabstop>
|
||||||
<tabstop>allowCache</tabstop>
|
<tabstop>allowCache</tabstop>
|
||||||
<tabstop>cacheMB</tabstop>
|
<tabstop>cacheMB</tabstop>
|
||||||
<tabstop>storeIcons</tabstop>
|
|
||||||
<tabstop>saveHistory</tabstop>
|
<tabstop>saveHistory</tabstop>
|
||||||
<tabstop>proxyType</tabstop>
|
<tabstop>proxyType</tabstop>
|
||||||
<tabstop>deleteHistoryOnClose</tabstop>
|
<tabstop>deleteHistoryOnClose</tabstop>
|
||||||
|
@ -20,9 +20,11 @@ RESOURCES = akn_res.qrc
|
|||||||
TRANSLATIONS = \
|
TRANSLATIONS = \
|
||||||
translations/cs_CZ.ts \
|
translations/cs_CZ.ts \
|
||||||
translations/de_DE.ts \
|
translations/de_DE.ts \
|
||||||
|
translations/el_GR.ts \
|
||||||
translations/id_ID.ts \
|
translations/id_ID.ts \
|
||||||
translations/ja_JP.ts \
|
translations/ja_JP.ts \
|
||||||
translations/nl_NL.ts \
|
translations/nl_NL.ts \
|
||||||
|
translations/ro_RO.ts \
|
||||||
translations/sr_BA.ts \
|
translations/sr_BA.ts \
|
||||||
translations/sr_RS.ts \
|
translations/sr_RS.ts \
|
||||||
translations/sv_SE.ts \
|
translations/sv_SE.ts \
|
||||||
|
@ -4,9 +4,11 @@
|
|||||||
<file>data/copyright</file>
|
<file>data/copyright</file>
|
||||||
<file>locale/cs_CZ.qm</file>
|
<file>locale/cs_CZ.qm</file>
|
||||||
<file>locale/de_DE.qm</file>
|
<file>locale/de_DE.qm</file>
|
||||||
|
<file>locale/el_GR.qm</file>
|
||||||
<file>locale/id_ID.qm</file>
|
<file>locale/id_ID.qm</file>
|
||||||
<file>locale/ja_JP.qm</file>
|
<file>locale/ja_JP.qm</file>
|
||||||
<file>locale/nl_NL.qm</file>
|
<file>locale/nl_NL.qm</file>
|
||||||
|
<file>locale/ro_RO.qm</file>
|
||||||
<file>locale/sr_BA.qm</file>
|
<file>locale/sr_BA.qm</file>
|
||||||
<file>locale/sr_RS.qm</file>
|
<file>locale/sr_RS.qm</file>
|
||||||
<file>locale/sv_SE.qm</file>
|
<file>locale/sv_SE.qm</file>
|
||||||
|
@ -28,9 +28,11 @@ RESOURCES = mousegestures.qrc
|
|||||||
TRANSLATIONS = \
|
TRANSLATIONS = \
|
||||||
translations/cs_CZ.ts \
|
translations/cs_CZ.ts \
|
||||||
translations/de_DE.ts \
|
translations/de_DE.ts \
|
||||||
|
translations/el_GR.ts \
|
||||||
translations/id_ID.ts \
|
translations/id_ID.ts \
|
||||||
translations/ja_JP.ts \
|
translations/ja_JP.ts \
|
||||||
translations/nl_NL.ts \
|
translations/nl_NL.ts \
|
||||||
|
translations/ro_RO.ts \
|
||||||
translations/sk_SK.ts \
|
translations/sk_SK.ts \
|
||||||
translations/sr_BA.ts \
|
translations/sr_BA.ts \
|
||||||
translations/sr_RS.ts \
|
translations/sr_RS.ts \
|
||||||
|
@ -14,9 +14,11 @@
|
|||||||
<file>data/copyright</file>
|
<file>data/copyright</file>
|
||||||
<file>locale/cs_CZ.qm</file>
|
<file>locale/cs_CZ.qm</file>
|
||||||
<file>locale/de_DE.qm</file>
|
<file>locale/de_DE.qm</file>
|
||||||
|
<file>locale/el_GR.qm</file>
|
||||||
<file>locale/id_ID.qm</file>
|
<file>locale/id_ID.qm</file>
|
||||||
<file>locale/ja_JP.qm</file>
|
<file>locale/ja_JP.qm</file>
|
||||||
<file>locale/nl_NL.qm</file>
|
<file>locale/nl_NL.qm</file>
|
||||||
|
<file>locale/ro_RO.qm</file>
|
||||||
<file>locale/sk_SK.qm</file>
|
<file>locale/sk_SK.qm</file>
|
||||||
<file>locale/sr_BA.qm</file>
|
<file>locale/sr_BA.qm</file>
|
||||||
<file>locale/sr_RS.qm</file>
|
<file>locale/sr_RS.qm</file>
|
||||||
|
@ -16,7 +16,9 @@ TRANSLATIONS += translations/cs_CZ.ts\
|
|||||||
translations/de_DE.ts\
|
translations/de_DE.ts\
|
||||||
translations/el_GR.ts\
|
translations/el_GR.ts\
|
||||||
translations/id_ID.ts\
|
translations/id_ID.ts\
|
||||||
|
translations/ja_JP.ts\
|
||||||
translations/nl_NL.ts\
|
translations/nl_NL.ts\
|
||||||
|
translations/ro_RO.ts\
|
||||||
translations/sk_SK.ts\
|
translations/sk_SK.ts\
|
||||||
translations/sr_BA.ts\
|
translations/sr_BA.ts\
|
||||||
translations/sr_RS.ts\
|
translations/sr_RS.ts\
|
||||||
|
@ -4,7 +4,9 @@
|
|||||||
<file>locale/de_DE.qm</file>
|
<file>locale/de_DE.qm</file>
|
||||||
<file>locale/el_GR.qm</file>
|
<file>locale/el_GR.qm</file>
|
||||||
<file>locale/id_ID.qm</file>
|
<file>locale/id_ID.qm</file>
|
||||||
|
<file>locale/ja_JP.qm</file>
|
||||||
<file>locale/nl_NL.qm</file>
|
<file>locale/nl_NL.qm</file>
|
||||||
|
<file>locale/ro_RO.qm</file>
|
||||||
<file>locale/sk_SK.qm</file>
|
<file>locale/sk_SK.qm</file>
|
||||||
<file>locale/sr_BA.qm</file>
|
<file>locale/sr_BA.qm</file>
|
||||||
<file>locale/sr_RS.qm</file>
|
<file>locale/sr_RS.qm</file>
|
||||||
|
Loading…
Reference in New Issue
Block a user