diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-04-30 03:09:22 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-04-30 03:09:22 (GMT) |
commit | 0282ea19722c247157c652ef9122379f0e715497 (patch) | |
tree | 9773641d150774bd8e66e87e33e5e8899a6a4a9c /demos/declarative/mediabrowser/mediabrowser.qml | |
parent | d85c0c07b72476d801db3f1cb622cb32ab50dcc4 (diff) | |
parent | e3c91e87a06b73a06c86f93c69951768874bbaf6 (diff) | |
download | Qt-0282ea19722c247157c652ef9122379f0e715497.zip Qt-0282ea19722c247157c652ef9122379f0e715497.tar.gz Qt-0282ea19722c247157c652ef9122379f0e715497.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/parser/javascriptgrammar.cpp
src/declarative/qml/parser/javascriptgrammar_p.h
Diffstat (limited to 'demos/declarative/mediabrowser/mediabrowser.qml')
-rw-r--r-- | demos/declarative/mediabrowser/mediabrowser.qml | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/demos/declarative/mediabrowser/mediabrowser.qml b/demos/declarative/mediabrowser/mediabrowser.qml deleted file mode 100644 index bcdca56..0000000 --- a/demos/declarative/mediabrowser/mediabrowser.qml +++ /dev/null @@ -1,36 +0,0 @@ -<?qtfx namespacepath:=content ?> -<Item width="800" height="480" id="MainWindow"> - <properties> - <Property name="minimized" value="false"/> - </properties> - - <Item id="Background"> - <Image src="content/pics/background.png" opaque="true"/> - - <Rect id="Menu" x="-150" width="150" height="480" color="#232323"> - <Text id="IconText" x="40" y="110" font.bold="true" font.size="9" text="Nokia Devices" color="white" style="Raised" styleColor="black"/> - <Image src="content/pics/shadow-right-screen.png" x="150" height="480" tile="true"/> - </Rect> - - <PhonesPathView id="PhonesPathView" model="{PhonesModel}" y="60" width="800" height="360"/> - <PhoneInfoContainer id="PhoneInfoContainer" width="750" x="25" y="500" height="440"/> - <MediaButton id="CloseButton" x="680" y="440" text="Close" onClicked="MainWindow.minimized = true"/> - - <states> - <State name="Minimized" when="{MainWindow.minimized == true}"> - <SetProperties target="{Background}" x="75"/> - <SetProperties target="{Menu}" x="-75"/> - </State> - </states> - <transitions> - <Transition fromState="*" toState="*"> - <NumericAnimation properties="x,y,size" duration="500" easing="easeInOutQuad"/> - </Transition> - </transitions> - </Item> - - <Text id="CategoryText" x="300" y="15" text="Nokia Devices" font.size="22" color="white" style="Raised" styleColor="black"/> - <Item id="Stack" x="45" y="50"/> - -</Item> - |