SpeedDial: Fix center speed dials option

src/lib/data/html/speeddial.html

@@ -58,6 +58,7 @@ var TITLE_RELOAD = '%TITLE-RELOAD%';
 var TITLE_FETCHTITLE = '%TITLE-FETCHTITLE%';
 var MAX_PAGES_ROW = %ROW-PAGES%;
 var DIAL_WIDTH = %SD-SIZE%;
+var SD_CENTER = %SD-CENTER%;
 
 var editingId = -1;
 
@@ -344,6 +345,12 @@ function alignPage() {
     if (margintop < 0) margintop = 0;
 
     $("#quickdial").css('margin-top', margintop + 'px');
+
+    $('#SdCntrToggle').prop('checked', SD_CENTER);
+    $('#quickdial div.entry').css({
+        float: SD_CENTER ? 'none' : 'left',
+        display: SD_CENTER ? 'inline-block' : 'block'
+    });
 }
 
 function bgImageSel() {
@@ -358,13 +365,13 @@ function bgImageSel() {
 function saveSettings() {
     MAX_PAGES_ROW = $('#PgInRow').val();
     DIAL_WIDTH = parseInt($('#SdSize').val());
-    SD_CNTR = ($('#SdCntrToggle').attr('checked') ? 1 : 0 );
+    SD_CENTER = $('#SdCntrToggle').attr('checked') ? true : false;
 
     external.speedDial.setBackgroundImage($('#BgImgHoldUrl').val());
     external.speedDial.setBackgroundImageSize($('#BgImgSelSiz').val());
     external.speedDial.setPagesInRow(MAX_PAGES_ROW);
     external.speedDial.setSdSize(DIAL_WIDTH);
-    external.speedDial.setSdCentered(SD_CNTR);
+    external.speedDial.setSdCentered(SD_CENTER);
 
     alignPage();
 }
@@ -406,17 +413,12 @@ function bgImgUpdate() {
 
 $(document).ready(function () {
   $('#BgImgSelSiz').val('%B_SIZE%').attr('selected','selected');
-  var bgImg = "%IMG_BACKGROUND%";
-  var sdSize = 'DIAL_WIDTH';
-  var sdCntr = "%SD-CNTR%";
-
-  bgImg == '' ? $('#BgImgToggle').prop('checked', false) : $('#BgImgToggle').prop('checked', true)
-  sdSize == '240' ? $('#SdSizeToggle').prop('checked', false) : $('#SdSizeToggle').prop('checked', true)
+  $('#BgImgToggle').prop('checked', "%IMG_BACKGROUND%"!= "");
+  $('#SdSizeToggle').prop('checked', DIAL_WIDTH != 240);
+  $('#SdCntrToggle').prop('checked', SD_CENTER);
   $('#BgImgToggle').is(':checked') ? $('#BgImgSel').removeAttr('disabled') : $('#BgImgSel').attr('disabled', 'disabled');
   $('#BgImgToggle').is(':checked') ? $('#BgImgSelSiz').removeAttr('disabled') : $('#BgImgSelSiz').attr('disabled', 'disabled');
   $('#SdSizeToggle').is(':checked') ? $('#SdSize').removeAttr('disabled') : $('#SdSize').attr('disabled', 'disabled');
-  sdCntr == 0 ? $('#SdCntrToggle').prop('checked', false) : $('#SdCntrToggle').prop('checked', true);
-  sdCntr == 0 ? '' : $('#quickdial div.entry').css({'float':'none', 'display':'inline-block'});
 });
 
 </script>

src/lib/network/schemehandlers/qupzillaschemehandler.cpp

@@ -316,7 +316,7 @@ QString QupZillaSchemeReply::speeddialPage()
     page.replace(QLatin1String("%B_SIZE%"), dial->backgroundImageSize());
     page.replace(QLatin1String("%ROW-PAGES%"), QString::number(dial->pagesInRow()));
     page.replace(QLatin1String("%SD-SIZE%"), QString::number(dial->sdSize()));
-    page.replace(QLatin1String("%SD-CNTR%"), QString::number(dial->sdCntr()));
+    page.replace(QLatin1String("%SD-CENTER%"), dial->sdCenter() ? QSL("true") : QSL("false"));
 
     return page;
 }

src/lib/plugins/speeddial.cpp

@@ -59,7 +59,7 @@ void SpeedDial::loadSettings()
     m_backgroundImageSize = settings.value("backsize", "auto").toString();
     m_maxPagesInRow = settings.value("pagesrow", 4).toInt();
     m_sizeOfSpeedDials = settings.value("sdsize", 231).toInt();
-    m_sdcentered = settings.value("sdcenter", 0).toInt();
+    m_sdcentered = settings.value("sdcenter", false).toBool();
     settings.endGroup();
 
     if (allPages.isEmpty()) {
@@ -170,7 +170,7 @@ int SpeedDial::sdSize()
     return m_sizeOfSpeedDials;
 }
 
-int SpeedDial::sdCntr()
+bool SpeedDial::sdCenter()
 {
     ENSURE_LOADED;
 
@@ -322,9 +322,9 @@ void SpeedDial::setSdSize(int count)
     m_sizeOfSpeedDials = count;
 }
 
-void SpeedDial::setSdCentered(int cntr)
+void SpeedDial::setSdCentered(bool centered)
 {
-    m_sdcentered = cntr;
+    m_sdcentered = centered;
 
     m_autoSaver->changeOcurred();
 }

src/lib/plugins/speeddial.h

@@ -57,7 +57,7 @@ public:
 
     int pagesInRow();
     int sdSize();
-    int sdCntr();
+    bool sdCenter();
 
     QString backgroundImage();
     QString backgroundImageUrl();
@@ -80,7 +80,7 @@ public slots:
     void setBackgroundImageSize(const QString &size);
     void setPagesInRow(int count);
     void setSdSize(int count);
-    void setSdCentered(int cntr);
+    void setSdCentered(bool centered);
 
 private slots:
     void thumbnailCreated(const QPixmap &pixmap);
@@ -99,7 +99,7 @@ private:
     QString m_backgroundImageSize;
     int m_maxPagesInRow;
     int m_sizeOfSpeedDials;
-    int m_sdcentered;
+    bool m_sdcentered;
 
     QList<Page> m_pages;
     AutoSaver* m_autoSaver;