Fixed regression introduced with KDE 4.2.0 that the column width setting was ignored.

BUG: 188701

svn path=/trunk/KDE/kdebase/apps/; revision=949864
This commit is contained in:
Peter Penz 2009-04-06 05:56:33 +00:00
parent 319bab3dd3
commit 6358214ee7
2 changed files with 10 additions and 5 deletions

View file

@ -77,6 +77,7 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(QWidget* parent) :
m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Small"));
m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Medium"));
m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Large"));
m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Huge"));
connect(m_textWidthBox, SIGNAL(currentIndexChanged(int)), this, SIGNAL(changed()));
QGridLayout* textGroupLayout = new QGridLayout(textGroup);
@ -113,9 +114,8 @@ void ColumnViewSettingsPage::applySettings()
settings->setItalicFont(font.italic());
settings->setFontWeight(font.weight());
// TODO:
//const int columnWidth = 150 + (m_columnWidthSlider->value() * 50);
//settings->setColumnWidth(columnWidth);
const int columnWidth = BaseTextWidth + (m_textWidthBox->currentIndex() * TextInc);
settings->setColumnWidth(columnWidth);
settings->writeConfig();
}
@ -151,8 +151,7 @@ void ColumnViewSettingsPage::loadSettings()
m_fontRequester->setCustomFont(font);
}
// TODO:
//m_columnWidthSlider->setValue((settings->columnWidth() - 150) / 50);
m_textWidthBox->setCurrentIndex((settings->columnWidth() - BaseTextWidth) / TextInc);
}
#include "columnviewsettingspage.moc"

View file

@ -53,6 +53,12 @@ private:
void loadSettings();
private:
enum
{
BaseTextWidth = 200,
TextInc = 50
};
IconSizeGroupBox* m_iconSizeGroupBox;
DolphinFontRequester* m_fontRequester;
KComboBox* m_textWidthBox;