summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-08-20 07:37:59 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-08-20 07:37:59 (GMT)
commitfd7dca696e09f3f57c54406fe1393fccdc298a36 (patch)
tree6d7e79254555ee1c2950572fac9644ac358bdd07 /examples
parent50fd8253b534d657d7ab6e2dd88c14d3943f869c (diff)
downloadQt-fd7dca696e09f3f57c54406fe1393fccdc298a36.zip
Qt-fd7dca696e09f3f57c54406fe1393fccdc298a36.tar.gz
Qt-fd7dca696e09f3f57c54406fe1393fccdc298a36.tar.bz2
Renaming Palette -> SystemPalette
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/fonts/fonts.qml2
-rw-r--r--examples/declarative/loader/Browser.qml18
2 files changed, 10 insertions, 10 deletions
diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml
index 3620a00..2aa4851 100644
--- a/examples/declarative/fonts/fonts.qml
+++ b/examples/declarative/fonts/fonts.qml
@@ -6,7 +6,7 @@ Rectangle {
width: 800; height: 600
color: Palette.base
- Palette { id: Palette; colorGroup: "Active" }
+ SystemPalette { id: Palette; colorGroup: Qt.Active }
FontLoader { id: FixedFont; name: "Courier" }
diff --git a/examples/declarative/loader/Browser.qml b/examples/declarative/loader/Browser.qml
index d3566da..e152779 100644
--- a/examples/declarative/loader/Browser.qml
+++ b/examples/declarative/loader/Browser.qml
@@ -4,14 +4,14 @@ Rectangle {
id: Root
width: parent.width
height: parent.height
- color: activePalette.base
+ color: Palette.base
FolderListModel {
id: folders
nameFilters: [ "*.qml" ]
// folder: "E:"
}
- Palette { id: activePalette; colorGroup: "Active" }
+ SystemPalette { id: Palette; colorGroup: Qt.Active }
Component {
id: FolderDelegate
@@ -31,8 +31,8 @@ Rectangle {
id: Highlight; visible: false
anchors.fill: parent
gradient: Gradient {
- GradientStop { id: t1; position: 0.0; color: activePalette.highlight }
- GradientStop { id: t2; position: 1.0; color: activePalette.lighter(activePalette.highlight) }
+ GradientStop { id: t1; position: 0.0; color: Palette.highlight }
+ GradientStop { id: t2; position: 1.0; color: Palette.lighter(Palette.highlight) }
}
}
Item {
@@ -44,7 +44,7 @@ Rectangle {
anchors.fill: parent; verticalAlignment: "AlignVCenter"
text: fileName; anchors.leftMargin: 32
font.pointSize: 10
- color: activePalette.windowText
+ color: Palette.windowText
}
MouseRegion {
id: Mouse
@@ -56,7 +56,7 @@ Rectangle {
name: "pressed"
when: Mouse.pressed
SetProperties { target: Highlight; visible: true }
- SetProperties { target: NameText; color: activePalette.highlightedText }
+ SetProperties { target: NameText; color: Palette.highlightedText }
}
]
}
@@ -92,13 +92,13 @@ Rectangle {
id: TitleBar
width: parent.width
height: 32
- color: activePalette.button; border.color: activePalette.mid
+ color: Palette.button; border.color: Palette.mid
Rectangle {
id: UpButton
width: 30
height: TitleBar.height
- border.color: activePalette.mid; color: "transparent"
+ border.color: Palette.mid; color: "transparent"
MouseRegion { anchors.fill: parent; onClicked: folders.folder = up(folders.folder) }
Image { anchors.centerIn: parent; source: "images/up.png" }
}
@@ -106,7 +106,7 @@ Rectangle {
Text {
anchors.left: UpButton.right; anchors.right: parent.right; height: parent.height
anchors.leftMargin: 4; anchors.rightMargin: 4
- text: folders.folder; color: activePalette.buttonText
+ text: folders.folder; color: Palette.buttonText
elide: "ElideLeft"; horizontalAlignment: "AlignRight"; verticalAlignment: "AlignVCenter"
}
}