kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 16:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

even less code duplication

Browse source
This commit is contained in:
Ignat Semenov 2013-04-11 14:29:37 +04:00
parent f407bf3f33
commit 7d6669c25b
2 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
plasma/applets/folderview/folderview.cpp
View file

@ -755,33 +755,11 @@ void FolderView::createConfigurationInterface(KConfigDialog *parent)
uiDisplay.numLinesEdit->setValue(m_numTextLines);
uiDisplay.colorButton->setColor(textColor());
for (int i = 0; i < uiDisplay.sortCombo->maxCount(); i++) {
if (m_sortColumn == uiDisplay.sortCombo->itemData(i).value<int>()) {
uiDisplay.sortCombo->setCurrentIndex(i);
break;
}
}
for (int i = 0; i < uiDisplay.flowCombo->count(); i++) {
if (m_flow == uiDisplay.flowCombo->itemData(i).value<IconView::Flow>()) {
uiDisplay.flowCombo->setCurrentIndex(i);
break;
}
}
for (int i = 0; i < uiLocation.titleCombo->count(); i++) {
if (m_labelType == uiLocation.titleCombo->itemData(i).value<FolderView::LabelType>()) {
uiLocation.titleCombo->setCurrentIndex(i);
break;
}
}
for (int i = 0; i < uiFilter.filterCombo->count(); i++) {
if (m_filterType == uiFilter.filterCombo->itemData(i).value<ProxyModel::FilterMode>()) {
uiFilter.filterCombo->setCurrentIndex(i);
break;
}
}
setCurrentItem(uiDisplay.sortCombo, m_sortColumn);
setCurrentItem(uiDisplay.directionCombo, m_sortOrder);
setCurrentItem(uiDisplay.flowCombo, m_flow);
setCurrentItem(uiLocation.titleCombo, m_labelType);
setCurrentItem(uiFilter.filterCombo, m_filterType);
filterChanged(uiFilter.filterCombo->currentIndex());
@ -1090,6 +1068,22 @@ void FolderView::addActionGroupToCombo(QActionGroup* group, QComboBox* combo)
}
}
// We can not use QComboBox::findData() since in qt4, comparing QVariant's containing
// enums (user types) fails even if the enums contained in the QVariant's are equal
template <typename T>
void FolderView::setCurrentItem(QComboBox* combo, T current)
{
if (!combo)
return;
for (int i = 0; i < combo->maxCount(); i++) {
if (current == combo->itemData(i).value<T>()) {
combo->setCurrentIndex(i);
break;
}
}
}
void FolderView::setupIconView()
{
if (m_iconView) {

2
plasma/applets/folderview/folderview.h
View file

@ -163,6 +163,8 @@ private:
void updatePasteAction();
void addActions(AbstractItemView *view);
void addActionGroupToCombo(QActionGroup *group, QComboBox *combo);
template <typename T>
void setCurrentItem(QComboBox *combo, T current);
QColor textColor() const;
void setupIconView();
void setUrl(const KUrl &url);