alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use all font properties from Theme all around

Browse Source
This commit is contained in:
Marco Martin 2011-10-13 18:23:40 +02:00
parent 9eda90088e
commit 486fbf6f82
7 changed files with 59 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
declarativeimports/plasmacomponents/qml/Button.qml
View File

@ -126,6 +126,15 @@ Item {
left: icon.right left: icon.right
right: parent.right right: parent.right
} }
font.capitalization: theme.defaultFont.capitalization
font.family: theme.defaultFont.family
font.italic: theme.defaultFont.italic
font.letterSpacing: theme.defaultFont.letterSpacing
font.pointSize: theme.defaultFont.pointSize
font.strikeout: theme.defaultFont.strikeout
font.underline: theme.defaultFont.underline
font.weight: theme.defaultFont.weight
font.wordSpacing: theme.defaultFont.wordSpacing
color: theme.buttonTextColor color: theme.buttonTextColor
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter

10
declarativeimports/plasmacomponents/qml/CheckBox.qml
View File

@ -32,6 +32,16 @@ DualStateButton {
id: fontMetricText id: fontMetricText
text: "M" text: "M"
visible: false visible: false
font.capitalization: theme.defaultFont.capitalization
font.family: theme.defaultFont.family
font.italic: theme.defaultFont.italic
font.letterSpacing: theme.defaultFont.letterSpacing
font.pointSize: theme.defaultFont.pointSize
font.strikeout: theme.defaultFont.strikeout
font.underline: theme.defaultFont.underline
font.weight: theme.defaultFont.weight
font.wordSpacing: theme.defaultFont.wordSpacing
color: theme.textColor
} }
PlasmaCore.SvgItem { PlasmaCore.SvgItem {
svg: PlasmaCore.Svg { svg: PlasmaCore.Svg {

2
declarativeimports/plasmacomponents/qml/Label.qml
View File

@ -32,9 +32,9 @@ Text {
font.underline: theme.defaultFont.underline font.underline: theme.defaultFont.underline
font.weight: theme.defaultFont.weight font.weight: theme.defaultFont.weight
font.wordSpacing: theme.defaultFont.wordSpacing font.wordSpacing: theme.defaultFont.wordSpacing
color: theme.textColor
wrapMode: Text.Wrap wrapMode: Text.Wrap
color: theme.textColor
PlasmaCore.Theme { PlasmaCore.Theme {
id: theme id: theme

10
declarativeimports/plasmacomponents/qml/RadioButton.qml
View File

@ -37,6 +37,16 @@ DualStateButton {
id: fontMetricText id: fontMetricText
text: "M" text: "M"
visible: false visible: false
font.capitalization: theme.defaultFont.capitalization
font.family: theme.defaultFont.family
font.italic: theme.defaultFont.italic
font.letterSpacing: theme.defaultFont.letterSpacing
font.pointSize: theme.defaultFont.pointSize
font.strikeout: theme.defaultFont.strikeout
font.underline: theme.defaultFont.underline
font.weight: theme.defaultFont.weight
font.wordSpacing: theme.defaultFont.wordSpacing
color: theme.textColor
} }
PlasmaCore.SvgItem { PlasmaCore.SvgItem {
svg: PlasmaCore.Svg { svg: PlasmaCore.Svg {

10
declarativeimports/plasmacomponents/qml/TextArea.qml
View File

@ -161,6 +161,16 @@ Item {
clip: true clip: true
wrapMode: TextEdit.Wrap wrapMode: TextEdit.Wrap
enabled: textArea.enabled enabled: textArea.enabled
font.capitalization: theme.defaultFont.capitalization
font.family: theme.defaultFont.family
font.italic: theme.defaultFont.italic
font.letterSpacing: theme.defaultFont.letterSpacing
font.pointSize: theme.defaultFont.pointSize
font.strikeout: theme.defaultFont.strikeout
font.underline: theme.defaultFont.underline
font.weight: theme.defaultFont.weight
font.wordSpacing: theme.defaultFont.wordSpacing
color: theme.viewTextColor
onCursorPositionChanged: { onCursorPositionChanged: {
if (cursorRectangle.x < flickArea.contentX) { if (cursorRectangle.x < flickArea.contentX) {

11
declarativeimports/plasmacomponents/qml/TextField.qml
View File

@ -138,10 +138,19 @@ Item {
text: placeholderText text: placeholderText
visible: textInput.text == "" && !textField.activeFocus visible: textInput.text == "" && !textField.activeFocus
// XXX: using textColor and low opacity for theming placeholderText // XXX: using textColor and low opacity for theming placeholderText
color: theme.textColor color: theme.viewTextColor
opacity: 0.5 opacity: 0.5
elide: Text.ElideRight elide: Text.ElideRight
clip: true clip: true
font.capitalization: theme.defaultFont.capitalization
font.family: theme.defaultFont.family
font.italic: theme.defaultFont.italic
font.letterSpacing: theme.defaultFont.letterSpacing
font.pointSize: theme.defaultFont.pointSize
font.strikeout: theme.defaultFont.strikeout
font.underline: theme.defaultFont.underline
font.weight: theme.defaultFont.weight
font.wordSpacing: theme.defaultFont.wordSpacing
} }
TextInput { TextInput {

9
declarativeimports/plasmacomponents/qml/ToolButton.qml
View File

@ -136,6 +136,15 @@ Item {
left: icon.right left: icon.right
right: parent.right right: parent.right
} }
font.capitalization: theme.defaultFont.capitalization
font.family: theme.defaultFont.family
font.italic: theme.defaultFont.italic
font.letterSpacing: theme.defaultFont.letterSpacing
font.pointSize: theme.defaultFont.pointSize
font.strikeout: theme.defaultFont.strikeout
font.underline: theme.defaultFont.underline
font.weight: theme.defaultFont.weight
font.wordSpacing: theme.defaultFont.wordSpacing
color: theme.buttonTextColor color: theme.buttonTextColor
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter