Dolphin is now a KUniqueApplication. A lot of thanks go to Oscar Blumberg, who submit...

[dolphin.git] / src / iconsviewsettingspage.cpp

diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp
index 8442872a5d8429361ceb1cdaf889c4409cfee91a..8720472463d06335d5e7df4e7d2f4e5293a24721 100644 (file)
--- a/src/iconsviewsettingspage.cpp
+++ b/src/iconsviewsettingspage.cpp
@@ -19,36 +19,41 @@
  ***************************************************************************/
 
 #include "iconsviewsettingspage.h"
  ***************************************************************************/
 
 #include "iconsviewsettingspage.h"

+#include "iconsmodesettings.h"
+#include "dolphinsettings.h"
+#include "pixmapviewer.h"
+
+#include <assert.h>

 
 #include <qlabel.h>
 #include <qslider.h>
 #include <q3buttongroup.h>
 #include <qradiobutton.h>
 #include <qspinbox.h>
 
 #include <qlabel.h>
 #include <qslider.h>
 #include <q3buttongroup.h>
 #include <qradiobutton.h>
 #include <qspinbox.h>

-#include <kiconloader.h>

 #include <qfontcombobox.h>
 #include <qfontcombobox.h>

+
+#include <kiconloader.h>

 #include <kdialog.h>
 #include <kdialog.h>

+#include <kglobalsettings.h>

 #include <klocale.h>
 #include <klocale.h>

-#include <assert.h>

 #include <kvbox.h>
 
 #include <kvbox.h>
 

-#include "iconsmodesettings.h"
-#include "dolphinsettings.h"
-#include "pixmapviewer.h"
-

 #define GRID_SPACING_BASE 8
 #define GRID_SPACING_INC 12
 
 #define GRID_SPACING_BASE 8
 #define GRID_SPACING_INC 12
 

-IconsViewSettingsPage::IconsViewSettingsPage(QWidget* parent) :
+IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
+                                             QWidget* parent) :

     KVBox(parent),
     KVBox(parent),

+    m_mainWindow(mainWindow),

     m_iconSizeSlider(0),
     m_previewSizeSlider(0),
     m_textWidthBox(0),
     m_iconSizeSlider(0),
     m_previewSizeSlider(0),
     m_textWidthBox(0),

-    m_gridSpacingBox(0),

     m_fontFamilyBox(0),
     m_fontSizeBox(0),
     m_textlinesCountBox(0),
     m_fontFamilyBox(0),
     m_fontSizeBox(0),
     m_textlinesCountBox(0),

-    m_arrangementBox(0)
+    m_additionalInfo(0),
+    m_arrangementBox(0),
+    m_gridSpacingBox(0)

 {
     const int spacing = KDialog::spacingHint();
     const int margin = KDialog::marginHint();
 {
     const int spacing = KDialog::spacingHint();
     const int margin = KDialog::marginHint();


@@ -131,6 +136,14 @@ IconsViewSettingsPage::IconsViewSettingsPage(QWidget* parent) :
     m_textWidthBox->addItem(i18n("Medium"));
     m_textWidthBox->addItem(i18n("Large"));
 
     m_textWidthBox->addItem(i18n("Medium"));
     m_textWidthBox->addItem(i18n("Large"));
 

+    new QLabel(i18n("Additional information:"), textGroup);
+    m_additionalInfo = new QComboBox(textGroup);
+    m_additionalInfo->addItem(i18n("No Information"));
+    m_additionalInfo->addItem(i18n("MIME Type"));
+    m_additionalInfo->addItem(i18n("Size"));
+    m_additionalInfo->addItem(i18n("Date"));
+    m_additionalInfo->setCurrentIndex(settings->additionalInfo());
+

     Q3GroupBox* gridGroup = new Q3GroupBox(2, Qt::Horizontal, i18n("Grid"), this);
     gridGroup->setSizePolicy(sizePolicy);
     gridGroup->setMargin(margin);
     Q3GroupBox* gridGroup = new Q3GroupBox(2, Qt::Horizontal, i18n("Grid"), this);
     gridGroup->setSizePolicy(sizePolicy);
     gridGroup->setMargin(margin);


@@ -184,7 +197,7 @@ void IconsViewSettingsPage::applySettings()
                           "LeftToRight" :
                           "TopToBottom";
     settings->setArrangement(arrangement);
                           "LeftToRight" :
                           "TopToBottom";
     settings->setArrangement(arrangement);

-    DolphinSettings::instance().calculateGridSize(m_textWidthBox->currentIndex());
+    //DolphinSettings::instance().calculateGridSize(m_textWidthBox->currentIndex());

 
     settings->setFontFamily(m_fontFamilyBox->currentFont().family());
     settings->setFontSize(fontSize);
 
     settings->setFontFamily(m_fontFamilyBox->currentFont().family());
     settings->setFontSize(fontSize);


@@ -253,7 +266,7 @@ void IconsViewSettingsPage::adjustTextWidthSelection()
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     assert(settings != 0);
 {
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     assert(settings != 0);

-    m_textWidthBox->setCurrentIndex(DolphinSettings::instance().textWidthHint());
+    //m_textWidthBox->setCurrentIndex(DolphinSettings::instance().textWidthHint());

 }
 
 #include "iconsviewsettingspage.moc"
 }
 
 #include "iconsviewsettingspage.moc"