Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KOrganizer
Commits
a73cce41
Commit
a73cce41
authored
Apr 03, 2016
by
Volker Krause
Browse files
Port preference dialog away from KLocale.
parent
bed8cace
Changes
1
Hide whitespace changes
Inline
Side-by-side
prefs/koprefsdialog.cpp
View file @
a73cce41
...
...
@@ -285,9 +285,8 @@ public:
foreach
(
const
QString
&
regionCode
,
regions
)
{
QString
name
=
KHolidays
::
HolidayRegion
::
name
(
regionCode
);
QString
languageName
=
KLocale
::
global
()
->
languageCodeToName
(
KHolidays
::
HolidayRegion
::
languageCode
(
regionCode
));
QLocale
locale
(
KHolidays
::
HolidayRegion
::
languageCode
(
regionCode
));
QString
languageName
=
QLocale
::
languageToString
(
locale
.
language
());
QString
label
;
if
(
languageName
.
isEmpty
())
{
label
=
name
;
...
...
@@ -859,14 +858,14 @@ KOPrefsDialogColorsAndFonts::KOPrefsDialogColorsAndFonts(QWidget *parent)
KPIM
::
KPrefsWidFont
*
timeBarFont
=
addWidFont
(
KOPrefs
::
instance
()
->
agendaTimeLabelsFontItem
(),
fontFrame
,
K
Locale
::
global
()
->
formatTime
(
QTime
(
12
,
34
)
));
Q
Locale
().
toString
(
QTime
(
12
,
34
),
QLocale
::
ShortFormat
));
fontLayout
->
addWidget
(
timeBarFont
->
label
(),
0
,
0
);
fontLayout
->
addWidget
(
timeBarFont
->
preview
(),
0
,
1
);
fontLayout
->
addWidget
(
timeBarFont
->
button
(),
0
,
2
);
KPIM
::
KPrefsWidFont
*
monthViewFont
=
addWidFont
(
KOPrefs
::
instance
()
->
monthViewFontItem
(),
fontFrame
,
K
Locale
::
global
()
->
formatTime
(
QTime
(
12
,
34
)
)
+
QLatin1Char
(
' '
)
+
Q
Locale
().
toString
(
QTime
(
12
,
34
),
QLocale
::
ShortFormat
)
+
QLatin1Char
(
' '
)
+
i18nc
(
"@label"
,
"Event text"
));
fontLayout
->
addWidget
(
monthViewFont
->
label
(),
1
,
0
);
...
...
@@ -882,7 +881,7 @@ KOPrefsDialogColorsAndFonts::KOPrefsDialogColorsAndFonts(QWidget *parent)
KPIM
::
KPrefsWidFont
*
marcusBainsFont
=
addWidFont
(
KOPrefs
::
instance
()
->
agendaMarcusBainsLineFontItem
(),
fontFrame
,
K
Locale
::
global
()
->
formatTime
(
QTime
(
12
,
34
,
23
)
));
Q
Locale
().
toString
(
QTime
(
12
,
34
,
23
),
QLocale
::
ShortFormat
));
fontLayout
->
addWidget
(
marcusBainsFont
->
label
(),
3
,
0
);
fontLayout
->
addWidget
(
marcusBainsFont
->
preview
(),
3
,
1
);
fontLayout
->
addWidget
(
marcusBainsFont
->
button
(),
3
,
2
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment