diff options
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/settings_webkit.ui | 85 | ||||
| -rw-r--r-- | src/settings/settingsdialog.cpp | 3 | 
2 files changed, 48 insertions, 40 deletions
| diff --git a/src/settings/settings_webkit.ui b/src/settings/settings_webkit.ui index e424fd9c..f2e616c8 100644 --- a/src/settings/settings_webkit.ui +++ b/src/settings/settings_webkit.ui @@ -6,8 +6,8 @@     <rect>      <x>0</x>      <y>0</y> -    <width>437</width> -    <height>346</height> +    <width>643</width> +    <height>560</height>     </rect>    </property>    <layout class="QVBoxLayout" name="verticalLayout"> @@ -17,99 +17,106 @@        <string>WebKit Settings</string>       </property>       <layout class="QGridLayout" name="gridLayout"> -      <item row="0" column="0" colspan="2"> +      <item row="0" column="0">         <widget class="QCheckBox" name="kcfg_autoLoadImages">          <property name="text">           <string>Autoload images</string>          </property>         </widget>        </item> -      <item row="0" column="3"> +      <item row="0" column="1" rowspan="7"> +       <widget class="Line" name="line"> +        <property name="sizePolicy"> +         <sizepolicy hsizetype="Expanding" vsizetype="Minimum"> +          <horstretch>0</horstretch> +          <verstretch>0</verstretch> +         </sizepolicy> +        </property> +        <property name="orientation"> +         <enum>Qt::Vertical</enum> +        </property> +       </widget> +      </item> +      <item row="0" column="2">         <widget class="QCheckBox" name="kcfg_linksIncludedInFocusChain">          <property name="text">           <string>Links included in focus chain</string>          </property>         </widget>        </item> -      <item row="1" column="0" colspan="2"> -       <widget class="QCheckBox" name="kcfg_javascriptEnabled"> -        <property name="sizePolicy"> -         <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> -          <horstretch>0</horstretch> -          <verstretch>0</verstretch> -         </sizepolicy> -        </property> +      <item row="1" column="0"> +       <widget class="QCheckBox" name="kcfg_dnsPrefetch">          <property name="text"> -         <string>JavaScript support</string> +         <string>prefetch DNS entries</string>          </property>         </widget>        </item> -      <item row="1" column="3"> +      <item row="1" column="2">         <widget class="QCheckBox" name="kcfg_zoomTextOnly">          <property name="text">           <string>Zoom text only</string>          </property>         </widget>        </item> -      <item row="2" column="0" colspan="2"> -       <widget class="QCheckBox" name="kcfg_javaEnabled"> +      <item row="2" column="0"> +       <widget class="QCheckBox" name="kcfg_javascriptEnabled"> +        <property name="sizePolicy"> +         <sizepolicy hsizetype="Minimum" vsizetype="Fixed"> +          <horstretch>0</horstretch> +          <verstretch>0</verstretch> +         </sizepolicy> +        </property>          <property name="text"> -         <string>Java support</string> +         <string>JavaScript support</string>          </property>         </widget>        </item> -      <item row="2" column="3"> +      <item row="2" column="2">         <widget class="QCheckBox" name="kcfg_printElementBackgrounds">          <property name="text">           <string>Print element backgrounds</string>          </property>         </widget>        </item> -      <item row="3" column="3"> +      <item row="4" column="2">         <widget class="QCheckBox" name="kcfg_offlineStorageDatabaseEnabled">          <property name="text">           <string>Offline storage database</string>          </property>         </widget>        </item> -      <item row="4" column="3"> -       <widget class="QCheckBox" name="kcfg_offlineWebApplicationCacheEnabled"> +      <item row="3" column="0" rowspan="2"> +       <widget class="QCheckBox" name="kcfg_javaEnabled">          <property name="text"> -         <string>Offline web application cache</string> +         <string>Java support</string>          </property>         </widget>        </item> -      <item row="5" column="3"> -       <widget class="QCheckBox" name="kcfg_localStorageDatabaseEnabled"> +      <item row="5" column="0"> +       <widget class="QCheckBox" name="kcfg_javascriptCanOpenWindows">          <property name="text"> -         <string>Local storage database</string> +         <string>JavaScript can open windows</string>          </property>         </widget>        </item> -      <item row="3" column="0"> -       <widget class="QCheckBox" name="kcfg_javascriptCanOpenWindows"> +      <item row="5" column="2"> +       <widget class="QCheckBox" name="kcfg_offlineWebApplicationCacheEnabled">          <property name="text"> -         <string>JavaScript can open windows</string> +         <string>Offline web application cache</string>          </property>         </widget>        </item> -      <item row="4" column="0"> +      <item row="6" column="0">         <widget class="QCheckBox" name="kcfg_javascriptCanAccessClipboard">          <property name="text">           <string>JavaScript can access clipboard</string>          </property>         </widget>        </item> -      <item row="0" column="2" rowspan="6"> -       <widget class="Line" name="line"> -        <property name="sizePolicy"> -         <sizepolicy hsizetype="Expanding" vsizetype="Minimum"> -          <horstretch>0</horstretch> -          <verstretch>0</verstretch> -         </sizepolicy> -        </property> -        <property name="orientation"> -         <enum>Qt::Vertical</enum> +      <item row="6" column="2"> +       <widget class="QCheckBox" name="kcfg_localStorageEnabled"> +        <property name="text"> +         <string>Local Storage</string>          </property>         </widget>        </item> diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp index b5add779..2f52a8c2 100644 --- a/src/settings/settingsdialog.cpp +++ b/src/settings/settingsdialog.cpp @@ -175,6 +175,7 @@ SettingsDialog::~SettingsDialog()  void SettingsDialog::setWebSettingsToolTips()  {      d->webkitUi.kcfg_autoLoadImages->setToolTip(i18n("Specifies whether images are automatically loaded in web pages.")); +    d->webkitUi.kcfg_dnsPrefetch->setToolTip( i18n("Specifies whether WebKit will try to pre-fetch DNS entries to speed up browsing.") );      d->webkitUi.kcfg_javascriptEnabled->setToolTip(i18n("Enables the execution of JavaScript programs."));      d->webkitUi.kcfg_javaEnabled->setToolTip(i18n("Enables support for Java applets."));      d->webkitUi.kcfg_pluginsEnabled->setToolTip(i18n("Enables support for plugins in web pages.")); @@ -185,7 +186,7 @@ void SettingsDialog::setWebSettingsToolTips()      d->webkitUi.kcfg_printElementBackgrounds->setToolTip(i18n("If enabled, background colors and images are also drawn when the page is printed."));      d->webkitUi.kcfg_offlineStorageDatabaseEnabled->setToolTip(i18n("Enables support for the HTML 5 offline storage feature."));      d->webkitUi.kcfg_offlineWebApplicationCacheEnabled->setToolTip(i18n("Enables support for the HTML 5 web application cache feature.")); -    d->webkitUi.kcfg_localStorageDatabaseEnabled->setToolTip(i18n("Enables support for the HTML 5 local storage feature.")); +    d->webkitUi.kcfg_localStorageEnabled->setToolTip(i18n("Enables support for the HTML 5 local storage feature."));  } | 
