#include "viewpropertiesdialog.h"
#include "additionalinfodialog.h"
+#include "kitemviews/kfileitemmodel.h"
#include "views/dolphinview.h"
-#include "settings/dolphinsettings.h"
#include "dolphin_generalsettings.h"
#include "dolphin_iconsmodesettings.h"
#include "viewpropsprogressinfo.h"
-#include <config-nepomuk.h>
-#ifdef HAVE_NEPOMUK
-#include <Nepomuk/ResourceManager>
-#endif
+#include <config-baloo.h>
-#include <KComponentData>
-#include <KLocale>
-#include <KIconLoader>
-#include <KIO/NetAccess>
+#include <KLocalizedString>
#include <KMessageBox>
-#include <KStandardDirs>
-#include <KUrl>
+#include <QUrl>
#include <KComboBox>
+#include <KConfigGroup>
+#include <KWindowConfig>
-#include <QAction>
#include <QButtonGroup>
#include <QCheckBox>
#include <QGridLayout>
#include <QGroupBox>
#include <QLabel>
-#include <QMenu>
#include <QPushButton>
#include <QRadioButton>
-#include <QBoxLayout>
+#include <QDialogButtonBox>
+#include <QVBoxLayout>
#include <views/viewproperties.h>
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 = DolphinSettings::instance().generalSettings()->globalViewProps();
+ 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"));
- m_viewMode->addItem(KIcon("view-list-details"), i18nc("@item:inlistbox", "Compact"));
- m_viewMode->addItem(KIcon("view-list-tree"), i18nc("@item:inlistbox", "Details"));
+ 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);
m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Descending"));
m_sorting = new KComboBox(sortingBox);
- m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Name"));
- m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Size"));
- m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Date"));
- m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Permissions"));
- m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Owner"));
- m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Group"));
- m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Type"));
-#ifdef HAVE_NEPOMUK
- // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance
- // is too slow currently (Nepomuk will support caching in future releases).
- //
- // if (!Nepomuk::ResourceManager::instance()->init()) {
- // m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Rating"));
- // m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Tags"));
- // }
-#endif
+ const QList<KFileItemModel::RoleInfo> 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"));
m_previewsShown = new QCheckBox(i18nc("@option:check", "Show preview"));
m_showInGroups = new QCheckBox(i18nc("@option:check", "Show in groups"));
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);
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(slotCategorizedSortingChanged()));
- 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<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged),
+ this, &ViewPropertiesDialog::slotViewModeChanged);
+ connect(m_sorting, static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged),
+ this, &ViewPropertiesDialog::slotSortingChanged);
+ connect(m_sortOrder, static_cast<void(KComboBox::*)(int)>(&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);
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();
}
{
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()
void ViewPropertiesDialog::slotViewModeChanged(int index)
{
- m_viewProps->setViewMode(static_cast<DolphinView::Mode>(index));
+ const QVariant itemData = m_viewMode->itemData(index);
+ const DolphinView::Mode viewMode = static_cast<DolphinView::Mode>(itemData.toInt());
+ m_viewProps->setViewMode(viewMode);
markAsDirty(true);
}
void ViewPropertiesDialog::slotSortingChanged(int index)
{
- Q_UNUSED(index);
- Q_ASSERT(false);
- //const DolphinView::Sorting sorting = DolphinSortFilterProxyModel::sortingForColumn(index);
- //m_viewProps->setSorting(sorting);
- //markAsDirty(true);
+ const QByteArray role = m_sorting->itemData(index).toByteArray();
+ m_viewProps->setSortRole(role);
+ markAsDirty(true);
}
void ViewPropertiesDialog::slotSortOrderChanged(int index)
markAsDirty(true);
}
-void ViewPropertiesDialog::slotCategorizedSortingChanged()
+void ViewPropertiesDialog::slotGroupedSortingChanged()
{
m_viewProps->setGroupedSorting(m_showInGroups->isChecked());
markAsDirty(true);
void ViewPropertiesDialog::markAsDirty(bool isDirty)
{
- m_isDirty = isDirty;
- enableButtonApply(isDirty);
+ if (m_isDirty != isDirty) {
+ m_isDirty = isDirty;
+ emit isDirtyChanged(isDirty);
+ }
}
void ViewPropertiesDialog::configureAdditionalInfo()
{
- QList<DolphinView::AdditionalInfo> infoList = m_viewProps->additionalInfoList();
- const bool useDefaultInfo = (m_viewProps->viewMode() == DolphinView::DetailsView) &&
- (infoList.isEmpty() || infoList.contains(DolphinView::NoInfo));
- if (useDefaultInfo) {
+ QList<QByteArray> visibleRoles = m_viewProps->visibleRoles();
+ const bool useDefaultRoles = (m_viewProps->viewMode() == DolphinView::DetailsView) && visibleRoles.isEmpty();
+ if (useDefaultRoles) {
// Using the details view without any additional information (-> additional column)
// 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.
- infoList.clear();
- infoList.append(DolphinView::SizeInfo);
- infoList.append(DolphinView::DateInfo);
- m_viewProps->setAdditionalInfoList(infoList);
+ visibleRoles.clear();
+ visibleRoles.append("text");
+ visibleRoles.append("size");
+ visibleRoles.append("modificationtime");
+ m_viewProps->setVisibleRoles(visibleRoles);
}
- QPointer<AdditionalInfoDialog> dialog = new AdditionalInfoDialog(this, infoList);
+ QPointer<AdditionalInfoDialog> dialog = new AdditionalInfoDialog(this, visibleRoles);
if (dialog->exec() == QDialog::Accepted) {
- m_viewProps->setAdditionalInfoList(dialog->informationList());
+ m_viewProps->setVisibleRoles(dialog->visibleRoles());
markAsDirty(true);
}
delete dialog;
// For directories where no .directory file is available, the .directory
// file stored for the global view properties is used as fallback. To update
// this file we temporary turn on the global view properties mode.
- GeneralSettings* settings = DolphinSettings::instance().generalSettings();
- Q_ASSERT(!settings->globalViewProps());
+ Q_ASSERT(!GeneralSettings::globalViewProps());
- settings->setGlobalViewProps(true);
+ GeneralSettings::setGlobalViewProps(true);
ViewProperties defaultProps(m_dolphinView->url());
defaultProps.setDirProperties(*m_viewProps);
defaultProps.save();
- settings->setGlobalViewProps(false);
+ GeneralSettings::setGlobalViewProps(false);
}
if (applyToAllFolders) {
// Updating the global view properties time stamp in the general settings makes
// all existing viewproperties invalid, as they have a smaller time stamp.
- GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+ GeneralSettings* settings = GeneralSettings::self();
settings->setViewPropsTimestamp(QDateTime::currentDateTime());
+ settings->save();
}
m_dolphinView->setMode(m_viewProps->viewMode());
- m_dolphinView->setSorting(m_viewProps->sorting());
+ m_dolphinView->setSortRole(m_viewProps->sortRole());
m_dolphinView->setSortOrder(m_viewProps->sortOrder());
m_dolphinView->setSortFoldersFirst(m_viewProps->sortFoldersFirst());
m_dolphinView->setGroupedSorting(m_viewProps->groupedSorting());
- m_dolphinView->setAdditionalInfoList(m_viewProps->additionalInfoList());
+ m_dolphinView->setVisibleRoles(m_viewProps->visibleRoles());
m_dolphinView->setPreviewsShown(m_viewProps->previewsShown());
m_dolphinView->setHiddenFilesShown(m_viewProps->hiddenFilesShown());
void ViewPropertiesDialog::loadSettings()
{
- // load view mode
- const int index = static_cast<int>(m_viewProps->viewMode());
- m_viewMode->setCurrentIndex(index);
+ // Load view mode
+ switch (m_viewProps->viewMode()) {
+ case DolphinView::IconsView: m_viewMode->setCurrentIndex(0); break;
+ case DolphinView::CompactView: m_viewMode->setCurrentIndex(1); break;
+ case DolphinView::DetailsView: m_viewMode->setCurrentIndex(2); break;
+ default: break;
+ }
- // load sort order and sorting
+ // Load sort order and sorting
const int sortOrderIndex = (m_viewProps->sortOrder() == Qt::AscendingOrder) ? 0 : 1;
m_sortOrder->setCurrentIndex(sortOrderIndex);
- m_sorting->setCurrentIndex(m_viewProps->sorting());
- const bool enabled = (index == DolphinView::DetailsView) ||
- (index == DolphinView::IconsView);
- m_additionalInfo->setEnabled(enabled);
+ const QList<KFileItemModel::RoleInfo> 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());
- // load show preview, show in groups and show hidden files settings
- m_previewsShown->setChecked(m_viewProps->previewsShown());
+ // Load show preview, show in groups and show hidden files settings
+ m_previewsShown->setChecked(m_viewProps->previewsShown());
m_showInGroups->setChecked(m_viewProps->groupedSorting());
- m_showInGroups->setEnabled(index == DolphinView::IconsView); // only the icons view supports categorized sorting
-
m_showHiddenFiles->setChecked(m_viewProps->hiddenFilesShown());
markAsDirty(false);
}
-#include "viewpropertiesdialog.moc"
projects / dolphin.git / blobdiff