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

[dolphin.git] / src / dolphinsettingsdialog.cpp

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index 998f6b4d26cd3c7a750528c9b20a749893ef97e0..1bbbbde55064de520d9c95f1f3b22662c7c7b313 100644 (file)
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/dolphinsettingsdialog.cpp
@@ -30,23 +30,24 @@
 #include <kicon.h>
 
 DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
 #include <kicon.h>
 
 DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :

-    KPageDialog(),
-    m_mainWindow(mainWindow)
+    KPageDialog(mainWindow)

 {
     const QSize minSize = minimumSize();
     setMinimumSize(QSize(512, minSize.height()));
 
     setFaceType(List);
 {
     const QSize minSize = minimumSize();
     setMinimumSize(QSize(512, minSize.height()));
 
     setFaceType(List);

-    setCaption(i18n("Dolphin Preferences"));
+    setCaption(i18nc("@title:window", "Dolphin Preferences"));

     setButtons(Ok | Apply | Cancel | Default);
     setDefaultButton(Ok);
 
     m_generalSettingsPage = new GeneralSettingsPage(mainWindow, this);
     setButtons(Ok | Apply | Cancel | Default);
     setDefaultButton(Ok);
 
     m_generalSettingsPage = new GeneralSettingsPage(mainWindow, this);

-    KPageWidgetItem* generalSettingsFrame = addPage(m_generalSettingsPage, i18n("General"));
-    generalSettingsFrame->setIcon(KIcon("exec"));
+    KPageWidgetItem* generalSettingsFrame = addPage(m_generalSettingsPage,
+                                                    i18nc("@title:group", "General"));
+    generalSettingsFrame->setIcon(KIcon("system-run"));

 
     m_viewSettingsPage = new ViewSettingsPage(mainWindow, this);
 
     m_viewSettingsPage = new ViewSettingsPage(mainWindow, this);

-    KPageWidgetItem* viewSettingsFrame = addPage(m_viewSettingsPage, i18n("View Modes"));
+    KPageWidgetItem* viewSettingsFrame = addPage(m_viewSettingsPage,
+                                                 i18nc("@title:group", "View Modes"));

     viewSettingsFrame->setIcon(KIcon("view-choose"));
 
     const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
     viewSettingsFrame->setIcon(KIcon("view-choose"));
 
     const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");


@@ -56,7 +57,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {
     KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");
 DolphinSettingsDialog::~DolphinSettingsDialog()
 {
     KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "SettingsDialog");

-    saveDialogSize(dialogConfig, KConfigFlags::Persistent);
+    saveDialogSize(dialogConfig);

 }
 
 void DolphinSettingsDialog::slotButtonClicked(int button)
 }
 
 void DolphinSettingsDialog::slotButtonClicked(int button)


@@ -64,7 +65,7 @@ void DolphinSettingsDialog::slotButtonClicked(int button)
     if ((button == Ok) || (button == Apply)) {
         applySettings();
     } else if (button == Default) {
     if ((button == Ok) || (button == Apply)) {
         applySettings();
     } else if (button == Default) {

-        const QString text(i18n("All settings will be reset to default values. Do you want to continue?"));
+        const QString text(i18nc("@info", "All settings will be reset to default values. Do you want to continue?"));

         if (KMessageBox::questionYesNo(this, text) == KMessageBox::Yes) {
             restoreDefaults();
         }
         if (KMessageBox::questionYesNo(this, text) == KMessageBox::Yes) {
             restoreDefaults();
         }