Cleanup of URL drop handling (simplified code, modifier keys work again). After furth...

[dolphin.git] / src / generalsettingspage.cpp

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index d7b72aa6ac7b6744496ec2a3d0fc7e33efdef767..1c0965c66f2eacf093fdc79421d929cb73c1d18a 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.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 "generalsettingspage.h"
@@ -38,12 +38,13 @@
 #include <kvbox.h>
 
 #include "dolphinsettings.h"
-#include "dolphin.h"
+#include "dolphinmainwindow.h"
 #include "dolphinview.h"
 #include "generalsettings.h"
 
-GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) :
+GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin,QWidget* parent) :
     SettingsPageBase(parent),
+    m_mainWindow(mainWin),
     m_homeUrl(0),
     m_startSplit(0),
     m_startEditable(0)
@@ -63,7 +64,7 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) :
     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);
 
@@ -88,29 +89,20 @@ GeneralSettingsPage::GeneralSettingsPage(QWidget* parent) :
     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.
@@ -134,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());
 }
@@ -158,7 +141,7 @@ void GeneralSettingsPage::selectHomeUrl()
 
 void GeneralSettingsPage::useCurrentLocation()
 {
-    const DolphinView* view = Dolphin::mainWin().activeView();
+    const DolphinView* view = m_mainWindow->activeView();
     m_homeUrl->setText(view->url().prettyUrl());
 }