The &-shortcut from another action is not set until the action has been shown at...

[dolphin.git] / src / settings / viewpropertiesdialog.cpp

diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 7c5aa7e99d0772edf09bb055036d40ee0f6e5a19..7830616d0cf55d212566f2a97acb269d7820ab00 100644 (file)
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -21,12 +21,10 @@
 #include "viewpropertiesdialog.h"
 
 #include "additionalinfodialog.h"
 #include "viewpropertiesdialog.h"
 
 #include "additionalinfodialog.h"

-#include "dolphinview.h"
+#include "views/dolphinview.h"

 #include "settings/dolphinsettings.h"
 #include "settings/dolphinsettings.h"

-#include "dolphinsortfilterproxymodel.h"

 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"

-#include "viewproperties.h"

 #include "viewpropsprogressinfo.h"
 
 #include <config-nepomuk.h>
 #include "viewpropsprogressinfo.h"
 
 #include <config-nepomuk.h>


@@ -54,6 +52,9 @@
 #include <QRadioButton>
 #include <QBoxLayout>
 
 #include <QRadioButton>
 #include <QBoxLayout>
 

+#include <views/dolphinsortfilterproxymodel.h>
+#include <views/viewproperties.h>
+

 ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     KDialog(dolphinView),
     m_isDirty(false),
 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"), 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);
 
         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);
 
         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);
 
         topLayout->addWidget(applyBox);
         topLayout->addWidget(m_useAsDefault);


@@ -318,7 +319,7 @@ void ViewPropertiesDialog::configureAdditionalInfo()
 
     QPointer<AdditionalInfoDialog> dialog = new AdditionalInfoDialog(this, info);
     if (dialog->exec() == QDialog::Accepted) {
 
     QPointer<AdditionalInfoDialog> dialog = new AdditionalInfoDialog(this, info);
     if (dialog->exec() == QDialog::Accepted) {

-        m_viewProps->setAdditionalInfo(dialog->additionalInfo());
+        m_viewProps->setAdditionalInfo(dialog->informationList());

         markAsDirty(true);
     }
     delete dialog;
         markAsDirty(true);
     }
     delete dialog;


@@ -334,7 +335,7 @@ void ViewPropertiesDialog::applyViewProperties()
     const bool applyToSubFolders = (m_applyToSubFolders != 0) &&
                                    m_applyToSubFolders->isChecked();
     if (applyToSubFolders) {
     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;
         }
         if (KMessageBox::questionYesNo(this, text) == KMessageBox::No) {
             return;
         }