Hide the "Sort by Rating" and "Sort by Tags" menu entries for KDE 4.0, as currently...

[dolphin.git] / src / generalsettingspage.cpp

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index ccb06cd09ce034b837fbad0f88877c0fc0e4817a..f856de1b17894e8135115bf084abf86dd7b6d31c 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -57,12 +57,12 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
     vBox->setSpacing(spacing);
 
     // create 'Home URL' editor
     vBox->setSpacing(spacing);
 
     // create 'Home URL' editor

-    QGroupBox* homeBox = new QGroupBox(i18n("Home Folder"), vBox);
+    QGroupBox* homeBox = new QGroupBox(i18nc("@title:group", "Home Folder"), vBox);

 
     KHBox* homeUrlBox = new KHBox(homeBox);
     homeUrlBox->setSpacing(spacing);
 
 
     KHBox* homeUrlBox = new KHBox(homeBox);
     homeUrlBox->setSpacing(spacing);
 

-    new QLabel(i18n("Location:"), homeUrlBox);
+    new QLabel(i18nc("@label:textbox", "Location:"), homeUrlBox);

     m_homeUrl = new QLineEdit(homeUrlBox);
 
     QPushButton* selectHomeUrlButton = new QPushButton(KIcon("folder-open"), QString(), homeUrlBox);
     m_homeUrl = new QLineEdit(homeUrlBox);
 
     QPushButton* selectHomeUrlButton = new QPushButton(KIcon("folder-open"), QString(), homeUrlBox);


@@ -72,10 +72,10 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
     KHBox* buttonBox = new KHBox(homeBox);
     buttonBox->setSpacing(spacing);
 
     KHBox* buttonBox = new KHBox(homeBox);
     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()),
             this, SLOT(useDefaultLocation()));
 
     connect(useDefaultButton, SIGNAL(clicked()),
             this, SLOT(useDefaultLocation()));
 


@@ -83,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("Startup Settings"), vBox);
+    QGroupBox* startBox = new QGroupBox(i18nc("@title:group", "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 mode"), startBox);
-    m_editableUrl = new QCheckBox(i18n("Editable location bar"), startBox);
-    m_filterBar = new QCheckBox(i18n("Show filter bar"),startBox);
+    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);
     startBoxLayout->addWidget(m_splitView);
 
     QVBoxLayout* startBoxLayout = new QVBoxLayout(startBox);
     startBoxLayout->addWidget(m_splitView);


@@ -96,26 +96,18 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
     startBoxLayout->addWidget(m_filterBar);
 
     // create 'Ask Confirmation For' group
     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(i18n("Ask For Confirmation When"), vBox);
-
-    m_confirmMoveToTrash = new QCheckBox(i18n("Moving files or folders to trash"), confirmBox);
-    m_confirmMoveToTrash->setChecked(trashConfig.readEntry("ConfirmTrash", false));
-
-    m_confirmDelete = new QCheckBox(i18n("Deleting files or folders"), confirmBox);
-    m_confirmDelete->setChecked(trashConfig.readEntry("ConfirmDelete", true));
+    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_confirmDelete = new QCheckBox(i18nc("@option:check Ask for Confirmation When",
+                                          "Deleting files or folders"), confirmBox);

 
     QVBoxLayout* confirmBoxLayout = new QVBoxLayout(confirmBox);
     confirmBoxLayout->addWidget(m_confirmMoveToTrash);
     confirmBoxLayout->addWidget(m_confirmDelete);
 
     // create 'Show the command 'Delete' in context menu' checkbox
 
     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(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));
+    m_showDeleteCommand = new QCheckBox(i18nc("@option:check", "Show 'Delete' command in context menu"), vBox);

 
     // 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


@@ -149,9 +141,9 @@ void GeneralSettingsPage::applySettings()
     KConfigGroup trashConfig(konqConfig, "Trash");
     trashConfig.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked());
     trashConfig.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());
     KConfigGroup trashConfig(konqConfig, "Trash");
     trashConfig.writeEntry("ConfirmTrash", m_confirmMoveToTrash->isChecked());
     trashConfig.writeEntry("ConfirmDelete", m_confirmDelete->isChecked());

+    trashConfig.sync();

 
 

-    KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals);
-    KConfigGroup kdeConfig(globalConfig, "KDE");
+    KConfigGroup kdeConfig(KGlobal::config(), "KDE");

     kdeConfig.writeEntry("ShowDeleteCommand", m_showDeleteCommand->isChecked());
     kdeConfig.sync();
 }
     kdeConfig.writeEntry("ShowDeleteCommand", m_showDeleteCommand->isChecked());
     kdeConfig.sync();
 }


@@ -162,10 +154,6 @@ void GeneralSettingsPage::restoreDefaults()
     settings->setDefaults();
 
     // TODO: reset default settings for trash and show delete command...
     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();
 }
 
     loadSettings();
 }


@@ -197,6 +185,14 @@ void GeneralSettingsPage::loadSettings()
     m_splitView->setChecked(settings->splitView());
     m_editableUrl->setChecked(settings->editableUrl());
     m_filterBar->setChecked(settings->filterBar());
     m_splitView->setChecked(settings->splitView());
     m_editableUrl->setChecked(settings->editableUrl());
     m_filterBar->setChecked(settings->filterBar());

+
+    KSharedConfig::Ptr konqConfig = KSharedConfig::openConfig("konquerorrc", KConfig::IncludeGlobals);
+    const KConfigGroup trashConfig(konqConfig, "Trash");
+    m_confirmMoveToTrash->setChecked(trashConfig.readEntry("ConfirmTrash", false));
+    m_confirmDelete->setChecked(trashConfig.readEntry("ConfirmDelete", true));
+
+    const KConfigGroup kdeConfig(KGlobal::config(), "KDE");
+    m_showDeleteCommand->setChecked(kdeConfig.readEntry("ShowDeleteCommand", false));

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