Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

Merge pull request #194 from pejakm/master

Browse Source 
Number of pages in a row slider in Speed Dial Settings
This commit is contained in:
David Rosca 2012-01-18 22:55:25 -08:00
commit f29bab10c6
19 changed files with 88 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/locale/sr_BA.qm
View File

Binary file not shown.

BIN
bin/locale/sr_RS.qm
View File

Binary file not shown.

14
src/data/html/speeddial.html
View File

@ -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: auto;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;}
#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;}
</style>
<script type="text/javascript" src="%JQUERY%"></script>
<script type="text/javascript" src="%JQUERY-UI%"></script>
@ -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({
});
</script>
<div id="settingsBox">
<div class="rowsel">
<span id="sliderValue">%ROW-PAGES%</span>
<input id="PgInRow" type="range" min="2" max="8" value="%ROW-PAGES%" step="1" onchange="document.getElementById('sliderValue').innerHTML = this.value;" />
<label for="PgInRow">%TXT_NRROWS%</label>
</div>
<div class="title"><input type="checkbox" name="sdbackimg" id="BgImgToggle" onchange="bgImgToggle();bgImgUpdate()" />&nbsp;<label for="BgImgToggle">%TXT_NOTE%</label></div>
<div class="content">
<p>

1
src/network/qupzillaschemehandler.cpp
View File

@ -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;

5
translations/cs_CZ.ts
View File

@ -3321,6 +3321,11 @@ nebyl nalezen!</translation>
<source>Select image</source>
<translation>Zvolit obrázek</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="270"/>
<source>Max dials in row:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>Load title from page</source>

5
translations/de_DE.ts
View File

@ -3368,6 +3368,11 @@
<source>Select image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="270"/>
<source>Max dials in row:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RSSManager</name>

5
translations/el_GR.ts
View File

@ -3316,6 +3316,11 @@
<source>Select image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="270"/>
<source>Max dials in row:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>Load title from page</source>

5
translations/empty.ts
View File

@ -3264,6 +3264,11 @@
<source>Select image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="270"/>
<source>Max dials in row:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>Load title from page</source>

5
translations/es_ES.ts
View File

@ -3315,6 +3315,11 @@
<source>Select image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="270"/>
<source>Max dials in row:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>Load title from page</source>

5
translations/fr_FR.ts
View File

@ -3318,6 +3318,11 @@ n&apos;a pas été trouvé!</translation>
<source>Select image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="270"/>
<source>Max dials in row:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>Load title from page</source>

5
translations/it_IT.ts
View File

@ -3318,6 +3318,11 @@
<source>Select image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="270"/>
<source>Max dials in row:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>Load title from page</source>

5
translations/nl_NL.ts
View File

@ -3317,6 +3317,11 @@ werd niet gevonden!</translation>
<source>Select image</source>
<translation>Selecteer afbeelding</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="270"/>
<source>Max dials in row:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>Load title from page</source>

5
translations/pl_PL.ts
View File

@ -3319,6 +3319,11 @@
<source>Select image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="270"/>
<source>Max dials in row:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>Load title from page</source>

5
translations/pt_PT.ts
View File

@ -3315,6 +3315,11 @@ não foi encontrado!</translation>
<source>Select image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="270"/>
<source>Max dials in row:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>Load title from page</source>

5
translations/ru_RU.ts
View File

@ -3327,6 +3327,11 @@
<source>Select image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="270"/>
<source>Max dials in row:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>Load title from page</source>

4
translations/sk_SK.ts
View File

@ -2681,6 +2681,10 @@
<source>Select image</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Max dials in row:</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RSSManager</name>

53
translations/sr_BA.ts
View File

@ -196,10 +196,6 @@
<source>Learn About Writing &amp;Rules</source>
<translation>Научите како да направите &amp;филтере</translation>
</message>
<message>
<source>New tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
</context>
<context>
<name>AddAcceptLanguage</name>
@ -529,10 +525,6 @@
<source>Choose name for folder: </source>
<translation>Име за фасциклу: </translation>
</message>
<message>
<source>New Tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/bookmarks/bookmarksmanager.cpp" line="218"/>
<source>Add Subfolder</source>
@ -627,10 +619,6 @@
<source>Search...</source>
<translation>Тражи...</translation>
</message>
<message>
<source>New Tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/sidebar/bookmarkssidebar.cpp" line="110"/>
<source>Open link in actual &amp;tab</source>
@ -1256,10 +1244,6 @@
<source>Error</source>
<translation>Грешка</translation>
</message>
<message>
<source>New tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="362"/>
<source>Not found</source>
@ -1461,10 +1445,6 @@
<source>Optimize Database</source>
<translation>Оптимизуј базу података</translation>
</message>
<message>
<source>New Tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/history/historymanager.cpp" line="99"/>
<source>Open link in actual tab</source>
@ -1594,10 +1574,6 @@
<source>Title</source>
<translation>име</translation>
</message>
<message>
<source>New Tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/sidebar/historysidebar.cpp" line="93"/>
<source>Open link in actual tab</source>
@ -2653,10 +2629,6 @@
</context>
<context>
<name>QupZilla</name>
<message>
<source>New tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="258"/>
<source>Private Browsing Enabled</source>
@ -3288,16 +3260,17 @@
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="268"/>
<source>Use background image</source>
<translation type="unfinished"></translation>
<translation>Слика за позадину</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="269"/>
<source>Select image</source>
<translation type="unfinished"></translation>
<translation>Изабери слику</translation>
</message>
<message>
<source>Speed Dial background image</source>
<translation type="obsolete">Слика позадине брзог бирања</translation>
<location filename="../src/network/qupzillaschemehandler.cpp" line="270"/>
<source>Max dials in row:</source>
<translation>Најв. страница у реду:</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
@ -3451,10 +3424,6 @@ Please add some with RSS icon in navigation bar on site which offers feeds.</sou
<source>Open link in new tab</source>
<translation>Отвори везу у новом језичку</translation>
</message>
<message>
<source>New Tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/rss/rssmanager.cpp" line="363"/>
<source>Error in fetching feed</source>
@ -4160,10 +4129,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
<source>Restore &amp;Closed Tab</source>
<translation>&amp;Врати затворени језичак</translation>
</message>
<message>
<source>New tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
</context>
<context>
<name>TabWidget</name>
@ -4263,10 +4228,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
<translation>Да би приказала ову страницу Капзила мора поново да пошаље захтијев
за учитавањем (као претрага куповине која је већ обављена)</translation>
</message>
<message>
<source>New tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/webview/webpage.cpp" line="313"/>
<source>Server refused the connection</source>
@ -4443,10 +4404,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
<source>Go to &amp;web address</source>
<translation>Иди на &amp;веб адресу</translation>
</message>
<message>
<source>New tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/webview/webview.cpp" line="453"/>
<source>Open link in new &amp;tab</source>

