]> cloud.milkyroute.net Git - dolphin.git/blobdiff - src/settings/viewpropertiesdialog.cpp
don't use temporaries when uneeded
[dolphin.git] / src / settings / viewpropertiesdialog.cpp
index 980ab0bba465d73e92f09fcfce5726d81334a75b..60c9f21f56160659a8fd17a25c32d22713812ccf 100644 (file)
 #include "viewpropertiesdialog.h"
 
 #include "additionalinfodialog.h"
-#include "kitemviews/kfileitemmodel.h"
-#include "views/dolphinview.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
+#include "kitemviews/kfileitemmodel.h"
 #include "viewpropsprogressinfo.h"
+#include "views/dolphinview.h"
 
-#include <config-baloo.h>
-
+#include <KComboBox>
 #include <KLocalizedString>
 #include <KMessageBox>
-#include <QUrl>
-#include <KComboBox>
-#include <KConfigGroup>
 #include <KWindowConfig>
 
 #include <QButtonGroup>
@@ -43,8 +39,6 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QRadioButton>
-#include <QDialogButtonBox>
-#include <QVBoxLayout>
 
 #include <views/viewproperties.h>
 
@@ -198,10 +192,11 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     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);
 
     auto applyButton = buttonBox->button(QDialogButtonBox::Apply);
+    applyButton->setEnabled(false);
     connect(applyButton, &QPushButton::clicked, this, &ViewPropertiesDialog::slotApply);
     connect(this, &ViewPropertiesDialog::isDirtyChanged, applyButton, [applyButton](bool isDirty) {
         applyButton->setEnabled(isDirty);