mirror of
https://invent.kde.org/system/dolphin
synced 2024-11-05 18:47:12 +00:00
int -> QVariant for IconView::Flow
This commit is contained in:
parent
5fb0a7236b
commit
391fd1b7a5
1 changed files with 7 additions and 7 deletions
|
@ -750,10 +750,10 @@ void FolderView::createConfigurationInterface(KConfigDialog *parent)
|
|||
uiDisplay.sortCombo->addItem(KGlobal::locale()->removeAcceleratorMarker(m_actionCollection.action("sort_type")->text()), KDirModel::Type);
|
||||
uiDisplay.sortCombo->addItem(KGlobal::locale()->removeAcceleratorMarker(m_actionCollection.action("sort_date")->text()), KDirModel::ModifiedTime);
|
||||
|
||||
uiDisplay.flowCombo->addItem(i18n("Top to Bottom, Left to Right"), IconView::TopToBottom);
|
||||
uiDisplay.flowCombo->addItem(i18n("Top to Bottom, Right to Left"), IconView::TopToBottomRightToLeft);
|
||||
uiDisplay.flowCombo->addItem(i18n("Left to Right, Top to Bottom"), IconView::LeftToRight);
|
||||
uiDisplay.flowCombo->addItem(i18n("Right to Left, Top to Bottom"), IconView::RightToLeft);
|
||||
uiDisplay.flowCombo->addItem(i18n("Top to Bottom, Left to Right"), QVariant::fromValue(IconView::TopToBottom));
|
||||
uiDisplay.flowCombo->addItem(i18n("Top to Bottom, Right to Left"), QVariant::fromValue(IconView::TopToBottomRightToLeft));
|
||||
uiDisplay.flowCombo->addItem(i18n("Left to Right, Top to Bottom"), QVariant::fromValue(IconView::LeftToRight));
|
||||
uiDisplay.flowCombo->addItem(i18n("Right to Left, Top to Bottom"), QVariant::fromValue(IconView::RightToLeft));
|
||||
|
||||
uiFilter.filterCombo->addItem(i18n("Show All Files"), QVariant::fromValue(ProxyModel::NoFilter));
|
||||
uiFilter.filterCombo->addItem(i18n("Show Files Matching"), QVariant::fromValue(ProxyModel::FilterShowMatches));
|
||||
|
@ -776,7 +776,7 @@ void FolderView::createConfigurationInterface(KConfigDialog *parent)
|
|||
}
|
||||
|
||||
for (int i = 0; i < uiDisplay.flowCombo->maxCount(); i++) {
|
||||
if (m_flow == uiDisplay.flowCombo->itemData(i).toInt()) {
|
||||
if (m_flow == uiDisplay.flowCombo->itemData(i).value<IconView::Flow>()) {
|
||||
uiDisplay.flowCombo->setCurrentIndex(i);
|
||||
break;
|
||||
}
|
||||
|
@ -897,8 +897,8 @@ void FolderView::configAccepted()
|
|||
const int sortColumn = uiDisplay.sortCombo->itemData(uiDisplay.sortCombo->currentIndex()).toInt();
|
||||
cg.writeEntry("sortColumn", sortColumn);
|
||||
|
||||
const int flow = uiDisplay.flowCombo->itemData(uiDisplay.flowCombo->currentIndex()).toInt();
|
||||
cg.writeEntry("flow", flow);
|
||||
const IconView::Flow flow = uiDisplay.flowCombo->itemData(uiDisplay.flowCombo->currentIndex()).value<IconView::Flow>();
|
||||
cg.writeEntry("flow", static_cast<int>(flow));
|
||||
|
||||
cg.writeEntry("alignToGrid", uiDisplay.alignToGrid->isChecked());
|
||||
cg.writeEntry("clickForFolderPreviews", uiDisplay.clickToView->isChecked());
|
||||
|
|
Loading…
Reference in a new issue