diff --git a/sources/awesome-widget/package/contents/ui/appearance.qml b/sources/awesome-widget/package/contents/ui/appearance.qml index 5c2f28a..620ec9b 100644 --- a/sources/awesome-widget/package/contents/ui/appearance.qml +++ b/sources/awesome-widget/package/contents/ui/appearance.qml @@ -18,6 +18,7 @@ import QtQuick 2.0 import org.kde.plasma.private.awesomewidget 1.0 +import "." Item { @@ -71,28 +72,7 @@ Item { ComboBoxSelector { id: fontWeight - model: [ - { - 'label': i18n("light"), - 'name': "light" - }, - { - 'label': i18n("normal"), - 'name': "normal" - }, - { - 'label': i18n("demi bold"), - 'name': "demibold" - }, - { - 'label': i18n("bold"), - 'name': "bold" - }, - { - 'label': i18n("black"), - 'name': "black" - } - ] + model: general.fontWeightModel text: i18n("Font weight") value: plasmoid.configuration.fontWeight onValueEdited: cfg_fontWeight = newValue @@ -100,16 +80,7 @@ Item { ComboBoxSelector { id: fontStyle - model: [ - { - 'label': i18n("normal"), - 'name': "normal" - }, - { - 'label': i18n("italic"), - 'name': "italic" - } - ] + model: general.fontStyleModel text: i18n("Font style") value: plasmoid.configuration.fontStyle onValueEdited: cfg_fontStyle = newValue @@ -123,24 +94,7 @@ Item { ComboBoxSelector { id: textStyle - model: [ - { - 'label': i18n("normal"), - 'name': "normal" - }, - { - 'label': i18n("outline"), - 'name': "outline" - }, - { - 'label': i18n("raised"), - 'name': "raised" - }, - { - 'label': i18n("sunken"), - 'name': "sunken" - } - ] + model: general.textStyleModel text: i18n("Style") value: plasmoid.configuration.textStyle onValueEdited: cfg_textStyle = newValue diff --git a/sources/awesome-widget/package/contents/ui/general.qml b/sources/awesome-widget/package/contents/ui/general.qml index 42cd857..5e0b5ab 100644 --- a/sources/awesome-widget/package/contents/ui/general.qml +++ b/sources/awesome-widget/package/contents/ui/general.qml @@ -39,4 +39,56 @@ QtObject { "raised": Text.Raised, "sunken": Text.Sunken } + + // models + property variant fontStyleModel: [ + { + 'label': i18n("normal"), + 'name': "normal" + }, + { + 'label': i18n("italic"), + 'name': "italic" + } + ] + property variant fontWeightModel: [ + { + 'label': i18n("light"), + 'name': "light" + }, + { + 'label': i18n("normal"), + 'name': "normal" + }, + { + 'label': i18n("demi bold"), + 'name': "demibold" + }, + { + 'label': i18n("bold"), + 'name': "bold" + }, + { + 'label': i18n("black"), + 'name': "black" + } + ] + property variant textStyleModel: [ + { + 'label': i18n("normal"), + 'name': "normal" + }, + { + 'label': i18n("outline"), + 'name': "outline" + }, + { + 'label': i18n("raised"), + 'name': "raised" + }, + { + 'label': i18n("sunken"), + 'name': "sunken" + } + ] }