[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/apps/dolphin/src/panels/information
From: Peter Penz <peter.penz () gmx ! at>
Date: 2009-10-17 12:43:59
Message-ID: 1255783439.487183.4737.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1036559 by ppenz:
Use the tunedLabel() workaround also for the configuration dialog. Hopefully this can \
be cleaned up until KDE 4.4...
CCMAIL: trueg@kde.org
M +25 -2 metadataconfigurationdialog.cpp
M +1 -1 metadatawidget.cpp
--- trunk/KDE/kdebase/apps/dolphin/src/panels/information/metadataconfigurationdialog.cpp \
#1036558:1036559 @@ -44,6 +44,7 @@
void init();
void loadMetaData();
+ QString tunedLabel(const QString& label) const;
int m_hiddenData;
MetaDataWidget* m_metaDataWidget;
@@ -194,8 +195,11 @@
}
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 @@
#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),
--- trunk/KDE/kdebase/apps/dolphin/src/panels/information/metadatawidget.cpp \
#1036558:1036559 @@ -524,7 +524,7 @@
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());
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic