diff --git a/bin/locale/cs_CZ.qm b/bin/locale/cs_CZ.qm index 725025025..ee04a0fce 100644 Binary files a/bin/locale/cs_CZ.qm and b/bin/locale/cs_CZ.qm differ diff --git a/bin/locale/de_DE.qm b/bin/locale/de_DE.qm index 10ac30f36..f1b53187d 100644 Binary files a/bin/locale/de_DE.qm and b/bin/locale/de_DE.qm differ diff --git a/bin/locale/el_GR.qm b/bin/locale/el_GR.qm index e82ba7eae..58e808863 100644 Binary files a/bin/locale/el_GR.qm and b/bin/locale/el_GR.qm differ diff --git a/bin/locale/es_ES.qm b/bin/locale/es_ES.qm index 7562b3a61..c82c5d3e5 100644 Binary files a/bin/locale/es_ES.qm and b/bin/locale/es_ES.qm differ diff --git a/bin/locale/fr_FR.qm b/bin/locale/fr_FR.qm index 88505e57e..edd2352a1 100644 Binary files a/bin/locale/fr_FR.qm and b/bin/locale/fr_FR.qm differ diff --git a/bin/locale/it_IT.qm b/bin/locale/it_IT.qm index 93d4ca945..2962eae51 100644 Binary files a/bin/locale/it_IT.qm and b/bin/locale/it_IT.qm differ diff --git a/bin/locale/nl_NL.qm b/bin/locale/nl_NL.qm index 91580c46a..ff77005c1 100644 Binary files a/bin/locale/nl_NL.qm and b/bin/locale/nl_NL.qm differ diff --git a/bin/locale/pl_PL.qm b/bin/locale/pl_PL.qm index 8464e0284..b80530744 100644 Binary files a/bin/locale/pl_PL.qm and b/bin/locale/pl_PL.qm differ diff --git a/bin/locale/pt_PT.qm b/bin/locale/pt_PT.qm index 02b4dcdf3..802899976 100644 Binary files a/bin/locale/pt_PT.qm and b/bin/locale/pt_PT.qm differ diff --git a/bin/locale/ru_RU.qm b/bin/locale/ru_RU.qm index 8198038e3..7edf4ce06 100644 Binary files a/bin/locale/ru_RU.qm and b/bin/locale/ru_RU.qm differ diff --git a/bin/locale/sk_SK.qm b/bin/locale/sk_SK.qm index 0d8c1fcf3..9a801c8ae 100644 Binary files a/bin/locale/sk_SK.qm and b/bin/locale/sk_SK.qm differ diff --git a/bin/locale/sr_BA.qm b/bin/locale/sr_BA.qm index 35856bf89..ab6fb080b 100644 Binary files a/bin/locale/sr_BA.qm and b/bin/locale/sr_BA.qm differ diff --git a/bin/locale/sr_RS.qm b/bin/locale/sr_RS.qm index ca927d209..064224874 100644 Binary files a/bin/locale/sr_RS.qm and b/bin/locale/sr_RS.qm differ diff --git a/bin/locale/zh_CN.qm b/bin/locale/zh_CN.qm index d4dbe52ff..d073d26ae 100644 Binary files a/bin/locale/zh_CN.qm and b/bin/locale/zh_CN.qm differ diff --git a/src/app/qupzilla.cpp b/src/app/qupzilla.cpp index e471c69f9..851ab2fb0 100644 --- a/src/app/qupzilla.cpp +++ b/src/app/qupzilla.cpp @@ -793,7 +793,7 @@ void QupZilla::aboutToShowHelpMenu() m_menuHelp->addAction(m_actionAbout); m_menuHelp->addSeparator(); #endif - QAction* infoAction = new QAction(QIcon(":/icons/menu/informations.png"), tr("Informations about application"), m_menuHelp); + QAction* infoAction = new QAction(QIcon(":/icons/menu/informations.png"), tr("Information about application"), m_menuHelp); infoAction->setData(QUrl("qupzilla:about")); infoAction->setShortcut(QKeySequence(QKeySequence::HelpContents)); connect(infoAction, SIGNAL(triggered()), this, SLOT(loadActionUrlInNewTab())); diff --git a/src/data/html/speeddial.html b/src/data/html/speeddial.html index 120973365..8dd15e837 100644 --- a/src/data/html/speeddial.html +++ b/src/data/html/speeddial.html @@ -8,10 +8,10 @@ body * {-webkit-user-select: none;font-size: 100%;line-height: 1.6;margin: 0px;} .add {position: absolute;right:10px;top:10px;width: 24px;height: 24px;background: url(%IMG_PLUS%); cursor: pointer;} #quickdial {margin: auto;text-align: center;} -#quickdial div.entry {position: relative;width: %SD-SIZE%px;float: left;border-width: 10px; +#quickdial div.entry {position: relative; float: left;border-width: 10px; -webkit-border-image: url(%BOX-BORDER%) 10;margin: 5px;} #quickdial img {display: block;margin: auto;} -#quickdial img[src*=".png"] {width: %SD-SIZE%px;height: auto;} +#quickdial img[src*=".png"] {height: auto;} #quickdial a {position: absolute;left: 0px;top: 0px;width: 100%;height: 87%;} div.entry:hover .edit, div.entry:hover .close, div.entry:hover .reload{display: inline;} @@ -34,7 +34,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: 250px;height: auto;background: #eeeeee;margin: 5px;-webkit-box-shadow: 0 0 6px 6px#888;box-shadow: 0 0 6px 6px #888;border-radius: 15px;padding: 8px 15px;border: 1px solid transparent;opacity: 1;z-index:200} +#settingsBox {position: absolute;right:58px;top:25px;width: 250px;height: auto;background: #eeeeee;margin: 5px;border-radius: 15px;padding: 8px 15px;border: 1px solid transparent;opacity: 1;z-index:200} #settingsBox .content {float:right;} #settingsBox .thumbhold {margin: 2px;padding: 1px;border-radius: 10px;text-align:center;width: 100px; height: 100px;background: #AAA;} #settingsBox .thumbhold p {margin: 0;padding: 0;background: #eeeeee url(%IMG_BACKGROUND%) no-repeat center center;background-size: %B_SIZE%;width: 98px;height:98px;border-radius: 10px;position: relative;left: 1px;top: 1px;} @@ -60,10 +60,7 @@ var TITLE_REMOVE = '%TITLE-REMOVE%'; var TITLE_RELOAD = '%TITLE-RELOAD%'; var TITLE_FETCHTITLE = '%TITLE-FETCHTITLE%'; var MAX_PAGES_ROW = %ROW-PAGES%; - -$(document).ready(function () { - $('head').append(''); -}); +var DIAL_WIDTH = %SD-SIZE%; var editingId = -1; @@ -276,10 +273,14 @@ function removeBox(id) { } function alignPage() { + $('#quickdial img[src*=".png"]').css('width', DIAL_WIDTH); + $('#quickdial div.entry').css({'width' : DIAL_WIDTH + 'px', + 'height' : Math.round(DIAL_WIDTH / 1.54) + 'px'}); + var width = $(window).width(); var height = $(window).height(); - var boxWidth = Math.floor(%SD-SIZE% + 30); - var boxHeight = Math.floor(Math.round(%SD-SIZE% / 1.54) + 40); + var boxWidth = Math.floor(DIAL_WIDTH + 30); + var boxHeight = Math.floor(Math.round(DIAL_WIDTH / 1.54) + 40); var maxBoxes = Math.floor(width / boxWidth); if (maxBoxes > MAX_PAGES_ROW) maxBoxes = MAX_PAGES_ROW; @@ -291,7 +292,9 @@ function alignPage() { var boxesCount = $("#quickdial").children("div").size(); var rows = Math.ceil(boxesCount / maxBoxes); var margintop = (height - rows * boxHeight) / 2; + if (margintop < 0) margintop = 0; + $("#quickdial").css('margin-top', margintop + 'px'); } @@ -303,22 +306,15 @@ function bgImageSel() { } function saveSettings() { -<<<<<<< HEAD - var BgImg = document.getElementById('BgImgHold').value; - var BgImgSz = document.getElementById('BgImgSelSiz').value; - MAX_PAGES_ROW = document.getElementById('PgInRow').value; - speeddial.setBackgroundImage(BgImg); - speeddial.setBackgroundImageSize(BgImgSz); - speeddial.setPagesInRow(MAX_PAGES_ROW); + MAX_PAGES_ROW = $('#PgInRow').val(); + DIAL_WIDTH = parseInt($('#SdSize').val()); - document.getElementById('settingsBox').style.display = 'none'; - alignPage(); -======= speeddial.setBackgroundImage($('#BgImgHold').val()); speeddial.setBackgroundImageSize($('#BgImgSelSiz').val()); - speeddial.setPagesInRow($('#PgInRow').val()); - speeddial.setSdSize($('#SdSize').val()); ->>>>>>> 5a9e3ba389b76c5e8b0477483f6298ff5dd53ddc + speeddial.setPagesInRow(MAX_PAGES_ROW); + speeddial.setSdSize(DIAL_WIDTH); + + alignPage(); } function bgImgToggle() { @@ -339,7 +335,7 @@ function sdSizeToggle() { var SdSizeSl = document.getElementById('sliderValueSd'); SdSize.disabled = (check.checked ? false : true); SdSize.value = (check.checked ? SdSize.value : 231); - SdSizeSl.innerHTML = (check.checked ? %SD-SIZE% : 231); + SdSizeSl.innerHTML = (check.checked ? DIAL_WIDTH : 231); } function bgImgUpdate() { @@ -356,7 +352,7 @@ function bgImgUpdate() { $(document).ready(function () { $('#BgImgSelSiz').val('%B_SIZE%').attr('selected','selected'); var bgImg = '%IMG_BACKGROUND%'; - var sdSize = '%SD-SIZE%'; + var sdSize = 'DIAL_WIDTH'; bgImg == '' ? $('#BgImgToggle').prop('checked', false) : $('#BgImgToggle').prop('checked', true) sdSize == '231' ? $('#SdSizeToggle').prop('checked', false) : $('#SdSizeToggle').prop('checked', true) $('#BgImgToggle').is(':checked') ? $('#BgImgSel').removeAttr('disabled') : $('#BgImgSel').attr('disabled', 'disabled'); @@ -424,35 +420,11 @@ $("#quickdial").sortable({

