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

Use the tunedLabel() workaround also for the configuration dialog. Hopefully this can be cleaned up until KDE 4.4...

Browse source 
CCMAIL: trueg@kde.org

svn path=/trunk/KDE/kdebase/apps/; revision=1036559
This commit is contained in:
Peter Penz 2009-10-17 12:43:58 +00:00
parent 998b88f304
commit 59c430bb3f
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/panels/information/metadataconfigurationdialog.cpp
View file

@ -44,6 +44,7 @@ public:
void init();
void loadMetaData();
QString tunedLabel(const QString& label) const;
int m_hiddenData;
MetaDataWidget* m_metaDataWidget;
@ -194,8 +195,11 @@ void MetaDataConfigurationDialog::Private::loadMetaData()
}
if (!skip) {
// const QString label = tunedLabel(prop.label());
const QString label = prop.label() + " --- " + key;
// TODO #1: use Nepomuk::formatValue(res, prop) if available
// instead of it.value().toString()
// TODO #2: using tunedLabel() is a workaround for KDE 4.3 (4.4?) until
// we get translated labels
const QString label = tunedLabel(prop.label());
QListWidgetItem* item = new QListWidgetItem(label, m_metaDataList);
item->setData(Qt::UserRole, key);
const bool show = settings.readEntry(key, true);
@ -207,6 +211,25 @@ void MetaDataConfigurationDialog::Private::loadMetaData()
#endif
}
QString MetaDataConfigurationDialog::Private::tunedLabel(const QString& label) const
{
QString tunedLabel;
const int labelLength = label.length();
if (labelLength > 0) {
tunedLabel.reserve(labelLength);
tunedLabel = label[0].toUpper();
for (int i = 1; i < labelLength; ++i) {
if (label[i].isUpper() && !label[i - 1].isSpace() && !label[i - 1].isUpper()) {
tunedLabel += ' ';
tunedLabel += label[i].toLower();
} else {
tunedLabel += label[i];
}
}
}
return tunedLabel;
}
MetaDataConfigurationDialog::MetaDataConfigurationDialog(QWidget* parent,
Qt::WFlags flags) :
KDialog(parent, flags),

2
src/panels/information/metadatawidget.cpp
View file

@ -524,7 +524,7 @@ void MetaDataWidget::Private::LoadFilesThread::run()
if (settings.readEntry(prop.name(), true)) {
// TODO #1: use Nepomuk::formatValue(res, prop) if available
// instead of it.value().toString()
// TODO #2: using tunedLabel() is a workaround for KDE 4.3 until
// TODO #2: using tunedLabel() is a workaround for KDE 4.3 (4.4?) until
// we get translated labels
metaInfoLabels.append(tunedLabel(prop.label()));
metaInfoValues.append(it.value().toString());