diff --git a/src/data/html/speeddial.html b/src/data/html/speeddial.html index b3b7165c0..c18bbe397 100644 --- a/src/data/html/speeddial.html +++ b/src/data/html/speeddial.html @@ -33,7 +33,7 @@ span.reload:hover {border-color: grey; border-radius: 4px;} .formTable input[type="text"] {width: 100%;-webkit-user-select: auto;} .sett {position: absolute;right:36px;top:10px;width: 24px;height: 24px;background: url(%IMG_SETTINGS%); cursor: pointer;} -#settingsBox {position: absolute;right:58px;top:25px;width: 240px;height: 135px;background: #eeeeee;margin: 5px;-webkit-box-shadow: 0 0 6px 6px#888;box-shadow: 0 0 6px 6px #888;border-radius: 15px;display: none;padding:8px 20px;border: 1px solid transparent;} +#settingsBox {position: absolute;right:58px;top:25px;width: 245px;height: 165px;background: #eeeeee;margin: 5px;-webkit-box-shadow: 0 0 6px 6px#888;box-shadow: 0 0 6px 6px #888;border-radius: 15px;display: none;padding:8px 20px;border: 1px solid transparent;} #settingsBox .title {margin-bottom: 1px;padding-bottom:2px;} #settingsBox .content {float:right;} #settingsBox .thumbhold {margin: 2px;padding: 1px;border-radius: 10px;text-align:center;width: 100px; height: 100px;background: #AAA;} @@ -42,6 +42,10 @@ span.reload:hover {border-color: grey; border-radius: 4px;} #settingsBox p select {margin: 2px;padding: 1px;text-align: center;width: 100px;} #settingsBox p select option {text-align: center;} #settingsBox .button {margin: 2px;padding: 1px;text-align:center;width: 100px;} +#settingsBox .rowsel {margin: 2px;padding: 1px;border-bottom: 1px solid #888;} +#settingsBox .rowsel label {width: 130px;white-space: nowrap;} +#settingsBox .rowsel input {text-align:center;width: 75px;margin-bottom: 6px;margin-right: 4px;float: right;} +#settingsBox .rowsel span {font-weight: bold;text-align: center;float: right;margin-left: 2px;} @@ -299,6 +303,7 @@ function checkSet() { checkb.checked = (bgImg == '' ? false : true); BgImgSel.disabled = (bgImg == '' ? true : false); BgImgSz.disabled = (bgImg == '' ? true : false); + BgImgSz.selectedIndex } function bgImageSel() { @@ -311,8 +316,10 @@ function bgImageSel() { function saveSettings() { var BgImg = document.getElementById('BgImgHold').value; var BgImgSz = document.getElementById('BgImgSelSiz').value; + var PgInRow = document.getElementById('PgInRow').value; speeddial.setBackgroundImage(BgImg); speeddial.setBackgroundImageSize(BgImgSz); + speeddial.setPagesInRow(PgInRow); } function bgImgToggle() { @@ -372,6 +379,11 @@ $("#quickdial").sortable({ });
+
+ %ROW-PAGES% +   + +
 

diff --git a/src/network/qupzillaschemehandler.cpp b/src/network/qupzillaschemehandler.cpp index 4bbae27e7..dbd80ec7b 100644 --- a/src/network/qupzillaschemehandler.cpp +++ b/src/network/qupzillaschemehandler.cpp @@ -267,6 +267,7 @@ QString QupZillaSchemeReply::speeddialPage() dPage.replace("%TXT_FHEIGHT%", tr("Fit Height")); dPage.replace("%TXT_NOTE%", tr("Use background image")); dPage.replace("%TXT_SELECTIMAGE%", tr("Select image")); + dPage.replace("%TXT_NRROWS%", tr("Max dials in row:")); } QString page = dPage;