- +

-<<<<<<< HEAD -
 
-
-

- - -

-

-
- -

-

- -

-
-

-======= ->>>>>>> 5a9e3ba389b76c5e8b0477483f6298ff5dd53ddc diff --git a/src/network/qupzillaschemehandler.cpp b/src/network/qupzillaschemehandler.cpp index 297f39570..fd067046f 100644 --- a/src/network/qupzillaschemehandler.cpp +++ b/src/network/qupzillaschemehandler.cpp @@ -267,12 +267,8 @@ 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")); -<<<<<<< HEAD - dPage.replace("%TXT_NRROWS%", tr("Max pages in row:")); -======= - dPage.replace("%TXT_NRROWS%", tr("Max number of pages in a row:")); - dPage.replace("%TXT_SDSIZE%", tr("Change size of dials")); ->>>>>>> 5a9e3ba389b76c5e8b0477483f6298ff5dd53ddc + dPage.replace("%TXT_NRROWS%", tr("Maximum pages in a row:")); + dPage.replace("%TXT_SDSIZE%", tr("Change size of pages:")); } QString page = dPage; diff --git a/translations/cs_CZ.ts b/translations/cs_CZ.ts index f3668b1e2..91094d73f 100644 --- a/translations/cs_CZ.ts +++ b/translations/cs_CZ.ts @@ -2836,6 +2836,11 @@ nebyl nalezen! &Page Source Zdrojový &kód stránky + + + Information about application + Informace o aplikaci + - QupZilla @@ -3018,9 +3023,8 @@ nebyl nalezen! &O QupZille - Informations about application - Informace o aplikaci + Informace o aplikaci @@ -3323,13 +3327,17 @@ nebyl nalezen! - Max number of pages in a row: - + Maximum pages in a row: + Maximum stránek v řadě: - Change size of dials - + Change size of pages: + Změnit velikost stránek: + + + Max number of pages in a row: + Maximální počet stránek v řadě: diff --git a/translations/de_DE.ts b/translations/de_DE.ts index 4110be493..30d723b35 100644 --- a/translations/de_DE.ts +++ b/translations/de_DE.ts @@ -2833,6 +2833,11 @@ &Page Source Seiten-&Quelltext + + + Information about application + + - QupZilla @@ -3015,9 +3020,8 @@ Über Qup&Zilla - Informations about application - Informationen über QupZilla + Informationen über QupZilla @@ -3370,12 +3374,12 @@ - Max number of pages in a row: + Maximum pages in a row: - Change size of dials + Change size of pages: diff --git a/translations/el_GR.ts b/translations/el_GR.ts index 46841cbc7..ac7c06586 100644 --- a/translations/el_GR.ts +++ b/translations/el_GR.ts @@ -2977,15 +2977,19 @@ About &Qt &Περί Qt + + + Information about application + + &About QupZilla Πε&ρί QupZilla - Informations about application - Πληροφορίες για την εφαρμογή + Πληροφορίες για την εφαρμογή @@ -3318,12 +3322,12 @@ - Max number of pages in a row: + Maximum pages in a row: - Change size of dials + Change size of pages: diff --git a/translations/empty.ts b/translations/empty.ts index 168432671..78abd65b6 100644 --- a/translations/empty.ts +++ b/translations/empty.ts @@ -2934,13 +2934,13 @@ - - &About QupZilla + + Information about application - - Informations about application + + &About QupZilla @@ -3266,12 +3266,12 @@ - Max number of pages in a row: + Maximum pages in a row: - Change size of dials + Change size of pages: diff --git a/translations/es_ES.ts b/translations/es_ES.ts index e9c9f4651..28c0449e0 100644 --- a/translations/es_ES.ts +++ b/translations/es_ES.ts @@ -2973,9 +2973,8 @@ &Acerca de QupZilla - Informations about application - Información acerca de la aplicación + Información acerca de la aplicación @@ -3037,6 +3036,11 @@ Pr&eferences &Preferencias + + + Information about application + + Other @@ -3317,12 +3321,12 @@ - Max number of pages in a row: + Maximum pages in a row: - Change size of dials + Change size of pages: diff --git a/translations/fr_FR.ts b/translations/fr_FR.ts index b58d00a68..3a16e3945 100644 --- a/translations/fr_FR.ts +++ b/translations/fr_FR.ts @@ -2937,6 +2937,11 @@ n'a pas été trouvé! Organize &Bookmarks &Organiser les marque-pages + + + Information about application + + - QupZilla @@ -2995,9 +3000,8 @@ n'a pas été trouvé! A propos de Qup&Zilla - Informations about application - Informations à propos de QupZilla + Informations à propos de QupZilla @@ -3320,12 +3324,12 @@ n'a pas été trouvé! - Max number of pages in a row: + Maximum pages in a row: - Change size of dials + Change size of pages: diff --git a/translations/it_IT.ts b/translations/it_IT.ts index b282ec4d6..ac7aaea5d 100644 --- a/translations/it_IT.ts +++ b/translations/it_IT.ts @@ -2928,6 +2928,11 @@ Organize &Bookmarks Organizza &segnalibri + + + Information about application + + - QupZilla @@ -2986,9 +2991,8 @@ &Informazioni su QupZilla - Informations about application - Informazioni sull' applicazione + Informazioni sull' applicazione @@ -3320,12 +3324,12 @@ - Max number of pages in a row: + Maximum pages in a row: - Change size of dials + Change size of pages: diff --git a/translations/nl_NL.ts b/translations/nl_NL.ts index 2dae3ff5a..9ad89ea07 100644 --- a/translations/nl_NL.ts +++ b/translations/nl_NL.ts @@ -2832,6 +2832,11 @@ werd niet gevonden! &Page Source &Pagina-broncode + + + Information about application + + - QupZilla @@ -3014,9 +3019,8 @@ werd niet gevonden! &Over QupZilla - Informations about application - Informatie over programma + Informatie over programma @@ -3319,12 +3323,12 @@ werd niet gevonden! - Max number of pages in a row: + Maximum pages in a row: - Change size of dials + Change size of pages: diff --git a/translations/pl_PL.ts b/translations/pl_PL.ts index 2def80f54..9961d118c 100644 --- a/translations/pl_PL.ts +++ b/translations/pl_PL.ts @@ -2839,6 +2839,11 @@ &Home &Strona startowa + + + Information about application + + - QupZilla @@ -3016,9 +3021,8 @@ &O QupZilli - Informations about application - Informacje o aplikacji + Informacje o aplikacji @@ -3321,12 +3325,12 @@ - Max number of pages in a row: + Maximum pages in a row: - Change size of dials + Change size of pages: diff --git a/translations/pt_PT.ts b/translations/pt_PT.ts index ba1d189a1..84d9837fd 100644 --- a/translations/pt_PT.ts +++ b/translations/pt_PT.ts @@ -2976,15 +2976,19 @@ não foi encontrado! About &Qt Sobre &Qt + + + Information about application + + &About QupZilla Sobre QupZill&a - Informations about application - Informações da aplicação + Informações da aplicação @@ -3317,12 +3321,12 @@ não foi encontrado! - Max number of pages in a row: + Maximum pages in a row: - Change size of dials + Change size of pages: diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 0df382276..e92cb96a8 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -2986,15 +2986,19 @@ About &Qt О &Qt + + + Information about application + + &About QupZilla &О QupZilla - Informations about application - О программе + О программе @@ -3329,12 +3333,12 @@ - Max number of pages in a row: + Maximum pages in a row: - Change size of dials + Change size of pages: diff --git a/translations/sk_SK.ts b/translations/sk_SK.ts index 298cf7f73..0a0c8d384 100644 --- a/translations/sk_SK.ts +++ b/translations/sk_SK.ts @@ -2340,7 +2340,7 @@ Informations about application - Informácie o programe + Informácie o programe Your session is not stored. @@ -2462,6 +2462,10 @@ - QupZilla + + Information about application + + QupZillaSchemeReply @@ -2682,11 +2686,11 @@ - Max number of pages in a row: + Maximum pages in a row: - Change size of dials + Change size of pages: diff --git a/translations/sr_BA.ts b/translations/sr_BA.ts index 542ab3b4f..19a2ea437 100644 --- a/translations/sr_BA.ts +++ b/translations/sr_BA.ts @@ -2936,15 +2936,19 @@ About &Qt О &Кјуту + + + Information about application + + &About QupZilla &О Капзили - Informations about application - Инфо програма + Инфо програма @@ -3269,13 +3273,21 @@ - Max number of pages in a row: - Максималан број брзих бирања у реду: + Maximum pages in a row: + + Change size of pages: + + + + Max number of pages in a row: + Максималан број брзих бирања у реду: + + Change size of dials - Промијени величину брзих бирања + Промијени величину брзих бирања diff --git a/translations/sr_RS.ts b/translations/sr_RS.ts index c2c22b60e..4d9da3545 100644 --- a/translations/sr_RS.ts +++ b/translations/sr_RS.ts @@ -2936,15 +2936,19 @@ About &Qt О &Кјуту + + + Information about application + + &About QupZilla &О Капзили - Informations about application - Инфо програма + Инфо програма @@ -3269,13 +3273,21 @@ - Max number of pages in a row: - Максималан број брзих бирања у реду: + Maximum pages in a row: + + Change size of pages: + + + + Max number of pages in a row: + Максималан број брзих бирања у реду: + + Change size of dials - Промени величину брзих бирања + Промени величину брзих бирања diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index 9a1f420b6..6d1b23d55 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -2967,9 +2967,8 @@ 关于QupZIlla&A - Informations about application - 软件信息 + 软件信息 @@ -3031,6 +3030,11 @@ Pr&eferences 首选项&e + + + Information about application + + Other @@ -3311,12 +3315,12 @@ - Max number of pages in a row: + Maximum pages in a row: - Change size of dials + Change size of pages: