X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/29c5ab3b74d26657c60b40770676be082caa953d..8eb9b508ca87fb1d634d8b8ba62c054ed04466d2:/src/settings/viewpropertiesdialog.cpp?ds=sidebyside

diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 7bd992ef1..f52bd12d2 100644
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -21,12 +21,10 @@
 #include "viewpropertiesdialog.h"
 
 #include "additionalinfodialog.h"
-#include "dolphinview.h"
+#include "views/dolphinview.h"
 #include "settings/dolphinsettings.h"
-#include "dolphinsortfilterproxymodel.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
-#include "viewproperties.h"
 #include "viewpropsprogressinfo.h"
 
 #include <config-nepomuk.h>
@@ -34,13 +32,13 @@
 #include <nepomuk/resourcemanager.h>
 #endif
 
-#include <kcomponentdata.h>
-#include <klocale.h>
-#include <kiconloader.h>
-#include <kio/netaccess.h>
-#include <kmessagebox.h>
-#include <kstandarddirs.h>
-#include <kurl.h>
+#include <KComponentData>
+#include <KLocale>
+#include <KIconLoader>
+#include <KIO/NetAccess>
+#include <KMessageBox>
+#include <KStandardDirs>
+#include <KUrl>
 #include <kcombobox.h>
 
 #include <QAction>
@@ -54,6 +52,9 @@
 #include <QRadioButton>
 #include <QBoxLayout>
 
+#include <views/dolphinsortfilterproxymodel.h>
+#include <views/viewproperties.h>
+
 ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     KDialog(dolphinView),
     m_isDirty(false),
@@ -182,7 +183,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
                                                         "Current folder"), applyBox);
         m_applyToCurrentFolder->setChecked(true);
         m_applyToSubFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To",
-                                                     "Current folder including all sub folders"), applyBox);
+                                                     "Current folder including all sub-folders"), applyBox);
         m_applyToAllFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To",
                                                      "All folders"), applyBox);
 
@@ -196,7 +197,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
         applyBoxLayout->addWidget(m_applyToSubFolders);
         applyBoxLayout->addWidget(m_applyToAllFolders);
 
-        m_useAsDefault = new QCheckBox(i18nc("@option:check", "Use as default for new folders"), main);
+        m_useAsDefault = new QCheckBox(i18nc("@option:check", "Use these view properties as default"), main);
 
         topLayout->addWidget(applyBox);
         topLayout->addWidget(m_useAsDefault);
@@ -316,11 +317,12 @@ void ViewPropertiesDialog::configureAdditionalInfo()
         m_viewProps->setAdditionalInfo(info);
     }
 
-    AdditionalInfoDialog dialog(this, info);
-    if (dialog.exec() == QDialog::Accepted) {
-        m_viewProps->setAdditionalInfo(dialog.additionalInfo());
+    QPointer<AdditionalInfoDialog> dialog = new AdditionalInfoDialog(this, info);
+    if (dialog->exec() == QDialog::Accepted) {
+        m_viewProps->setAdditionalInfo(dialog->informationList());
         markAsDirty(true);
     }
+    delete dialog;
 }
 
 void ViewPropertiesDialog::applyViewProperties()
@@ -333,7 +335,7 @@ void ViewPropertiesDialog::applyViewProperties()
     const bool applyToSubFolders = (m_applyToSubFolders != 0) &&
                                    m_applyToSubFolders->isChecked();
     if (applyToSubFolders) {
-        const QString text(i18nc("@info", "The view properties of all sub folders will be changed. Do you want to continue?"));
+        const QString text(i18nc("@info", "The view properties of all sub-folders will be changed. Do you want to continue?"));
         if (KMessageBox::questionYesNo(this, text) == KMessageBox::No) {
             return;
         }