#include "additionalinfodialog.h"
#include "views/dolphinview.h"
-#include "settings/dolphinsettings.h"
#include "dolphin_generalsettings.h"
#include "dolphin_iconsmodesettings.h"
#include "viewpropsprogressinfo.h"
m_useAsDefault(0)
{
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);
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(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);
QLabel* sortingLabel = new QLabel(i18nc("@label:listbox", "Sorting:"), propsGrid);
QWidget* sortingBox = new QWidget(propsGrid);
m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Ascending"));
m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Descending"));
+ // TODO: Provide a kind of SortingInfoAccessor similar to AdditionalInfoAccessor
+ // to assure that adding a sort-role requires to change only one file
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 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
+ m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Link Destination"));
+ m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Path"));
+
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"));
connect(m_previewsShown, SIGNAL(clicked()),
this, SLOT(slotShowPreviewChanged()));
connect(m_showInGroups, SIGNAL(clicked()),
- this, SLOT(slotCategorizedSortingChanged()));
+ this, SLOT(slotGroupedSortingChanged()));
connect(m_showHiddenFiles, SIGNAL(clicked()),
this, SLOT(slotShowHiddenFilesChanged()));
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);
+ m_viewProps->setSorting(static_cast<DolphinView::Sorting>(index));
+ markAsDirty(true);
}
void ViewPropertiesDialog::slotSortOrderChanged(int index)
markAsDirty(true);
}
-void ViewPropertiesDialog::slotCategorizedSortingChanged()
+void ViewPropertiesDialog::slotGroupedSortingChanged()
{
m_viewProps->setGroupedSorting(m_showInGroups->isChecked());
markAsDirty(true);
// 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->writeConfig();
}
m_dolphinView->setMode(m_viewProps->viewMode());
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);
-
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);
}
projects / dolphin.git / blobdiff