use "Sort by" instead of "Sort By"

[dolphin.git] / src / generalsettingspage.cpp

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index 6994af0523b5a2122a16cad36cb81c672d5bd3b3..4ba0e6b08900c6d2ace647e11cfe9e9d29f3ba01 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -20,88 +20,104 @@
 
 #include "generalsettingspage.h"
 
 
 #include "generalsettingspage.h"
 

-#include <qlayout.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>
-#include <kdialog.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-
-#include <q3grid.h>
-#include <q3groupbox.h>
-#include <klocale.h>
-#include <qcheckbox.h>
-#include <q3buttongroup.h>
-#include <qpushbutton.h>
-#include <kfiledialog.h>
-#include <qradiobutton.h>
-#include <kvbox.h>
-

 #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"
 

-GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin,QWidget* parent) :
+#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),
     m_homeUrl(0),
     SettingsPageBase(parent),
     m_mainWindow(mainWin),
     m_homeUrl(0),

-    m_startSplit(0),
-    m_startEditable(0)
+    m_splitView(0),
+    m_editableUrl(0),
+    m_filterBar(0),
+    m_showDeleteCommand(0),
+    m_confirmMoveToTrash(0),
+    m_confirmDelete(0)

 {
 {

-    Q3VBoxLayout* topLayout = new Q3VBoxLayout(this, 2, KDialog::spacingHint());
-

     const int spacing = KDialog::spacingHint();
     const int spacing = KDialog::spacingHint();

-    const int margin = KDialog::marginHint();
-    const QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-
-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();

 
 

+    QVBoxLayout* topLayout = new QVBoxLayout(this);

     KVBox* vBox = new KVBox(this);
     KVBox* vBox = new KVBox(this);

-    vBox->setSizePolicy(sizePolicy);

     vBox->setSpacing(spacing);
     vBox->setSpacing(spacing);

-    vBox->setMargin(margin);
-    vBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored);

 
 

-    // create 'Home Url' editor
-    Q3GroupBox* homeGroup = new Q3GroupBox(1, Qt::Horizontal, i18n("Home Folder"), vBox);
-    homeGroup->setSizePolicy(sizePolicy);
-    homeGroup->setMargin(margin);
+    // create 'Home URL' editor
+    QGroupBox* homeBox = new QGroupBox(i18nc("@title:group", "Home Folder"), vBox);

 
 

-    KHBox* homeUrlBox = new KHBox(homeGroup);
-    homeUrlBox->setSizePolicy(sizePolicy);
+    KHBox* homeUrlBox = new KHBox(homeBox);

     homeUrlBox->setSpacing(spacing);
 
     homeUrlBox->setSpacing(spacing);
 

-    new QLabel(i18n("Location:"), homeUrlBox);
-    m_homeUrl = new QLineEdit(settings->homeUrl(), homeUrlBox);
+    new QLabel(i18nc("@label:textbox", "Location:"), homeUrlBox);
+    m_homeUrl = new QLineEdit(homeUrlBox);

 
 

-    QPushButton* selectHomeUrlButton = new QPushButton(SmallIcon("folder"), QString::null, homeUrlBox);
+    QPushButton* selectHomeUrlButton = new QPushButton(KIcon("folder-open"), QString(), homeUrlBox);

     connect(selectHomeUrlButton, SIGNAL(clicked()),
             this, SLOT(selectHomeUrl()));
 
     connect(selectHomeUrlButton, SIGNAL(clicked()),
             this, SLOT(selectHomeUrl()));
 

-    KHBox* buttonBox = new KHBox(homeGroup);
-    buttonBox->setSizePolicy(sizePolicy);
+    KHBox* buttonBox = new KHBox(homeBox);

     buttonBox->setSpacing(spacing);
     buttonBox->setSpacing(spacing);

-    QPushButton* useCurrentButton = new QPushButton(i18n("Use current location"), buttonBox);
+
+    QPushButton* useCurrentButton = new QPushButton(i18nc("@action:button", "Use Current Location"), buttonBox);

     connect(useCurrentButton, SIGNAL(clicked()),
             this, SLOT(useCurrentLocation()));
     connect(useCurrentButton, SIGNAL(clicked()),
             this, SLOT(useCurrentLocation()));

-    QPushButton* useDefaultButton = new QPushButton(i18n("Use default location"), buttonBox);
+    QPushButton* useDefaultButton = new QPushButton(i18nc("@action:button", "Use Default Location"), buttonBox);

     connect(useDefaultButton, SIGNAL(clicked()),
     connect(useDefaultButton, SIGNAL(clicked()),

-            this, SLOT(useDefaulLocation()));
+            this, SLOT(useDefaultLocation()));

 
 

-    QGroupBox* startBox = new QGroupBox(i18n("Start"), vBox);
+    QVBoxLayout* homeBoxLayout = new QVBoxLayout(homeBox);
+    homeBoxLayout->addWidget(homeUrlBox);
+    homeBoxLayout->addWidget(buttonBox);

 
 

-    // create 'Start with split view' checkbox
-    m_startSplit = new QCheckBox(i18n("Start with split view"), startBox);
-    m_startSplit->setChecked(settings->splitView());
+    QGroupBox* startBox = new QGroupBox(i18nc("@title:group", "Startup Settings"), vBox);

 
 

-    // create 'Start with editable navigation bar' checkbox
-    m_startEditable = new QCheckBox(i18n("Start with editable navigation bar"), startBox);
-    m_startEditable->setChecked(settings->editableUrl());
+    // create 'Split view', 'Editable location' and 'Filter bar' checkboxes
+    m_splitView = new QCheckBox(i18nc("@option:check Startup Settings", "Split view mode"), startBox);
+    m_editableUrl = new QCheckBox(i18nc("@option:check Startup Settings", "Editable location bar"), startBox);
+    m_filterBar = new QCheckBox(i18nc("@option:check Startup Settings", "Show filter bar"),startBox);

 
     QVBoxLayout* startBoxLayout = new QVBoxLayout(startBox);
 
     QVBoxLayout* startBoxLayout = new QVBoxLayout(startBox);

-    startBoxLayout->addWidget(m_startSplit);
-    startBoxLayout->addWidget(m_startEditable);
+    startBoxLayout->addWidget(m_splitView);
+    startBoxLayout->addWidget(m_editableUrl);
+    startBoxLayout->addWidget(m_filterBar);
+
+    // create 'Ask Confirmation For' group
+    KSharedConfig::Ptr konqConfig = KSharedConfig::openConfig("konquerorrc", KConfig::IncludeGlobals);
+    const KConfigGroup trashConfig(konqConfig, "Trash");
+
+    QGroupBox* confirmBox = new QGroupBox(i18nc("@title:group", "Ask For Confirmation When"), vBox);
+
+    m_confirmMoveToTrash = new QCheckBox(i18nc("@option:check Ask for Confirmation When",
+                                               "Moving files or folders to trash"), confirmBox);
+    m_confirmMoveToTrash->setChecked(trashConfig.readEntry("ConfirmTrash", false));
+
+    m_confirmDelete = new QCheckBox(i18nc("@option:check Ask for Confirmation When",
+                                          "Deleting files or folders"), confirmBox);
+    m_confirmDelete->setChecked(trashConfig.readEntry("ConfirmDelete", true));
+
+    QVBoxLayout* confirmBoxLayout = new QVBoxLayout(confirmBox);
+    confirmBoxLayout->addWidget(m_confirmMoveToTrash);
+    confirmBoxLayout->addWidget(m_confirmDelete);
+
+    // create 'Show the command 'Delete' in context menu' checkbox
+    m_showDeleteCommand = new QCheckBox(i18nc("@option:check", "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));

 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout


@@ -109,8 +125,9 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin,QWidget* par
     new QWidget(vBox);
 
     topLayout->addWidget(vBox);
     new QWidget(vBox);
 
     topLayout->addWidget(vBox);

-}

 
 

+    loadSettings();
+}

 
 GeneralSettingsPage::~GeneralSettingsPage()
 {
 
 GeneralSettingsPage::~GeneralSettingsPage()
 {


@@ -126,14 +143,39 @@ void GeneralSettingsPage::applySettings()
         settings->setHomeUrl(url.prettyUrl());
     }
 
         settings->setHomeUrl(url.prettyUrl());
     }
 

-    settings->setSplitView(m_startSplit->isChecked());
-    settings->setEditableUrl(m_startEditable->isChecked());
+    settings->setSplitView(m_splitView->isChecked());
+    settings->setEditableUrl(m_editableUrl->isChecked());
+    settings->setFilterBar(m_filterBar->isChecked());
+
+    KSharedConfig::Ptr konqConfig = KSharedConfig::openConfig("konquerorrc", KConfig::IncludeGlobals);
+    KConfigGroup trashConfig(konqConfig, "Trash");
+    trashConfig.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked());
+    trashConfig.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());
+
+    KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
+    KConfigGroup kdeConfig(globalConfig, "KDE");
+    kdeConfig.writeEntry("ShowDeleteCommand", m_showDeleteCommand->isChecked());
+    kdeConfig.sync();
+}
+
+void GeneralSettingsPage::restoreDefaults()
+{
+    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    settings->setDefaults();
+
+    // TODO: reset default settings for trash and show delete command...
+    //KSharedConfig::Ptr konqConfig = KSharedConfig::openConfig("konquerorrc", KConfig::IncludeGlobals);
+    //KConfigGroup trashConfig(konqConfig, "Trash");
+    //KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
+    //KConfigGroup kdeConfig(globalConfig, "KDE");
+
+    loadSettings();

 }
 
 void GeneralSettingsPage::selectHomeUrl()
 {
     const QString homeUrl(m_homeUrl->text());
 }
 
 void GeneralSettingsPage::selectHomeUrl()
 {
     const QString homeUrl(m_homeUrl->text());

-    KUrl url(KFileDialog::getExistingUrl(homeUrl));
+    KUrl url(KFileDialog::getExistingDirectoryUrl(homeUrl));

     if (!url.isEmpty()) {
         m_homeUrl->setText(url.prettyUrl());
     }
     if (!url.isEmpty()) {
         m_homeUrl->setText(url.prettyUrl());
     }


@@ -141,13 +183,22 @@ 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());
 }
 

-void GeneralSettingsPage::useDefaulLocation()
+void GeneralSettingsPage::useDefaultLocation()

 {
     m_homeUrl->setText("file://" + QDir::homePath());
 }
 
 {
     m_homeUrl->setText("file://" + QDir::homePath());
 }
 

+void GeneralSettingsPage::loadSettings()
+{
+    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    m_homeUrl->setText(settings->homeUrl());
+    m_splitView->setChecked(settings->splitView());
+    m_editableUrl->setChecked(settings->editableUrl());
+    m_filterBar->setChecked(settings->filterBar());
+}
+

 #include "generalsettingspage.moc"
 #include "generalsettingspage.moc"