diff --git a/bin/locale/qt_es.qm b/bin/locale/qt_es.qm index dc787ee85..519116090 100644 Binary files a/bin/locale/qt_es.qm and b/bin/locale/qt_es.qm differ diff --git a/src/data/html/speeddial.html b/src/data/html/speeddial.html index ce83ca346..113a7a68c 100644 --- a/src/data/html/speeddial.html +++ b/src/data/html/speeddial.html @@ -7,21 +7,22 @@ body {background: #eeeeee url(%IMG_BACKGROUND%) no-repeat center center;backgrou 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;} -#quickdial div.entry {position: relative;width: 231px;height: 150px;float: left;border-width: 10px; +#quickdial {margin: auto;text-align: center;} +#quickdial div.entry {position: relative;width: %SD-SIZE%px;float: left;border-width: 10px; -webkit-border-image: url(%BOX-BORDER%) 10;margin: 5px;} #quickdial img {display: block;margin: auto;} -#quickdial a {position: absolute;left: 0px;top: 0px;width: 231px;height: 130px;} +#quickdial img[src*=".png"] {width: %SD-SIZE%px;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;} -span.boxTitle {width:231px;max-height: 20px; position: absolute;top: 133px;left: 0px;text-align: center;overflow:hidden;} -span.close {width: 14px;height: 14px;position: absolute;left: 215px;top: 135px; +span.boxTitle {width:100%;max-height: 20px; position: absolute;top: 89%;left: 0px;text-align: center;overflow:hidden;} +span.close {width: 14px;height: 14px;position: absolute;left: 92%;top: 90%; background: url(%IMG_CLOSE%) no-repeat;background-position: center;border: 1px solid transparent;display: none;} span.close:hover {border-color: grey; border-radius: 3px;} -span.edit {width: 14px;height: 14px;position: absolute;left: 0px;top: 135px; +span.edit {width: 14px;height: 14px;position: absolute;left: 0px;top: 90%; background: url(%IMG_EDIT%) no-repeat;background-position: center;border: 1px solid transparent;display: none;} span.edit:hover {border-color: grey; border-radius: 3px;} -span.reload {width: 16px;height: 16px;position: absolute;left: 213px;top: 0px;background: url(%IMG_RELOAD%) no-repeat;background-position: center;border: 1px solid transparent;display: none;} +span.reload {width: 16px;height: 16px;position: absolute;left: 92%;top: 0px;background: url(%IMG_RELOAD%) no-repeat;background-position: center;border: 1px solid transparent;display: none;} span.reload:hover {border-color: grey; border-radius: 4px;} #overlay-edit {width: 380px;max-height: 265px;border-width: 20px;margin-left: auto;margin-right: auto;margin-top: 100px; @@ -33,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: 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 {position: absolute;right:58px;top:25px;width: auto;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 .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,10 +43,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;} +#settingsBox .rowsel {margin: 2px;padding: 3px 0;border-bottom: 1px solid #888;} +#settingsBox .rowsel label {width: 140px;display: inline-block;} +#settingsBox .rowsel input {text-align: center;width: 80px;height: 15px;margin: 0px;padding-bottom: 0;} +#settingsBox .rowsel span {font-weight: bold;text-align: right;margin: 2px;padding-right: 2px;} @@ -61,6 +62,10 @@ var TITLE_RELOAD = '%TITLE-RELOAD%'; var TITLE_FETCHTITLE = '%TITLE-FETCHTITLE%'; var MAX_PAGES_ROW = %ROW-PAGES%; +$(document).ready(function () { + $('head').append(''); +}); + var editingId = -1; function onRemoveClick(box) { @@ -274,27 +279,23 @@ function removeBox(id) { function alignPage() { 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); - // 1 box width: 262px - var maxBoxes = Math.floor(width / 262); + var maxBoxes = Math.floor(width / boxWidth); if (maxBoxes > MAX_PAGES_ROW) maxBoxes = MAX_PAGES_ROW; if (maxBoxes < 1) maxBoxes = 1; - var maxwidth = maxBoxes * 262; + var maxwidth = maxBoxes * boxWidth; $("#quickdial").css('width', maxwidth + 'px'); var boxesCount = $("#quickdial").children("div").size(); var rows = Math.ceil(boxesCount / maxBoxes); - var margintop = (height - rows * 190) / 2; + var margintop = (height - rows * boxHeight) / 2; if (margintop < 0) margintop = 0; $("#quickdial").css('margin-top', margintop + 'px'); } -function toggleDisplay(id) { - var div = document.getElementById(id); - div.style.display = (div.style.display == 'block' ? 'none' : 'block'); -} - function checkSet() { var checkb = document.getElementById('BgImgToggle'); var BgImgSel = document.getElementById('BgImgSel'); @@ -303,7 +304,6 @@ function checkSet() { checkb.checked = (bgImg == '' ? false : true); BgImgSel.disabled = (bgImg == '' ? true : false); BgImgSz.disabled = (bgImg == '' ? true : false); - BgImgSz.selectedIndex } function bgImageSel() { @@ -317,9 +317,11 @@ function saveSettings() { var BgImg = document.getElementById('BgImgHold').value; var BgImgSz = document.getElementById('BgImgSelSiz').value; var PgInRow = document.getElementById('PgInRow').value; + var SdSize = document.getElementById('SdSize').value; speeddial.setBackgroundImage(BgImg); speeddial.setBackgroundImageSize(BgImgSz); speeddial.setPagesInRow(PgInRow); + speeddial.setSdSize(SdSize); } function bgImgToggle() { @@ -358,7 +360,7 @@ document.addEventListener("DOMContentLoaded", checkSet, false);
- + -
-
- %ROW-PAGES% - - + - diff --git a/src/data/icons.qrc b/src/data/icons.qrc index 70ef115e8..5937735d7 100644 --- a/src/data/icons.qrc +++ b/src/data/icons.qrc @@ -55,7 +55,6 @@ icons/menu/search-icon.png icons/menu/gear.png icons/menu/wikipedia.png - icons/menu/yahoo.png icons/browsers/firefox.png icons/browsers/chrome.png icons/browsers/opera.png @@ -69,5 +68,6 @@ icons/preferences/preferences-system-firewall.png icons/browsers/html.png icons/menu/translate.png + icons/menu/duck.png diff --git a/src/data/icons/menu/duck.png b/src/data/icons/menu/duck.png new file mode 100644 index 000000000..1fa44692a Binary files /dev/null and b/src/data/icons/menu/duck.png differ diff --git a/src/data/icons/menu/yahoo.png b/src/data/icons/menu/yahoo.png deleted file mode 100644 index 7905fdcfa..000000000 Binary files a/src/data/icons/menu/yahoo.png and /dev/null differ diff --git a/src/network/qupzillaschemehandler.cpp b/src/network/qupzillaschemehandler.cpp index dbd80ec7b..8ed1311ba 100644 --- a/src/network/qupzillaschemehandler.cpp +++ b/src/network/qupzillaschemehandler.cpp @@ -267,7 +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")); - dPage.replace("%TXT_NRROWS%", tr("Max dials in row:")); + dPage.replace("%TXT_NRROWS%", tr("Max pages in row:")); + dPage.replace("%TXT_SDSIZE%", tr("Size of dials:")); } QString page = dPage; @@ -275,5 +276,6 @@ QString QupZillaSchemeReply::speeddialPage() page.replace("%IMG_BACKGROUND%", mApp->plugins()->speedDial()->backgroundImage()); page.replace("%B_SIZE%", mApp->plugins()->speedDial()->backgroundImageSize()); page.replace("%ROW-PAGES%", QString::number(mApp->plugins()->speedDial()->pagesInRow())); + page.replace("%SD-SIZE%", QString::number(mApp->plugins()->speedDial()->sdSize())); return page; } diff --git a/src/opensearch/searchenginesmanager.cpp b/src/opensearch/searchenginesmanager.cpp index 9810546e8..b253b6cf0 100644 --- a/src/opensearch/searchenginesmanager.cpp +++ b/src/opensearch/searchenginesmanager.cpp @@ -129,16 +129,16 @@ void SearchEnginesManager::restoreDefaults() yt.shortcut = "yt"; yt.suggestionsUrl = "http://suggestqueries.google.com/complete/search?ds=yt&output=firefox&q=%s"; - Engine yahoo; - yahoo.name = "Yahoo!"; - yahoo.icon = QIcon(":/icons/menu/yahoo.png"); - yahoo.url = "http://search.yahoo.com/search?ei=utf-8&fr=sfp&iscqry=&p=%s"; - yahoo.shortcut = "yh"; + Engine duck; + duck.name = "DuckDuckGo"; + duck.icon = QIcon(":/icons/menu/duck.png"); + duck.url = "https://duckduckgo.com/?q=%s"; + duck.shortcut = "d"; addEngine(google, false); addEngine(wiki, false); addEngine(yt, false); - addEngine(yahoo, false); + addEngine(duck, false); emit enginesChanged(); } diff --git a/src/plugins/speeddial.cpp b/src/plugins/speeddial.cpp index 9b112f219..fd9934e09 100644 --- a/src/plugins/speeddial.cpp +++ b/src/plugins/speeddial.cpp @@ -37,6 +37,7 @@ void SpeedDial::loadSettings() m_backgroundImage = settings.value("background", "").toString(); m_backgroundImageSize = settings.value("backsize", "auto").toString(); m_maxPagesInRow = settings.value("pagesrow", 4).toInt(); + m_sizeOfSpeedDials = settings.value("sdsize", 231).toInt(); settings.endGroup(); if (m_allPages.isEmpty()) { @@ -67,6 +68,7 @@ void SpeedDial::saveSettings() settings.setValue("background", m_backgroundImage); settings.setValue("backsize", m_backgroundImageSize); settings.setValue("pagesrow", m_maxPagesInRow); + settings.setValue("sdsize", m_sizeOfSpeedDials); settings.endGroup(); } @@ -108,6 +110,15 @@ int SpeedDial::pagesInRow() return m_maxPagesInRow; } +int SpeedDial::sdSize() +{ + if (!m_loaded) { + loadSettings(); + } + + return m_sizeOfSpeedDials; +} + QString SpeedDial::backgroundImage() { if (!m_loaded) { @@ -227,6 +238,11 @@ void SpeedDial::setPagesInRow(int count) m_maxPagesInRow = count; } +void SpeedDial::setSdSize(int count) +{ + m_sizeOfSpeedDials = count; +} + void SpeedDial::thumbnailCreated(const QPixmap &image) { PageThumbnailer* thumbnailer = qobject_cast(sender()); diff --git a/src/plugins/speeddial.h b/src/plugins/speeddial.h index 11d56067f..ae8cdc631 100644 --- a/src/plugins/speeddial.h +++ b/src/plugins/speeddial.h @@ -40,6 +40,7 @@ public: void addPage(const QUrl &url, const QString &title); int pagesInRow(); + int sdSize(); QString backgroundImage(); QString backgroundImageSize(); QString initialScript(); @@ -55,6 +56,7 @@ public slots: Q_INVOKABLE void setBackgroundImage(const QString &image); Q_INVOKABLE void setBackgroundImageSize(const QString &size); Q_INVOKABLE void setPagesInRow(int count); + Q_INVOKABLE void setSdSize(int count); private slots: void thumbnailCreated(const QPixmap &image); @@ -66,6 +68,7 @@ private: QString m_backgroundImage; QString m_backgroundImageSize; int m_maxPagesInRow; + int m_sizeOfSpeedDials; QList > m_webFrames;