1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00

Merge branch 'master' of github.com:QupZilla/qupzilla

This commit is contained in:
Mladen Pejaković 2013-01-29 15:02:46 +01:00
commit 7024e14592
28 changed files with 3366 additions and 3639 deletions

View File

@ -232,7 +232,7 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent)
QColor pbColor = settings.value("CustomProgressColor", p_QupZilla->palette().color(QPalette::Highlight)).value<QColor>();
setProgressBarColorIcon(pbColor);
connect(ui->customColorToolButton, SIGNAL(clicked(bool)), SLOT(selectCustomProgressBarColor()));
connect(ui->setProgressBarColorToHighlightButton, SIGNAL(clicked()), SLOT(setProgressBarColorIcon()));
connect(ui->resetProgressBarcolor, SIGNAL(clicked()), SLOT(setProgressBarColorIcon()));
settings.endGroup();
settings.beginGroup("SearchEngines");

View File

@ -849,87 +849,6 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showLoadingInAddressBar">
<property name="text">
<string>Show loading progress in address bar</string>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="adressProgressSettings" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_18">
<item>
<widget class="QComboBox" name="progressStyleSelector">
<item>
<property name="text">
<string>Fill</string>
</property>
</item>
<item>
<property name="text">
<string>Bottom</string>
</property>
</item>
<item>
<property name="text">
<string>Top</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxCustomProgressColor">
<property name="toolTip">
<string>If unchecked the bar will adapt to the background color.</string>
</property>
<property name="text">
<string>custom color:</string>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="progressBarColorSelector" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_19">
<item>
<widget class="QToolButton" name="customColorToolButton">
<property name="toolTip">
<string>Select color</string>
</property>
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="setProgressBarColorToHighlightButton">
<property name="toolTip">
<string>Many styles use Highlight color for the progressbar.</string>
</property>
<property name="text">
<string>set to &quot;Highlight&quot; color</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_9">
<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>
</widget>
</item>
<item>
<widget class="QCheckBox" name="selectAllOnFocus">
<property name="text">
@ -953,14 +872,130 @@
</item>
<item>
<widget class="QCheckBox" name="searchWithDefaultEngine">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled the default engine will be taken for searching without search shortcut in the address bar instead of the engine currently selected in the web search bar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Search with Default Engine</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_16">
<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>
<item>
<widget class="QCheckBox" name="showLoadingInAddressBar">
<property name="text">
<string>Show loading progress in address bar</string>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="adressProgressSettings" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_18">
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer">
<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="QComboBox" name="progressStyleSelector">
<item>
<property name="text">
<string>Fill</string>
</property>
</item>
<item>
<property name="text">
<string>Bottom</string>
</property>
</item>
<item>
<property name="text">
<string>Top</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkBoxCustomProgressColor">
<property name="text">
<string>Custom color:</string>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="progressBarColorSelector" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_19">
<property name="topMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QToolButton" name="customColorToolButton">
<property name="toolTip">
<string>Select color</string>
</property>
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="resetProgressBarcolor">
<property name="text">
<string>Reset</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_9">
<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>
</widget>
</item>
<item>
<spacer name="verticalSpacer_7">
<property name="orientation">

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1663,10 +1663,6 @@
<source>Close windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>If enabled, pages will be allowed to automatically open popup windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open popup windows</source>
<translation type="unfinished"></translation>
@ -2700,30 +2696,10 @@
<source>Top</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>If unchecked the bar will adapt to the background color.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>custom color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Many styles use Highlight color for the progressbar.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>set to &quot;Highlight&quot; color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled the default engine will be taken for searching without search shortcut in the address bar instead of the engine currently selected in the web search bar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search with Default Engine</source>
<translation type="unfinished"></translation>
@ -2816,6 +2792,14 @@
<source>HTML5 Permisions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Custom color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reset</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1689,10 +1689,6 @@
<source>Close windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>If enabled, pages will be allowed to automatically open popup windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open popup windows</source>
<translation type="unfinished"></translation>
@ -2771,30 +2767,10 @@
<source>Top</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>If unchecked the bar will adapt to the background color.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>custom color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Many styles use Highlight color for the progressbar.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>set to &quot;Highlight&quot; color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled the default engine will be taken for searching without search shortcut in the address bar instead of the engine currently selected in the web search bar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search with Default Engine</source>
<translation type="unfinished"></translation>
@ -2887,6 +2863,14 @@
<source>HTML5 Permisions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Custom color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reset</source>
<translation type="unfinished">بازنشاندن</translation>
</message>
</context>
<context>
<name>QObject</name>

File diff suppressed because it is too large Load Diff

View File

@ -1685,10 +1685,6 @@
<source>Close windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>If enabled, pages will be allowed to automatically open popup windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open popup windows</source>
<translation type="unfinished"></translation>
@ -2763,30 +2759,10 @@
<source>Top</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>If unchecked the bar will adapt to the background color.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>custom color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Many styles use Highlight color for the progressbar.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>set to &quot;Highlight&quot; color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled the default engine will be taken for searching without search shortcut in the address bar instead of the engine currently selected in the web search bar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search with Default Engine</source>
<translation type="unfinished"></translation>
@ -2879,6 +2855,14 @@
<source>HTML5 Permisions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Custom color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reset</source>
<translation type="unfinished">Alapértelmezett nagyítási arány visszaállítása</translation>
</message>
</context>
<context>
<name>QObject</name>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1715,10 +1715,6 @@
<source>Close windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>If enabled, pages will be allowed to automatically open popup windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open popup windows</source>
<translation type="unfinished"></translation>
@ -2830,11 +2826,11 @@
</message>
<message>
<source>If unchecked the bar will adapt to the background color.</source>
<translation></translation>
<translation type="obsolete"></translation>
</message>
<message>
<source>custom color:</source>
<translation>:</translation>
<translation type="obsolete">:</translation>
</message>
<message>
<source>Select color</source>
@ -2842,15 +2838,15 @@
</message>
<message>
<source>Many styles use Highlight color for the progressbar.</source>
<translation>使</translation>
<translation type="obsolete">使</translation>
</message>
<message>
<source>set to &quot;Highlight&quot; color</source>
<translation></translation>
<translation type="obsolete"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled the default engine will be taken for searching without search shortcut in the address bar instead of the engine currently selected in the web search bar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
<translation type="obsolete">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message>
<message>
<source>Search with Default Engine</source>
@ -2945,6 +2941,14 @@
<source>HTML5 Permisions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Custom color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reset</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>

View File

@ -1685,10 +1685,6 @@
<source>Close windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>If enabled, pages will be allowed to automatically open popup windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open popup windows</source>
<translation type="unfinished"></translation>
@ -2763,30 +2759,10 @@
<source>Top</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>If unchecked the bar will adapt to the background color.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>custom color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Many styles use Highlight color for the progressbar.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>set to &quot;Highlight&quot; color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled the default engine will be taken for searching without search shortcut in the address bar instead of the engine currently selected in the web search bar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search with Default Engine</source>
<translation type="unfinished"></translation>
@ -2879,6 +2855,14 @@
<source>HTML5 Permisions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Custom color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reset</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1685,10 +1685,6 @@ nu a putut fi găsit!</translation>
<source>Close windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>If enabled, pages will be allowed to automatically open popup windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open popup windows</source>
<translation type="unfinished"></translation>
@ -2765,30 +2761,10 @@ nu a putut fi găsit!</translation>
<source>Top</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>If unchecked the bar will adapt to the background color.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>custom color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Many styles use Highlight color for the progressbar.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>set to &quot;Highlight&quot; color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled the default engine will be taken for searching without search shortcut in the address bar instead of the engine currently selected in the web search bar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search with Default Engine</source>
<translation type="unfinished"></translation>
@ -2881,6 +2857,14 @@ nu a putut fi găsit!</translation>
<source>HTML5 Permisions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Custom color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reset</source>
<translation type="unfinished">Resetează</translation>
</message>
</context>
<context>
<name>QObject</name>

File diff suppressed because it is too large Load Diff

View File

@ -1689,10 +1689,6 @@
<source>Close windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>If enabled, pages will be allowed to automatically open popup windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open popup windows</source>
<translation type="unfinished"></translation>
@ -2771,30 +2767,10 @@
<source>Top</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>If unchecked the bar will adapt to the background color.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>custom color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Many styles use Highlight color for the progressbar.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>set to &quot;Highlight&quot; color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled the default engine will be taken for searching without search shortcut in the address bar instead of the engine currently selected in the web search bar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search with Default Engine</source>
<translation>Vyhľadávať pomocou predvoleného prehliadača</translation>
@ -2887,6 +2863,14 @@
<source>HTML5 Permisions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Custom color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reset</source>
<translation type="unfinished">Resetovať</translation>
</message>
</context>
<context>
<name>QObject</name>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1691,10 +1691,6 @@
<source>Close windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>If enabled, pages will be allowed to automatically open popup windows</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open popup windows</source>
<translation type="unfinished"></translation>
@ -2773,30 +2769,10 @@
<source>Top</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>If unchecked the bar will adapt to the background color.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>custom color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Select color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Many styles use Highlight color for the progressbar.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>set to &quot;Highlight&quot; color</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If enabled the default engine will be taken for searching without search shortcut in the address bar instead of the engine currently selected in the web search bar.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Search with Default Engine</source>
<translation type="unfinished"></translation>
@ -2889,6 +2865,14 @@
<source>HTML5 Permisions</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Custom color:</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Reset</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QObject</name>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff