X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/edb2c4ad62f874b37c7aba6c06479dfdaf647120..163fa7ce30c0bd1b18d0c750bf9358560c2db7af:/src/iconsviewsettingspage.cpp

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 562953dcc..8442872a5 100644
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
 #include "iconsviewsettingspage.h"
@@ -39,10 +39,8 @@
 #define GRID_SPACING_BASE 8
 #define GRID_SPACING_INC 12
 
-IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
-                                             QWidget* parent) :
+IconsViewSettingsPage::IconsViewSettingsPage(QWidget* parent) :
     KVBox(parent),
-    m_mode(mode),
     m_iconSizeSlider(0),
     m_previewSizeSlider(0),
     m_textWidthBox(0),
@@ -89,29 +87,27 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
     m_iconSizeViewer->setEraseColor(iconBackgroundColor);
     slotIconSizeChanged(m_iconSizeSlider->value());
 
-    if (m_mode == DolphinIconsView::Previews) {
-        // create 'Preview Size' group including slider and preview
-        Q3GroupBox* previewSizeGroup = new Q3GroupBox(2, Qt::Vertical, i18n("Preview Size"), sizesLayout);
-        previewSizeGroup->setSizePolicy(sizePolicy);
-        previewSizeGroup->setMargin(margin);
-
-        KHBox* previewSizeVBox = new KHBox(previewSizeGroup);
-        previewSizeVBox->setSpacing(spacing);
-        new QLabel(i18n("Small"), previewSizeVBox);
-        m_previewSizeSlider = new QSlider(0, 5, 1, 0,  Qt::Horizontal, previewSizeVBox);
-        m_previewSizeSlider->setValue(sliderValue(settings->previewSize()));
-        m_previewSizeSlider->setTickmarks(QSlider::TicksBelow);
-        connect(m_previewSizeSlider, SIGNAL(valueChanged(int)),
-                this, SLOT(slotPreviewSizeChanged(int)));
-        new QLabel(i18n("Large"), previewSizeVBox);
-
-        m_previewSizeViewer = new PixmapViewer(previewSizeGroup);
-        m_previewSizeViewer->setMinimumWidth(K3Icon::SizeEnormous);
-        m_previewSizeViewer->setFixedHeight(K3Icon::SizeEnormous);
-        m_previewSizeViewer->setEraseColor(iconBackgroundColor);
-
-        slotPreviewSizeChanged(m_previewSizeSlider->value());
-    }
+    // create 'Preview Size' group including slider and preview
+    Q3GroupBox* previewSizeGroup = new Q3GroupBox(2, Qt::Vertical, i18n("Preview Size"), sizesLayout);
+    previewSizeGroup->setSizePolicy(sizePolicy);
+    previewSizeGroup->setMargin(margin);
+
+    KHBox* previewSizeVBox = new KHBox(previewSizeGroup);
+    previewSizeVBox->setSpacing(spacing);
+    new QLabel(i18n("Small"), previewSizeVBox);
+    m_previewSizeSlider = new QSlider(0, 5, 1, 0,  Qt::Horizontal, previewSizeVBox);
+    m_previewSizeSlider->setValue(sliderValue(settings->previewSize()));
+    m_previewSizeSlider->setTickmarks(QSlider::TicksBelow);
+    connect(m_previewSizeSlider, SIGNAL(valueChanged(int)),
+            this, SLOT(slotPreviewSizeChanged(int)));
+    new QLabel(i18n("Large"), previewSizeVBox);
+
+    m_previewSizeViewer = new PixmapViewer(previewSizeGroup);
+    m_previewSizeViewer->setMinimumWidth(K3Icon::SizeEnormous);
+    m_previewSizeViewer->setFixedHeight(K3Icon::SizeEnormous);
+    m_previewSizeViewer->setEraseColor(iconBackgroundColor);
+
+    slotPreviewSizeChanged(m_previewSizeSlider->value());
 
     Q3GroupBox* textGroup = new Q3GroupBox(2, Qt::Horizontal, i18n("Text"), this);
     textGroup->setSizePolicy(sizePolicy);
@@ -131,9 +127,9 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
 
     new QLabel(i18n("Text width:"), textGroup);
     m_textWidthBox = new QComboBox(textGroup);
