SVN_SILENT made messages (.desktop file) - always resolve ours

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

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index d699ef894bc342b236a478133557fcda80a7508b..f6c4c830875d0c7b0a9d989f8c5d468135647a16 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -14,8 +14,8 @@
 #include "startup/startupsettingspage.h"
 #include "trash/trashsettingspage.h"
 #include "viewmodes/viewsettingspage.h"
 #include "startup/startupsettingspage.h"
 #include "trash/trashsettingspage.h"
 #include "viewmodes/viewsettingspage.h"

-#include "config-kuserfeedback.h"
-#ifdef HAVE_KUSERFEEDBACK
+#include "config-dolphin.h"
+#if HAVE_KUSERFEEDBACK

 #include "userfeedback/dolphinfeedbackprovider.h"
 #include "userfeedback/userfeedbacksettingspage.h"
 #endif
 #include "userfeedback/dolphinfeedbackprovider.h"
 #include "userfeedback/userfeedbacksettingspage.h"
 #endif


@@ -86,7 +86,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K
         QStringLiteral("open_in_new_window"),
         QStringLiteral("copy_location"),
         QStringLiteral("duplicate"),
         QStringLiteral("open_in_new_window"),
         QStringLiteral("copy_location"),
         QStringLiteral("duplicate"),

-        QStringLiteral("open_terminal"),
+        QStringLiteral("open_terminal_here")

     });
     KPageWidgetItem* contextMenuSettingsFrame = addPage(contextMenuSettingsPage,
                                                         i18nc("@title:group", "Context Menu"));
     });
     KPageWidgetItem* contextMenuSettingsFrame = addPage(contextMenuSettingsPage,
                                                         i18nc("@title:group", "Context Menu"));


@@ -105,7 +105,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K
         connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
     }
 
         connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
     }
 

-#ifdef HAVE_KUSERFEEDBACK
+#if HAVE_KUSERFEEDBACK

     // User Feedback
     UserFeedbackSettingsPage* feedbackSettingsPage = nullptr;
     if (DolphinFeedbackProvider::instance()->isEnabled()) {
     // User Feedback
     UserFeedbackSettingsPage* feedbackSettingsPage = nullptr;
     if (DolphinFeedbackProvider::instance()->isEnabled()) {


@@ -124,7 +124,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K
     if (trashSettingsPage) {
         m_pages.append(trashSettingsPage);
     }
     if (trashSettingsPage) {
         m_pages.append(trashSettingsPage);
     }

-#ifdef HAVE_KUSERFEEDBACK
+#if HAVE_KUSERFEEDBACK

     if (feedbackSettingsPage) {
         m_pages.append(feedbackSettingsPage);
     }
     if (feedbackSettingsPage) {
         m_pages.append(feedbackSettingsPage);
     }