Disable all the 'create new' items when in the Trash

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

diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
index 23a65b5ac0a96e7f5a1d6812848ef898aa5650a1..535aa944b9f346778b02ffc46ada1837970729d1 100644 (file)
--- a/src/settings/additionalinfodialog.cpp
+++ b/src/settings/additionalinfodialog.cpp
@@ -19,19 +19,19 @@
 
 #include "additionalinfodialog.h"
 
-#include <config-baloo.h>
-
-#include <KSharedConfig>
-#include <KLocalizedString>
 #include "kitemviews/kfileitemmodel.h"
+
 #include <KConfigGroup>
+#include <KLocalizedString>
+#include <KSharedConfig>
 #include <KWindowConfig>
+#include <config-baloo.h>
 
 #include <QCheckBox>
-#include <QLabel>
-#include <QVBoxLayout>
 #include <QDialogButtonBox>
+#include <QLabel>
 #include <QPushButton>
+#include <QVBoxLayout>
 
 #ifdef HAVE_BALOO
     #include <Baloo/IndexerConfig>
@@ -41,7 +41,7 @@ AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
                                            const QList<QByteArray>& visibleRoles) :
     QDialog(parent),
     m_visibleRoles(visibleRoles),
-    m_listWidget(0)
+    m_listWidget(nullptr)
 {
     setWindowTitle(i18nc("@title:window", "Additional Information"));
     setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
@@ -69,9 +69,9 @@ AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
         QListWidgetItem* item = new QListWidgetItem(info.translation, m_listWidget);
         item->setCheckState(visibleRoles.contains(info.role) ? Qt::Checked : Qt::Unchecked);
 
-        const bool enable = (!info.requiresBaloo && !info.requiresIndexer) ||
+        const bool enable = ((!info.requiresBaloo && !info.requiresIndexer) ||
                             (info.requiresBaloo) ||
-                            (info.requiresIndexer && indexingEnabled);
+                            (info.requiresIndexer && indexingEnabled)) && info.role != "text";
 
         if (!enable) {
             item->setFlags(item->flags() & ~Qt::ItemIsEnabled);
@@ -85,7 +85,7 @@ AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
     layout->addWidget(buttonBox);
 
     auto okButton = buttonBox->button(QDialogButtonBox::Ok);
-    okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
+    okButton->setShortcut(Qt::CTRL + Qt::Key_Return);
     okButton->setDefault(true);
 
     const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "AdditionalInfoDialog");