Mercurial Repositories > eric / changeset

--- a/src/eric7/WebBrowser/Network/EricSchemeHandler.py	Sat Jan 07 16:59:19 2023 +0100
+++ b/src/eric7/WebBrowser/Network/EricSchemeHandler.py	Sat Jan 07 19:16:55 2023 +0100
@@ -251,7 +251,7 @@
             page = page.replace("@URL@", self.tr("URL"))
             page = page.replace("@TITLE@", self.tr("Title"))
             page = page.replace("@APPLY@", self.tr("Apply"))
-            page = page.replace("@CLOSE@", self.tr("Close"))
+            page = page.replace("@CANCEL@", self.tr("Cancel"))
             page = page.replace("@NEW-PAGE@", self.tr("New Page"))
             page = page.replace("@TITLE-EDIT@", self.tr("Edit"))
             page = page.replace("@TITLE-REMOVE@", self.tr("Remove"))

--- a/src/eric7/WebBrowser/WebBrowserView.py	Sat Jan 07 16:59:19 2023 +0100
+++ b/src/eric7/WebBrowser/WebBrowserView.py	Sat Jan 07 19:16:55 2023 +0100
@@ -2087,19 +2087,19 @@
         """
         Private slot to add a new speed dial.
         """
-        self.__page.runJavaScript("addSpeedDial();", WebBrowserPage.SafeJsWorld)
+        self.__page.runJavaScript("addSpeedDial();", WebBrowserPage.UnsafeJsWorld)
 
     def __configureSpeedDial(self):
         """
         Private slot to configure the speed dial.
         """
-        self.page().runJavaScript("configureSpeedDial();", WebBrowserPage.SafeJsWorld)
+        self.page().runJavaScript("configureSpeedDial();", WebBrowserPage.UnsafeJsWorld)
 
     def __reloadAllSpeedDials(self):
         """
         Private slot to reload all speed dials.
         """
-        self.page().runJavaScript("reloadAll();", WebBrowserPage.SafeJsWorld)
+        self.page().runJavaScript("reloadAll();", WebBrowserPage.UnsafeJsWorld)
 
     def __resetSpeedDials(self):
         """

--- a/src/eric7/WebBrowser/data/html/speeddialPage.html	Sat Jan 07 16:59:19 2023 +0100
+++ b/src/eric7/WebBrowser/data/html/speeddialPage.html	Sat Jan 07 19:16:55 2023 +0100
@@ -307,7 +307,7 @@
                      '<tr><td></td><td><input type="checkbox" id="fetchTitle" onclick="onFetchTitleClick(this)">' +
                      '<label for="fetchTitle">  ' + TITLE_FETCHTITLE + ' </label></td></tr>' +
                      '</table><p class="buttonbox">' +
-                     '<input type="button" value=" @CLOSE@ " onClick="hideEditBox();">' +
+                     '<input type="button" value=" @CANCEL@ " onClick="hideEditBox();">' +
                      '<input type="button" value="   ' + EDIT + '   " onClick="boxEdited()"></p>' +
                      '</div></div>');
 
@@ -546,7 +546,7 @@
     $('#PgInRow').val(MAX_PAGES_ROW);
     $('#sliderValuePg').html(MAX_PAGES_ROW);
     $('#SdSize').val(DIAL_WIDTH);
-    $('#SdSizeToggle').prop('checked', DIAL_WIDTH != 231);
+    $('#SdSizeToggle').prop('checked', DIAL_WIDTH != 240);
     $('#sliderValueSd').html(DIAL_WIDTH);
     $('#SdSizeToggle').is(':checked') ? $('#SdSize').removeAttr('disabled') : $('#SdSize').attr('disabled', 'disabled');
 
@@ -600,6 +600,13 @@
                 emitChanged(allPages());
             }
         });
+
+      document.getElementById("PgInRow").oninput = function() {
+          $('#sliderValuePg').html(this.value);
+      };
+      document.getElementById("SdSize").oninput = function() {
+          $('#sliderValueSd').html(this.value);
+      };
     }
 
     </script>
@@ -609,19 +616,19 @@
           <label for="PgInRow">@TXT_NRROWS@</label>
         </div>
         <div class="rowsel">
-          <span id="sliderValuePg">@ROW-PAGES@</span>
-          <input id="PgInRow" type="range" min="2" max="8" value="@ROW-PAGES@" step="1" onchange="$('#sliderValuePg').html(this.value);" />
+          <span id="sliderValuePg"></span>
+          <input id="PgInRow" type="range" min="2" max="10" step="1" />
         </div>
         <div class="togop">
           <input type="checkbox" name="sdsizet" id="SdSizeToggle" onchange="sdSizeToggle()" />&nbsp;<label for="SdSizeToggle">@TXT_SDSIZE@</label>
         </div>
         <div class="rowsel">
-          <span id="sliderValueSd">@SD-SIZE@</span>
-          <input id="SdSize" type="range" min="145" max="360" value="@SD-SIZE@" step="1" onchange="$('#sliderValueSd').html(this.value);" />
+          <span id="sliderValueSd"></span>
+          <input id="SdSize" type="range" min="100" max="500" step="1" />
         </div>
         <div class="content">
           <p class="buttonbox">
-            <input type="button" value=" @CLOSE@ " onClick="$('#fadeOverlay2').fadeOut('slow');" />
+            <input type="button" value=" @CANCEL@ " onClick="$('#fadeOverlay2').fadeOut('slow');" />
             <input type="button" value="   @APPLY@   " onClick="saveSettings();$('#fadeOverlay2').fadeOut('slow');"/>
           </p>
         </div>

Binary file src/eric7/WebBrowser/data/icons/close.png has changed

Binary file src/eric7/WebBrowser/data/icons/edit.png has changed

Binary file src/eric7/WebBrowser/data/icons/plus.png has changed

Binary file src/eric7/WebBrowser/data/icons/reload.png has changed

Binary file src/eric7/WebBrowser/data/icons/setting.png has changed