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

[dolphin.git] / src / generalsettingspage.cpp

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index 0ad74759067012caa3c20a26747f187e79405bb8..1c0965c66f2eacf093fdc79421d929cb73c1d18a 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -64,7 +64,7 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin,QWidget* par
     vBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored);
 
     // create 'Home Url' editor
-    Q3GroupBox* homeGroup = new Q3GroupBox(1, Qt::Horizontal, i18n("Home Url"), vBox);
+    Q3GroupBox* homeGroup = new Q3GroupBox(1, Qt::Horizontal, i18n("Home Folder"), vBox);
     homeGroup->setSizePolicy(sizePolicy);
     homeGroup->setMargin(margin);
 
@@ -89,29 +89,20 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin,QWidget* par
     connect(useDefaultButton, SIGNAL(clicked()),
             this, SLOT(useDefaulLocation()));
 
-    // create 'Default View Mode' group
-    Q3ButtonGroup* buttonGroup = new Q3ButtonGroup(3, Qt::Vertical, i18n("Default View Mode"), vBox);
-    buttonGroup->setSizePolicy(sizePolicy);
-    buttonGroup->setMargin(margin);
-
-    m_iconsView = new QRadioButton(i18n("Icons"), buttonGroup);
-    m_detailsView = new QRadioButton(i18n("Details"), buttonGroup);
-    m_previewsView = new QRadioButton(i18n("Previews"), buttonGroup);
-
-    switch (settings->defaultViewMode()) {
-        case DolphinView::IconsView:    m_iconsView->setChecked(true); break;
-        case DolphinView::DetailsView:  m_detailsView->setChecked(true); break;
-        case DolphinView::PreviewsView: m_previewsView->setChecked(true); break;
-    }
+    QGroupBox* startBox = new QGroupBox(i18n("Start"), vBox);
 
     // create 'Start with split view' checkbox
-    m_startSplit = new QCheckBox(i18n("Start with split view"), vBox);
+    m_startSplit = new QCheckBox(i18n("Start with split view"), startBox);
     m_startSplit->setChecked(settings->splitView());
 
     // create 'Start with editable navigation bar' checkbox
-    m_startEditable = new QCheckBox(i18n("Start with editable navigation bar"), vBox);
+    m_startEditable = new QCheckBox(i18n("Start with editable navigation bar"), startBox);
     m_startEditable->setChecked(settings->editableUrl());
 
+    QVBoxLayout* startBoxLayout = new QVBoxLayout(startBox);
+    startBoxLayout->addWidget(m_startSplit);
+    startBoxLayout->addWidget(m_startEditable);
+
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
@@ -135,15 +126,6 @@ void GeneralSettingsPage::applySettings()
         settings->setHomeUrl(url.prettyUrl());
     }
 
-    DolphinView::Mode viewMode = DolphinView::IconsView;
-    if (m_detailsView->isChecked()) {
-        viewMode = DolphinView::DetailsView;
-    }
-    else if (m_previewsView->isChecked()) {
-        viewMode = DolphinView::PreviewsView;
-    }
-    settings->setDefaultViewMode(viewMode);
-
     settings->setSplitView(m_startSplit->isChecked());
     settings->setEditableUrl(m_startEditable->isChecked());
 }