]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/iconsviewsettingspage.cpp
Jippie: file previews are generated again! Thanks to Fredrik for giving me a hint...
[dolphin.git] / src / iconsviewsettingspage.cpp
index fab0a560436a0632a89f2c8efa10478fd2efaf42..743ca936b7a2c363dd72a2a3fbe32173d937d545 100644 (file)
  *   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"
+#include "dolphin_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 <qfontcombobox.h>
+
 #include <kiconloader.h>
-#include <kfontcombo.h>
 #include <kdialog.h>
+#include <kglobalsettings.h>
 #include <klocale.h>
-#include <assert.h>
+#include <kvbox.h>
 
-#include "iconsmodesettings.h"
-#include "dolphinsettings.h"
-#include "pixmapviewer.h"
+#include <QListView>
 
 #define GRID_SPACING_BASE 8
-#define GRID_SPACING_INC 12
+#define GRID_SPACING_INC 24
 
-IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
+IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
                                              QWidget* parent) :
-    Q3VBox(parent),
-    m_mode(mode),
+    KVBox(parent),
+    m_mainWindow(mainWindow),
     m_iconSizeSlider(0),
     m_previewSizeSlider(0),
     m_textWidthBox(0),
-    m_gridSpacingBox(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();
@@ -61,7 +67,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
     IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
     assert(settings != 0);
 
-    Q3HBox* sizesLayout = new Q3HBox(this);
+    KHBox* sizesLayout = new KHBox(this);
     sizesLayout->setSpacing(spacing);
     sizesLayout->setSizePolicy(sizePolicy);
 
@@ -72,7 +78,7 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
 
     const QColor iconBackgroundColor(KGlobalSettings::baseColor());
 
-    Q3HBox* iconSizeVBox = new Q3HBox(iconSizeGroup);
+    KHBox* iconSizeVBox = new KHBox(iconSizeGroup);
     iconSizeVBox->setSpacing(spacing);
     new QLabel(i18n("Small"), iconSizeVBox);
     m_iconSizeSlider = new QSlider(0, 5, 1, 0,  Qt::Horizontal, iconSizeVBox);
@@ -88,36 +94,34 @@ 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);
-
-        Q3HBox* previewSizeVBox = new Q3HBox(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);
     textGroup->setMargin(margin);
 
     new QLabel(i18n("Font family:"), textGroup);
-    m_fontFamilyBox = new KFontCombo(textGroup);
+    m_fontFamilyBox = new QFontComboBox(textGroup);
     m_fontFamilyBox->setCurrentFont(settings->fontFamily());
 
     new QLabel(i18n("Font size:"), textGroup);
@@ -130,27 +134,35 @@ 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"));
+
+    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);
 
-    const bool leftToRightArrangement = (settings->arrangement() == Q3IconView::LeftToRight);
+    const bool leftToRightArrangement = (settings->arrangement() == QListView::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
@@ -172,9 +184,7 @@ void IconsViewSettingsPage::applySettings()
     const int defaultSize = iconSize(m_iconSizeSlider->value());
     settings->setIconSize(defaultSize);
 
-    int previewSize = (m_mode == DolphinIconsView::Previews) ?
-                      iconSize(m_previewSizeSlider->value()) :
-                      defaultSize;
+    int previewSize = iconSize(m_previewSizeSlider->value());
     if (previewSize < defaultSize) {
         // assure that the preview size is never smaller than the icon size
         previewSize = defaultSize;
@@ -183,18 +193,33 @@ void IconsViewSettingsPage::applySettings()
 
     const int fontSize = m_fontSizeBox->value();
 
-    QString arrangement = (m_arrangementBox->currentItem() == 0) ?
-                          "LeftToRight" :
-                          "TopToBottom";
+    const int arrangement = (m_arrangementBox->currentIndex() == 0) ?
+                            QListView::LeftToRight :
+                            QListView::TopToBottom;
+
     settings->setArrangement(arrangement);
-    DolphinSettings::instance().calculateGridSize(m_textWidthBox->currentItem());
 
-    settings->setFontFamily(m_fontFamilyBox->currentFont());
+    // TODO: this is just a very rough testing code to calculate the grid
+    // width and height
+    int gridWidth = defaultSize;
+    int gridHeight = defaultSize;
+    if (arrangement == QListView::TopToBottom) {
+        gridWidth += 96;
+        gridHeight += 64;
+    }
+    else {
+        gridWidth += 256;
+    }
+
+    settings->setGridWidth(gridWidth);
+    settings->setGridHeight(gridHeight);
+
+    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)
@@ -256,7 +281,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"