Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/WebBrowserPage.ui	Thu Jan 25 11:54:38 2018 +0100
+++ b/Preferences/ConfigurationPages/WebBrowserPage.ui	Thu Jan 25 13:42:27 2018 +0100
@@ -10,7 +10,7 @@
     <height>2000</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout_5">
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
@@ -374,7 +374,7 @@
      <property name="title">
       <string>Privacy</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
+     <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <widget class="QGroupBox" name="javaScriptGroup">
         <property name="toolTip">
@@ -383,14 +383,24 @@
         <property name="title">
          <string>JavaScript</string>
         </property>
-        <layout class="QVBoxLayout" name="verticalLayout_5">
+        <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
           <widget class="QCheckBox" name="jsOpenWindowsCheckBox">
            <property name="toolTip">
             <string>Select to allow JavaScript to open windows</string>
            </property>
            <property name="text">
-            <string>JavaScript can open windows</string>
+            <string>Allow to open windows</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="jsActivateWindowsCheckBox">
+           <property name="toolTip">
+            <string>Select to allow JavaScript to activate windows</string>
+           </property>
+           <property name="text">
+            <string>Allow to activate windows</string>
            </property>
           </widget>
          </item>
@@ -400,7 +410,7 @@
             <string>Select to allow JavaScript to access the clipboard</string>
            </property>
            <property name="text">
-            <string>JavaScript can access clipboard</string>
+            <string>Allow to access the clipboard</string>
            </property>
           </widget>
          </item>
@@ -479,8 +489,8 @@
      <property name="title">
       <string>Security</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_9">
-      <item row="0" column="0">
+     <layout class="QVBoxLayout" name="verticalLayout_4">
+      <item>
        <widget class="QCheckBox" name="xssAuditingCheckBox">
         <property name="toolTip">
          <string>Select to enable XSS auditing</string>
@@ -494,7 +504,7 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
+      <item>
        <widget class="QCheckBox" name="insecureContentsCheckBox">
         <property name="toolTip">
          <string>Select to allow HTTPS pages to run JavaScript, CSS, plugins or web-sockets from HTTP URLs</string>
@@ -504,6 +514,16 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="insecureGeolocationCheckBox">
+        <property name="toolTip">
+         <string>Select to allow insecure origins (i.e. those not having an https:// URL) to request Geolocation features.</string>
+        </property>
+        <property name="text">
+         <string>Allow insecure origins to access Geolocation</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
@@ -941,6 +961,7 @@
   <tabstop>sessionTimerSpinBox</tabstop>
   <tabstop>defaultSchemeCombo</tabstop>
   <tabstop>jsOpenWindowsCheckBox</tabstop>
+  <tabstop>jsActivateWindowsCheckBox</tabstop>
   <tabstop>jsClipboardCheckBox</tabstop>
   <tabstop>pluginsCheckBox</tabstop>
   <tabstop>doNotTrackCheckBox</tabstop>
@@ -948,6 +969,7 @@
   <tabstop>refererWhitelistButton</tabstop>
   <tabstop>xssAuditingCheckBox</tabstop>
   <tabstop>insecureContentsCheckBox</tabstop>
+  <tabstop>insecureGeolocationCheckBox</tabstop>
   <tabstop>expireHistory</tabstop>
   <tabstop>diskCacheCheckBox</tabstop>
   <tabstop>cacheSizeSpinBox</tabstop>