also toggle the text between "Split" and "Join" for the split action

[dolphin.git] / src / viewpropertiesdialog.cpp

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 99f40bfa92a1a1fc3a68add3d8ee5679d150e3aa..40c1a409d330b880d19d644b086bcee9430fc1a5 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -34,14 +34,14 @@
 #include <kstandarddirs.h>
 #include <kurl.h>
 
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QLabel>
-#include <QRadioButton>
-#include <QVBoxLayout>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QRadioButton>
+#include <QtGui/QBoxLayout>
 
 ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     KDialog(dolphinView),
@@ -80,8 +80,8 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
 
     QLabel* viewModeLabel = new QLabel(i18n("View mode:"), propsBox);
     m_viewMode = new QComboBox(propsBox);
-    m_viewMode->addItem(KIcon("view-icon"), i18n("Icons"));
-    m_viewMode->addItem(KIcon("fileview-text"), i18n("Details"));
+    m_viewMode->addItem(KIcon("fileview-icon"), i18n("Icons"));
+    m_viewMode->addItem(KIcon("fileview-detailed"), i18n("Details"));
     m_viewMode->addItem(KIcon("fileview-column"), i18n("Column"));
     const int index = static_cast<int>(m_viewProps->viewMode());
     m_viewMode->setCurrentIndex(index);
@@ -97,8 +97,8 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_sortOrder->setCurrentIndex(sortOrderIdx);
 
     m_categorizedSorting = new QComboBox(sortingBox);
-    m_categorizedSorting->addItem(i18n("Uncategorized"));
-    m_categorizedSorting->addItem(i18n("Categorized"));
+    m_categorizedSorting->addItem(i18n("Ungrouped"));
+    m_categorizedSorting->addItem(i18n("Show in Groups"));
     m_categorizedSorting->setCurrentIndex(m_viewProps->categorizedSorting() ? 1 : 0);
     m_categorizedSorting->setEnabled(iconsViewEnabled);
 
@@ -203,6 +203,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
 
     main->setLayout(topLayout);
     setMainWidget(main);
+
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
+                                    "ViewPropertiesDialog");
+    restoreDialogSize(dialogConfig);
 }
 
 ViewPropertiesDialog::~ViewPropertiesDialog()
@@ -210,6 +214,10 @@ ViewPropertiesDialog::~ViewPropertiesDialog()
     m_isDirty = false;
     delete m_viewProps;
     m_viewProps = 0;
+
+    KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
+                              "ViewPropertiesDialog");
+    saveDialogSize(dialogConfig, KConfigFlags::Persistent);
 }
 
 void ViewPropertiesDialog::slotOk()