Commit a73cce41 authored by Volker Krause's avatar Volker Krause
Browse files

Port preference dialog away from KLocale.

parent bed8cace
...@@ -285,9 +285,8 @@ public: ...@@ -285,9 +285,8 @@ public:
foreach (const QString &regionCode, regions) { foreach (const QString &regionCode, regions) {
QString name = KHolidays::HolidayRegion::name(regionCode); QString name = KHolidays::HolidayRegion::name(regionCode);
QString languageName = QLocale locale(KHolidays::HolidayRegion::languageCode(regionCode));
KLocale::global()->languageCodeToName( QString languageName = QLocale::languageToString(locale.language());
KHolidays::HolidayRegion::languageCode(regionCode));
QString label; QString label;
if (languageName.isEmpty()) { if (languageName.isEmpty()) {
label = name; label = name;
...@@ -859,14 +858,14 @@ KOPrefsDialogColorsAndFonts::KOPrefsDialogColorsAndFonts(QWidget *parent) ...@@ -859,14 +858,14 @@ KOPrefsDialogColorsAndFonts::KOPrefsDialogColorsAndFonts(QWidget *parent)
KPIM::KPrefsWidFont *timeBarFont = KPIM::KPrefsWidFont *timeBarFont =
addWidFont(KOPrefs::instance()->agendaTimeLabelsFontItem(), fontFrame, addWidFont(KOPrefs::instance()->agendaTimeLabelsFontItem(), fontFrame,
KLocale::global()->formatTime(QTime(12, 34))); QLocale().toString(QTime(12, 34), QLocale::ShortFormat));
fontLayout->addWidget(timeBarFont->label(), 0, 0); fontLayout->addWidget(timeBarFont->label(), 0, 0);
fontLayout->addWidget(timeBarFont->preview(), 0, 1); fontLayout->addWidget(timeBarFont->preview(), 0, 1);
fontLayout->addWidget(timeBarFont->button(), 0, 2); fontLayout->addWidget(timeBarFont->button(), 0, 2);
KPIM::KPrefsWidFont *monthViewFont = KPIM::KPrefsWidFont *monthViewFont =
addWidFont(KOPrefs::instance()->monthViewFontItem(), fontFrame, addWidFont(KOPrefs::instance()->monthViewFontItem(), fontFrame,
KLocale::global()->formatTime(QTime(12, 34)) + QLatin1Char(' ') + QLocale().toString(QTime(12, 34), QLocale::ShortFormat) + QLatin1Char(' ') +
i18nc("@label", "Event text")); i18nc("@label", "Event text"));
fontLayout->addWidget(monthViewFont->label(), 1, 0); fontLayout->addWidget(monthViewFont->label(), 1, 0);
...@@ -882,7 +881,7 @@ KOPrefsDialogColorsAndFonts::KOPrefsDialogColorsAndFonts(QWidget *parent) ...@@ -882,7 +881,7 @@ KOPrefsDialogColorsAndFonts::KOPrefsDialogColorsAndFonts(QWidget *parent)
KPIM::KPrefsWidFont *marcusBainsFont = KPIM::KPrefsWidFont *marcusBainsFont =
addWidFont(KOPrefs::instance()->agendaMarcusBainsLineFontItem(), fontFrame, addWidFont(KOPrefs::instance()->agendaMarcusBainsLineFontItem(), fontFrame,
KLocale::global()->formatTime(QTime(12, 34, 23))); QLocale().toString(QTime(12, 34, 23), QLocale::ShortFormat));
fontLayout->addWidget(marcusBainsFont->label(), 3, 0); fontLayout->addWidget(marcusBainsFont->label(), 3, 0);
fontLayout->addWidget(marcusBainsFont->preview(), 3, 1); fontLayout->addWidget(marcusBainsFont->preview(), 3, 1);
fontLayout->addWidget(marcusBainsFont->button(), 3, 2); fontLayout->addWidget(marcusBainsFont->button(), 3, 2);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment