fixed some activation issues in combination with split views

[dolphin.git] / src / generalsettingspage.cpp

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index ee4832e571f1e3dae52a49852202565d8a7f87ef..ccb06cd09ce034b837fbad0f88877c0fc0e4817a 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -20,24 +20,25 @@
 
 #include "generalsettingspage.h"
 
 
 #include "generalsettingspage.h"
 

-#include <kdialog.h>
-#include <kfiledialog.h>
-#include <klocale.h>
-#include <kvbox.h>
-
-#include <QtGui/QCheckBox>
-#include <QtGui/QGroupBox>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPushButton>
-#include <QtGui/QRadioButton>
-

 #include "dolphinsettings.h"
 #include "dolphinmainwindow.h"
 #include "dolphinview.h"
 #include "dolphinsettings.h"
 #include "dolphinmainwindow.h"
 #include "dolphinview.h"

+#include "dolphinviewcontainer.h"

 
 #include "dolphin_generalsettings.h"
 
 
 #include "dolphin_generalsettings.h"
 

+#include <kdialog.h>
+#include <kfiledialog.h>
+#include <klocale.h>
+#include <kvbox.h>
+
+#include <QCheckBox>
+#include <QGroupBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QRadioButton>
+

 GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* parent) :
     SettingsPageBase(parent),
     m_mainWindow(mainWin),
 GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* parent) :
     SettingsPageBase(parent),
     m_mainWindow(mainWin),


@@ -82,12 +83,12 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
     homeBoxLayout->addWidget(homeUrlBox);
     homeBoxLayout->addWidget(buttonBox);
 
     homeBoxLayout->addWidget(homeUrlBox);
     homeBoxLayout->addWidget(buttonBox);
 

-    QGroupBox* startBox = new QGroupBox(i18n("Start"), vBox);
+    QGroupBox* startBox = new QGroupBox(i18n("Startup Settings"), vBox);

 
     // create 'Split view', 'Editable location' and 'Filter bar' checkboxes
 
     // create 'Split view', 'Editable location' and 'Filter bar' checkboxes

-    m_splitView = new QCheckBox(i18n("Split view"), startBox);
-    m_editableUrl = new QCheckBox(i18n("Editable location"), startBox);
-    m_filterBar = new QCheckBox(i18n("Filter bar"),startBox);
+    m_splitView = new QCheckBox(i18n("Split view mode"), startBox);
+    m_editableUrl = new QCheckBox(i18n("Editable location bar"), startBox);
+    m_filterBar = new QCheckBox(i18n("Show filter bar"),startBox);

 
     QVBoxLayout* startBoxLayout = new QVBoxLayout(startBox);
     startBoxLayout->addWidget(m_splitView);
 
     QVBoxLayout* startBoxLayout = new QVBoxLayout(startBox);
     startBoxLayout->addWidget(m_splitView);


@@ -98,12 +99,12 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
     KSharedConfig::Ptr konqConfig = KSharedConfig::openConfig("konquerorrc", KConfig::IncludeGlobals);
     const KConfigGroup trashConfig(konqConfig, "Trash");
 
     KSharedConfig::Ptr konqConfig = KSharedConfig::openConfig("konquerorrc", KConfig::IncludeGlobals);
     const KConfigGroup trashConfig(konqConfig, "Trash");
 

-    QGroupBox* confirmBox = new QGroupBox(i18n("Ask Confirmation For"), vBox);
+    QGroupBox* confirmBox = new QGroupBox(i18n("Ask For Confirmation When"), vBox);

 
 

-    m_confirmMoveToTrash = new QCheckBox(i18n("Move to trash"), confirmBox);
+    m_confirmMoveToTrash = new QCheckBox(i18n("Moving files or folders to trash"), confirmBox);

     m_confirmMoveToTrash->setChecked(trashConfig.readEntry("ConfirmTrash", false));
 
     m_confirmMoveToTrash->setChecked(trashConfig.readEntry("ConfirmTrash", false));
 

-    m_confirmDelete = new QCheckBox(i18n("Delete"), confirmBox);
+    m_confirmDelete = new QCheckBox(i18n("Deleting files or folders"), confirmBox);

     m_confirmDelete->setChecked(trashConfig.readEntry("ConfirmDelete", true));
 
     QVBoxLayout* confirmBoxLayout = new QVBoxLayout(confirmBox);
     m_confirmDelete->setChecked(trashConfig.readEntry("ConfirmDelete", true));
 
     QVBoxLayout* confirmBoxLayout = new QVBoxLayout(confirmBox);


@@ -111,7 +112,7 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
     confirmBoxLayout->addWidget(m_confirmDelete);
 
     // create 'Show the command 'Delete' in context menu' checkbox
     confirmBoxLayout->addWidget(m_confirmDelete);
 
     // create 'Show the command 'Delete' in context menu' checkbox

-    m_showDeleteCommand = new QCheckBox(i18n("Show the command 'Delete' in context menu"), vBox);
+    m_showDeleteCommand = new QCheckBox(i18n("Show 'Delete' command in context menu"), vBox);

     const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
     const KConfigGroup kdeConfig(globalConfig, "KDE");
     m_showDeleteCommand->setChecked(kdeConfig.readEntry("ShowDeleteCommand", false));
     const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
     const KConfigGroup kdeConfig(globalConfig, "KDE");
     m_showDeleteCommand->setChecked(kdeConfig.readEntry("ShowDeleteCommand", false));


@@ -180,7 +181,7 @@ void GeneralSettingsPage::selectHomeUrl()
 
 void GeneralSettingsPage::useCurrentLocation()
 {
 
 void GeneralSettingsPage::useCurrentLocation()
 {

-    const DolphinView* view = m_mainWindow->activeView();
+    const DolphinView* view = m_mainWindow->activeViewContainer()->view();

     m_homeUrl->setText(view->url().prettyUrl());
 }
 
     m_homeUrl->setText(view->url().prettyUrl());
 }