X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/2ba5c2cfc2cea534cccd860f94a7198530b83594..a6db5029acc09639fd8c7c20a7676b1ac9f36539:/src/settings/viewpropertiesdialog.cpp diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp index 420daec8d..980ab0bba 100644 --- a/src/settings/viewpropertiesdialog.cpp +++ b/src/settings/viewpropertiesdialog.cpp @@ -21,83 +21,79 @@ #include "viewpropertiesdialog.h" #include "additionalinfodialog.h" -#include "views/rolesaccessor.h" +#include "kitemviews/kfileitemmodel.h" #include "views/dolphinview.h" #include "dolphin_generalsettings.h" #include "dolphin_iconsmodesettings.h" #include "viewpropsprogressinfo.h" -#include -#ifdef HAVE_NEPOMUK -#include -#endif +#include -#include -#include -#include -#include +#include #include -#include -#include +#include #include +#include +#include -#include #include #include #include #include #include -#include #include #include -#include +#include +#include #include ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : - KDialog(dolphinView), + QDialog(dolphinView), m_isDirty(false), m_dolphinView(dolphinView), - m_viewProps(0), - m_viewMode(0), - m_sortOrder(0), - m_sorting(0), - m_sortFoldersFirst(0), - m_previewsShown(0), - m_showInGroups(0), - m_showHiddenFiles(0), - m_additionalInfo(0), - m_applyToCurrentFolder(0), - m_applyToSubFolders(0), - m_applyToAllFolders(0), - m_useAsDefault(0) + m_viewProps(nullptr), + m_viewMode(nullptr), + m_sortOrder(nullptr), + m_sorting(nullptr), + m_sortFoldersFirst(nullptr), + m_previewsShown(nullptr), + m_showInGroups(nullptr), + m_showHiddenFiles(nullptr), + m_additionalInfo(nullptr), + m_applyToCurrentFolder(nullptr), + m_applyToSubFolders(nullptr), + m_applyToAllFolders(nullptr), + m_useAsDefault(nullptr) { Q_ASSERT(dolphinView); const bool useGlobalViewProps = GeneralSettings::globalViewProps(); - setCaption(i18nc("@title:window", "View Properties")); - setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply); + setWindowTitle(i18nc("@title:window", "View Properties")); + setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); - const KUrl& url = dolphinView->url(); + const QUrl& url = dolphinView->url(); m_viewProps = new ViewProperties(url); m_viewProps->setAutoSaveEnabled(false); - QWidget* main = new QWidget(); - QVBoxLayout* topLayout = new QVBoxLayout(); + auto layout = new QVBoxLayout(this); + setLayout(layout); + + auto propsGrid = new QWidget(this); + layout->addWidget(propsGrid); // create 'Properties' group containing view mode, sorting, sort order and show hidden files - QWidget* propsBox = main; + QWidget* propsBox = this; if (!useGlobalViewProps) { - propsBox = new QGroupBox(i18nc("@title:group", "Properties"), main); + propsBox = new QGroupBox(i18nc("@title:group", "Properties"), this); + layout->addWidget(propsBox); } - QWidget* propsGrid = new QWidget(); - QLabel* viewModeLabel = new QLabel(i18nc("@label:listbox", "View mode:"), propsGrid); m_viewMode = new KComboBox(propsGrid); - m_viewMode->addItem(KIcon("view-list-icons"), i18nc("@item:inlistbox", "Icons"), DolphinView::IconsView); - m_viewMode->addItem(KIcon("view-list-details"), i18nc("@item:inlistbox", "Compact"), DolphinView::CompactView); - m_viewMode->addItem(KIcon("view-list-tree"), i18nc("@item:inlistbox", "Details"), DolphinView::DetailsView); + m_viewMode->addItem(QIcon::fromTheme(QStringLiteral("view-list-icons")), i18nc("@item:inlistbox", "Icons"), DolphinView::IconsView); + m_viewMode->addItem(QIcon::fromTheme(QStringLiteral("view-list-details")), i18nc("@item:inlistbox", "Compact"), DolphinView::CompactView); + m_viewMode->addItem(QIcon::fromTheme(QStringLiteral("view-list-tree")), i18nc("@item:inlistbox", "Details"), DolphinView::DetailsView); QLabel* sortingLabel = new QLabel(i18nc("@label:listbox", "Sorting:"), propsGrid); QWidget* sortingBox = new QWidget(propsGrid); @@ -107,10 +103,9 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Descending")); m_sorting = new KComboBox(sortingBox); - const RolesAccessor& rolesAccessor = RolesAccessor::instance(); - const QList roles = rolesAccessor.roles(); - foreach (const QByteArray& role, roles) { - m_sorting->addItem(rolesAccessor.translation(role), role); + const QList rolesInfo = KFileItemModel::rolesInformation(); + foreach (const KFileItemModel::RoleInfo& info, rolesInfo) { + m_sorting->addItem(info.translation, info.role); } m_sortFoldersFirst = new QCheckBox(i18nc("@option:check", "Show folders first")); @@ -132,7 +127,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : propsGridLayout->addWidget(sortingLabel, 1, 0, Qt::AlignRight); propsGridLayout->addWidget(sortingBox, 1, 1); - QVBoxLayout* propsBoxLayout = new QVBoxLayout(propsBox); + QVBoxLayout* propsBoxLayout = propsBox == this ? layout : new QVBoxLayout(propsBox); propsBoxLayout->addWidget(propsGrid); propsBoxLayout->addWidget(m_sortFoldersFirst); propsBoxLayout->addWidget(m_previewsShown); @@ -140,33 +135,29 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : propsBoxLayout->addWidget(m_showHiddenFiles); propsBoxLayout->addWidget(m_additionalInfo); - topLayout->addWidget(propsBox); - - connect(m_viewMode, SIGNAL(currentIndexChanged(int)), - this, SLOT(slotViewModeChanged(int))); - connect(m_sorting, SIGNAL(currentIndexChanged(int)), - this, SLOT(slotSortingChanged(int))); - connect(m_sortOrder, SIGNAL(currentIndexChanged(int)), - this, SLOT(slotSortOrderChanged(int))); - connect(m_additionalInfo, SIGNAL(clicked()), - this, SLOT(configureAdditionalInfo())); - connect(m_sortFoldersFirst, SIGNAL(clicked()), - this, SLOT(slotSortFoldersFirstChanged())); - connect(m_previewsShown, SIGNAL(clicked()), - this, SLOT(slotShowPreviewChanged())); - connect(m_showInGroups, SIGNAL(clicked()), - this, SLOT(slotGroupedSortingChanged())); - connect(m_showHiddenFiles, SIGNAL(clicked()), - this, SLOT(slotShowHiddenFilesChanged())); - - connect(this, SIGNAL(okClicked()), this, SLOT(slotOk())); - connect(this, SIGNAL(applyClicked()), this, SLOT(slotApply())); + connect(m_viewMode, static_cast(&KComboBox::currentIndexChanged), + this, &ViewPropertiesDialog::slotViewModeChanged); + connect(m_sorting, static_cast(&KComboBox::currentIndexChanged), + this, &ViewPropertiesDialog::slotSortingChanged); + connect(m_sortOrder, static_cast(&KComboBox::currentIndexChanged), + this, &ViewPropertiesDialog::slotSortOrderChanged); + connect(m_additionalInfo, &QPushButton::clicked, + this, &ViewPropertiesDialog::configureAdditionalInfo); + connect(m_sortFoldersFirst, &QCheckBox::clicked, + this, &ViewPropertiesDialog::slotSortFoldersFirstChanged); + connect(m_previewsShown, &QCheckBox::clicked, + this, &ViewPropertiesDialog::slotShowPreviewChanged); + connect(m_showInGroups, &QCheckBox::clicked, + this, &ViewPropertiesDialog::slotGroupedSortingChanged); + connect(m_showHiddenFiles, &QCheckBox::clicked, + this, &ViewPropertiesDialog::slotShowHiddenFilesChanged); // Only show the following settings if the view properties are remembered // for each directory: if (!useGlobalViewProps) { // create 'Apply View Properties To' group - QGroupBox* applyBox = new QGroupBox(i18nc("@title:group", "Apply View Properties To"), main); + QGroupBox* applyBox = new QGroupBox(i18nc("@title:group", "Apply View Properties To"), this); + layout->addWidget(applyBox); m_applyToCurrentFolder = new QRadioButton(i18nc("@option:radio Apply View Properties To", "Current folder"), applyBox); @@ -186,27 +177,38 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : applyBoxLayout->addWidget(m_applyToSubFolders); applyBoxLayout->addWidget(m_applyToAllFolders); - m_useAsDefault = new QCheckBox(i18nc("@option:check", "Use these view properties as default"), main); + m_useAsDefault = new QCheckBox(i18nc("@option:check", "Use these view properties as default"), this); + layout->addWidget(m_useAsDefault); + + connect(m_applyToCurrentFolder, &QRadioButton::clicked, + this, &ViewPropertiesDialog::markAsDirty); + connect(m_applyToSubFolders, &QRadioButton::clicked, + this, &ViewPropertiesDialog::markAsDirty); + connect(m_applyToAllFolders, &QRadioButton::clicked, + this, &ViewPropertiesDialog::markAsDirty); + connect(m_useAsDefault, &QCheckBox::clicked, + this, &ViewPropertiesDialog::markAsDirty); + } - topLayout->addWidget(applyBox); - topLayout->addWidget(m_useAsDefault); + layout->addStretch(); - connect(m_applyToCurrentFolder, SIGNAL(clicked(bool)), - this, SLOT(markAsDirty(bool))); - connect(m_applyToSubFolders, SIGNAL(clicked(bool)), - this, SLOT(markAsDirty(bool))); - connect(m_applyToAllFolders, SIGNAL(clicked(bool)), - this, SLOT(markAsDirty(bool))); - connect(m_useAsDefault, SIGNAL(clicked(bool)), - this, SLOT(markAsDirty(bool))); - } + auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::Apply, this); + connect(buttonBox, &QDialogButtonBox::accepted, this, &ViewPropertiesDialog::accept); + connect(buttonBox, &QDialogButtonBox::rejected, this, &ViewPropertiesDialog::reject); + layout->addWidget(buttonBox); - main->setLayout(topLayout); - setMainWidget(main); + auto okButton = buttonBox->button(QDialogButtonBox::Ok); + okButton->setShortcut(Qt::CTRL | Qt::Key_Return); + okButton->setDefault(true); - const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), - "ViewPropertiesDialog"); - restoreDialogSize(dialogConfig); + auto applyButton = buttonBox->button(QDialogButtonBox::Apply); + connect(applyButton, &QPushButton::clicked, this, &ViewPropertiesDialog::slotApply); + connect(this, &ViewPropertiesDialog::isDirtyChanged, applyButton, [applyButton](bool isDirty) { + applyButton->setEnabled(isDirty); + }); + + const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "ViewPropertiesDialog"); + KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig); loadSettings(); } @@ -215,17 +217,16 @@ ViewPropertiesDialog::~ViewPropertiesDialog() { m_isDirty = false; delete m_viewProps; - m_viewProps = 0; + m_viewProps = nullptr; - KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), - "ViewPropertiesDialog"); - saveDialogSize(dialogConfig, KConfigBase::Persistent); + KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "ViewPropertiesDialog"); + KWindowConfig::saveWindowSize(windowHandle(), dialogConfig); } -void ViewPropertiesDialog::slotOk() +void ViewPropertiesDialog::accept() { applyViewProperties(); - accept(); + QDialog::accept(); } void ViewPropertiesDialog::slotApply() @@ -285,8 +286,10 @@ void ViewPropertiesDialog::slotShowHiddenFilesChanged() void ViewPropertiesDialog::markAsDirty(bool isDirty) { - m_isDirty = isDirty; - enableButtonApply(isDirty); + if (m_isDirty != isDirty) { + m_isDirty = isDirty; + emit isDirtyChanged(isDirty); + } } void ViewPropertiesDialog::configureAdditionalInfo() @@ -298,9 +301,9 @@ void ViewPropertiesDialog::configureAdditionalInfo() // makes no sense and leads to a usability problem as no viewport area is available // anymore. Hence as fallback provide at least a size and date column. visibleRoles.clear(); - visibleRoles.append("name"); + visibleRoles.append("text"); visibleRoles.append("size"); - visibleRoles.append("date"); + visibleRoles.append("modificationtime"); m_viewProps->setVisibleRoles(visibleRoles); } @@ -362,7 +365,7 @@ void ViewPropertiesDialog::applyViewProperties() // all existing viewproperties invalid, as they have a smaller time stamp. GeneralSettings* settings = GeneralSettings::self(); settings->setViewPropsTimestamp(QDateTime::currentDateTime()); - settings->writeConfig(); + settings->save(); } m_dolphinView->setMode(m_viewProps->viewMode()); @@ -393,8 +396,14 @@ void ViewPropertiesDialog::loadSettings() const int sortOrderIndex = (m_viewProps->sortOrder() == Qt::AscendingOrder) ? 0 : 1; m_sortOrder->setCurrentIndex(sortOrderIndex); - const QList roles = RolesAccessor::instance().roles(); - const int sortRoleIndex = roles.indexOf(m_viewProps->sortRole()); + const QList rolesInfo = KFileItemModel::rolesInformation(); + int sortRoleIndex = 0; + for (int i = 0; i < rolesInfo.count(); ++i) { + if (rolesInfo[i].role == m_viewProps->sortRole()) { + sortRoleIndex = i; + break; + } + } m_sorting->setCurrentIndex(sortRoleIndex); m_sortFoldersFirst->setChecked(m_viewProps->sortFoldersFirst()); @@ -406,4 +415,3 @@ void ViewPropertiesDialog::loadSettings() markAsDirty(false); } -#include "viewpropertiesdialog.moc"