53
translations/sr_RS.ts
View File

@ -196,10 +196,6 @@
<source>Learn About Writing &amp;Rules</source>
<translation>Научите како да направите &amp;филтере</translation>
</message>
<message>
<source>New tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
</context>
<context>
<name>AddAcceptLanguage</name>
@ -529,10 +525,6 @@
<source>Choose name for folder: </source>
<translation>Име за фасциклу: </translation>
</message>
<message>
<source>New Tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/bookmarks/bookmarksmanager.cpp" line="218"/>
<source>Add Subfolder</source>
@ -627,10 +619,6 @@
<source>Search...</source>
<translation>Тражи...</translation>
</message>
<message>
<source>New Tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/sidebar/bookmarkssidebar.cpp" line="110"/>
<source>Open link in actual &amp;tab</source>
@ -1256,10 +1244,6 @@
<source>Error</source>
<translation>Грешка</translation>
</message>
<message>
<source>New tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="362"/>
<source>Not found</source>
@ -1461,10 +1445,6 @@
<source>Optimize Database</source>
<translation>Оптимизуј базу података</translation>
</message>
<message>
<source>New Tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/history/historymanager.cpp" line="99"/>
<source>Open link in actual tab</source>
@ -1594,10 +1574,6 @@
<source>Title</source>
<translation>име</translation>
</message>
<message>
<source>New Tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/sidebar/historysidebar.cpp" line="93"/>
<source>Open link in actual tab</source>
@ -2653,10 +2629,6 @@
</context>
<context>
<name>QupZilla</name>
<message>
<source>New tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="258"/>
<source>Private Browsing Enabled</source>
@ -3288,16 +3260,17 @@
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="268"/>
<source>Use background image</source>
<translation type="unfinished"></translation>
<translation>Слика за позадину</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="269"/>
<source>Select image</source>
<translation type="unfinished"></translation>
<translation>Изабери слику</translation>
</message>
<message>
<source>Speed Dial background image</source>
<translation type="obsolete">Слика позадине брзог бирања</translation>
<location filename="../src/network/qupzillaschemehandler.cpp" line="270"/>
<source>Max dials in row:</source>
<translation>Најв. страница у реду:</translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
@ -3451,10 +3424,6 @@ Please add some with RSS icon in navigation bar on site which offers feeds.</sou
<source>Open link in new tab</source>
<translation>Отвори везу у новом језичку</translation>
</message>
<message>
<source>New Tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/rss/rssmanager.cpp" line="363"/>
<source>Error in fetching feed</source>
@ -4160,10 +4129,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
<source>Restore &amp;Closed Tab</source>
<translation>&amp;Врати затворени језичак</translation>
</message>
<message>
<source>New tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
</context>
<context>
<name>TabWidget</name>
@ -4263,10 +4228,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
<translation>Да би приказала ову страницу Капзила мора поново да пошаље захтев
за учитавањем (као претрага куповине која је већ обављена)</translation>
</message>
<message>
<source>New tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/webview/webpage.cpp" line="313"/>
<source>Server refused the connection</source>
@ -4443,10 +4404,6 @@ After adding or removing certificate paths, it is neccessary to restart QupZilla
<source>Go to &amp;web address</source>
<translation>Иди на &amp;веб адресу</translation>
</message>
<message>
<source>New tab</source>
<translation type="obsolete">Нови језичак</translation>
</message>
<message>
<location filename="../src/webview/webview.cpp" line="453"/>
<source>Open link in new &amp;tab</source>

5
translations/zh_CN.ts
View File

@ -3309,6 +3309,11 @@
<source>Select image</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="270"/>
<source>Max dials in row:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/network/qupzillaschemehandler.cpp" line="252"/>
<source>Load title from page</source>