-    m_textWidthBox->insertItem(i18n("Small"));
-    m_textWidthBox->insertItem(i18n("Medium"));
-    m_textWidthBox->insertItem(i18n("Large"));
+    m_textWidthBox->addItem(i18n("Small"));
+    m_textWidthBox->addItem(i18n("Medium"));
+    m_textWidthBox->addItem(i18n("Large"));
 
     Q3GroupBox* gridGroup = new Q3GroupBox(2, Qt::Horizontal, i18n("Grid"), this);
     gridGroup->setSizePolicy(sizePolicy);
@@ -142,16 +138,16 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
     const bool leftToRightArrangement = (settings->arrangement() == "LeftToRight");
     new QLabel(i18n("Arrangement:"), gridGroup);
     m_arrangementBox = new QComboBox(gridGroup);
-    m_arrangementBox->insertItem(i18n("Left to right"));
-    m_arrangementBox->insertItem(i18n("Top to bottom"));
-    m_arrangementBox->setCurrentItem(leftToRightArrangement ? 0 : 1);
+    m_arrangementBox->addItem(i18n("Left to right"));
+    m_arrangementBox->addItem(i18n("Top to bottom"));
+    m_arrangementBox->setCurrentIndex(leftToRightArrangement ? 0 : 1);
 
     new QLabel(i18n("Grid spacing:"), gridGroup);
     m_gridSpacingBox = new QComboBox(gridGroup);
-    m_gridSpacingBox->insertItem(i18n("Small"));
-    m_gridSpacingBox->insertItem(i18n("Medium"));
-    m_gridSpacingBox->insertItem(i18n("Large"));
-    m_gridSpacingBox->setCurrentItem((settings->gridSpacing() - GRID_SPACING_BASE) / GRID_SPACING_INC);
+    m_gridSpacingBox->addItem(i18n("Small"));
+    m_gridSpacingBox->addItem(i18n("Medium"));
+    m_gridSpacingBox->addItem(i18n("Large"));
+    m_gridSpacingBox->setCurrentIndex((settings->gridSpacing() - GRID_SPACING_BASE) / GRID_SPACING_INC);
 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
@@ -173,8 +169,8 @@ void IconsViewSettingsPage::applySettings()
     const int defaultSize = iconSize(m_iconSizeSlider->value());
     settings->setIconSize(defaultSize);
 
-    int previewSize = (m_mode == DolphinIconsView::Previews) ?
-                      iconSize(m_previewSizeSlider->value()) :
+    int previewSize = //(m_mode == DolphinIconsView::Previews) ?
+                      //iconSize(m_previewSizeSlider->value()) :
                       defaultSize;
     if (previewSize < defaultSize) {
         // assure that the preview size is never smaller than the icon size
@@ -184,18 +180,18 @@ void IconsViewSettingsPage::applySettings()
 
     const int fontSize = m_fontSizeBox->value();
 
-    QString arrangement = (m_arrangementBox->currentItem() == 0) ?
+    QString arrangement = (m_arrangementBox->currentIndex() == 0) ?
                           "LeftToRight" :
                           "TopToBottom";
     settings->setArrangement(arrangement);
-    DolphinSettings::instance().calculateGridSize(m_textWidthBox->currentItem());
+    DolphinSettings::instance().calculateGridSize(m_textWidthBox->currentIndex());
 
     settings->setFontFamily(m_fontFamilyBox->currentFont().family());
     settings->setFontSize(fontSize);
     settings->setNumberOfTexlines(m_textlinesCountBox->value());
 
     settings->setGridSpacing(GRID_SPACING_BASE +
-                             m_gridSpacingBox->currentItem() * GRID_SPACING_INC);
+                             m_gridSpacingBox->currentIndex() * GRID_SPACING_INC);
 }
 
 void IconsViewSettingsPage::slotIconSizeChanged(int value)
@@ -257,7 +253,7 @@ void IconsViewSettingsPage::adjustTextWidthSelection()
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     assert(settings != 0);
-    m_textWidthBox->setCurrentItem(DolphinSettings::instance().textWidthHint());
+    m_textWidthBox->setCurrentIndex(DolphinSettings::instance().textWidthHint());
 }
 
 #include "iconsviewsettingspage.moc"