summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Bodson <yann.bodson@nokia.com>2009-10-05 04:56:07 (GMT)
committerYann Bodson <yann.bodson@nokia.com>2009-10-05 04:56:07 (GMT)
commitbe4ed0f02bf6c46e5d9c915b1d0d2b38c40bdfda (patch)
tree1cb384714156589639b0bce1946991ddbd1f2927
parentd480c23bf54a4dce59b4d29c6276b875307b11ce (diff)
downloadQt-be4ed0f02bf6c46e5d9c915b1d0d2b38c40bdfda.zip
Qt-be4ed0f02bf6c46e5d9c915b1d0d2b38c40bdfda.tar.gz
Qt-be4ed0f02bf6c46e5d9c915b1d0d2b38c40bdfda.tar.bz2
Change .sci syntax to match BorderImage.
-rw-r--r--demos/declarative/flickr/common/pics/button-pressed.sci10
-rw-r--r--demos/declarative/flickr/common/pics/button.sci10
-rw-r--r--demos/declarative/flickr/mobile/images/lineedit.sci10
-rw-r--r--demos/declarative/flickr/mobile/images/titlebar.sci10
-rw-r--r--demos/declarative/flickr/mobile/images/toolbutton.sci10
-rw-r--r--demos/declarative/webbrowser/content/pics/addressbar-filled.sci10
-rw-r--r--demos/declarative/webbrowser/content/pics/addressbar.sci10
-rw-r--r--demos/declarative/webbrowser/content/pics/footer.sci10
-rw-r--r--demos/declarative/webbrowser/content/pics/softshadow-left.sci10
-rw-r--r--demos/declarative/webbrowser/content/pics/softshadow-right.sci10
-rw-r--r--examples/declarative/border-image/colors-round.sci10
-rw-r--r--examples/declarative/border-image/colors-stretch.sci10
-rw-r--r--src/declarative/fx/qfxscalegrid.cpp10
13 files changed, 65 insertions, 65 deletions
diff --git a/demos/declarative/flickr/common/pics/button-pressed.sci b/demos/declarative/flickr/common/pics/button-pressed.sci
index d3b16e2..b8db272 100644
--- a/demos/declarative/flickr/common/pics/button-pressed.sci
+++ b/demos/declarative/flickr/common/pics/button-pressed.sci
@@ -1,5 +1,5 @@
-gridLeft: 8
-gridTop: 4
-gridBottom: 4
-gridRight: 8
-imageFile: button.png
+border.left: 8
+border.top: 4
+border.bottom: 4
+border.right: 8
+source: button.png
diff --git a/demos/declarative/flickr/common/pics/button.sci b/demos/declarative/flickr/common/pics/button.sci
index d3b16e2..b8db272 100644
--- a/demos/declarative/flickr/common/pics/button.sci
+++ b/demos/declarative/flickr/common/pics/button.sci
@@ -1,5 +1,5 @@
-gridLeft: 8
-gridTop: 4
-gridBottom: 4
-gridRight: 8
-imageFile: button.png
+border.left: 8
+border.top: 4
+border.bottom: 4
+border.right: 8
+source: button.png
diff --git a/demos/declarative/flickr/mobile/images/lineedit.sci b/demos/declarative/flickr/mobile/images/lineedit.sci
index 7c5ec6c..054bff7 100644
--- a/demos/declarative/flickr/mobile/images/lineedit.sci
+++ b/demos/declarative/flickr/mobile/images/lineedit.sci
@@ -1,5 +1,5 @@
-gridLeft: 10
-gridTop: 10
-gridBottom: 10
-gridRight: 10
-imageFile: lineedit.png
+border.left: 10
+border.top: 10
+border.bottom: 10
+border.right: 10
+source: lineedit.png
diff --git a/demos/declarative/flickr/mobile/images/titlebar.sci b/demos/declarative/flickr/mobile/images/titlebar.sci
index 50444e1..0418d94 100644
--- a/demos/declarative/flickr/mobile/images/titlebar.sci
+++ b/demos/declarative/flickr/mobile/images/titlebar.sci
@@ -1,5 +1,5 @@
-gridLeft: 10
-gridTop: 12
-gridBottom: 12
-gridRight: 10
-imageFile: titlebar.png
+border.left: 10
+border.top: 12
+border.bottom: 12
+border.right: 10
+source: titlebar.png
diff --git a/demos/declarative/flickr/mobile/images/toolbutton.sci b/demos/declarative/flickr/mobile/images/toolbutton.sci
index a0a885f..9e4f965 100644
--- a/demos/declarative/flickr/mobile/images/toolbutton.sci
+++ b/demos/declarative/flickr/mobile/images/toolbutton.sci
@@ -1,5 +1,5 @@
-gridLeft: 15
-gridTop: 4
-gridBottom: 4
-gridRight: 15
-imageFile: toolbutton.png
+border.left: 15
+border.top: 4
+border.bottom: 4
+border.right: 15
+source: toolbutton.png
diff --git a/demos/declarative/webbrowser/content/pics/addressbar-filled.sci b/demos/declarative/webbrowser/content/pics/addressbar-filled.sci
index 464dbf5..96c5efb 100644
--- a/demos/declarative/webbrowser/content/pics/addressbar-filled.sci
+++ b/demos/declarative/webbrowser/content/pics/addressbar-filled.sci
@@ -1,6 +1,6 @@
-gridLeft: 7
-gridTop: 7
-gridBottom: 7
-gridRight: 7
-imageFile: addressbar-filled.png
+border.left: 7
+border.top: 7
+border.bottom: 7
+border.right: 7
+source: addressbar-filled.png
diff --git a/demos/declarative/webbrowser/content/pics/addressbar.sci b/demos/declarative/webbrowser/content/pics/addressbar.sci
index 23a2a19..8f1cd18 100644
--- a/demos/declarative/webbrowser/content/pics/addressbar.sci
+++ b/demos/declarative/webbrowser/content/pics/addressbar.sci
@@ -1,6 +1,6 @@
-gridLeft: 7
-gridTop: 7
-gridBottom: 7
-gridRight: 7
-imageFile: addressbar.png
+border.left: 7
+border.top: 7
+border.bottom: 7
+border.right: 7
+source: addressbar.png
diff --git a/demos/declarative/webbrowser/content/pics/footer.sci b/demos/declarative/webbrowser/content/pics/footer.sci
index be1d086..7be58f1 100644
--- a/demos/declarative/webbrowser/content/pics/footer.sci
+++ b/demos/declarative/webbrowser/content/pics/footer.sci
@@ -1,6 +1,6 @@
-gridLeft: 5
-gridTop: 0
-gridBottom: 0
-gridRight: 5
-imageFile: footer.png
+border.left: 5
+border.top: 0
+border.bottom: 0
+border.right: 5
+source: footer.png
diff --git a/demos/declarative/webbrowser/content/pics/softshadow-left.sci b/demos/declarative/webbrowser/content/pics/softshadow-left.sci
index 82e38f8..45c88d5 100644
--- a/demos/declarative/webbrowser/content/pics/softshadow-left.sci
+++ b/demos/declarative/webbrowser/content/pics/softshadow-left.sci
@@ -1,5 +1,5 @@
-gridLeft: 0
-gridTop: 16
-gridBottom: 16
-gridRight: 0
-imageFile: softshadow-left.png
+border.left: 0
+border.top: 16
+border.bottom: 16
+border.right: 0
+source: softshadow-left.png
diff --git a/demos/declarative/webbrowser/content/pics/softshadow-right.sci b/demos/declarative/webbrowser/content/pics/softshadow-right.sci
index e9494ed..4d459c0 100644
--- a/demos/declarative/webbrowser/content/pics/softshadow-right.sci
+++ b/demos/declarative/webbrowser/content/pics/softshadow-right.sci
@@ -1,5 +1,5 @@
-gridLeft: 0
-gridTop: 16
-gridBottom: 16
-gridRight: 0
-imageFile: softshadow-right.png
+border.left: 0
+border.top: 16
+border.bottom: 16
+border.right: 0
+source: softshadow-right.png
diff --git a/examples/declarative/border-image/colors-round.sci b/examples/declarative/border-image/colors-round.sci
index 3784e10..506f6f5 100644
--- a/examples/declarative/border-image/colors-round.sci
+++ b/examples/declarative/border-image/colors-round.sci
@@ -1,7 +1,7 @@
-gridLeft:30
-gridTop:30
-gridRight:30
-gridBottom:30
+border.left:30
+border.top:30
+border.right:30
+border.bottom:30
horizontalTileRule:Round
verticalTileRule:Round
-imageFile:colors.png
+source:colors.png
diff --git a/examples/declarative/border-image/colors-stretch.sci b/examples/declarative/border-image/colors-stretch.sci
index c693599..e4989a7 100644
--- a/examples/declarative/border-image/colors-stretch.sci
+++ b/examples/declarative/border-image/colors-stretch.sci
@@ -1,5 +1,5 @@
-gridLeft:30
-gridTop:30
-gridRight:30
-gridBottom:30
-imageFile:colors.png
+border.left:30
+border.top:30
+border.right:30
+border.bottom:30
+source:colors.png
diff --git a/src/declarative/fx/qfxscalegrid.cpp b/src/declarative/fx/qfxscalegrid.cpp
index f0c5758..4c6a522 100644
--- a/src/declarative/fx/qfxscalegrid.cpp
+++ b/src/declarative/fx/qfxscalegrid.cpp
@@ -142,15 +142,15 @@ QFxGridScaledImage::QFxGridScaledImage(QIODevice *data)
list[0] = list[0].trimmed();
list[1] = list[1].trimmed();
- if (list[0] == QLatin1String("gridLeft"))
+ if (list[0] == QLatin1String("border.left"))
l = list[1].toInt();
- else if (list[0] == QLatin1String("gridRight"))
+ else if (list[0] == QLatin1String("border.right"))
r = list[1].toInt();
- else if (list[0] == QLatin1String("gridTop"))
+ else if (list[0] == QLatin1String("border.top"))
t = list[1].toInt();
- else if (list[0] == QLatin1String("gridBottom"))
+ else if (list[0] == QLatin1String("border.bottom"))
b = list[1].toInt();
- else if (list[0] == QLatin1String("imageFile"))
+ else if (list[0] == QLatin1String("source"))
imgFile = list[1];
else if (list[0] == QLatin1String("horizontalTileRule"))
_h = stringToRule(list[1]);