Merge lp:~fboucault/ubuntu-ui-toolkit/simple_theming into lp:ubuntu-ui-toolkit

[Florian Boucault]

Simplified theming infrastructure.

There are no stylesheets anymore (.qmltheme file), only delegates remain. A theme is a QML module containing delegates whose names are standardized.
The default theme is called 'Ambiance' and available from QML through 'import Ubuntu.Components.Themes.Ambiance 0.1'.
The name of the current theme is set in ~/.config/ubuntu-ui-toolkit/theme.ini

Writing a new theme is done by creating a QML module and adding it in the Ubuntu/Components/Themes folder.
A theme inherits from another theme by containing a text file name 'parent_theme' whose first and only line is the name of the parent theme.

* Moved themes/ directory to Ubuntu/Components/Themes so that themes are importable.
* Simplified ThemeEngine and ThemeSettings class, removed the rest of the theming infrastructure (ItemStyle, Style, QmlThemeLoader, Selector, StyleCache).
* Adapted all widgets to use the simplified theming technique:
 - new StyledItem class that has a 'style' Component property representing the delegate
 - all widgets that have delegates inherit from StyledItem
 - all widgets set the 'style' property to the corresponding delegate in the current theme by using Theme.createStyleComponent()
 - Ambiance's stylesheet property/values have been moved to where they are used (mostly to the delegates)
 - TextAreaDelegate: exposed background as Component property
 - Added a delegate specific to TextField: TextFieldDelegate
 - Renamed delegates so that they match their widget's name (e.g. EditorCursorDelegate.qml renamed to TextCursorDelegate.qml since it's the delegate of TextCursor.qml)
* Renamed UITK_THEME_PATH into UBUNTU_UI_TOOLKIT_THEMES_PATH.

[lp:~fboucault/ubuntu-ui-toolkit/simple_theming]

565. By Florian Boucault on 2013-06-26

Moved themes under Ubuntu/Components/Themes*

566. By Florian Boucault on 2013-06-26

Removed useless debug.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:564
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/216/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/73/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/73/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/216/rebuild

review: Needs Fixing (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/simple_theming]

567. By Florian Boucault on 2013-06-26

Removed references to qmltheme.

568. By Florian Boucault on 2013-06-26

Updated components.api and CHANGES

569. By Florian Boucault on 2013-06-26

Removed outdated theming documentation.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:568
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/217/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/74/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/74/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/217/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:569
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/218/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/75
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/75/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/218/rebuild

review: Approve (continuous-integration)

[Florian Boucault (fboucault)]

Before reviewing/merging, the following needs to be done:
- documenting ThemeEngine and StyledItem
- testing on the phone
- adding unit tests for ThemeEngine
- proposing merge requests to fix the following apps that are using ItemStyle:
  * camera-app
  * mediaplayer-app
  * ubuntu-calculator-app
  * phone-app
  * notes-app
  * ubuntu-facebook-app

Optionally we may also want to:
- rename all *Delegate.qml into *Style.qml
- find a better name for the property StyledItem.delegate

review: Needs Fixing

[lp:~fboucault/ubuntu-ui-toolkit/simple_theming]

570. By Florian Boucault on 2013-06-27

tst_performance: set styledItem on delegates.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:570
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/221/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/78
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/78/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/221/rebuild

review: Approve (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/simple_theming]

571. By Florian Boucault on 2013-06-27

Documented StyledItem.

572. By Florian Boucault on 2013-06-27

StyledItem: renamed internal delegateLoader into styleLoader.

573. By Florian Boucault on 2013-06-27

Recommend the use of the Style suffix.

574. By Florian Boucault on 2013-06-27

Added documentation for ThemeEngine.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:573
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/222/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/79
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/79/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/222/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:574
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/223/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/80
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/80/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/223/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

> - find a better name for the property StyledItem.delegate

QtQuick Controls call it as "panel", how about us calling in the same way? they have it as internal, perhaps we should also keep it as such...

[Zsombor Egri (zsombi)]

As we do a major rework of theming, perhaps we should also rename the class name from ThemeEngine to UCTheme

review: Needs Fixing

[Zsombor Egri (zsombi)]

901 + \qmlabstract StyledItem
902 + \inqmlmodule Ubuntu.Components 0.1
903 + \ingroup ubuntu

I think documentation wise StyledItem should belong to theming group.

review: Needs Fixing

[Zsombor Egri (zsombi)]

In StyledItem.qml

944 + Loader {
945 + id: styleLoader
946 + anchors.fill: parent
947 + sourceComponent: style
948 + property Item styledItem: styledItem
949 + }

Shouldn't we display error message if the style loading fails?

review: Needs Fixing

[lp:~fboucault/ubuntu-ui-toolkit/simple_theming]

575. By Florian Boucault on 2013-06-27

Theme.setName should not override the system wide theme.

[Zsombor Egri (zsombi)]

QtQuick Controls style shave "panel" component in styles, so they separate style properties from visuals. In this way you can change the style properties separately from the visuals. What do you think, shouldn't we also have this feature?

On the other hand we have the delegates specifying the styling properties as public properties, so a theme which is based on an other one can simply override the previous theme delegate and change these properties only...

review: Needs Information

[lp:~fboucault/ubuntu-ui-toolkit/simple_theming]

576. By Florian Boucault on 2013-06-27

Renamed StyledItem.delegate into StyledItem.__styleInstance

577. By Florian Boucault on 2013-06-27

Merged trunk

[Zsombor Egri (zsombi)]

Do we really need separate delegate for TextField and TextArea? Those should look the same.. or you wanted to have separate delegate for each styled item in case a theme wants to have different look?

review: Needs Information

[Zsombor Egri (zsombi)]

So far looks good :) Waiting for the rest...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:575
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/229/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/86/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/86/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/229/rebuild

review: Needs Fixing (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/simple_theming]

578. By Florian Boucault on 2013-06-27

Renamed all theme Delegates into Styles

579. By Florian Boucault on 2013-06-27

Merged trunk

580. By Florian Boucault on 2013-06-27

Fixed components.api

581. By Florian Boucault on 2013-06-27

Renamed ThemeEngine into UCTheme.
Renamed ThemeSettings into UCThemeSettings.

582. By Florian Boucault on 2013-06-27

Moved StyledItem into theming documentation group.

[Florian Boucault (fboucault)]

> As we do a major rework of theming, perhaps we should also rename the class
> name from ThemeEngine to UCTheme

Done.

[Florian Boucault (fboucault)]

> 901 + \qmlabstract StyledItem
> 902 + \inqmlmodule Ubuntu.Components 0.1
> 903 + \ingroup ubuntu
>
> I think documentation wise StyledItem should belong to theming group.

Done.

[Florian Boucault (fboucault)]

> In StyledItem.qml
>
> 944 + Loader {
> 945 + id: styleLoader
> 946 + anchors.fill: parent
> 947 + sourceComponent: style
> 948 + property Item styledItem: styledItem
> 949 + }
>
> Shouldn't we display error message if the style loading fails?

I believe Loader does that already.

[Florian Boucault (fboucault)]

> QtQuick Controls style shave "panel" component in styles, so they separate
> style properties from visuals. In this way you can change the style properties
> separately from the visuals. What do you think, shouldn't we also have this
> feature?
>

I have not found that we need to do that to get the same benefits.

> On the other hand we have the delegates specifying the styling properties as
> public properties, so a theme which is based on an other one can simply
> override the previous theme delegate and change these properties only...

Exactly.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:580
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/231/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/88
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/88
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/88/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/231/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:582
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/232/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/89/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/232/rebuild

review: Needs Fixing (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/simple_theming]

583. By Florian Boucault on 2013-06-27

Merged trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:583
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/233/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/90
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/90/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/233/rebuild

review: Approve (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/simple_theming]

584. By Florian Boucault on 2013-06-27

qtdeclarative5-ubuntu-ui-toolkit-plugin should not install the Themes directory.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:584
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/234/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/91
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/91
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/91/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/234/rebuild

review: Approve (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/simple_theming]

585. By Florian Boucault on 2013-06-27

Missing backslash preventing sci files from being installed.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:585
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/235/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/92
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/92
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/92/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/235/rebuild

review: Approve (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/simple_theming]

586. By Florian Boucault on 2013-06-27

Header height is set by its delegate.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:586
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/236/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/93
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/93/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/236/rebuild

review: Approve (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/simple_theming]

587. By Florian Boucault on 2013-06-30

Merged trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:587
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/245/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/102
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/102/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/245/rebuild

review: Approve (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/simple_theming]

588. By Florian Boucault on 2013-06-30

UCTheme: renamed styleUrlForTheme to styleUrl and made it public in prevision for future use in the QQmlExtensionPlugin.

589. By Florian Boucault on 2013-06-30

Removed deprecated documentation.

590. By Florian Boucault on 2013-07-01

Made styleUrl private again. Moved UCTheme registration into the class itself.

591. By Florian Boucault on 2013-07-01

Only expose TextAreaStyle and TextFieldStyle as we are not ready to commit to the APIs of all the Styles.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:588
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/246/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/103
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/103/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/246/rebuild

review: Approve (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/simple_theming]

592. By Florian Boucault on 2013-07-01

Added failing test cases.

593. By Florian Boucault on 2013-07-01

Fixed failing tests.

594. By Florian Boucault on 2013-07-01

Removed rogue references to ItemStyle.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:591
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/251/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/108
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/108/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/251/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:594
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/252/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/109
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/109/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/252/rebuild

review: Needs Fixing (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/simple_theming]

595. By Florian Boucault on 2013-07-01

Merged from trunk.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:595
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/253/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/110
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/110/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/253/rebuild

review: Approve (continuous-integration)

[lp:~fboucault/ubuntu-ui-toolkit/simple_theming]

596. By Florian Boucault on 2013-07-01

Merged with trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:596
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/254/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/111
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/111
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/111/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/254/rebuild

review: Approve (continuous-integration)

[Florian Boucault (fboucault)]

Everything is ready to go.

All apps that need adaptation have MRs ready to land:

* mediaplayer-app https://code.launchpad.net/~fboucault/mediaplayer-app/new_theming/+merge/171887
* camera-app https://code.launchpad.net/~fboucault/camera-app/new_theming/+merge/171886
* notes-app https://code.launchpad.net/~fboucault/notes-app/new_theming/+merge/171885
* phone-app https://code.launchpad.net/~boiko/phone-app/new_theming/+merge/172431

[Zsombor Egri (zsombi)]

Two small things to be fixed still:
- UCTheme::setName(), ::createStyleComponent(), ::styleUrl() and ::parentThemeName() can take const QString& as parameter.
- because of common.pri removal we have two warnings in Layouts.pro and Layouts\plugin.pro. I think we should fix those, either here or in a separate MR.

review: Needs Fixing

[Zsombor Egri (zsombi)]

Not sure whether it has bee brought in by this MR, but we have these errors displayed when opening a Dialog or Popover:
> When launching the toolkit gallery and activating Dialog or Popover (not on
> the Sheet), the following error is printed:
> (kernel/qobject.cpp:2571, QObject::connect) - QObject::connect: Cannot connect
> QQuickShaderEffectSource:: to ShapeItem::onImagePropertiesChanged()
>
> Would this be an error in Shape?

review: Needs Fixing

[Florian Boucault (fboucault)]

> Not sure whether it has bee brought in by this MR, but we have these errors
> displayed when opening a Dialog or Popover:
> > When launching the toolkit gallery and activating Dialog or Popover (not on
> > the Sheet), the following error is printed:
> > (kernel/qobject.cpp:2571, QObject::connect) - QObject::connect: Cannot
> connect
> > QQuickShaderEffectSource:: to ShapeItem::onImagePropertiesChanged()
> >
> > Would this be an error in Shape?

Also happens in trunk.

[Florian Boucault (fboucault)]

> Two small things to be fixed still:
> - UCTheme::setName(), ::createStyleComponent(), ::styleUrl() and
> ::parentThemeName() can take const QString& as parameter.

We only have a short window to merge this and the 4 other apps so that the build does not break. Can we avoid this detail? (also note that QStrings are shared implicity therefore no copy is occuring when passing by value)

> - because of common.pri removal we have two warnings in Layouts.pro and
> Layouts\plugin.pro. I think we should fix those, either here or in a separate
> MR.

Why here? the removal of common.pri was done in trunk.

=== modified file 'CHANGES'
--- CHANGES	2013-06-21 11:35:19 +0000
+++ CHANGES	2013-07-01 22:15:52 +0000
@@ -9,6 +9,8 @@
 
 API Changes
 ***********
+
+* REMOVED IN ALL: attached property ItemStyle
 * ADDED IN OrientationHelper: property alias rotating
 * ADDED IN OrientationHelper: property alias __orientationHelper
 * ADDED IN OrientationHelper: property bool transitionEnabled

=== modified file 'components.api'
--- components.api	2013-07-01 20:32:20 +0000
+++ components.api	2013-07-01 22:15:52 +0000
@@ -15,7 +15,7 @@
     property bool enabled
     property Component itemHint
 modules/Ubuntu/Components/ActionItem.qml
-Item
+StyledItem
     property Action action
     property string text
     property url iconSource
@@ -28,7 +28,7 @@
 AnimatedItem
     property bool running
 modules/Ubuntu/Components/AnimatedItem.qml
-Item
+StyledItem
     property bool onScreen
 modules/Ubuntu/Components/Button.qml
 AbstractButton
@@ -55,7 +55,7 @@
     function getEventSpeed(currentTime, event)
     function pushDragEvent(event)
 modules/Ubuntu/Components/Header.qml
-Item
+StyledItem
     function show()
     function hide()
     property string title
@@ -108,7 +108,7 @@
     function pop()
     function clear()
 modules/Ubuntu/Components/PageTreeNode.qml
-Item
+StyledItem
     property bool __isPageTreeNode
     property Header header
     property Toolbar toolbar
@@ -139,7 +139,7 @@
     property real maximumValue
     property real value
 modules/Ubuntu/Components/Scrollbar.qml
-Item
+StyledItem
     property Flickable flickableItem
     property int align
     property bool __interactive
@@ -153,6 +153,10 @@
     signal touched(bool onThumb)
     function formatValue(v)
     property alias __internals
+modules/Ubuntu/Components/StyledItem.qml
+FocusScope
+    property Component style
+    readonly property Item __styleInstance
 modules/Ubuntu/Components/Switch.qml
 CheckBox
 modules/Ubuntu/Components/Tab.qml
@@ -172,7 +176,7 @@
     default property alias tabChildren
     signal modelChanged()
 modules/Ubuntu/Components/TextArea.qml
-FocusScope
+StyledItem
     property bool highlighted
     property alias placeholderText
     readonly property alias displayText
@@ -234,13 +238,13 @@
     function forceActiveFocus()
     property alias __internal
 modules/Ubuntu/Components/TextCursor.qml
-Item
+StyledItem
     property var editorItem
     property string positionProperty
     property var popover
     function openPopover()
 modules/Ubuntu/Components/TextField.qml
-FocusScope
+StyledItem
     property bool highlighted
     property alias placeholderText
     property bool hasClearButton
@@ -330,14 +334,6 @@
     Method {
     name: "contains"
     Parameter { name: "point"; type: "QPointF" }
-    name: "ItemStyleAttached"
-    prototype: "QObject"
-    exports: ["ItemStyle 0.1"]
-    Property { name: "class"; type: "string" }
-    Property { name: "name"; type: "string" }
-    Property { name: "style"; type: "UCStyle"; isPointer: true }
-    Property { name: "delegate"; type: "QQuickItem"; isPointer: true }
-    Property { name: "path"; type: "string"; isReadonly: true }
     name: "QQmlPropertyMap"
     prototype: "QObject"
     Signal {
@@ -412,9 +408,6 @@
     Signal {
     name: "sourceChanged"
     Parameter { type: "QUrl" }
-    name: "UCStyle"
-    prototype: "QObject"
-    exports: ["Style 0.1"]
     name: "UCUbuntuAnimation"
     prototype: "QObject"
     exports: ["UbuntuAnimation 0.1"]

=== modified file 'debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install'
--- debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install	2013-02-15 11:52:44 +0000
+++ debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install	2013-07-01 22:15:52 +0000
@@ -1,1 +1,9 @@
-usr/lib/*/qt5/qml/
+usr/lib/*/qt5/qml/Ubuntu/Layouts
+usr/lib/*/qt5/qml/Ubuntu/Components/*.qml
+usr/lib/*/qt5/qml/Ubuntu/Components/*.js
+usr/lib/*/qt5/qml/Ubuntu/Components/qmldir
+usr/lib/*/qt5/qml/Ubuntu/Components/plugins.qmltypes
+usr/lib/*/qt5/qml/Ubuntu/Components/libUbuntuComponents.so
+usr/lib/*/qt5/qml/Ubuntu/Components/artwork
+usr/lib/*/qt5/qml/Ubuntu/Components/ListItems
+usr/lib/*/qt5/qml/Ubuntu/Components/Popups

=== modified file 'debian/ubuntu-ui-toolkit-theme.install'
--- debian/ubuntu-ui-toolkit-theme.install	2013-02-15 11:52:44 +0000
+++ debian/ubuntu-ui-toolkit-theme.install	2013-07-01 22:15:52 +0000
@@ -1,1 +1,1 @@
-usr/share/themes/Ambiance
+usr/lib/*/qt5/qml/Ubuntu/Components/Themes

=== modified file 'examples/examples.pro'
--- examples/examples.pro	2013-05-07 10:23:57 +0000
+++ examples/examples.pro	2013-07-01 22:15:52 +0000
@@ -8,7 +8,7 @@
 
 
 #examples = jokes unit-converter
-#filetypes = qml png svg js qmltheme jpg wav
+#filetypes = qml png svg js jpg wav
  
 #OTHER_FILES = ""
 

=== modified file 'examples/jokes/jokes.pro'
--- examples/jokes/jokes.pro	2013-05-07 10:23:57 +0000
+++ examples/jokes/jokes.pro	2013-07-01 22:15:52 +0000
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-filetypes = qml png svg js qmltheme jpg qmlproject desktop wav
+filetypes = qml png svg js jpg qmlproject desktop wav
 
 OTHER_FILES = ""
 

=== modified file 'examples/locale/locale.pro'
--- examples/locale/locale.pro	2013-05-07 10:23:57 +0000
+++ examples/locale/locale.pro	2013-07-01 22:15:52 +0000
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-filetypes = qml png svg js qmltheme jpg qmlproject desktop
+filetypes = qml png svg js jpg qmlproject desktop
 
 OTHER_FILES = ""
 

=== modified file 'examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro'
--- examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro	2013-05-06 16:24:50 +0000
+++ examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.pro	2013-07-01 22:15:52 +0000
@@ -2,7 +2,7 @@
 
 SUBDIRS += po
 
-filetypes = qml png svg js qmltheme jpg qmlproject desktop
+filetypes = qml png svg js jpg qmlproject desktop
 
 OTHER_FILES = ""
 

=== modified file 'examples/unit-converter/unit-converter.pro'
--- examples/unit-converter/unit-converter.pro	2013-05-07 10:23:57 +0000
+++ examples/unit-converter/unit-converter.pro	2013-07-01 22:15:52 +0000
@@ -1,6 +1,6 @@
 TEMPLATE = subdirs
 
-filetypes = qml png svg js qmltheme jpg qmlproject desktop
+filetypes = qml png svg js jpg qmlproject desktop
 
 OTHER_FILES = ""
 

=== modified file 'export_modules_dir.sh'
--- export_modules_dir.sh	2013-04-24 17:09:29 +0000
+++ export_modules_dir.sh	2013-07-01 22:15:52 +0000
@@ -17,4 +17,4 @@
 
 export QML_IMPORT_PATH=$PWD/modules
 export QML2_IMPORT_PATH=$PWD/modules
-export UITK_THEME_PATH=.
+export UBUNTU_UI_TOOLKIT_THEMES_PATH=$PWD/modules

=== modified file 'modules/Ubuntu/Components/ActionItem.qml'
--- modules/Ubuntu/Components/ActionItem.qml	2013-06-28 18:14:20 +0000
+++ modules/Ubuntu/Components/ActionItem.qml	2013-07-01 22:15:52 +0000
@@ -31,7 +31,7 @@
         See \l ToolbarItems for examples of how to use \l ToolbarButton or other ActionItems
         in a toolbar.
 */
-Item {
+StyledItem {
     id: actionItem
 
     /*!

=== modified file 'modules/Ubuntu/Components/ActivityIndicator.qml'
--- modules/Ubuntu/Components/ActivityIndicator.qml	2013-02-27 07:15:35 +0000
+++ modules/Ubuntu/Components/ActivityIndicator.qml	2013-07-01 22:15:52 +0000
@@ -15,11 +15,6 @@
  */
 
 import QtQuick 2.0
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import "." 0.1 as Theming
 
 /*!
     \qmltype ActivityIndicator
@@ -63,6 +58,5 @@
     implicitWidth: units.gu(3)
     implicitHeight: units.gu(3)
 
-    Theming.ItemStyle.class: "activityindicator"
-
+    style: Theme.createStyleComponent("ActivityIndicatorStyle.qml", indicator)
 }

=== modified file 'modules/Ubuntu/Components/AnimatedItem.qml'
--- modules/Ubuntu/Components/AnimatedItem.qml	2012-10-29 17:14:42 +0000
+++ modules/Ubuntu/Components/AnimatedItem.qml	2013-07-01 22:15:52 +0000
@@ -26,7 +26,7 @@
 
 import QtQuick 2.0
 
-Item {
+StyledItem {
     id: root
     /*!
       \preliminary

=== modified file 'modules/Ubuntu/Components/Button.qml'
--- modules/Ubuntu/Components/Button.qml	2013-06-26 23:42:39 +0000
+++ modules/Ubuntu/Components/Button.qml	2013-07-01 22:15:52 +0000
@@ -15,11 +15,6 @@
  */
 
 import QtQuick 2.0
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
 
 /*!
     \qmltype Button
@@ -69,8 +64,6 @@
 AbstractButton {
     id: button
 
-    // FIXME: see FIXME above
-    Theming.ItemStyle.class: "button"
     implicitWidth: units.gu(9)
     implicitHeight: units.gu(4)
 
@@ -107,4 +100,6 @@
        https://bugreports.qt-project.org/browse/QTBUG-14861
     */
     property string iconPosition: "left"
+
+    style: Theme.createStyleComponent("ButtonStyle.qml", button)
 }

=== modified file 'modules/Ubuntu/Components/CheckBox.qml'
--- modules/Ubuntu/Components/CheckBox.qml	2013-05-24 09:12:56 +0000
+++ modules/Ubuntu/Components/CheckBox.qml	2013-07-01 22:15:52 +0000
@@ -15,11 +15,6 @@
  */
 
 import QtQuick 2.0
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
 
 /*!
     \qmltype CheckBox
@@ -45,11 +40,6 @@
 AbstractButton {
     id: checkBox
 
-    // FIXME: see FIXME above
-    Theming.ItemStyle.class: "checkbox"
-    implicitWidth: units.gu(4)
-    implicitHeight: units.gu(4)
-
     /*!
       \preliminary
       Specifies whether the checkbox is checked or not. By default the property
@@ -61,4 +51,6 @@
       \internal
      */
     onClicked: checked = !checked
+
+    style: Theme.createStyleComponent("CheckBoxStyle.qml", checkBox)
 }

=== modified file 'modules/Ubuntu/Components/Components.pro'
--- modules/Ubuntu/Components/Components.pro	2013-06-25 14:18:18 +0000
+++ modules/Ubuntu/Components/Components.pro	2013-07-01 22:15:52 +0000
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 
-SUBDIRS += plugin
+SUBDIRS += plugin Themes
 
 include(deployment.pri)

=== modified file 'modules/Ubuntu/Components/Header.qml'
--- modules/Ubuntu/Components/Header.qml	2013-06-21 11:28:33 +0000
+++ modules/Ubuntu/Components/Header.qml	2013-07-01 22:15:52 +0000
@@ -17,9 +17,9 @@
 import QtQuick 2.0
 // FIXME: When a module contains QML, C++ and JavaScript elements exported,
 // we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
+// by the QML engine. As workaround, we use Ubuntu named import.
 // Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
+import Ubuntu.Components 0.1 as Ubuntu
 
 /*!
     \internal
@@ -27,10 +27,8 @@
     \inqmlmodule Ubuntu.Components 0.1
     \ingroup ubuntu
 */
-Item {
+StyledItem {
     id: header
-    // FIXME: see above
-    Theming.ItemStyle.class: "header"
 
     anchors {
         left: parent.left
@@ -41,10 +39,9 @@
     Behavior on y {
         enabled: !(header.flickable && header.flickable.moving)
         SmoothedAnimation {
-            duration: Theming.UbuntuAnimation.FastDuration
+            duration: Ubuntu.UbuntuAnimation.FastDuration
         }
     }
-    height: units.gu(10)
 
     /*! \internal */
     onHeightChanged: internal.movementEnded()
@@ -157,4 +154,6 @@
             if (flickable && !flickable.interactive) header.show();
         }
     }
+
+    style: Theme.createStyleComponent("HeaderStyle.qml", header)
 }

=== modified file 'modules/Ubuntu/Components/Label.qml'
--- modules/Ubuntu/Components/Label.qml	2013-05-20 08:34:52 +0000
+++ modules/Ubuntu/Components/Label.qml	2013-07-01 22:15:52 +0000
@@ -15,11 +15,6 @@
  */
 
 import QtQuick 2.0
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
 
 /*!
     \qmltype Label
@@ -45,8 +40,6 @@
 Text {
     id: label
 
-    Theming.ItemStyle.class: "label"
-
     /*!
       The size of the text. One of the following strings (from smallest to largest):
         \list
@@ -63,8 +56,5 @@
 
     font.pixelSize: FontUtils.sizeToPixels(fontSize)
     font.family: "Ubuntu"
-    /* FIXME: do not set any font subproperties (e.g. font.family, font.italic, etc.)
-       as setting there default value here will prevent them from being overriden
-       by the theme.
-    */
+    color: "#757373"
 }

=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2013-06-14 16:28:04 +0000
+++ modules/Ubuntu/Components/MainView.qml	2013-07-01 22:15:52 +0000
@@ -15,11 +15,6 @@
  */
 
 import QtQuick 2.0
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
 
 /*!
     \qmltype MainView
@@ -140,13 +135,13 @@
       */
     property string applicationName
 
-    // FIXME: Make sure that the theming is only in the background, and the delegate
+    // FIXME: Make sure that the theming is only in the background, and the style
     //  should not occlude contents of the MainView. When making changes here, make
     //  sure that bug https://bugs.launchpad.net/manhattan/+bug/1124076 does not come back.
-    Item {
+    StyledItem {
         id: background
-        Theming.ItemStyle.class: "mainview"
         anchors.fill: parent
+        style: Theme.createStyleComponent("MainViewStyle.qml", background)
     }
 
     /*!

=== modified file 'modules/Ubuntu/Components/PageTreeNode.qml'
--- modules/Ubuntu/Components/PageTreeNode.qml	2013-05-21 18:06:28 +0000
+++ modules/Ubuntu/Components/PageTreeNode.qml	2013-07-01 22:15:52 +0000
@@ -26,7 +26,7 @@
     It is used to propagate properties such as \l header and \l toolbar from a
     \l MainView (the root node) to each \l Page (leaf node) in the tree.
 */
-Item {
+StyledItem {
     id: node
 
     /*!

=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2013-06-13 13:39:32 +0000
+++ modules/Ubuntu/Components/Panel.qml	2013-07-01 22:15:52 +0000
@@ -86,7 +86,6 @@
 
                 Item {
                     anchors.fill: parent
-                    ItemStyle.class: "toolbar"
 
                     // two properties used by the toolbar delegate:
                     property bool opened: panel.opened

=== modified file 'modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml'
--- modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2013-06-12 18:52:01 +0000
+++ modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2013-07-01 22:15:52 +0000
@@ -17,7 +17,6 @@
 import QtQuick 2.0
 import "../" 0.1
 import "../ListItems" 0.1
-import "../" 0.1 as Theming
 
 /*!
     \qmltype ActionSelectionPopover

=== modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
--- modules/Ubuntu/Components/Popups/Dialog.qml	2013-05-28 19:25:47 +0000
+++ modules/Ubuntu/Components/Popups/Dialog.qml	2013-07-01 22:15:52 +0000
@@ -16,11 +16,6 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
 import "internalPopupUtils.js" as InternalPopupUtils
 
 /*!
@@ -120,13 +115,13 @@
       The property holds the margins from the dialog's dismissArea. The property
       is themed.
       */
-    property real edgeMargins
+    property real edgeMargins: units.gu(2)
 
     /*!
       The property holds the margin from the dialog's caller. The property
       is themed.
       */
-    property real callerMargin
+    property real callerMargin: units.gu(1)
 
     /*!
       The property controls whether the dialog is modal or not. Modal dialogs block
@@ -138,8 +133,6 @@
       */
     property bool modal: true
 
-    Theming.ItemStyle.class: "dialog"
-
     /*
     QtObject {
         id: internal
@@ -157,22 +150,21 @@
     __foreground: foreground
     __eventGrabber.enabled: modal
     __dimBackground: modal
+    fadingAnimation: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
 
-    Item {
+    StyledItem {
         id: foreground
-        // FIXME: see above
-        Theming.ItemStyle.class: "foreground"
         width: Math.min(minimumWidth, dialog.width)
         anchors.centerIn: parent
 
-        // used in the delegate
+        // used in the style
         property string title
         property string text
-        property real minimumWidth
-        property real minimumHeight
+        property real minimumWidth: units.gu(38)
+        property real minimumHeight: units.gu(32)
         property real maxHeight: 3*dialog.height/4
-        property real margins
-        property real itemSpacing
+        property real margins: units.gu(4)
+        property real itemSpacing: units.gu(2)
         property Item dismissArea: dialog.dismissArea
 
         height: Math.min(childrenRect.height, dialog.height)
@@ -190,14 +182,18 @@
             onWidthChanged: updateChildrenWidths();
 
             Label {
-                ItemStyle.class: "title"
                 horizontalAlignment: Text.AlignHCenter
                 text: dialog.title
+                fontSize: "large"
+                color: Qt.rgba(1, 1, 1, 0.9)
             }
 
             Label {
                 horizontalAlignment: Text.AlignHCenter
                 text: dialog.text
+                fontSize: "medium"
+                color: Qt.rgba(1, 1, 1, 0.6)
+                wrapMode: Text.Wrap
             }
 
             onChildrenChanged: updateChildrenWidths()
@@ -208,5 +204,7 @@
                 }
             }
         }
+
+        style: Theme.createStyleComponent("DialogForegroundStyle.qml", foreground)
     }
 }

=== modified file 'modules/Ubuntu/Components/Popups/Pointer.qml'
--- modules/Ubuntu/Components/Popups/Pointer.qml	2013-03-14 11:48:53 +0000
+++ modules/Ubuntu/Components/Popups/Pointer.qml	2013-07-01 22:15:52 +0000
@@ -15,21 +15,16 @@
  */
 
 import QtQuick 2.0
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
+import Ubuntu.Components 0.1
 
 // internal class, used inside subclasses of PopupBase
-Item {
+StyledItem {
     id: pointer
-    Theming.ItemStyle.class: "pointer"
 
     // Using Item.Rotation does not play well with the
     //  translation that would be needed after rotating.
-    property real longAxis
-    property real shortAxis
+    property real longAxis: units.gu(2)
+    property real shortAxis: units.gu(1)
 
     // up, down, left or right, or none to hide the pointer
     property string direction: "down"
@@ -39,4 +34,6 @@
 
     width: rotate ? shortAxis : longAxis
     height: rotate ? longAxis : shortAxis
+
+    style: Theme.createStyleComponent("PointerStyle.qml", pointer)
 }

=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
--- modules/Ubuntu/Components/Popups/Popover.qml	2013-05-24 09:12:56 +0000
+++ modules/Ubuntu/Components/Popups/Popover.qml	2013-07-01 22:15:52 +0000
@@ -16,11 +16,7 @@
 
 import QtQuick 2.0
 import "internalPopupUtils.js" as InternalPopupUtils
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
+import Ubuntu.Components 0.1
 
 /*!
     \qmltype Popover
@@ -129,13 +125,13 @@
       The property holds the margins from the popover's dismissArea. The property
       is themed.
       */
-    property real edgeMargins
+    property real edgeMargins: units.gu(2)
 
     /*!
       The property holds the margin from the popover's caller. The property
       is themed.
       */
-    property real callerMargin
+    property real callerMargin: units.gu(1)
 
     /*!
       The property drives the automatic closing of the Popover when user taps
@@ -147,7 +143,7 @@
       */
     property bool autoClose: true
 
-    Theming.ItemStyle.class: "popover"
+    fadingAnimation: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
 
     QtObject {
         id: internal
@@ -164,13 +160,11 @@
     __eventGrabber.enabled: autoClose
     __closeOnDismissAreaPress: true
 
-    Item {
+    StyledItem {
         id: foreground
 
-        // FIXME: see above
-        Theming.ItemStyle.class: "foreground"
         //styling properties
-        property real minimumWidth
+        property real minimumWidth: units.gu(40)
 
         property real maxWidth: dismissArea ? (internal.portrait ? dismissArea.width : dismissArea.width * 3/4) : 0.0
         property real maxHeight: dismissArea ? (internal.portrait ? dismissArea.height * 3/4 : dismissArea.height) : 0.0
@@ -179,6 +173,7 @@
 
         Item {
             id: containerItem
+            parent: foreground.__styleInstance.contentItem
             anchors {
                 left: parent.left
                 top: parent.top
@@ -189,6 +184,8 @@
 
         onWidthChanged: internal.updatePosition()
         onHeightChanged: internal.updatePosition()
+
+        style: Theme.createStyleComponent("PopoverForegroundStyle.qml", foreground)
     }
 
     Pointer { id: pointer }

=== modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml'
--- modules/Ubuntu/Components/Popups/PopupBase.qml	2013-05-24 10:07:44 +0000
+++ modules/Ubuntu/Components/Popups/PopupBase.qml	2013-07-01 22:15:52 +0000
@@ -15,11 +15,6 @@
  */
 
 import QtQuick 2.0
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
 import Ubuntu.Components 0.1
 
 /*!
@@ -134,14 +129,14 @@
     // dimmer
     Rectangle {
         id: background
-        Theming.ItemStyle.class: "background"
         // styling properties
         property bool dim: false
         anchors.fill: parent
         visible: dim
+        color: popupBase.width > units.gu(60) ? Qt.rgba(0, 0, 0, 0.6) : Qt.rgba(0, 0, 0, 0.9)
     }
 
-    Theming.InverseMouseArea {
+    InverseMouseArea {
         id: eventGrabber
         enabled: true
         anchors.fill: __foreground

=== modified file 'modules/Ubuntu/Components/Popups/SheetBase.qml'
--- modules/Ubuntu/Components/Popups/SheetBase.qml	2013-05-19 19:03:44 +0000
+++ modules/Ubuntu/Components/Popups/SheetBase.qml	2013-07-01 22:15:52 +0000
@@ -16,11 +16,6 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
 
 /*!
     \qmltype SheetBase
@@ -78,17 +73,14 @@
     /*! \internal */
     property alias __rightButton: foreground.rightButton
 
-    Theming.ItemStyle.class: "sheet"
+    fadingAnimation: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
 
     __foreground: foreground
     __eventGrabber.enabled: modal
 
-    Item {
+    StyledItem {
         id: foreground
 
-        // FIXME: see above
-        Theming.ItemStyle.class: "foreground"
-
         property string title
         property real contentsWidth: units.gu(64)
         property real contentsHeight: units.gu(40)
@@ -103,21 +95,15 @@
         property real minHeight: Math.min(units.gu(40), sheet.height)
         property real maxHeight: sheet.height
 
-        // childrenRect includes the delegate which may add decoration
-        // to the sheet (such as a header with title), and thus width and height
-        // can differ from contentsWidth and contentsHeight.
-        // Delegate makes use of minWidth/maxWidth/minHeight/maxHeight properties
-        // which are defined above. Those properties are not moved to the delegate
-        // because here we have easy access to sheet.width and sheet.height.
-        width: childrenRect.width
-        height: childrenRect.height
-
         Item {
             id: containerItem
+            parent: foreground.__styleInstance.contentItem
             anchors {
                 fill: parent
                 margins: units.gu(1)
             }
         }
+
+        style: Theme.createStyleComponent("SheetForegroundStyle.qml", sheet)
     }
 }

=== modified file 'modules/Ubuntu/Components/Scrollbar.qml'
--- modules/Ubuntu/Components/Scrollbar.qml	2013-03-14 11:56:06 +0000
+++ modules/Ubuntu/Components/Scrollbar.qml	2013-07-01 22:15:52 +0000
@@ -15,11 +15,6 @@
  */
 
 import QtQuick 2.0
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
 
 /*!
     \qmltype ScrollBar
@@ -35,7 +30,7 @@
     direction (RTL or LTR).
 
     The content position is driven through the attached Flickable. Therefore every
-    delegate implementation should drive the position through contentX/contentY
+    style implementation should drive the position through contentX/contentY
     properties, depending on whether the orientation is vertical or horizontal.
 
     Example:
@@ -63,7 +58,7 @@
     \endqml
   */
 
-Item {
+StyledItem {
     id: scrollbar
 
     /*!
@@ -94,9 +89,6 @@
     */
     property bool __interactive: false
 
-    // styling
-    Theming.ItemStyle.class: "scrollbar"
-
     implicitWidth: internals.vertical ? units.gu(4) : flickableItem.width
     implicitHeight: !internals.vertical ? units.gu(4) : flickableItem.height
 
@@ -154,4 +146,6 @@
             return undefined;
         }
     }
+
+    style: Theme.createStyleComponent("ScrollbarStyle.qml", scrollbar)
 }

=== modified file 'modules/Ubuntu/Components/Slider.qml'
--- modules/Ubuntu/Components/Slider.qml	2013-05-24 09:12:56 +0000
+++ modules/Ubuntu/Components/Slider.qml	2013-07-01 22:15:52 +0000
@@ -33,11 +33,6 @@
 import QtQuick 2.0
 import "mathUtils.js" as MathUtils
 import "sliderUtils.js" as SliderFuncs
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import "." 0.1 as Theming
 
 /*!
     \qmltype Slider
@@ -47,7 +42,7 @@
      values.
 
     The slider's sensing area is defined by the width and height, therefore
-    delegates should take this into account when defining the visuals, and
+    styles should take this into account when defining the visuals, and
     alter these values to align the graphics' sizes.
 
     \l {http://design.ubuntu.com/apps/building-blocks/slider}{See also the Design Guidelines on Sliders}.
@@ -68,16 +63,16 @@
     \section2 Theming
 
     The slider's default style class is \b slider and style properties depend on
-    the actual delegate defined by the theme, except of one property which defines
+    the actual style defined by the theme, except of one property which defines
     the spacing units between the slider's bar and thumb, called \b thumbSpacing.
     The slider uses one single touch sensing area to position the thumb within the
-    bar. Therefore However delegates must define the following properties:
+    bar. Therefore However styles must define the following properties:
     \list
     \li * \b bar - the slider's bar object
     \li * \b thumb - the slider's thumb object
     \endlist
 
-    Beside these, the library provies functions for delegates to update liveValue and
+    Beside these, the library provies functions for styles to update liveValue and
     normalizedValue in SliderUtils module.
 
     \b{This component is under heavy development.}
@@ -88,8 +83,6 @@
     width: units.gu(38)
     height: units.gu(5)
 
-    Theming.ItemStyle.class: "slider"
-
     // FIXME(loicm) Add Support for the inverted property. There's an ongoing
     //     debate on whether we should use that property (like every other
     //     toolkits) or add new enumerations to the orientation property and
@@ -157,7 +150,7 @@
       default, the value v is rounded to the nearest interger value.
 
       \b Note: this function will be deprecated, and will be solved with particular
-      delegates for the thumb.
+      styles for the thumb.
      */
     function formatValue(v) {
         return v.toFixed(0)
@@ -179,9 +172,9 @@
     QtObject {
         id: internals
 
-        property real thumbSpacing: slider.Theming.ItemStyle.delegate ? slider.Theming.ItemStyle.delegate.thumbSpacing : 0
-        property Item bar: slider.Theming.ItemStyle.delegate ? slider.Theming.ItemStyle.delegate.bar : null
-        property Item thumb: slider.Theming.ItemStyle.delegate ? slider.Theming.ItemStyle.delegate.thumb :  null
+        property real thumbSpacing: slider.__styleInstance ? slider.__styleInstance.thumbSpacing : 0
+        property Item bar: slider.__styleInstance ? slider.__styleInstance.bar : null
+        property Item thumb: slider.__styleInstance ? slider.__styleInstance.thumb :  null
 
         property real liveValue: 0.0
         property real normalizedValue: MathUtils.clamp((liveValue - slider.minimumValue) /
@@ -244,4 +237,6 @@
             }
         }
     }
+
+    style: Theme.createStyleComponent("SliderStyle.qml", slider)
 }

=== added file 'modules/Ubuntu/Components/StyledItem.qml'
--- modules/Ubuntu/Components/StyledItem.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/StyledItem.qml	2013-07-01 22:15:52 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+/*!
+    \qmlabstract StyledItem
+    \inqmlmodule Ubuntu.Components 0.1
+    \ingroup theming
+    \brief The StyledItem class allows items to be styled by the theme.
+
+    StyledItem provides facilities for making an Item stylable by the theme.
+
+    In order to make an Item stylable by the theme, it is enough to make the Item
+    inherit from StyledItem and set its \l style property to be the result of the
+    appropriate call to Theme.createStyleComponent().
+
+    Example definition of a custom Item MyItem.qml:
+    \qml
+        StyledItem {
+            id: myItem
+            style: Theme.createStyleComponent("MyItemStyle.qml", myItem)
+        }
+    \endqml
+
+    The Component set on \l style is instantiated and placed below everything else
+    that the Item contains.
+
+    A reference to the Item being styled is accessible from the style and named
+    'styledItem'.
+
+    \sa {Theme}
+*/
+FocusScope {
+    id: styledItem
+
+    /*!
+       Component instantiated immediately and placed below everything else.
+    */
+    property Component style
+
+    /*!
+       \internal
+       Instance of the \l style.
+    */
+    readonly property Item __styleInstance: styleLoader.status == Loader.Ready ? styleLoader.item : null
+
+    implicitWidth: __styleInstance ? __styleInstance.implicitWidth : 0
+    implicitHeight: __styleInstance ? __styleInstance.implicitHeight : 0
+
+    Loader {
+        id: styleLoader
+        anchors.fill: parent
+        sourceComponent: style
+        property Item styledItem: styledItem
+    }
+}

=== modified file 'modules/Ubuntu/Components/Switch.qml'
--- modules/Ubuntu/Components/Switch.qml	2013-05-24 09:12:56 +0000
+++ modules/Ubuntu/Components/Switch.qml	2013-07-01 22:15:52 +0000
@@ -19,12 +19,6 @@
 
 import QtQuick 2.0
 
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
-
 /*!
     \qmltype Switch
     \inqmlmodule Ubuntu.Components 0.1
@@ -47,5 +41,6 @@
     \endqml
 */
 CheckBox {
-    Theming.ItemStyle.class: "switch"
+    id: switchItem
+    style: Theme.createStyleComponent("SwitchStyle.qml", switchItem)
 }

=== modified file 'modules/Ubuntu/Components/Tabs.qml'
--- modules/Ubuntu/Components/Tabs.qml	2013-05-24 19:47:47 +0000
+++ modules/Ubuntu/Components/Tabs.qml	2013-07-01 22:15:52 +0000
@@ -15,11 +15,6 @@
  */
 
 import QtQuick 2.0
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
 
 /*!
     \qmltype Tabs
@@ -100,8 +95,6 @@
 
 PageTreeNode {
     id: tabs
-    // FIXME: see above
-    Theming.ItemStyle.class: "new-tabs"
     anchors.fill: parent
 
     /*!
@@ -128,7 +121,7 @@
       \internal
       Header contents that will be used to override the default title inside the header,
       and provides scrollable tab buttons.
-      FIXME: headerContents may be specified here directly, not taken from the delegate.
+      FIXME: headerContents may be specified here directly, not taken from the style.
      */
     property Component __headerContents
 
@@ -147,7 +140,7 @@
 
     /*!
       \internal
-      Used by the delegate to create the tabs header.
+      Used by the style to create the tabs header.
     */
     property alias __tabs: tabsModel.tabList
 
@@ -158,7 +151,7 @@
     default property alias tabChildren: tabsModel.children
 
     /*!
-      Used by the tabs delegate to update the tabs header with the titles of all the tabs.
+      Used by the tabs style to update the tabs header with the titles of all the tabs.
       This signal is used in an intermediate step in transitioning the tabs to a new
       implementation and may be removed in the future.
      */
@@ -166,7 +159,7 @@
 
     /*!
       \internal
-      required by NewTabsDelegate
+      required by TabsStyle
      */
     Item {
         anchors.fill: parent
@@ -218,4 +211,6 @@
             }
         }
     }
+
+    style: Theme.createStyleComponent("TabsStyle.qml", tabs)
 }

=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2013-05-19 19:23:40 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2013-07-01 22:15:52 +0000
@@ -15,11 +15,6 @@
  */
 
 import QtQuick 2.0
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import "." 0.1 as Theming
 
 /*!
     \qmltype TextArea
@@ -76,12 +71,10 @@
     character or word. The editor leaves the selection mode by pressing/tapping again on it
     or by losing focus.
 
-    The default styling uses \b textarea selector.
-
     \b{This component is under heavy development.}
   */
 
-FocusScope {
+StyledItem {
     id: control
     implicitWidth: units.gu(30)
     implicitHeight: (autoSize) ? internal.minimumSize : internal.linesHeight(4)
@@ -96,19 +89,7 @@
     property bool highlighted: focus
     /*!
       Text that appears when there is no focus and no content in the component
-      (hint text). The hint style can be customized by defining a style selector which
-      styles a label. For example the default styling defines the hint styling using
-      \b{.textarea .label} selector.
-
-      \code
-      .textarea .label {
-           italic: true;
-           color: "#B6B6B6";
-           fontSize: "small";
-           elide: Text.ElideRight;
-           wrapMode: Text.WordWrap;
-      }
-      \endcode
+      (hint text).
 
       \qmlproperty string placeholderText
       */
@@ -740,8 +721,6 @@
     // the editor activates automatically when pressed in the editor control,
     // however that one can be slightly spaced to the main control area
 
-    // styling
-    Theming.ItemStyle.class: "textarea"
     //internals
 
     /*!\internal */
@@ -766,7 +745,7 @@
         // public property locals enabling aliasing
         property string displayText: editor.getText(0, editor.length)
         property real lineSpacing: units.dp(3)
-        property real frameSpacing: 0
+        property real frameSpacing: control.__styleInstance.frameSpacing
         property real lineSize: editor.font.pixelSize + lineSpacing
         property real minimumSize: units.gu(4)
         property real inputAreaWidth: control.width - 2 * frameSpacing
@@ -892,7 +871,6 @@
         id: leftCursorLoader
         onStatusChanged: {
             if (status == Loader.Ready && item) {
-                item.Theming.ItemStyle.class = "left-pin";
                 item.positionProperty = "selectionStart";
                 item.parent = editor;
             }
@@ -902,7 +880,6 @@
         id: rightCursorLoader
         onStatusChanged: {
             if (status == Loader.Ready && item) {
-                item.Theming.ItemStyle.class = "right-pin";
                 item.positionProperty = "selectionEnd";
                 item.parent = editor;
             }
@@ -922,6 +899,10 @@
         }
         // hint is shown till user types something in the field
         visible: (editor.getText(0, editor.length) == "") && !editor.inputMethodComposing
+        color: Qt.rgba(0.5, 0.5, 0.5, 0.5)
+        fontSize: "medium"
+        elide: Text.ElideRight
+        wrapMode: Text.WordWrap
     }
 
     //scrollbars and flickable
@@ -976,6 +957,10 @@
             mouseSelectionMode: TextEdit.SelectWords
             selectByMouse: false
             cursorDelegate: cursor
+            color: control.__styleInstance.color
+            selectedTextColor: "#F3F3E7"
+            selectionColor: "#19B6EE"
+            font.pixelSize: FontUtils.sizeToPixels("medium")
             // forward keys to the root element so it can be captured outside of it
             Keys.forwardTo: [control]
 
@@ -1034,4 +1019,6 @@
             }
         }
     }
+
+    style: Theme.createStyleComponent("TextAreaStyle.qml", control)
 }

=== modified file 'modules/Ubuntu/Components/TextCursor.qml'
--- modules/Ubuntu/Components/TextCursor.qml	2013-02-13 09:36:45 +0000
+++ modules/Ubuntu/Components/TextCursor.qml	2013-07-01 22:15:52 +0000
@@ -15,12 +15,12 @@
  */
 
 import QtQuick 2.0
-import "." 0.1 as Theming
 import "Popups" 0.1
 
-Item {
+StyledItem {
     id: cursorItem
-    Theming.ItemStyle.class: "cursor"
+
+    width: units.dp(1)
 
     /*
       Property holding the text input item instance.
@@ -57,4 +57,6 @@
                             })
         }
     }
+
+    style: Theme.createStyleComponent("TextCursorStyle.qml", cursorItem)
 }

=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2013-06-03 13:51:10 +0000
+++ modules/Ubuntu/Components/TextField.qml	2013-07-01 22:15:52 +0000
@@ -15,11 +15,6 @@
  */
 
 import QtQuick 2.0
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import "." 0.1 as Theming
 
 /*!
     \qmltype TextField
@@ -59,14 +54,12 @@
             }
             secondaryItem: Row {
                 Button {
-                    ItemStyle.class: "transparent-button"
                     height: parent.height
                     width: height
                     iconSource: "caps-lock.png"
                     onClicked: doSomething()
                 }
                 Button {
-                    ItemStyle.class: "transparent-button"
                     height: parent.height
                     width: height
                     iconSource: "num-lock.png"
@@ -78,7 +71,7 @@
     \endqml
 */
 
-FocusScope {
+StyledItem {
     id: control
 
     implicitWidth: units.gu(25)
@@ -519,7 +512,6 @@
     }
 
     // internals
-    Theming.ItemStyle.class: "textfield"
 
     /*! internal */
     onVisibleChanged: {
@@ -545,7 +537,7 @@
         id: internal
         // array of borders in left, top, right, bottom order
         property bool textChanged: false
-        property real spacing: 0
+        property real spacing: control.__styleInstance.overlaySpacing
         property real lineSpacing: units.dp(3)
         property real lineSize: editor.font.pixelSize + lineSpacing
         //selection properties
@@ -656,8 +648,7 @@
 
     AbstractButton {
         id: clearButton
-        Theming.ItemStyle.class: "clear-button"
-        property url iconSource
+        property url iconSource: control.__styleInstance.iconSource
         anchors {
             top: parent.top
             right: rightPane.left
@@ -695,6 +686,9 @@
         }
         // hint is shown till user types something in the field
         visible: (editor.text == "") && !editor.inputMethodComposing
+        color: Qt.rgba(0.5, 0.5, 0.5, 0.5)
+        fontSize: "medium"
+        elide: Text.ElideRight
     }
 
 
@@ -713,6 +707,11 @@
         clip: true
         onTextChanged: internal.textChanged = true
         cursorDelegate: cursor
+        color: control.__styleInstance.color
+        selectedTextColor: "#F3F3E7"
+        selectionColor: "#19B6EE"
+        font.pixelSize: FontUtils.sizeToPixels("medium")
+        passwordCharacter: "\u2022"
         // forward keys to the root element so it can be captured outside of it
         Keys.forwardTo: [control]
 
@@ -778,4 +777,6 @@
         editor.accepted.connect(control.accepted);
         cursorPosition = 0;
     }
+
+    style: Theme.createStyleComponent("TextFieldStyle.qml", control)
 }

=== renamed directory 'themes' => 'modules/Ubuntu/Components/Themes'
=== renamed file 'themes/Ambiance/qmltheme/ActivityIndicatorDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml'
--- themes/Ambiance/qmltheme/ActivityIndicatorDelegate.qml	2013-05-14 13:33:39 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2013-07-01 22:15:52 +0000
@@ -22,13 +22,14 @@
 
     anchors.fill: parent
     smooth: true
-    visible: item.running
+    visible: styledItem.running
     fillMode: Image.PreserveAspectFit
     horizontalAlignment: Image.AlignHCenter
     verticalAlignment: Image.AlignVCenter
+    source: "artwork/spinner.png"
 
     NumberAnimation on rotation {
-        running: item.running
+        running: styledItem.running
         from: 0
         to: 360
         loops: Animation.Infinite

=== added file 'modules/Ubuntu/Components/Themes/Ambiance/Ambiance.pro'
--- modules/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/Ambiance.pro	2013-07-01 22:15:52 +0000
@@ -0,0 +1,23 @@
+TEMPLATE = subdirs
+
+uri = Ubuntu.Components.Themes.Ambiance
+installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
+
+QMLDIR_FILE = qmldir
+QML_FILES = *.qml
+ARTWORK_FILES += artwork/*.png \
+                 artwork/*.svg \
+                 artwork/*.sci
+
+qmldir_file.path = $$installPath
+qmldir_file.files = $$QMLDIR_FILE
+
+qml_files.path = $$installPath
+qml_files.files = $$QML_FILES
+
+artwork_files.path = $$installPath/artwork
+artwork_files.files = $$ARTWORK_FILES
+
+
+INSTALLS += qmldir_file qml_files artwork_files
+OTHER_FILES += $$QMLDIR_FILE $$QML_FILES $$ARTWORK_FILES

=== renamed file 'themes/Ambiance/qmltheme/ButtonDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml'
--- themes/Ambiance/qmltheme/ButtonDelegate.qml	2013-06-26 23:42:39 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2013-07-01 22:15:52 +0000
@@ -22,8 +22,8 @@
     anchors.fill: parent
 
     // styling properties
-    property url borderSource
-    property url borderPressed
+    property url borderSource: "artwork/ubuntushape_small_radius_idle.sci"
+    property url borderPressed: "artwork/ubuntushape_small_radius_pressed.sci"
 
     // pick either a clear or dark text color depending on the luminance of the
     // background color to maintain good contrast (works in most cases)
@@ -39,7 +39,7 @@
         id: border
 
         anchors.fill: parent
-        color: item.color
+        color: styledItem.color
         borderSource: visuals.borderSource
         opacity: 1.0 - borderPressed.opacity
         visible: color.a != 0.0
@@ -49,14 +49,14 @@
         id: borderPressed
 
         anchors.fill: parent
-        color: item.color
+        color: styledItem.color
         borderSource: visuals.borderPressed
-        opacity: item.pressed ? 1.0 : 0.0
+        opacity: styledItem.pressed ? 1.0 : 0.0
         Behavior on opacity { UbuntuNumberAnimation {} }
         visible: color.a != 0.0
     }
 
-    TransparentButtonDelegate {
-        textColor: __luminance(item.color) <= 0.72 ? Qt.rgba(0.95, 0.95, 0.91, 1.0) : Qt.rgba(0.2, 0.2, 0.2, 0.8)//"#333333"
+    TransparentButtonStyle {
+        textColor: __luminance(styledItem.color) <= 0.72 ? Qt.rgba(0.95, 0.95, 0.91, 1.0) : Qt.rgba(0.2, 0.2, 0.2, 0.8)//"#333333"
     }
 }

=== renamed file 'themes/Ambiance/qmltheme/CheckBoxDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml'
--- themes/Ambiance/qmltheme/CheckBoxDelegate.qml	2013-07-01 12:50:42 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2013-07-01 22:15:52 +0000
@@ -20,24 +20,28 @@
 Item {
     id: visuals
     // styling properties
-    property color checkedColor
-    property color uncheckedColor
+    property color checkedColor: "#DD4814"
+    property color uncheckedColor: Qt.rgba(0.0, 0.0, 0.0, 0.1)
+
     /*!
       The image to show inside the checkbox when it is checked.
      */
-    property url checkMarkSource
+    property url checkMarkSource: "artwork/CheckMark.png"
     /*!
       The animation to fade the color from checkedColor to uncheckedColor and vice versa.
      */
-    property PropertyAnimation backgroundColorAnimation: PropertyAnimation{duration: 0}
+    property PropertyAnimation backgroundColorAnimation: ColorAnimation { duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing }
 
     // code
     anchors.fill: parent
     opacity: enabled ? 1.0 : 0.5
 
+    implicitWidth: units.gu(4)
+    implicitHeight: units.gu(4)
+
     UbuntuShape {
         anchors.fill: parent
-        color: item.checked ? checkedColor : uncheckedColor
+        color: styledItem.checked ? checkedColor : uncheckedColor
         Behavior on color {
             ColorAnimation {
                 duration: backgroundColorAnimation.duration
@@ -51,7 +55,7 @@
         anchors.centerIn: parent
         smooth: true
         source: checkMarkSource
-        opacity: item.checked ? 1.0 : 0.0
+        opacity: styledItem.checked ? 1.0 : 0.0
         Behavior on opacity {
             UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
         }

=== renamed file 'themes/Ambiance/qmltheme/DialogForegroundDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml'
--- themes/Ambiance/qmltheme/DialogForegroundDelegate.qml	2013-06-28 13:56:45 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/DialogForegroundStyle.qml	2013-07-01 22:15:52 +0000
@@ -20,8 +20,9 @@
 Item {
     id: visuals
     // styling properties
-    property color color
-    property string radius
+    visible: styledItem.dismissArea.width > units.gu(60)
+    property color color: visible ? Qt.rgba(0, 0, 0, 0.7) : "transparent"
+    property string radius: "medium"
 
     anchors.fill: parent
     z: -1

=== renamed file 'themes/Ambiance/qmltheme/HeaderDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml'
--- themes/Ambiance/qmltheme/HeaderDelegate.qml	2013-05-06 11:18:06 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml	2013-07-01 22:15:52 +0000
@@ -17,7 +17,7 @@
 import Ubuntu.Components 0.1
 
 Item {
-    id: headerDelegate
+    id: headerStyle
     /*!
       The height of the headercontents, which is the full height of
       the header minus the separators shown at the bottom of it.
@@ -27,43 +27,33 @@
     /*!
       The background color of the header.
      */
-    property color backgroundColor: "transparent"
+    property color backgroundColor: "#ededf0"
 
     /*!
       The source of the background image of the header. If the image is has (semi-)transparent
       pixels, \l backgroundColor can be set to specify the color behind those (semi-)transparent
       pixels.
      */
-    property url backgroundSource: ""
+    property url backgroundSource: "artwork/background_paper.png"
 
     /*!
       The source of the image that separates the header from the contents of a \l MainView.
       The separator will be drawn over the contents.
      */
-    property url separatorSource: ""
+    property url separatorSource: "artwork/PageHeaderBaseDividerLight.sci"
 
     /*!
       The source of an additional image attached to the bottom of the separator. The contents
       of the \l MainView will be drawn on top of the separator bottom image.
      */
-    property url separatorBottomSource: ""
+    property url separatorBottomSource: "artwork/PageHeaderBaseDividerBottom.png"
 
-    property int fontWeight
+    property int fontWeight: Font.Light
     property string fontSize: "x-large"
-    property color textColor: "black"
-    property real textLeftMargin
+    property color textColor: Qt.rgba(0.51, 0.51, 0.51, 0.9)
+    property real textLeftMargin: units.gu(2)
 
-    anchors {
-        left: parent ? parent.left : undefined
-        right: parent ? parent.right : undefined
-        top: parent ? parent.top : undefined
-    }
-    height: headerDelegate.contentHeight + separator.height + separatorBottom.height
-    Binding {
-        target: item
-        property: "height"
-        value: height
-    }
+    implicitHeight: headerStyle.contentHeight + separator.height + separatorBottom.height
 
     Rectangle {
         id: backgroundColor
@@ -72,9 +62,9 @@
             right: parent.right
             top: parent.top
         }
-        color: headerDelegate.backgroundColor
+        color: headerStyle.backgroundColor
         visible: color != "transparent"
-        height: headerDelegate.contentHeight + separator.height
+        height: headerStyle.contentHeight + separator.height
     }
     Image {
         id: background
@@ -83,10 +73,10 @@
             right: parent.right
             top: parent.top
         }
-        source: headerDelegate.backgroundSource
+        source: headerStyle.backgroundSource
         visible: source != ""
         fillMode: Image.Tile
-        height: headerDelegate.contentHeight + separator.height
+        height: headerStyle.contentHeight + separator.height
     }
     BorderImage {
         id: separator
@@ -95,7 +85,7 @@
             left: parent.left
             right: parent.right
         }
-        source: headerDelegate.separatorSource
+        source: headerStyle.separatorSource
     }
     Image {
         id: separatorBottom
@@ -104,7 +94,7 @@
             left: parent.left
             right: parent.right
         }
-        source: headerDelegate.separatorBottomSource
+        source: headerStyle.separatorBottomSource
     }
 
     Item {
@@ -114,23 +104,22 @@
             right: parent.right
             top: parent.top
         }
-        height: headerDelegate.contentHeight
+        height: headerStyle.contentHeight
 
         Label {
             anchors {
                 left: parent.left
                 verticalCenter: parent.verticalCenter
-                leftMargin: headerDelegate.textLeftMargin
+                leftMargin: headerStyle.textLeftMargin
             }
-            text: item.title
-            font.weight: headerDelegate.fontWeight
+            text: styledItem.title
+            font.weight: headerStyle.fontWeight
             visible: contentsLoader.status != Loader.Ready
-            fontSize: headerDelegate.fontSize
-            color: headerDelegate.textColor
+            fontSize: headerStyle.fontSize
+            color: headerStyle.textColor
         }
 
-        // Link to item here, because Loader has its own item property
-        property Header header: item
+        property Header header: styledItem
         Loader {
             id: contentsLoader
             sourceComponent: foreground.header.contents

=== renamed file 'themes/Ambiance/qmltheme/MainViewDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml'
--- themes/Ambiance/qmltheme/MainViewDelegate.qml	2013-03-14 12:52:13 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/MainViewStyle.qml	2013-07-01 22:15:52 +0000
@@ -20,29 +20,29 @@
     // styling properties
     anchors.fill: parent
     z: -1
-    id: mainViewDelegate
+    id: mainViewStyle
 
     /*!
       The background color of the main view.
      */
-    property color backgroundColor
+    property color backgroundColor: "#ededf0"
 
     /*!
       The background texture of the main view. The image will be drawn over the background color,
       so if it has (semi-)transparent pixels, in those pixels the background color will be visible.
      */
-    property url backgroundSource: ""
+    property url backgroundSource: "artwork/background_paper.png"
 
     Rectangle {
         id: backgroundColor
         anchors.fill: parent
-        color: mainViewDelegate.backgroundColor
+        color: mainViewStyle.backgroundColor
     }
 
     Image {
         id: backgroundTexture
         anchors.fill: parent
-        source: mainViewDelegate.backgroundSource
+        source: mainViewStyle.backgroundSource
         fillMode: Image.Tile
     }
 }

=== renamed file 'themes/Ambiance/qmltheme/NewTabBar.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/NewTabBar.qml'
=== renamed file 'themes/Ambiance/qmltheme/PointerDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/PointerStyle.qml'
--- themes/Ambiance/qmltheme/PointerDelegate.qml	2013-03-14 12:01:42 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PointerStyle.qml	2013-07-01 22:15:52 +0000
@@ -23,7 +23,11 @@
     id: image
     anchors.fill: parent
 
-    visible: (item.direction !== "none")
+    visible: (styledItem.direction !== "none")
+    source: (styledItem.direction === "left") ? "artwork/LeftArrow.png" :
+            (styledItem.direction === "right") ? "artwork/RightArrow.png" :
+            (styledItem.direction === "up") ? "artwork/UpArrow.png" :
+                                              "artwork/DownArrow.png"
 
     smooth: true
 }

=== renamed file 'themes/Ambiance/qmltheme/PointerDelegateShader.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/PointerStyleShader.qml'
--- themes/Ambiance/qmltheme/PointerDelegateShader.qml	2012-12-14 18:19:26 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PointerStyleShader.qml	2013-07-01 22:15:52 +0000
@@ -29,12 +29,12 @@
         //  but I did not manage to get a 3x3 matrix from QML into the shader.
 
         // rotate pointer 90 degrees
-        property bool rotate: (item.direction === "left" || item.direction === "right")
+        property bool rotate: (styledItem.direction === "left" || styledItem.direction === "right")
 
         // flip the direction of the pointer
-        property bool flip: (item.direction === "left" || item.direction === "up")
+        property bool flip: (styledItem.direction === "left" || styledItem.direction === "up")
 
-        visible: (item.direction !== "none")
+        visible: (styledItem.direction !== "none")
 
         vertexShader: "
             uniform highp mat4 qt_Matrix;

=== renamed file 'themes/Ambiance/qmltheme/PopoverForegroundDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml'
--- themes/Ambiance/qmltheme/PopoverForegroundDelegate.qml	2013-06-28 13:56:45 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/PopoverForegroundStyle.qml	2013-07-01 22:15:52 +0000
@@ -21,8 +21,8 @@
 Item {
     id: frame
     // styling properties
-    property string radius: "small"
-    property color color
+    property string radius: "medium"
+    property color color: "white"
 
     property alias contentItem: body
 

=== renamed file 'themes/Ambiance/qmltheme/ScrollbarDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml'
--- themes/Ambiance/qmltheme/ScrollbarDelegate.qml	2013-03-13 12:26:20 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ScrollbarStyle.qml	2013-07-01 22:15:52 +0000
@@ -19,7 +19,7 @@
 
 /*
   The visuals handle both active and passive modes. This behavior is driven yet by
-  the item's __inactive property, however should be detected upon runtime based on
+  the styledItem's __inactive property, however should be detected upon runtime based on
   the device type.
   On active scrollbars, positioning is handled so that the logic updates the flickable's
   X/Y content positions, which is then synched with the contentPosition by the main
@@ -63,36 +63,36 @@
     property real overlayOpacityWhenShown: 0.6
     property real overlayOpacityWhenHidden: 0.0
 
-    property PropertyAnimation scrollbarFadeInAnimation: PropertyAnimation{duration: 100}
-    property PropertyAnimation scrollbarFadeOutAnimation: PropertyAnimation{duration: 100}
-    property int scrollbarFadeOutPause: 100
-    property PropertyAnimation sliderAnimation: PropertyAnimation{duration: 100}
-    property PropertyAnimation thumbConnectorFading: PropertyAnimation{duration: 100}
-    property PropertyAnimation thumbFading: PropertyAnimation{duration: 100}
-
-    property color sliderColor
-    property real sliderRadius
-    property color thumbConnectorColor
-    property url forwardThumbReleased
-    property url forwardThumbPressed
-    property url backwardThumbReleased
-    property url backwardThumbPressed
-
-    property real scrollAreaThickness
-    property real thumbConnectorMargin
+    property PropertyAnimation scrollbarFadeInAnimation: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
+    property PropertyAnimation scrollbarFadeOutAnimation: UbuntuNumberAnimation { duration: UbuntuAnimation.SlowDuration }
+    property int scrollbarFadeOutPause: 300
+    property PropertyAnimation sliderAnimation: UbuntuNumberAnimation {}
+    property PropertyAnimation thumbConnectorFading: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
+    property PropertyAnimation thumbFading: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
+
+    property color sliderColor: Qt.rgba(0.5, 0.5, 0.5, 0.7)
+    property real sliderRadius: units.gu(0.5)
+    property color thumbConnectorColor: "white"
+    property url forwardThumbReleased: (styledItem.align === Qt.AlignLeading || styledItem.align === Qt.AlignTrailing) ? "artwork/ScrollbarBottomIdle.png" : "artwork/ScrollbarRightIdle.png"
+    property url forwardThumbPressed: (styledItem.align === Qt.AlignLeading || styledItem.align === Qt.AlignTrailing) ? "artwork/ScrollbarBottomPressed.png" : "artwork/ScrollbarRightPressed.png"
+    property url backwardThumbReleased: (styledItem.align === Qt.AlignLeading || styledItem.align === Qt.AlignTrailing) ? "artwork/ScrollbarTopIdle.png" : "artwork/ScrollbarLeftIdle.png"
+    property url backwardThumbPressed: (styledItem.align === Qt.AlignLeading || styledItem.align === Qt.AlignTrailing) ? "artwork/ScrollbarTopPressed.png" : "artwork/ScrollbarLeftPressed.png"
+
+    property real scrollAreaThickness: units.gu(0.5)
+    property real thumbConnectorMargin: units.dp(3)
 
     // helper properties to ease code readability
-    property Flickable flickableItem: item.flickableItem
-    property bool isScrollable: item.__private.scrollable && pageSize > 0.0
+    property Flickable flickableItem: styledItem.flickableItem
+    property bool isScrollable: styledItem.__private.scrollable && pageSize > 0.0
                                 && contentSize > 0.0 && contentSize > pageSize
-    property bool isVertical: ScrollbarUtils.isVertical(item)
-    property bool frontAligned: (item.align === Qt.AlignLeading)
-    property bool rearAligned: (item.align === Qt.AlignTrailing)
-    property bool topAligned: (item.align === Qt.AlignTop)
-    property bool bottomAligned: (item.align === Qt.AlignBottom)
+    property bool isVertical: ScrollbarUtils.isVertical(styledItem)
+    property bool frontAligned: (styledItem.align === Qt.AlignLeading)
+    property bool rearAligned: (styledItem.align === Qt.AlignTrailing)
+    property bool topAligned: (styledItem.align === Qt.AlignTop)
+    property bool bottomAligned: (styledItem.align === Qt.AlignBottom)
 
-    property real pageSize: (isVertical) ? item.height : item.width
-    property real contentSize: (isVertical) ? item.flickableItem.contentHeight : item.flickableItem.contentWidth
+    property real pageSize: (isVertical) ? styledItem.height : styledItem.width
+    property real contentSize: (isVertical) ? styledItem.flickableItem.contentHeight : styledItem.flickableItem.contentWidth
 
     /*****************************************
       Visuals
@@ -184,7 +184,7 @@
 
         duration: 200
         easing.type: Easing.InOutQuad
-        target: item.flickableItem
+        target: styledItem.flickableItem
         property: (isVertical) ? "contentY" : "contentX"
     }
 
@@ -193,7 +193,7 @@
         id: scrollbarArea
 
         property real thickness: scrollAreaThickness
-        property real proximityThickness: (isVertical) ? item.width - thickness : item.height - thickness
+        property real proximityThickness: (isVertical) ? styledItem.width - thickness : styledItem.height - thickness
         anchors {
             fill: parent
             leftMargin: (!isVertical || frontAligned) ? 0 : proximityThickness
@@ -230,13 +230,13 @@
     // total size of the flickable.
     Item {
         id: scrollCursor
-        x: (isVertical) ? 0 : ScrollbarUtils.sliderPos(item, 0.0, item.width - scrollCursor.width)
-        y: (!isVertical) ? 0 : ScrollbarUtils.sliderPos(item, 0.0, item.height - scrollCursor.height)
-        width: (isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(item, 0.0, flickableItem.width)
-        height: (!isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(item, 0.0, flickableItem.height)
+        x: (isVertical) ? 0 : ScrollbarUtils.sliderPos(styledItem, 0.0, styledItem.width - scrollCursor.width)
+        y: (!isVertical) ? 0 : ScrollbarUtils.sliderPos(styledItem, 0.0, styledItem.height - scrollCursor.height)
+        width: (isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(styledItem, 0.0, flickableItem.width)
+        height: (!isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(styledItem, 0.0, flickableItem.height)
 
         function drag() {
-            ScrollbarUtils.dragAndClamp(item, scrollCursor, contentSize, pageSize);
+            ScrollbarUtils.dragAndClamp(styledItem, scrollCursor, contentSize, pageSize);
         }
     }
 
@@ -252,10 +252,10 @@
             bottom: (!isVertical) ? scrollbarArea.bottom : undefined
         }
 
-        x: (isVertical) ? 0 : ScrollbarUtils.sliderPos(item, 0.0, item.width - slider.width)
-        y: (!isVertical) ? 0 : ScrollbarUtils.sliderPos(item, 0.0, item.height - slider.height)
-        width: (isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(item, minimumSliderSize, flickableItem.width)
-        height: (!isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(item, minimumSliderSize, flickableItem.height)
+        x: (isVertical) ? 0 : ScrollbarUtils.sliderPos(styledItem, 0.0, styledItem.width - slider.width)
+        y: (!isVertical) ? 0 : ScrollbarUtils.sliderPos(styledItem, 0.0, styledItem.height - slider.height)
+        width: (isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(styledItem, minimumSliderSize, flickableItem.width)
+        height: (!isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(styledItem, minimumSliderSize, flickableItem.height)
         radius: visuals.sliderRadius
 
         Behavior on width {
@@ -274,7 +274,7 @@
         }
 
         function scroll(amount) {
-            scrollAnimation.to = ScrollbarUtils.scrollAndClamp(item, amount, 0.0, contentSize - pageSize);
+            scrollAnimation.to = ScrollbarUtils.scrollAndClamp(styledItem, amount, 0.0, contentSize - pageSize);
             scrollAnimation.restart();
         }
     }
@@ -417,7 +417,7 @@
         height: childrenRect.height
 
         property bool shown
-        property int maximumPos: (isVertical) ? item.height - thumb.height : item.width - thumb.width
+        property int maximumPos: (isVertical) ? styledItem.height - thumb.height : styledItem.width - thumb.width
 
         /* Show the thumb as close as possible to the mouse pointer */
         onShownChanged: {

=== renamed file 'themes/Ambiance/qmltheme/SelectionCursorDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml'
--- themes/Ambiance/qmltheme/SelectionCursorDelegate.qml	2013-03-13 15:22:23 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SelectionCursorStyle.qml	2013-07-01 22:15:52 +0000
@@ -17,11 +17,12 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 
-EditorCursorDelegate {
+EditorCursorStyle {
     id: cursor
 
-    property bool startPin: (item.positionProperty === "selectionStart")
-    property int cursorPosition: item.editorItem[item.positionProperty]
+    blinking: false
+    property bool startPin: (styledItem.positionProperty === "selectionStart")
+    property int cursorPosition: styledItem.editorItem[styledItem.positionProperty]
 
     visible: true
 
@@ -29,7 +30,7 @@
     {
         if (undefined === pos)
             return;
-        var rect = item.editorItem.positionToRectangle(pos);
+        var rect = styledItem.editorItem.positionToRectangle(pos);
         x = rect.x;
         y = rect.y;
     }
@@ -78,13 +79,13 @@
 
             function updateEditorCursorPosition()
             {
-                var pos = item.editorItem.mapFromItem(item, cursor.x, cursor.y + cursor.height / 2);
+                var pos = styledItem.editorItem.mapFromItem(styledItem, cursor.x, cursor.y + cursor.height / 2);
                 var dx = dragArea.cursorStartX + dragDX;
                 var dy = dragArea.cursorStartY + dragDY;
                 if (startPin)
-                    item.editorItem.select(item.editorItem.positionAt(dx, dy), item.editorItem.selectionEnd);
+                    styledItem.editorItem.select(styledItem.editorItem.positionAt(dx, dy), styledItem.editorItem.selectionEnd);
                 else
-                    item.editorItem.select(item.editorItem.selectionStart, item.editorItem.positionAt(dx, dy));
+                    styledItem.editorItem.select(styledItem.editorItem.selectionStart, styledItem.editorItem.positionAt(dx, dy));
             }
         }
     }

=== renamed file 'themes/Ambiance/qmltheme/SheetForegroundDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml'
--- themes/Ambiance/qmltheme/SheetForegroundDelegate.qml	2013-04-08 13:30:17 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SheetForegroundStyle.qml	2013-07-01 22:15:52 +0000
@@ -20,13 +20,13 @@
 Item {
     id: visuals
     // styling properties
-    property color backgroundColor
-    property color headerColor
-    property real headerHeight
-    property real buttonContainerWidth
+    property color backgroundColor: "lightgray"
+    property color headerColor: "darkgray"
+    property real headerHeight: units.gu(8)
+    property real buttonContainerWidth: units.gu(14)
 
-    width: MathUtils.clamp(item.contentsWidth, item.minWidth, item.maxWidth)
-    height: header.height + containerItem.height
+    implicitWidth: MathUtils.clamp(styledItem.contentsWidth, styledItem.minWidth, styledItem.maxWidth)
+    implicitHeight: header.height + containerItem.height
 
     property alias contentItem: containerItem
 
@@ -50,7 +50,7 @@
             width: headerText.implicitWidth + units.gu(4)
             elide: Text.ElideRight
             horizontalAlignment: Text.AlignHCenter
-            text: item.title
+            text: styledItem.title
         }
 
         Item {
@@ -61,7 +61,7 @@
                 bottom: parent.bottom
             }
             width: visuals.buttonContainerWidth
-            Component.onCompleted: header.updateButton(item.leftButton, leftButtonContainer)
+            Component.onCompleted: header.updateButton(styledItem.leftButton, leftButtonContainer)
         }
 
         Item {
@@ -72,7 +72,7 @@
                 bottom: parent.bottom
             }
             width: visuals.buttonContainerWidth
-            Component.onCompleted: header.updateButton(item.rightButton, rightButtonContainer)
+            Component.onCompleted: header.updateButton(styledItem.rightButton, rightButtonContainer)
         }
 
         function updateButton(button, container) {
@@ -85,16 +85,16 @@
         }
 
         Connections {
-            target: item
-            onLeftButtonChanged: header.updateButton(item.leftButton, leftButtonContainer)
-            onRightButtonChanged: header.updateButton(item.rightButton, rightButtonContainer)
+            target: styledItem
+            onLeftButtonChanged: header.updateButton(styledItem.leftButton, leftButtonContainer)
+            onRightButtonChanged: header.updateButton(styledItem.rightButton, rightButtonContainer)
         }
     }
 
     Rectangle {
         id: containerItem
         color: visuals.backgroundColor
-        height: MathUtils.clamp(item.contentsHeight, item.minHeight - header.height, item.maxHeight - header.height)
+        height: MathUtils.clamp(styledItem.contentsHeight, styledItem.minHeight - header.height, styledItem.maxHeight - header.height)
         anchors {
             top: header.bottom
             left: parent.left

=== renamed file 'themes/Ambiance/qmltheme/SliderDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml'
--- themes/Ambiance/qmltheme/SliderDelegate.qml	2013-03-25 14:55:38 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SliderStyle.qml	2013-07-01 22:15:52 +0000
@@ -19,10 +19,9 @@
 
 /*
   The default slider style consists of a bar and a thumb shape, where the thumb
-  is having a label showing the actual value. This label can be styled using
-  \b{.slider .label} selector.
+  is having a label showing the actual value.
 
-  This delegate is styled using the following properties:
+  This style is styled using the following properties:
   - backgroundColor: color for the slider bar
   - thumbColor: color for the thumb
   - thumbSpacing: spacing between the thumb and the bar
@@ -34,10 +33,10 @@
     id: main
     // styling properties
 
-    property color backgroundColor: "white"
-    property color thumbColor: "darkgray"
-    property real thumbSpacing: 0
-    property real backgroundOpacity: 1.0
+    property color backgroundColor: "#c0c0c0"
+    property color thumbColor: "#bbbbbb"
+    property real thumbSpacing: units.dp(2)
+    property real backgroundOpacity: 0.1
     property real thumbOpacity: 1.0
 
     // visuals
@@ -49,10 +48,10 @@
 
     // private properties
 
-    property real liveValue: SliderUtils.liveValue(item)
-    property real normalizedValue: SliderUtils.normalizedValue(item)
+    property real liveValue: SliderUtils.liveValue(styledItem)
+    property real normalizedValue: SliderUtils.normalizedValue(styledItem)
     property real thumbSpace: backgroundShape.width - (2.0 * thumbSpacing + thumbWidth)
-    property real thumbWidth: item.height - thumbSpacing
+    property real thumbWidth: styledItem.height - thumbSpacing
 
     UbuntuShape {
         id: backgroundShape
@@ -81,6 +80,9 @@
             right: thumbShape.right
         }
         horizontalAlignment: Text.AlignHCenter
-        text: item.formatValue(MathUtils.clamp(liveValue, item.minimumValue, item.maximumValue))
+        text: styledItem.formatValue(MathUtils.clamp(liveValue, styledItem.minimumValue, styledItem.maximumValue))
+        fontSize: "medium"
+        color: "white"
+        font.weight: Font.Bold
     }
 }

=== renamed file 'themes/Ambiance/qmltheme/SwitchDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml'
--- themes/Ambiance/qmltheme/SwitchDelegate.qml	2013-07-01 12:50:42 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/SwitchStyle.qml	2013-07-01 22:15:52 +0000
@@ -19,8 +19,8 @@
 Item {
     id: visuals
     // style properties
-    property url crossSource
-    property url checkMarkSource
+    property url crossSource: "artwork/Cross.png"
+    property url checkMarkSource: "artwork/CheckMark.png"
     /*!
       The opacity of the "cross" image when the switch is not checked,
       and opacity of the "checkMark" image when the switch is checked.
@@ -30,29 +30,29 @@
       The opacity of the "cross" image when the switch is checked,
       and the opacity of the "checkMark" image when the switch is not checked.
      */
-    property real unselectedImageOpacity: 1.0
+    property real unselectedImageOpacity: 0.4
     /*!
       Spacing around the thumb.
      */
-    property real thumbSpacing: units.dp(1)
+    property real thumbSpacing: units.dp(2)
     /*!
       Color of the thumb when the switch is checked.
      */
-    property color checkedThumbColor
+    property color checkedThumbColor: "#DD4814"
     /*!
       Color of the thumb when the switch is not checked.
      */
-    property color uncheckedThumbColor
+    property color uncheckedThumbColor: "#bbbbbb"
     /*!
       The animation to fade the color from checkedColor to uncheckedColor and vice versa.
      */
-    property ColorAnimation thumbColorAnimation: ColorAnimation{duration: 0}
+    property ColorAnimation thumbColorAnimation: ColorAnimation { duration: UbuntuAnimation.SnapDuration; easing: UbuntuAnimation.StandardEasing }
     /*!
       The animation on x to move the thumb.
      */
-    property NumberAnimation moveThumbAnimation: NumberAnimation{duration: 0}
+    property NumberAnimation moveThumbAnimation: UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
 
-    property color backgroundColor: Qt.rgba(0.5, 0.5, 0.5, 0.5)
+    property color backgroundColor: Qt.rgba(0.78, 0.78, 0.78, 0.1)
     property real thumbWidth: units.gu(4)
     property real thumbHeight: units.gu(4)
 
@@ -60,11 +60,18 @@
     anchors.fill: parent
     implicitWidth: 2*thumb.width + 3*thumb.spacing
     implicitHeight: thumb.height + 2*thumb.spacing
-    opacity: item.enabled ? 1.0 : 0.5
-
-    Component.onCompleted: {
-        item.implicitWidth = implicitWidth;
-        item.implicitHeight = implicitHeight;
+    opacity: styledItem.enabled ? 1.0 : 0.5
+
+    Binding {
+        target: styledItem
+        property: "implicitWidth"
+        value: implicitWidth
+    }
+
+    Binding {
+        target: styledItem
+        property: "implicitHeight"
+        value: implicitHeight
     }
 
     UbuntuShape {
@@ -80,10 +87,10 @@
 
             width: visuals.thumbHeight
             height: visuals.thumbWidth
-            x: item.checked ? rightThumbPosition.x : leftThumbPosition.x
+            x: styledItem.checked ? rightThumbPosition.x : leftThumbPosition.x
             y: leftThumbPosition.y
 
-            color: item.checked ? visuals.checkedThumbColor
+            color: styledItem.checked ? visuals.checkedThumbColor
                                 : visuals.uncheckedThumbColor
 
             Behavior on x {
@@ -113,7 +120,7 @@
 
             Image {
                 anchors.centerIn: parent
-                opacity: item.checked ? visuals.unselectedImageOpacity
+                opacity: styledItem.checked ? visuals.unselectedImageOpacity
                                       : visuals.selectedImageOpacity
                 source: visuals.crossSource
             }
@@ -132,7 +139,7 @@
 
             Image {
                 anchors.centerIn: parent
-                opacity: item.checked ? visuals.selectedImageOpacity
+                opacity: styledItem.checked ? visuals.selectedImageOpacity
                                       : visuals.unselectedImageOpacity
                 source: visuals.checkMarkSource
             }

=== renamed file 'themes/Ambiance/qmltheme/NewTabsDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/TabsStyle.qml'
--- themes/Ambiance/qmltheme/NewTabsDelegate.qml	2013-05-03 21:07:40 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TabsStyle.qml	2013-07-01 22:15:52 +0000
@@ -38,35 +38,34 @@
      */
     onSwipeToSwitchTabsChanged: print("swipeToSwitchTabs property is DEPRECATED.")
 
-    property color headerTextColor
-    property color headerTextSelectedColor
-    property real headerTextOpacity
-    property real headerTextSelectedOpacity
-    property int headerTextFadeDuration
-    property string headerFontSize
-    property int headerFontWeight
-    property real headerTextLeftMargin
-    property real headerTextRightMargin
-    property real headerTextBottomMargin
-    property url indicatorImageSource
-    property real tabBarHeight
+    property color headerTextColor: "#333333"
+    property color headerTextSelectedColor: "#333333"
+    property real headerTextOpacity: 0.4
+    property real headerTextSelectedOpacity: 0.9
+    property int headerTextFadeDuration: 350
+    property string headerFontSize: "x-large"
+    property int headerFontWeight: Font.Light
+    property real headerTextLeftMargin: units.gu(2)
+    property real headerTextRightMargin: units.gu(2)
+    property real headerTextBottomMargin: units.gu(2)
+    property url indicatorImageSource: "artwork/chevron.png"
+    property real tabBarHeight: units.gu(7.5)
 
     /*!
       The time of inactivity in ms before the tab bar is automatically deactivated
      */
-    property int deactivateTime: 1000
+    property int deactivateTime: 3000
 
     /*!
       The velocity at which buttons are repositioned when a new tab gets selected.
      */
-    property real buttonPositioningVelocity
+    property real buttonPositioningVelocity: 1.0
 
     // visuals
-    id: tabsDelegate
+    id: tabsStyle
     anchors.fill: parent
 
-    // use theTabs property because item gives problems in the loader
-    property Tabs theTabs: item
+    property Tabs theTabs: styledItem
     property Component headerContents: Component {
         NewTabBar {
             id: tabBar
@@ -77,23 +76,23 @@
                 right: parent ? parent.right : undefined
             }
             //height: tabBarHeight
-            headerTextColor: tabsDelegate.headerTextColor
-            headerTextSelectedColor: tabsDelegate.headerTextSelectedColor
-            headerTextOpacity: tabsDelegate.headerTextOpacity
-            headerTextSelectedOpacity: tabsDelegate.headerTextSelectedOpacity
-            headerTextFadeDuration: tabsDelegate.headerTextFadeDuration
-            indicatorImageSource: tabsDelegate.indicatorImageSource
-            headerFontSize: tabsDelegate.headerFontSize
-            headerFontWeight: tabsDelegate.headerFontWeight
-            headerTextLeftMargin: tabsDelegate.headerTextLeftMargin
-            headerTextRightMargin: tabsDelegate.headerTextRightMargin
-            headerTextBottomMargin: tabsDelegate.headerTextBottomMargin
-            buttonPositioningVelocity: tabsDelegate.buttonPositioningVelocity
-            deactivateTime: tabsDelegate.deactivateTime
+            headerTextColor: tabsStyle.headerTextColor
+            headerTextSelectedColor: tabsStyle.headerTextSelectedColor
+            headerTextOpacity: tabsStyle.headerTextOpacity
+            headerTextSelectedOpacity: tabsStyle.headerTextSelectedOpacity
+            headerTextFadeDuration: tabsStyle.headerTextFadeDuration
+            indicatorImageSource: tabsStyle.indicatorImageSource
+            headerFontSize: tabsStyle.headerFontSize
+            headerFontWeight: tabsStyle.headerFontWeight
+            headerTextLeftMargin: tabsStyle.headerTextLeftMargin
+            headerTextRightMargin: tabsStyle.headerTextRightMargin
+            headerTextBottomMargin: tabsStyle.headerTextBottomMargin
+            buttonPositioningVelocity: tabsStyle.buttonPositioningVelocity
+            deactivateTime: tabsStyle.deactivateTime
         }
     }
 
     Component.onCompleted: {
-        item.__headerContents = headerContents;
+        styledItem.__headerContents = headerContents;
     }
 }

=== renamed file 'themes/Ambiance/qmltheme/TextAreaDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml'
--- themes/Ambiance/qmltheme/TextAreaDelegate.qml	2013-04-18 05:42:22 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml	2013-07-01 22:15:52 +0000
@@ -21,40 +21,30 @@
 Item {
     id: visuals
     // style properties
+    property url iconSource: "artwork/clear.svg"
     // FIXME: needs type checking in themes to define the proper type to be used
     // if color type is used, alpha value gets lost
 
-    property color color
+    property color color: (styledItem.enabled) ? "#757373"  : "darkgray"
     /*!
       Background fill color
       */
-    property color backgroundColor: Qt.rgba(0, 0, 0, 0.1)
+    property color backgroundColor: (styledItem.focus || styledItem.highlighted) ? "white" : Qt.rgba(0, 0, 0, 0.1)
     property color errorColor: "red"
-    property real backgroundOpacity
+    property real backgroundOpacity: styledItem.enabled ? 1.0 : 0.1
 
     /*!
       Spacing between the frame and the text editor area
       */
-    property var frameSpacing
-    property real overlaySpacing
+    property real frameSpacing: units.gu(1)
+    property real overlaySpacing: units.gu(0.5)
 
     anchors.fill: parent
 
-    Binding {
-        target: item.__internal
-        property: "frameSpacing"
-        value: visuals.frameSpacing
-    }
-    Binding {
-        target: item.__internal
-        property: "spacing"
-        value: visuals.overlaySpacing
-    }
-
     z: -1
-    UbuntuShape {
-        id: shape
-        property bool error: (item.hasOwnProperty("errorHighlight") && item.errorHighlight && !item.acceptableInput)
+
+    property Component background: UbuntuShape {
+        property bool error: (styledItem.hasOwnProperty("errorHighlight") && styledItem.errorHighlight && !styledItem.acceptableInput)
         onErrorChanged: (error) ? visuals.errorColor : visuals.backgroundColor;
         color: visuals.backgroundColor;
         anchors.fill: parent
@@ -62,7 +52,13 @@
 
         MouseArea {
             anchors.fill: parent
-            onPressed: if (!item.activeFocus && item.activeFocusOnPress) item.forceActiveFocus()
+            onPressed: if (!styledItem.activeFocus && styledItem.activeFocusOnPress) styledItem.forceActiveFocus()
         }
     }
+
+    Loader {
+        id: backgroundLoader
+        sourceComponent: background
+        anchors.fill: parent
+    }
 }

=== renamed file 'themes/Ambiance/qmltheme/EditorCursorDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml'
--- themes/Ambiance/qmltheme/EditorCursorDelegate.qml	2013-05-20 09:06:47 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml	2013-07-01 22:15:52 +0000
@@ -21,28 +21,28 @@
     /*!
       Cursor color
       */
-    property color color
+    property color color: Qt.rgba(0.4, 0.4, 0.4, 1.0)
 
     /*!
       Properties driving cursor blinking. If either of these values are 0, no
       blinking is provided.
       */
-    property bool blinking
-    property int blinkTimeoutShown
-    property int blinkTimeoutHidden
+    property bool blinking: true
+    property int blinkTimeoutShown: 800
+    property int blinkTimeoutHidden: 400
 
     /*!
       Selection mode pin styles
       */
-    property var pinSize
-    property var pinSensingOffset
-    property color pinColor
+    property var pinSize: units.gu(1.2)
+    property var pinSensingOffset: units.dp(4)
+    property color pinColor: "blue"
 
     anchors.fill: parent
     Rectangle {
         id: cursor
 
-        property bool showCursor: item.visible
+        property bool showCursor: styledItem.visible
         property bool timerShowCursor: true
 
         visible: showCursor && timerShowCursor

=== added file 'modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TextFieldStyle.qml	2013-07-01 22:15:52 +0000
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+
+TextAreaStyle {
+}

=== renamed file 'themes/Ambiance/qmltheme/ToolbarButtonDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml'
--- themes/Ambiance/qmltheme/ToolbarButtonDelegate.qml	2013-04-29 18:36:03 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml	2013-07-01 22:15:52 +0000
@@ -20,15 +20,15 @@
 Item {
     id: visuals
     // styling properties
-    property int iconWidth: 0
-    property int iconHeight: 0
+    property int iconWidth: units.gu(2)
+    property int iconHeight: units.gu(2)
 
     anchors.fill: parent
 
     Item {
         anchors.centerIn: parent
         height: icon.height + label.height + label.anchors.topMargin
-        opacity: item.enabled ? 1.0 : 0.3
+        opacity: styledItem.enabled ? 1.0 : 0.3
 
         Image {
             id: icon
@@ -38,7 +38,7 @@
             }
             width: iconWidth
             height: iconWidth
-            source: item.iconSource
+            source: styledItem.iconSource
         }
 
         Label {
@@ -49,9 +49,11 @@
                 topMargin: units.gu(1)
             }
             width: paintedWidth
-            text: item.text
+            text: styledItem.text
+            fontSize: "x-small"
+            color: "#888888"
         }
     }
 
-    Component.onCompleted: item.implicitWidth = implicitWidth
+    Component.onCompleted: styledItem.implicitWidth = implicitWidth
 }

=== renamed file 'themes/Ambiance/qmltheme/ToolbarDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml'
--- themes/Ambiance/qmltheme/ToolbarDelegate.qml	2013-05-14 13:33:39 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ToolbarStyle.qml	2013-07-01 22:15:52 +0000
@@ -19,11 +19,10 @@
 Item {
     id: visuals
     // styling properties
-    property color color
-    property real barOpacity
+    property color color: "white"
+    property real barOpacity: 0.9
 
     anchors.fill: parent
-    property alias contentItem: background
 
     Rectangle {
         id: background
@@ -40,7 +39,7 @@
             bottom: background.top
         }
         source: Qt.resolvedUrl("artwork/toolbar_dropshadow.png")
-        opacity: item.opened || item.animating ? 0.5 : 0.0
+        opacity: styledItem.opened || styledItem.animating ? 0.5 : 0.0
         Behavior on opacity {
             UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration }
         }

=== renamed file 'themes/Ambiance/qmltheme/TransparentButtonDelegate.qml' => 'modules/Ubuntu/Components/Themes/Ambiance/TransparentButtonStyle.qml'
--- themes/Ambiance/qmltheme/TransparentButtonDelegate.qml	2013-01-28 16:40:37 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/TransparentButtonStyle.qml	2013-07-01 22:15:52 +0000
@@ -28,31 +28,31 @@
       The padding on the left and right side of the button foreground.
     */
     property real horizontalPadding: units.gu(2)
-    property real maximumWidth: item.width - 2*foreground.horizontalPadding
-    property real spacing: (item.text == "" || item.iconSource == "") ? 0 : units.gu(1)
+    property real maximumWidth: styledItem.width - 2*foreground.horizontalPadding
+    property real spacing: (styledItem.text == "" || styledItem.iconSource == "") ? 0 : units.gu(1)
     property real verticalPadding: units.gu(0.5)
 
     width: icon.width + label.width + foreground.spacing
-    height: item.height - 2*foreground.verticalPadding
+    height: styledItem.height - 2*foreground.verticalPadding
     implicitWidth: icon.width + label.implicitWidth + foreground.spacing
 
     Image {
         id: icon
-        source: item.iconSource
+        source: styledItem.iconSource
         fillMode: Image.PreserveAspectFit
         anchors.verticalCenter: foreground.verticalCenter
-        opacity: item.enabled ? 1.0 : 0.5
+        opacity: styledItem.enabled ? 1.0 : 0.5
     }
 
     Label {
         id: label
-        text: item.text
+        text: styledItem.text
         anchors {
             verticalCenter: foreground.verticalCenter
             verticalCenterOffset: units.dp(-1)
         }
         fontSize: "medium"
-        opacity: item.enabled ? 1.0 : 0.5
+        opacity: styledItem.enabled ? 1.0 : 0.5
         elide: Text.ElideRight
 
         property real availableWidth: foreground.maximumWidth - icon.width - foreground.spacing
@@ -97,6 +97,6 @@
                 }
             }
         ]
-        state: (item.iconSource == "" || item.text == "") ? "center" : item.iconPosition
+        state: (styledItem.iconSource == "" || styledItem.text == "") ? "center" : styledItem.iconPosition
     }
 }

=== renamed directory 'themes/Ambiance/qmltheme/artwork' => 'modules/Ubuntu/Components/Themes/Ambiance/artwork'
=== renamed file 'themes/Ambiance/qmltheme/qmldir' => 'modules/Ubuntu/Components/Themes/Ambiance/qmldir'
--- themes/Ambiance/qmltheme/qmldir	2013-06-29 19:10:44 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/qmldir	2013-07-01 22:15:52 +0000
@@ -1,32 +1,22 @@
-module qmltheme
-ButtonStyle 0.1 ButtonStyle.qml
-ButtonDelegate 0.1 ButtonDelegate.qml
-ToolbarDelegate 0.1 ToolbarDelegate.qml
-ToolbarButtonDelegate 0.1 ToolbarButtonDelegate.qml
-HeaderDelegate 0.1 HeaderDelegate.qml
-MainViewDelegate 0.1 MainViewDelegate.qml
-CheckBoxStyle 0.1 CheckBoxStyle.qml
-CheckBoxDelegate 0.1 CheckBoxDelegate.qml
-SwitchStyle 0.1 SwitchStyle.qml
-SwitchDelegate 0.1 SwitchDelegate.qml
-NewTabBar 0.1 NewTabBar.qml
-NewTabsDelegate 0.1 NewTabsDelegate.qml
-NewTabsStyle 0.1 NewTabsStyle.qml
-TransparentButtonDelegate 0.1 TransparentButtonDelegate.qml
-UbuntuShapeStyle 0.1 UbuntuShapeStyle.qml
-DialogForegroundDelegate 0.1 DialogForegroundDelegate.qml
-PopoverForegroundDelegate 0.1 PopoverForegroundDelegate.qml
-SheetForegroundDelegate 0.1 SheetForegroundDelegate.qml
-PointerDelegate 0.1 PointerDelegate.qml
-ScrollbarStyle 0.1 ScrollbarStyle.qml
-ScrollbarDelegate 0.1 ScrollbarDelegate.qml
-ScrollSliderSizer 0.1 ScrollSliderSizer.qml
+module Ubuntu.Components.Themes.Ambiance
+internal ActivityIndicatorStyle ActivityIndicatorStyle.qml
+internal ButtonStyle ButtonStyle.qml
+internal CheckBoxStyle CheckBoxStyle.qml
+internal DialogForegroundStyle DialogForegroundStyle.qml
+internal HeaderStyle HeaderStyle.qml
+internal MainViewStyle MainViewStyle.qml
+internal PointerStyle PointerStyle.qml
+internal PointerStyleShader PointerStyleShader.qml
+internal PopoverForegroundStyle PopoverForegroundStyle.qml
+internal ScrollbarStyle ScrollbarStyle.qml
+internal SelectionCursorStyle SelectionCursorStyle.qml
+internal SheetForegroundStyle SheetForegroundStyle.qml
+internal SliderStyle SliderStyle.qml
+internal SwitchStyle SwitchStyle.qml
+TextAreaStyle 0.1 TextAreaStyle.qml
+internal TextCursorStyle TextCursorStyle.qml
 TextFieldStyle 0.1 TextFieldStyle.qml
-TextFieldDelegate 0.1 TextFieldDelegate.qml
-EditorCursorStyle 0.1 EditorCursorStyle.qml
-EditorCursorDelegate 0.1 EditorCursorDelegate.qml
-SelectionCursorDelegate 0.1 SelectionCursorDelegate.qml
-TextAreaStyle 0.1 TextAreaStyle.qml
-TextAreaDelegate 0.1 TextAreaDelegate.qml
-SliderDelegate 0.1 SliderDelegate.qml
-ActivityIndicatorDelegate 0.1 ActivityIndicatorDelegate.qml
+internal ToolbarButtonStyle ToolbarButtonStyle.qml
+internal ToolbarStyle ToolbarStyle.qml
+internal TransparentButtonStyle TransparentButtonStyle.qml
+ 

=== renamed file 'themes/themes.pro' => 'modules/Ubuntu/Components/Themes/Themes.pro'
--- themes/themes.pro	2013-06-28 16:33:57 +0000
+++ modules/Ubuntu/Components/Themes/Themes.pro	2013-07-01 22:15:52 +0000
@@ -1,26 +1,2 @@
 TEMPLATE = subdirs
-
-THEME_FILES = Ambiance/qmltheme/*.qmltheme
-QML_FILES = $$system(ls Ambiance/qmltheme/*.qml)
-QML_FILES += $$system(ls Ambiance/qmltheme/*.js)
-QMLDIR_FILE = Ambiance/qmltheme/qmldir
-
-OTHER_FILES += $$THEME_FILES $$QML_FILES $$QMLDIR_FILE
-
-theme_files.path = /usr/share/themes/Ambiance/qmltheme
-theme_files.files = $$THEME_FILES
-
-ARTWORK_FILES += \
-    Ambiance/qmltheme/artwork/*.png \
-    Ambiance/qmltheme/artwork/*.svg \
-    Ambiance/qmltheme/artwork/*.sci
-theme_artworks.path = /usr/share/themes/Ambiance/qmltheme/artwork
-theme_artworks.files = $$ARTWORK_FILES
-
-qmldir_file.path = /usr/share/themes/Ambiance/qmltheme
-qmldir_file.files = $$QMLDIR_FILE
-
-qml_files.path = /usr/share/themes/Ambiance/qmltheme
-qml_files.files = $$QML_FILES
-
-INSTALLS += theme_files theme_artworks qmldir_file qml_files
+SUBDIRS += Ambiance

=== modified file 'modules/Ubuntu/Components/Toolbar.qml'
--- modules/Ubuntu/Components/Toolbar.qml	2013-06-19 10:17:28 +0000
+++ modules/Ubuntu/Components/Toolbar.qml	2013-07-01 22:15:52 +0000
@@ -15,11 +15,6 @@
  */
 
 import QtQuick 2.0
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
 
 /*!
     \internal
@@ -111,7 +106,7 @@
         }
     }
 
-    Item {
+    StyledItem {
         // FIXME:
         // All theming items go into the background because only the children
         //  of the Panel are being shown/hidden while the toolbar
@@ -124,10 +119,11 @@
         }
         height: units.gu(8)
 
-        Theming.ItemStyle.class: "toolbar"
-        // The values of opened and animated properties are used in the delegate
+        // The values of opened and animated properties are used in the style
         property bool opened: toolbar.opened
         property bool animating: toolbar.animating
+
+        style: Theme.createStyleComponent("ToolbarStyle.qml", background)
     }
 
     Item {

=== modified file 'modules/Ubuntu/Components/ToolbarActions.qml'
--- modules/Ubuntu/Components/ToolbarActions.qml	2013-06-17 17:34:41 +0000
+++ modules/Ubuntu/Components/ToolbarActions.qml	2013-07-01 22:15:52 +0000
@@ -246,7 +246,7 @@
             // Disable the mouse area so swipes on the button will not be blocked
             // from going to the toolbar. The panel will take care calling the button's clicked().
             __mouseArea.visible: false
-            Theming.ItemStyle.class: "toolbar-button"
+            style: Theme.createStyleComponent("ToolbarButtonStyle.qml", toolButton)
             width: visible ? units.gu(5) : 0
             height: toolbarActions.height
         }

=== modified file 'modules/Ubuntu/Components/ToolbarButton.qml'
--- modules/Ubuntu/Components/ToolbarButton.qml	2013-06-14 16:28:04 +0000
+++ modules/Ubuntu/Components/ToolbarButton.qml	2013-07-01 22:15:52 +0000
@@ -15,11 +15,6 @@
  */
 
 import QtQuick 2.0
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
 
 /*!
     \qmltype ToolbarButton
@@ -85,7 +80,8 @@
 */
 ActionItem {
     id: toolbarButton
-    Theming.ItemStyle.class: "toolbar-button"
     height: parent ? parent.height : undefined
     width: units.gu(5)
+
+    style: Theme.createStyleComponent("ToolbarButtonStyle.qml", toolbarButton)
 }

=== modified file 'modules/Ubuntu/Components/ToolbarItems.qml'
--- modules/Ubuntu/Components/ToolbarItems.qml	2013-06-17 12:36:11 +0000
+++ modules/Ubuntu/Components/ToolbarItems.qml	2013-07-01 22:15:52 +0000
@@ -15,11 +15,6 @@
  */
 
 import QtQuick 2.0
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Theming named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Theming
 
 /*!
     \qmltype ToolbarItems

=== modified file 'modules/Ubuntu/Components/overview.qdoc'
--- modules/Ubuntu/Components/overview.qdoc	2013-06-27 12:54:26 +0000
+++ modules/Ubuntu/Components/overview.qdoc	2013-07-01 22:15:52 +0000
@@ -20,8 +20,6 @@
 
      \part General Topics
      \list
-     \li \l{theming-components.html}{Theming} describes the styling capabilities
-     provided by the toolkit.
      \li \l{ubuntu-layouts.html}{Layouts} describes a flexible layouting engine
      to ease the development of responsive user interfaces.
      \li \l {Resolution Independence} describes the facilities that should be

=== removed file 'modules/Ubuntu/Components/plugin/itemstyleattached.cpp'
--- modules/Ubuntu/Components/plugin/itemstyleattached.cpp	2013-05-20 09:06:47 +0000
+++ modules/Ubuntu/Components/plugin/itemstyleattached.cpp	1970-01-01 00:00:00 +0000
@@ -1,715 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Zsombor Egri <[e-mail]>
- */
-
-#include <QtQml/QQmlComponent>
-#include <QtQml/QQmlContext>
-#include <QtQml/QQmlEngine>
-#include <QtQml/QQmlInfo>
-#include <QtQuick/QQuickItem>
-
-#include "itemstyleattached.h"
-#include "itemstyleattached_p.h"
-#include "themeengine.h"
-#include "themeengine_p.h"
-#include "quickutils.h"
-
-#include <private/qqmlproperty_p.h>
-#include <private/qqmlcomponentattached_p.h>
-
-const char *itemProperty = "item";
-
-/*!
-  \qmltype ItemStyle
-  \inqmlmodule Ubuntu.Components 0.1
-  \ingroup theming
-  \brief The ItemStyle attached property contains styling properties for a
-  particular UI element.
-
-  The element provides styling support to any element derived from Item
-  (QQuickItem).
-  The style is selected based on the \a class and \a name properties. If neither
-  of these is defined, the framework will use the meta class name to identify the
-  style rule to be used. However this can happen only if the document defining the
-  item refers to the styling attached property.
-
-  The following items will use styling as they declare and refer to styling
-  attached properties, and styling Text can be done by defining the ".Text"
-  selector.
-
-  \qml
-  Item {
-      ItemStyle.class: "button"
-  }
-  \endqml
-  \qml
-  Text {
-      ItemStyle.class: "text"
-  }
-  \endqml
-
-  An item can use private styling by setting the style and/or the delegate property
-  locally. In this case the item won't use the theme defined style/delegate but will
-  use the styling elements defined locally. Switching back to theme defined styles
-  can be achieved by clearing the style/delegate property. It is also possible to
-  set only one of the styling elements locally and use the theme defined one for
-  the other.
-
-  \qml
-  // Button.qml
-  Item {
-     id: root
-     property bool pressed: false
-     property bool hovered: false
-     property color color: "lightgray"
-
-     signal clicked
-
-     MouseArea {
-        anchors.fill: parent
-        onClicked: control.clicked()
-     }
-  }
-  \endqml
-  In the example above the Button document refers to the style property of the attached
-  styling, therefore the element by default will use the style defined using
-  the ".button" selector.
-
-  The following example shows a Button item that uses a private delegate but the
-  styles from the themes.
-
-  \qml
-  Button {
-     id: control
-     ItemStyle.delegate: Rectangle {
-        anchors.fill: parent
-        color: ItemStyle.style.color
-        radius: 15
-        border {
-            width: 2
-            color: Qt.darker(color, 1.4)
-        }
-     }
-  }
-  \endqml
-
- Attached styling defines a context property which can be used from delegates and
- also in style declaration to access the item properties. This property is called
- \b item.
-*/
-
-
-ItemStyleAttachedPrivate::ItemStyleAttachedPrivate(ItemStyleAttached *qq, QObject *attached):
-    q_ptr(qq),
-    attachee(qobject_cast<QQuickItem*>(attached)),
-    style(0),
-    delegate(0),
-    styleRule(0),
-    completed(false),
-    customStyle(false),
-    customDelegate(false),
-    connectedToEngine(false)
-{
-    styleClass = QuickUtils::instance().className(attachee).toLower();
-    // refresh style upon reparenting!
-    // there is no reason to do styling till the parent is not set and this applies
-    // to the root objects too as even those have an internal parent
-    QObject::connect(attachee, SIGNAL(parentChanged(QQuickItem*)), q_ptr, SLOT(_q_reapplyStyling(QQuickItem*)));
-
-    // connect to one of the attached components to receive completion
-    QQmlComponentAttached *component = QQmlComponent::qmlAttachedProperties(attachee);
-    if (component) {
-        QObject::connect(component, SIGNAL(completed()), q_ptr, SLOT(_q_refreshStyle()));
-    } else {
-        qmlInfo(q_ptr) << "WARNING: no attached component found for " << styleClass;
-    }
-
-    listenThemeEngine();
-
-    //enum attachee properties and watch them
-    watchAttacheeProperties();
-}
-
-ItemStyleAttachedPrivate::~ItemStyleAttachedPrivate()
-{
-    // remove name from the theming engine
-    if (!styleId.isEmpty())
-        ThemeEnginePrivate::registerName(attachee, QString());
-    resetDelegate();
-    resetStyle();
-}
-
-/*!
- * \internal
- * Enumerates attachee properties and marks them all candidates for styling. Connects
- * each property's notify signal so we get notified when those are binded in QML, so we
- * won't alter their value.
- */
-void ItemStyleAttachedPrivate::watchAttacheeProperties()
-{
-    Q_Q(ItemStyleAttached);
-    // enumerate properties and figure out which one has binding
-    const QMetaObject *mo = attachee->metaObject();
-    QMetaMethod onAttacheePropertyChanged = q->metaObject()->method(q->metaObject()->indexOfSlot("_q_attacheePropertyChanged()"));
-    for (int i = 0; i < mo->propertyCount(); i++) {
-        const QMetaProperty prop = mo->property(i);
-
-        if (!prop.hasNotifySignal() || UCStyle::omitProperty(prop.name())) {
-            continue;
-        }
-
-        QQmlProperty qmlProp(attachee, prop.name(), QQmlEngine::contextForObject(attachee));
-        QQmlAbstractBinding *binding = QQmlPropertyPrivate::binding(qmlProp);
-        if (binding) {
-            // mark as first time bound, so further styling can unbind it and do styling
-            watchedProperties.mark(i, StyledPropertyMap::Bound, binding);
-        } else {
-            watchedProperties.mark(i, StyledPropertyMap::Enabled);
-        }
-
-        if (QLatin1String(prop.name()) == QLatin1String("font")) {
-            // never ban the font property from being styled
-            continue;
-        }
-
-        // connect property's notify signal to watch when it gets changed so we can stop watching it
-        QObject::connect(attachee, prop.notifySignal(), q, onAttacheePropertyChanged);
-    }
-}
-
-/*!
- * \internal
- * Captures attachee property changes which are to be removed from stylable ones.
- */
-void ItemStyleAttachedPrivate::_q_attacheePropertyChanged()
-{
-    Q_Q(ItemStyleAttached);
-
-    const QMetaObject *mo = attachee->metaObject();
-    QMetaMethod signal = mo->method(q->senderSignalIndex());
-    QString property = QString(signal.name()).remove("Changed");
-
-    // was the property change invoked by the style update, exit
-    if (style && style->isUpdating(property))
-        return;
-
-    int index = mo->indexOfProperty(property.toLatin1());
-    if (watchedProperties.isBanned(index))
-        return;
-
-    // ban property from being styled
-    watchedProperties.mark(index, StyledPropertyMap::Banned);
-
-    // unbind style from attachee
-    if (style)
-        style->unbindProperty(property);
-}
-
-bool ItemStyleAttachedPrivate::updateStyle()
-{
-    bool result = false;
-    // do not do anything till the component gets complete?
-    if (!completed)
-       return result;
-
-    if (!customStyle) {
-        // make sure we have a theme
-        if (styleRule && styleRule->style) {
-            QQmlContext *context = new QQmlContext(qmlContext(attachee));
-            context->setContextProperty(itemProperty, attachee);
-            QObject *obj = styleRule->style->create(context);
-            style = qobject_cast<UCStyle*>(obj);
-            if (!style) {
-                delete obj;
-                delete context;
-            } else {
-                // set style as parent for the context so it gets deleted together with the style
-                context->setParent(style);
-                // set owner so we know that the style object has been created by theming
-                style->setOwner(attachee);
-            }
-            result = (style != 0);
-        }
-    } else
-        result = true;
-
-    // reparent also custom styles!
-    if (result && style) {
-        style->bindItem(attachee, watchedProperties, true);
-        style->bindItem(delegate, watchedProperties, false);
-    }
-    return result;
-}
-
-bool ItemStyleAttachedPrivate::updateDelegate()
-{
-    bool result = false;
-    // do not do anything till the component gets complete?
-    if (!completed)
-       return result;
-
-    if (!customDelegate) {
-        // make sure we have a theme
-        if (styleRule && styleRule->delegate) {
-            QQmlContext * context = new QQmlContext(qmlContext(attachee));
-            context->setContextProperty(itemProperty, attachee);
-            delegate = qobject_cast<QQuickItem*>(styleRule->delegate->create(context));
-            if (delegate) {
-                // set delegate as parent for the context so it gets deleted together with the style
-                context->setParent(delegate);
-                // set delegate's parent to attachee
-                delegate->setParent(attachee);
-            } else {
-                delete context;
-            }
-            result = (delegate != 0);
-        }
-    } else
-        result = true;
-
-    if (delegate && ((delegate->parent() != attachee) || (delegate->parentItem() != attachee))) {
-        delegate->setParentItem(attachee);
-        // If style item contains a property "contentItem" that points
-        // to an item, reparent all children into it:
-        QVariant contentVariant = delegate->property("contentItem");
-        QQuickItem *contentItem = qvariant_cast<QQuickItem *>(contentVariant);
-        if (contentItem) {
-            Q_FOREACH (QObject *child, attachee->children()) {
-                QQuickItem *childItem = qobject_cast<QQuickItem *>(child);
-                if (childItem && (childItem != delegate))
-                    childItem->setParentItem(contentItem);
-            }
-        }
-        // setup property "bindings" towards delegate properties
-        if (style)
-            style->bindItem(delegate, watchedProperties, false);
-    }
-    return result;
-}
-
-/*!
-  \internal
-  Updates the style and delegate variables. The style update is forced
-  when the item changes the style lookup from private to theme.
-*/
-int ItemStyleAttachedPrivate::updateTheme()
-{
-    int result = NoUpdate;
-    // check if the new rule differs from the previous one
-    StyleCache::StyleData *newRule = ThemeEnginePrivate::styleRuleForPath(styleSelector);
-    if (newRule && (styleRule != newRule)) {
-        // check what has been changed
-        bool styleChanged = (!styleRule || (styleRule && (styleRule->style != newRule->style)));
-        bool delegateChanged = (!styleRule || (styleRule && (styleRule->delegate != newRule->delegate)));
-        styleRule = newRule;
-
-        // the order is: clean up delegate then style, then create style and then delegate
-        // so that when delegate is built we already have the styles ready for that
-        if (delegateChanged) {
-            resetDelegate();
-        }
-        if (styleChanged) {
-            resetStyle();
-            styleChanged = updateStyle();
-        }
-        if (delegateChanged) {
-            delegateChanged = updateDelegate();
-        } else if (style) {
-            style->bindItem(delegate, watchedProperties, false);
-        }
-        if (styleChanged || delegateChanged) {
-            if (styleChanged) {
-                result |= StyleUpdated;
-            }
-            if (delegateChanged) {
-                result |= DelegateUpdated;
-            }
-            Q_Q(ItemStyleAttached);
-            Q_EMIT q->styleChanged();
-        }
-    }
-    return result;
-}
-
-void ItemStyleAttachedPrivate::resetStyle()
-{
-    if (!style)
-        return;
-    // clear bindings, disconnect as properties may change before the style
-    // is deleted
-    style->unbindItem(delegate);
-    style->unbindItem(attachee);
-
-    // delete style also if there is an owner set to it
-    if (!customStyle || style->owner()) {
-        // reset style object before we delete it, themed animations may get changed
-        // during the style deletion which will cause invalid pointer operations
-        // in style bindings cleanup
-        // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1175394
-        QObject *object = style;
-        style = 0;
-        delete object;
-    }
-}
-
-void ItemStyleAttachedPrivate::resetDelegate()
-{
-    if (!delegate)
-        return;
-    // remove all bindings between style and delegate
-    if (style)
-        style->unbindItem(delegate);
-
-    // delete delegate also if there is an owner set to it
-    if (!customDelegate || (delegate->parent() == attachee)) {
-        delegate->setParent(0);
-        delegate->setParentItem(0);
-        delete delegate;
-        delegate = 0;
-    }
-}
-
-/*!
- * \internal
- * Applies styling on children recoursively.
- */
-void ItemStyleAttachedPrivate::applyStyleOnChildren(QQuickItem *item)
-{
-    QList<QQuickItem*> children = item->childItems();
-    Q_FOREACH(QQuickItem *child, children) {
-        ItemStyleAttached *style = ThemeEnginePrivate::attachedStyle(child);
-        if (style)
-            style->d_ptr->_q_reapplyStyling(child->parentItem());
-        else
-            applyStyleOnChildren(child);
-    }
-}
-
-/*!
-  \internal
-  Registers the element with the given instance \a id. Returns true on
-  successful registration. On error, the theme engine's error string is set.
-  */
-bool ItemStyleAttachedPrivate::registerName(const QString &id)
-{
-    bool result = true;
-    if (ThemeEnginePrivate::registerName(attachee, id)) {
-        styleId = id;
-        attachee->setProperty("name", styleId);
-    } else {
-        ThemeEnginePrivate::setError(QString("Instance %1 already registered. Resetting instance for %2.")
-                                     .arg(styleId)
-                                     .arg(styleClass));
-        styleId = QString();
-        result = false;
-    }
-    return result;
-}
-
-/*!
-  \internal
-  Checks if the item needs to receive updates from theme engine or not. Connects to
-  or disconnects from the engine.
-  */
-void ItemStyleAttachedPrivate::listenThemeEngine()
-{
-    Q_Q(ItemStyleAttached);
-    if (!customStyle || !customDelegate) {
-        if (!connectedToEngine) {
-            connectedToEngine = (bool)QObject::connect(ThemeEngine::instance(), SIGNAL(themeChanged()), q, SLOT(_q_refreshStyle()));
-        }
-    } else {
-        if (connectedToEngine)
-            connectedToEngine = !QObject::disconnect(ThemeEngine::instance(), SIGNAL(themeChanged()), q, SLOT(_q_refreshStyle()));
-        if (!connectedToEngine) {
-            styleRule = 0;
-            styleSelector.clear();
-        }
-    }
-}
-
-/*!
- * \internal
- * Transfers the ownership of the style object (style or delegate) to teh current item.
- */
-void ItemStyleAttachedPrivate::gainOwnershipOverStyleObject(QObject *styleObject, bool style)
-{
-    if (!styleObject)
-        return;
-
-    if (style) {
-        UCStyle *style = qobject_cast<UCStyle*>(styleObject);
-        if (!style)
-            return;
-        ItemStyleAttached *attached = ThemeEnginePrivate::attachedStyle(style->owner());
-        if (attached) {
-            attached->d_ptr->style = 0;
-            style->setOwner(attachee);
-        }
-    } else {
-        QQuickItem *delegate = qobject_cast<QQuickItem*>(styleObject);
-        if (!delegate)
-            return;
-        // return if the delegate has no parent item set - case ItemStyle.delegate: Item{}
-        if (!delegate->parentItem())
-            return;
-        ItemStyleAttached *attached = ThemeEnginePrivate::attachedStyle(delegate->parentItem());
-        // check if the object is set as parent's delegate
-        if (attached && (attached->d_ptr->delegate == delegate)) {
-            // need to take ownership
-            attached->d_ptr->delegate = 0;
-            // set the new parent of the delegate
-            delegate->setParent(attachee);
-        }
-    }
-}
-
-
-/*!
-  \internal
-  Internal slot to update the style of an item when the theme is changed. The slot
-  is connected to the engine's themeChanged() signal. The slot should not be used
-  from other methods as it will cause performance problems.
-  */
-void ItemStyleAttachedPrivate::_q_refreshStyle()
-{
-    // no need to delay style applying any longer
-    bool applyOnChildren = !completed;
-    if (!completed) {
-        styleSelector = Selector(attachee);
-    }
-    completed = true;
-
-    // ... but style refresh is needed as the old styles are dead
-    styleRule = 0;
-
-    int update = updateTheme();
-    if (applyOnChildren) {
-        // theme applied first time, style on custom style objects
-        if (((update & StyleUpdated) != StyleUpdated) && customStyle) {
-            updateStyle();
-        }
-        if (((update & DelegateUpdated) != DelegateUpdated) && customDelegate) {
-            updateDelegate();
-        }
-        // this will happen only upon the styled item gets completed
-        applyStyleOnChildren(attachee);
-    }
-}
-
-/*!
- * \internal
- * Reapply styling on parent change.
- */
-void ItemStyleAttachedPrivate::_q_reapplyStyling(QQuickItem *parentItem)
-{
-    if (!parentItem || !completed)
-        // the component is most likely used in a delegate, is being deleted
-        // or not yet complete
-        return;
-
-    Selector newSelector(attachee);
-    if (newSelector != styleSelector) {
-        styleSelector = newSelector;
-        updateTheme();
-    }
-    // need to reapply styling on each child of the attachee!
-    // this will cause performance issues!
-    applyStyleOnChildren(attachee);
-}
-
-/*==============================================================================
-  */
-
-ItemStyleAttached::ItemStyleAttached(QObject *parent) :
-    QObject(parent),
-    d_ptr(new ItemStyleAttachedPrivate(this, parent))
-{
-    d_ptr->styleSelector = Selector(d_ptr->attachee);
-}
-
-ItemStyleAttached::~ItemStyleAttached()
-{}
-
-ItemStyleAttached *ItemStyleAttached::qmlAttachedProperties(QObject *obj)
-{
-    ItemStyleAttached *ret = 0;
-    if (qobject_cast<QQuickItem*>(obj)) {
-        ret = new ItemStyleAttached(obj);
-    }
-    return ret;
-}
-
-/*!
-  \qmlproperty string ItemStyle::name
-  This property holds the item unique identifier used in styling.
-  */
-/*!
-  name property.
-  */
-QString ItemStyleAttached::name() const
-{
-    Q_D(const ItemStyleAttached);
-    return d->styleId;
-}
-/*!
-  Updates the name property.
-  */
-void ItemStyleAttached::setName(const QString &name)
-{
-    Q_D(ItemStyleAttached);
-    if (d->styleId.compare(name, Qt::CaseInsensitive)) {
-        if (d->registerName(name.toLower())) {
-            d->styleSelector.update();
-            if (!d->completed)
-                return;
-            d->updateTheme();
-            // refresh children theme
-            d->applyStyleOnChildren(d->attachee);
-        }
-    }
-}
-
-/*!
-  \qmlproperty string ItemStyle::class
-  This property holds the style class identifier used by the item.
-  When the engine locates the style rule to be applied on the item, it takes
-  the class and name properties. If none is specified, the meta class
-  name will be used to search for the style. This must be taken into account both
-  when defining themes and designing items and applications.
-  */
-/*!
-  class property.
-  */
-QString ItemStyleAttached::styleClass()
-{
-    Q_D(ItemStyleAttached);
-    return d->styleClass.replace('.', ' ');
-}
-/*!
-  Sets the class property value.
-  */
-void ItemStyleAttached::setStyleClass(const QString &styleClass)
-{
-    Q_D(ItemStyleAttached);
-    if (d->styleClass.compare(styleClass.trimmed(), Qt::CaseInsensitive)) {
-        // replace spaces with dots
-        d->styleClass = styleClass.toLower().trimmed().replace(' ', '.');
-        d->styleSelector.update();
-        if (!d->completed)
-            return;
-        d->updateTheme();
-        // refresh children theme
-        d->applyStyleOnChildren(d->attachee);
-    }
-}
-
-/*!
- *\qmlproperty string ItemStyle::path
- * This property holds the style path applied on the attachee item.
- */
-QString ItemStyleAttached::path() const
-{
-    Q_D(const ItemStyleAttached);
-    return d->styleRule ?
-                d->styleRule->selector().toString() :
-                QString("(null)");
-}
-
-/*!
-  \qmlproperty Style ItemStyle::style
-  The property holds the object containing the style configuration properties. This can
-  either be defined by a theme style rule or the private style. When set, the item will
-  no longer use the theme defined style properties but the ones set. The property must be
-  reset (set to null object) in order to use the theme defined styles.
-
-  Modifying the property alone will only affect the styling. The delegate will be used
-  from the theme unless specified explicitly. Therefore items can be used with custom
-  styling and theme defined delegate, theme style and custom delegate or both theme defined/
-  custom.
-  */
-/*!
-  \internal
-  Returns the object created out of the style used.
-  */
-UCStyle *ItemStyleAttached::style() const
-{
-    Q_D(const ItemStyleAttached);
-    return d->style;
-}
-
-
-/*!
-  \internal
-  Sets/resets the style object for the item.
-  */
-void ItemStyleAttached::setStyle(UCStyle *style)
-{
-    Q_D(ItemStyleAttached);
-    if (d->style != style) {
-        // clear the previous style
-        d->resetStyle();
-        // check if style belongs to a styled item, if it does, detach it
-        d->customStyle = (style != 0);
-        d->gainOwnershipOverStyleObject(style, true);
-        d->style = style;
-        d->listenThemeEngine();
-        if (d->updateStyle())
-            Q_EMIT styleChanged();
-    }
-}
-
-/*!
-  \qmlproperty Item ItemStyle::delegate
-  The property holds the Item containing the visuals. This can either be defined
-  by a theme or can be a private element. When set, the item will no longer use
-  the theme defined visuals but the ones set. The property must be reset (set to
-  null object) in order to use the theme defined visuals.
-
-  Modifying the property alone will only affect the visuals. Styles can be still
-  used from the theme, unless specified explicitly. Therefore custom visuals can
-  be made so that are aware of the styling properties.
-  */
-/*!
-  Returns the delegate Item created out of the style.
-  */
-QQuickItem *ItemStyleAttached::delegate() const
-{
-    Q_D(const ItemStyleAttached);
-    return d->delegate;
-}
-
-/*!
-  \internal
-  Sets/resets the delegate item for the item.
-  */
-void ItemStyleAttached::setDelegate(QQuickItem *delegate)
-{
-    Q_D(ItemStyleAttached);
-    if (d->delegate != delegate) {
-        // clear the previous theme delegate
-        d->resetDelegate();
-        d->customDelegate = (delegate != 0);
-        d->gainOwnershipOverStyleObject(delegate, false);
-        d->delegate = delegate;
-        d->listenThemeEngine();
-        if (d->updateDelegate())
-            Q_EMIT styleChanged();
-    }
-}
-
-#include "moc_itemstyleattached.cpp"

=== removed file 'modules/Ubuntu/Components/plugin/itemstyleattached.h'
--- modules/Ubuntu/Components/plugin/itemstyleattached.h	2013-04-26 07:23:32 +0000
+++ modules/Ubuntu/Components/plugin/itemstyleattached.h	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Zsombor Egri <[e-mail]>
- */
-
-#ifndef ITEMSTYLEATTACHED_H
-#define ITEMSTYLEATTACHED_H
-
-#include <QtCore/QObject>
-#include <QtQml>
-
-class QQuickItem;
-class UCStyle;
-class ItemStyleAttachedPrivate;
-class ItemStyleAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QString class READ styleClass WRITE setStyleClass NOTIFY styleChanged)
-    Q_PROPERTY(QString name READ name WRITE setName NOTIFY styleChanged)
-    Q_PROPERTY(UCStyle *style READ style WRITE setStyle NOTIFY styleChanged)
-    Q_PROPERTY(QQuickItem *delegate READ delegate WRITE setDelegate NOTIFY styleChanged)
-
-    Q_PROPERTY(QString path READ path NOTIFY styleChanged)
-
-public:
-    explicit ItemStyleAttached(QObject *parent = 0);
-    ~ItemStyleAttached();
-    static ItemStyleAttached *qmlAttachedProperties(QObject *obj);
-
-Q_SIGNALS:
-    void styleChanged();
-    
-public Q_SLOTS:
-
-public: //getters
-    QString name() const;
-    QString styleClass();
-    QString path() const;
-
-private:
-    void setName(const QString &name);
-    void setStyleClass(const QString &styleClass);
-    UCStyle *style() const;
-    void setStyle(UCStyle *style);
-    QQuickItem *delegate() const;
-    void setDelegate(QQuickItem *delegate);
-
-private:
-    Q_DISABLE_COPY(ItemStyleAttached)
-    Q_DECLARE_PRIVATE(ItemStyleAttached)
-    QScopedPointer<ItemStyleAttachedPrivate> d_ptr;
-    friend class ThemeEnginePrivate;
-    friend class SelectorNode;
-
-    Q_PRIVATE_SLOT(d_func(), void _q_attacheePropertyChanged())
-    Q_PRIVATE_SLOT(d_func(), void _q_reapplyStyling(QQuickItem *))
-    Q_PRIVATE_SLOT(d_func(), void _q_refreshStyle())
-};
-
-QML_DECLARE_TYPEINFO(ItemStyleAttached, QML_HAS_ATTACHED_PROPERTIES)
-
-#endif // ITEMSTYLEATTACHED_H

=== removed file 'modules/Ubuntu/Components/plugin/itemstyleattached_p.h'
--- modules/Ubuntu/Components/plugin/itemstyleattached_p.h	2013-05-07 10:55:24 +0000
+++ modules/Ubuntu/Components/plugin/itemstyleattached_p.h	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Zsombor Egri <[e-mail]>
- */
-
-#ifndef ITEMSTYLEATTACHED_P_H
-#define ITEMSTYLEATTACHED_P_H
-
-#include "itemstyleattached.h"
-#include "stylecache_p.h"
-#include "ucstyle.h"
-
-class QQmlContext;
-class ItemStyleAttachedPrivate {
-    Q_DECLARE_PUBLIC(ItemStyleAttached)
-
-public:
-    enum UpdateThemeResult {
-        NoUpdate = 0,
-        StyleUpdated = 0x01,
-        DelegateUpdated = 0x02
-    };
-    ItemStyleAttachedPrivate(ItemStyleAttached *qq, QObject *attached);
-    ~ItemStyleAttachedPrivate();
-
-    ItemStyleAttached *q_ptr;
-    QQuickItem *attachee;
-    UCStyle *style;
-    QQuickItem *delegate;
-    QString styleClass;
-    QString styleId;
-    Selector styleSelector;
-
-    // internal members
-    StyleCache::StyleData *styleRule;
-    // hash of attachee property indexes as key, containing enabled/disabled value
-    StyledPropertyMap watchedProperties;
-    bool completed;
-    bool customStyle;
-    bool customDelegate;
-    bool connectedToEngine;
-
-    void watchAttacheeProperties();
-    bool updateStyle();
-    bool updateDelegate();
-    int updateTheme();
-    void resetStyle();
-    void resetDelegate();
-    void applyStyleOnChildren(QQuickItem *item);
-    bool registerName(const QString &id);
-    void listenThemeEngine();
-    void gainOwnershipOverStyleObject(QObject *styleObject, bool style);
-    void _q_attacheePropertyChanged();
-    void _q_refreshStyle();
-    void _q_reapplyStyling(QQuickItem *);
-
-#ifdef QT_TESTLIB_LIB
-    friend class tst_ThemeEngineStyle;
-#endif
-};
-
-#endif // ITEMSTYLEATTACHED_P_H

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2013-06-28 13:56:45 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2013-07-01 22:15:52 +0000
@@ -23,8 +23,7 @@
 #include <QtGui/QScreen>
 
 #include "plugin.h"
-#include "themeengine.h"
-#include "itemstyleattached.h"
+#include "uctheme.h"
 
 #include <QtQml/QQmlContext>
 #include "i18n.h"
@@ -39,7 +38,6 @@
 #include "qquickclipboard.h"
 #include "qquickmimedata.h"
 #include "bottombarvisibilitycommunicator.h"
-#include "ucstyle.h"
 #include "ucubuntuanimation.h"
 #include "ucfontutils.h"
 #include "ucarguments.h"
@@ -64,7 +62,6 @@
 {
     Q_ASSERT(uri == QLatin1String("Ubuntu.Components"));
 
-    qmlRegisterUncreatableType<ItemStyleAttached>(uri, 0, 1, "ItemStyle", "Type is not instantiable.");
     qmlRegisterUncreatableType<UbuntuI18n>(uri, 0, 1, "i18n", "Singleton object");
     qmlRegisterExtendedType<QQuickImageBase, UCQQuickImageExtension>(uri, 0, 1, "QQuickImageBase");
     qmlRegisterUncreatableType<UCUnits>(uri, 0, 1, "UCUnits", "Not instantiable");
@@ -74,7 +71,6 @@
     qmlRegisterType<InverseMouseAreaType>(uri, 0, 1, "InverseMouseArea");
     qmlRegisterType<QQuickMimeData>(uri, 0, 1, "MimeData");
     qmlRegisterSingletonType<QQuickClipboard>(uri, 0, 1, "Clipboard", registerClipboard);
-    qmlRegisterType<UCStyle>(uri, 0, 1, "Style");
     qmlRegisterSingletonType<UCUbuntuAnimation>(uri, 0, 1, "UbuntuAnimation", registerUCUbuntuAnimation);
     qmlRegisterType<UCArguments>(uri, 0, 1, "Arguments");
     qmlRegisterType<UCArgument>(uri, 0, 1, "Argument");
@@ -84,14 +80,14 @@
 void UbuntuComponentsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
     QQmlExtensionPlugin::initializeEngine(engine, uri);
-    // call engine registration method to load the theme
     QQmlContext* context = engine->rootContext();
 
     // register root object watcher that sets a global property with the root object
     // that can be accessed from any object
     context->setContextProperty("QuickUtils", &QuickUtils::instance());
 
-    context->setContextProperty("Theme", ThemeEngine::initializeEngine(engine));
+    UCTheme::instance().registerToContext(context);
+
     context->setContextProperty("i18n", &UbuntuI18n::instance());
     static ContextPropertyChangeListener i18nChangeListener(context, "i18n");
     QObject::connect(&UbuntuI18n::instance(), SIGNAL(domainChanged()),

=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2013-06-25 14:18:18 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2013-07-01 22:15:52 +0000
@@ -18,14 +18,8 @@
 uri = Ubuntu.Components
 
 HEADERS += plugin.h \
-    themeengine.h \
-    themeengine_p.h \
-    themeloader_p.h \
-    themesettings_p.h \
-    stylecache_p.h \
-    itemstyleattached.h \
-    itemstyleattached_p.h \
-    qmlthemeloader_p.h \
+    uctheme.h \
+    ucthemesettings.h \
     i18n.h \
     listener.h \
     ucscalingimageprovider.h \
@@ -40,19 +34,14 @@
     qquickclipboard.h \
     qquickmimedata.h \
     qquickclipboard_p.h \
-    selector_p.h \
-    ucstyle.h \
     ucubuntuanimation.h \
     ucfontutils.h \
     ucarguments.h \
     ucargument.h
 
 SOURCES += plugin.cpp \
-    themeengine.cpp \
-    stylecache.cpp \
-    themesettings.cpp \
-    itemstyleattached.cpp \
-    qmlthemeloader.cpp \
+    uctheme.cpp \
+    ucthemesettings.cpp \
     i18n.cpp \
     listener.cpp \
     ucscalingimageprovider.cpp \
@@ -65,8 +54,6 @@
     bottombarvisibilitycommunicator.cpp \
     qquickclipboard.cpp \
     qquickmimedata.cpp \
-    selector.cpp \
-    ucstyle.cpp \
     ucubuntuanimation.cpp \
     ucfontutils.cpp \
     ucarguments.cpp \

=== removed file 'modules/Ubuntu/Components/plugin/qmlthemeloader.cpp'
--- modules/Ubuntu/Components/plugin/qmlthemeloader.cpp	2013-05-02 00:54:44 +0000
+++ modules/Ubuntu/Components/plugin/qmlthemeloader.cpp	1970-01-01 00:00:00 +0000
@@ -1,777 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Zsombor Egri <[e-mail]>
- */
-
-#include "themeengine.h"
-#include "themeengine_p.h"
-#include "qmlthemeloader_p.h"
-#include <QtQml/QQmlEngine>
-#include <QtQml/QQmlContext>
-#include <QtQml/QQmlComponent>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
-#include <QtCore/QCoreApplication>
-#include <QtQml/QQmlInfo>
-#include <QtCore/QRegularExpression>
-#include <QDebug>
-
-/*
-  QmlTheme file parser
-
-  The parsing steps are:
-  1. load file and build up selectorTable
-  2. normalize selectorTable by updating each selector with the non-overridden
-     properties from the base selector
-  3. build ThemeEngine's styleCache by creating Rule elements using the styles,
-     mappings and imports specified.
-
-  TODOs:
-  - optimization
-  - merge steps 1 and 2
-  - export into QML theme file for comparison in between CSS-like and QML theme
-    loading
-*/
-
-const char *styleRuleComponent =  \
-        "import QtQuick 2.0\n"
-        "%1\n"
-        "%2\n";
-
-const char *stylePropertyFormat = \
-        "%1 {\n"
-        "%2"
-        "    }";
-
-/*!
- * \internal
- * The function lists the folders the listed import modules can be found.
- */
-QStringList importFolders(QQmlEngine *engine, QString imports)
-{
-    QStringList importPaths = engine->importPathList();
-    imports.remove("import ");
-    imports.remove(QRegularExpression(" \\d.\\d"));
-    imports.replace(QChar('.'), QDir::separator());
-    QStringList importList = imports.split('\n');
-
-    QStringList result;
-    Q_FOREACH(const QString &import, importList) {
-        Q_FOREACH(const QString &path, importPaths) {
-            QDir dir(path + QDir::separator() + import);
-            if (dir.exists())
-                result << dir.path();
-        }
-    }
-    return result;
-}
-
-/*!
-  \internal
-    Returns a subset from the given selector and configures it to ignore relation
-    and name.
-  */
-Selector selectorSubset(const Selector &path, int elements, int ignoreFlags = SelectorNode::IgnoreAll)
-{
-    Selector result;
-    while (elements > 0) {
-        result << SelectorNode(path[path.length() - elements], ignoreFlags);
-        elements--;
-    }
-    return result;
-}
-
-/*!
- * \internal
- * Create a QQmlComponent from a given QML string using the given engine
- */
-QQmlComponent *createComponent(QQmlEngine *engine, const QString &qmlCode)
-{
-    if (qmlCode.isEmpty())
-        return 0;
-
-    QQmlComponent *ret = new QQmlComponent(engine);
-    ret->setData(qmlCode.toLatin1(), QUrl());
-    if (ret->isError() || !ret->isReady()) {
-        QString errorString = ret->isError() ? ret->errorString() : "Component not ready";
-        ThemeEnginePrivate::setError(QString("Error on creating style rule: \n%2\n%3")
-                                     .arg(qmlCode)
-                                     .arg(errorString));
-        delete ret;
-        ret = 0;
-    }
-    return ret;
-}
-
-/*!
- * \internal
- * Create a QQmlComponent delegate from a given file. The file is searched in the folders
- * specified in folderList parameter.
- */
-QQmlComponent *createDelegate(QQmlEngine *engine, const QString &qmlType, const QStringList &folderList)
-{
-    if (qmlType.isEmpty() || folderList.isEmpty())
-        return 0;
-
-    QFile f;
-    Q_FOREACH(const QString &folder, folderList) {
-        f.setFileName(folder + QDir::separator() + qmlType + ".qml");
-        if (f.exists()) {
-            QQmlComponent *ret = new QQmlComponent(engine, f.fileName());
-            if (ret->isError() || !ret->isReady()) {
-                QString errorString = ret->isError() ? ret->errorString() : "Component not ready";
-                ThemeEnginePrivate::setError(QString("Error on creating delegate: \n%2\n%3")
-                                             .arg(qmlType)
-                                             .arg(errorString));
-                delete ret;
-                ret = 0;
-            }
-            return ret;
-        }
-    }
-    // the QML type wasn't found in the folders, try to create a component
-    // using inline QML document
-    return createComponent(engine, QString("import QtQuick 2.0; %1{}").arg(qmlType));
-}
-
-/*!
- * \brief QmlThemeLoader::urlMacro resolves the QmlTheme url() macro.
- */
-QString QmlThemeLoader::urlMacro(const QString &param, const QTextStream &stream)
-{
-    QString path(param);
-    path.remove('\"');
-
-    if (!path.startsWith('/') && !path.startsWith("qrc:/") &&
-            !path.startsWith("image:/") && !path.startsWith(":/")) {
-        // check if we have one of the location tags: current, system, application
-        if (path.startsWith("current:")) {
-            path.remove("current:");
-            if (!path.startsWith('/'))
-                path.prepend('/');
-            path.prepend(QDir::currentPath());
-        } else if (path.startsWith("application:")) {
-            path.remove("application:");
-            if (!path.startsWith('/'))
-                path.prepend('/');
-            path.prepend(QCoreApplication::applicationDirPath());
-        } else if (path.startsWith("system:")) {
-            path.remove("system:");
-            if (!path.startsWith('/'))
-                path.prepend('/');
-            path.prepend(themeFolder());
-        } else {
-            QFile *file = qobject_cast<QFile*>(stream.device());
-            QFileInfo fi(*file);
-            //create the path so that returns the absolute path to the URL given
-            path = QFileInfo(fi.absoluteDir().path() + '/' + path).absoluteFilePath();
-        }
-    }
-    return path;
-}
-
-/*!
-  \internal
-  Reads the stream character by character skipping characters specified in \a bypassTokens
-  parameter and comments. Returns a string which in the most cases contains a single character
-  except when a '/' chracter was followed by a valid one, when returns two chars.
-  */
-QString QmlThemeLoader::readChar(QTextStream &stream, const QRegExp &bypassTokens)
-{
-    QString data;
-    while (!stream.atEnd()) {
-
-        data += stream.read(1);
-
-        // skip comments by default; as we read character by character, it's easier to
-        // implement by checking the comment limitators than using QRegExp, which would
-        // ease our life if we'd work with strings.
-        if (data[0] == '/') {
-            if (data == "/*") {
-                // read till we get the comment's end mark
-                QChar charData;
-                // consume comment
-                while ((charData = stream.read(1)[0]) != '/') {
-                    while (charData != '*')
-                        charData = stream.read(1)[0];
-                }
-                data.clear();
-                continue;
-            } else if (data.length() <= 1)
-                // we don't know yet the next character, so stay in
-                continue;
-            else
-                // we have the next one and that's not a comment marker, so return it
-                return data;
-        }
-
-        // check if we have something to skip
-        if (!data.contains(bypassTokens))
-            return data;
-        else
-            data.clear();
-    }
-    return QString();
-}
-
-/*!
-  \internal
-  Reads the stream content till one of the \a tokens is reached. The characters
-  specified in \a bypassTokens will be skipped. \a excludeToken specifies whether
-  the limiting token reached should be included in the data read or not (default
-  is not to include).
-  */
-QString QmlThemeLoader::readTillToken(QTextStream &stream, const QRegExp &tokens, const QRegExp &bypassTokens, bool excludeToken)
-{
-    QString ret;
-    while (!stream.atEnd() && !ret.contains(tokens)) {
-        ret += readChar(stream, bypassTokens);
-    }
-    if (excludeToken)
-        // remove the last character as that is the token
-        ret.remove(ret.length() - 1, 1);
-    return ret;
-}
-
-/*!
-  \internal
-  Special read function for reading declaration block where we may have objects
-  defined and we need to count the opened and closed parenthesis.
-  Example of such a declaration block:
-  \code
-  .button {
-      pressedAnimation: NumberAnimation {duration: 300; easing.type: Easing.OutQuad};
-  }
-  \endcode
-  */
-QString QmlThemeLoader::readDeclarationBlock(QTextStream &stream)
-{
-    // read till the close brace count is zero
-    // the first opened brace is consumed, therefore start from 1
-    int braceCount = 1;
-    QString chunk, data;
-
-    while (!stream.atEnd() && (braceCount > 0)) {
-        chunk = readChar(stream, QRegExp("[\r\n]"));
-        if (chunk[0] == '{')
-            braceCount++;
-        if (chunk[0] == '}')
-            braceCount--;
-        if (braceCount)
-            data += chunk;
-    }
-
-    return data;
-}
-
-/*!
- * \internal
- * Parses the declaration block and fills the property map from it. Also resolves
- * macros and any other special tokens/tags in property value.
- */
-void QmlThemeLoader::parseDeclarationBlock(const QString &blockData, PropertyMap &propertyMap, const QTextStream &stream)
-{
-    // parse data
-    QString propertyName, propertyValue;
-    const QChar *data = blockData.constData();
-    while (!data->isNull()) {
-        if (*data != ':')
-            propertyName += *data;
-        else {
-            // and continue to parse string till we get the declaration end token ';'
-            // note that we can have several of those as we can have object blocks inside
-            // e.g. animation: NumberAnimation {duration: 100; easing.type: Easing.OutQuad};
-            // in which case we need to pay attention on braces, and so on.
-            propertyValue.clear();
-            int braceCount = 0;
-            data++;
-            while (!data->isNull()) {
-                if ((*data == ';') && !braceCount)
-                    break;
-                if (*data == '{')
-                    braceCount++;
-                if (*data == '}')
-                    braceCount--;
-                propertyValue += *data;
-                data++;
-            }
-            propertyValue = propertyValue.trimmed();
-            if (!propertyValue.isEmpty()) {
-                // resolve all macros and special tags/tokens
-                patchDeclarationValue(propertyValue, stream);
-                propertyMap.properties.insert(propertyName.trimmed(), propertyValue);
-            }
-            // check if we reached the end of the data
-            if (data->isNull())
-                return;
-            propertyName.clear();
-            propertyValue.clear();
-        }
-        data++;
-    }
-}
-
-/*!
- * \internal
- * Resolves macros, tokens/tags in the property value data.
- */
-void QmlThemeLoader::patchDeclarationValue(QString &value, const QTextStream &stream)
-{
-    // check if the value is declared using url() macro
-    int atUrl;
-    while ((atUrl = value.indexOf("url")) >= 0) {
-        // check if it is the url() function, so the next valid character should be a "(" one
-        int pathStart = value.indexOf('(', atUrl);
-        if (pathStart >= 0) {
-            int pathEnd = value.indexOf(')', pathStart);
-            QString path = value.mid(pathStart + 1, pathEnd - pathStart - 1).trimmed();
-            // replace url(path) with the resolved one
-            value.replace(atUrl, pathEnd - atUrl + 1, urlMacro(path, stream).prepend('\"').append('\"'));
-        }
-    }
-}
-
-
-/*!
-  \internal
-  Resolves the "inheritance" between atomic selector items (the last items in a CSS selector component).
-  */
-void QmlThemeLoader::handleSelector(const Selector &selector, const PropertyMap &newProperties)
-{
-    PropertyMap propertyMap;
-    if (selectorTable.contains(selector))
-        propertyMap = selectorTable.value(selector);
-    // merge tables;newProperties override the existing ones
-    propertyMap.merge(newProperties, true);
-    // save them (back) into the table
-    selectorTable.insert(selector, propertyMap);
-}
-
-/*!
-  \internal
-  Normalizes the style table - copies the properties that were not overridden from the base
-  styles into the derivates.
-  */
-void QmlThemeLoader::normalizeStyles()
-{
-    QHashIterator<Selector, PropertyMap > i(selectorTable);
-    while (i.hasNext()) {
-        i.next();
-        Selector selector = i.key();
-        if (normalizeSelector(selector))
-            // start all over as hash iterator is not valid anymore
-            i.toFront();
-    }
-}
-
-/*!
-  \internal
-  Updates the properties of a rule based on the subset of the proeprty. May ignore relation
-  and/or style ID when collecting properties. override should be true when properties from
-  derivates are collected.
-  */
-bool QmlThemeLoader::updateRuleProperties(Selector &selector, PropertyMap &propertyMap, bool override)
-{
-    bool result = false;
-    // make sure we don't have the styleId disturbing
-    selector[0] = SelectorNode(selector[0], SelectorNode::NoStyleId);
-    if (selectorTable.contains(selector)) {
-        // make sure the selector is normalized
-        normalizeSelector(selector);
-        // get the properties and copy the base ones into the current selector
-        propertyMap.merge(selectorTable.value(selector), override);
-    }
-    return result;
-}
-
-/*!
- * \internal
- * Normalizes a given selector. Returns true if the selector was normalized(updated)
- * otherwise returns false.
- */
-bool QmlThemeLoader::normalizeSelector(const Selector &selector)
-{
-    PropertyMap propertyMap = selectorTable.value(selector);
-    if (propertyMap.normalized)
-        return false;
-    // not normalized yet
-
-    // collect properties from the derived ones
-    SelectorNode last = selector.last();
-    QString derivates = last.derivates();
-    if (!derivates.isEmpty()) {
-        // get the deriveds first then override those with the current properties
-        PropertyMap derivedMap;
-        Q_FOREACH(const QString& derived, derivates.split('.')) {
-            if (!derived.isEmpty()) {
-                Selector derivedSelector(derived);
-                QHash<Selector, PropertyMap>::iterator i = selectorTable.find(derivedSelector);
-                if (i != selectorTable.end() && i.key() == derivedSelector) {
-                    // update to the real selector as that may also be derived
-                    derivedSelector = i.key();
-                    updateRuleProperties(derivedSelector, derivedMap, true);
-                } else {
-                    //FIXME: fire a warning in ThemeEngine, when error handling is done properly
-                    qmlInfo(ThemeEnginePrivate::themeEngine) << QString("Undefined selector: [%1]")
-                                .arg(derivedSelector.toString());
-                }
-            }
-        }
-        if (!derivedMap.properties.isEmpty()) {
-            // override with the current stuff
-            propertyMap.merge(derivedMap, false);
-        }
-    }
-    // parse the cascade
-    if (selector.count() > 1) {
-        // need to check only the last node from the selector path
-        Selector subset = selectorSubset(selector, 1);
-        updateRuleProperties(subset, propertyMap, false);
-    }
-    propertyMap.normalized = true;
-    selectorTable.insert(selector, propertyMap);
-    return true;
-}
-
-
-/*!
-  \internal
-  Parses a QmlTheme theme. Reads the stream char-by-char to avoid seeking in the stream.
-  Seeking would be needed when reading entire line and parsing tags out of it.
-*/
-bool QmlThemeLoader::parseTheme(const QUrl &url)
-{
-    // open the file
-    QString fname = (url.scheme() == "qrc") ? url.toString().remove("qrc") : url.path();
-    QFile file(fname);
-    if (file.open(QFile::ReadOnly | QFile::Text)) {
-        QTextStream stream(&file);
-
-        QString data;
-
-        // read stream character by character so we don't need to seek
-        while (!stream.atEnd()) {
-
-            data += readChar(stream);
-
-            if (data.isEmpty())
-                break;
-
-            if (data[0] == '@') {
-                if (!parseAtRules(stream))
-                    return false;
-                data.clear();
-                continue;
-            }
-            if (!parseDeclarations(data, stream))
-                return false;
-        }
-        return true;
-    } else {
-        ThemeEnginePrivate::setError(QString("%1: %2")
-                                     .arg(file.errorString())
-                                     .arg(file.fileName()));
-    }
-    return false;
-}
-
-bool QmlThemeLoader::parseAtRules(QTextStream &stream)
-{
-    // rule!! read till the first token
-    QString data = readTillToken(stream, QRegExp("[({]"), QRegExp("[\t]")).simplified();
-
-    //lookup for the rule handler and continue parsing with it
-    if (rules.contains(data))
-        return rules.value(data)(this, stream);
-    else
-        ThemeEnginePrivate::setError(QString("Unhandled rule: %1").arg(data));
-    return false;
-}
-
-bool QmlThemeLoader::parseDeclarations(QString &data, QTextStream &stream)
-{
-   // read till we hit a '{' token
-   data += readTillToken(stream, QRegExp("[{]"), QRegExp("[\t\r\n]")).simplified();
-    if (data.isEmpty())
-        return false;
-
-    QList<Selector> selectors = ThemeEnginePrivate::parseSelector(data);
-    if (selectors.isEmpty()) {
-        ThemeEnginePrivate::setError(QString("Syntax error!\n%1").arg(data));
-        return false;
-    } else {
-        // load declarator and apply on each selector
-        data = readDeclarationBlock(stream);
-        PropertyMap propertyMap;
-        if (!data.isEmpty())
-            parseDeclarationBlock(data, propertyMap, stream);
-
-        Q_FOREACH (const Selector &selector, selectors) {
-            handleSelector(selector, propertyMap);
-        }
-    }
-
-    // clear data before continuing parsing
-    data.clear();
-    return true;
-}
-
-bool QmlThemeLoader::generateStyleQml(StyleCache &cache)
-{
-    QString styleQml;
-    QString delegateQml;
-
-    // add delegates to cache
-    QHashIterator<QString, QPair<QString, QString> > t(qmlMap);
-    QStringList folders = importFolders(m_engine, imports);
-    while (t.hasNext()) {
-        t.next();
-        QQmlComponent *delegate = createDelegate(m_engine, t.value().second, folders);
-        if (delegate)
-            cache.addDelegate(t.value().second, delegate);
-    }
-
-    // go through the selector map and build the styles to each
-    QHashIterator<Selector, PropertyMap > i(selectorTable);
-    while (i.hasNext()) {
-        i.next();
-        Selector selector = i.key();
-        PropertyMap propertyMap = i.value();
-
-        buildStyleAndDelegate(selector, propertyMap.properties, styleQml, delegateQml);
-
-        QQmlComponent *style = createComponent(m_engine, styleQml);
-        if (!style && delegateQml.isEmpty()) {
-            return false;
-        }
-        cache.addStyleRule(selector, style, delegateQml);
-    }
-
-    return true;
-}
-
-QPair<QString, QString> QmlThemeLoader::selectorMapping(const Selector &selector)
-{
-    Selector subset;
-    QString qmap;
-    for (int count = selector.count(); count > 0; count--) {
-        subset = selectorSubset(selector, count, SelectorNode::IgnoreNone);
-        qmap = subset.toString();
-        if (qmlMap.contains(qmap)) {
-            return qmlMap.value(qmap);
-        }
-    }
-    // if none found, check the last node's style class
-    qmap = '.' + selector.last().getClass();
-    return (qmlMap.contains(qmap)) ? qmlMap.value(qmap) : QPair<QString, QString>();
-}
-
-
-void QmlThemeLoader::buildStyleAndDelegate(Selector &selector, PropertyHash &properties, QString &style, QString &delegate)
-{
-    QPair<QString, QString> qmlTypes = selectorMapping(selector);
-
-    style.clear();
-    delegate.clear();
-
-    // get the type for style and delegate
-    if (properties.count() > 0) {
-        QString propertyPrefix("    ");
-
-        // do not consider style types
-        style = QString(stylePropertyFormat).arg("Style");
-        propertyPrefix += "property var";
-
-        // add properties
-        QHashIterator<QString, QString> i(properties);
-        QString propertyArg;
-        while (i.hasNext()) {
-            i.next();
-            propertyArg += QString("   %1 %2: %3\n")
-                    .arg(propertyPrefix)
-                    .arg(i.key())
-                    .arg(i.value());
-        }
-        // append the closing brace
-        style = style.arg(propertyArg);
-        style = QString(styleRuleComponent).arg(imports).arg(style);
-    }
-
-    // delegate
-    delegate = qmlTypes.second;
-}
-
-/*============================================================================*/
-
-/*!
-  \internal
-  Extracts the theme specified to be imported, and loads it.
-  */
-bool QmlThemeLoader::handleImport(QmlThemeLoader *loader, QTextStream &stream)
-{
-    QString themeFile = QmlThemeLoader::readTillToken(stream, QRegExp("[;]"), QRegExp("[ )\t\r\n\"]"));
-    // check if the imported theme file is an absolute path or not;
-    // if not, build the path relative to the current parsed file
-    // Note: resource stored theme files must use absolute paths, or should have
-    // qrc: scheme specified
-    bool result = false;
-    themeFile = urlMacro(themeFile, stream);
-    if (themeFile.startsWith("qrc"))
-        result = loader->parseTheme(QUrl(themeFile));
-    else {
-        result = loader->parseTheme(QUrl::fromLocalFile(themeFile));
-        if (result)
-            loader->themeFiles << themeFile;
-    }
-    return result;
-}
-
-/*!
-  \internal
-  Parses qml-mapping rule needed when defing the QML Rule pattern. The qml-mapping rule
-  syntax is as follows:
-  qml-mapping(css-tag, style-qml-type, delegate-qml-type)
-  where
-     - css-tag is the tag used in CSS theme
-     - style-qml-type is the name of the QML document defining the style properties
-     - delegate-qml-type is the name of the QML document defining the item delegate.
-  If no style is given, the theme engine will use QtObject for style and will declare all
-  properties typed as variant.
-
-  Example:
-  css.
-
-  @qml-mapping(button, ButonStyle, ButtonDelegate)
-
-  .button {
-     color: "blue"
-  }
-
-  .frame {
-     border: 2
-  }
-
-  will be translated as
-
-  Rule {
-    selector: ".button"
-    style: ButtonStyle {
-        color: "blue"
-    }
-    delegate: ButtonDelegate{}
-  }
-
-  Rule {
-    selector: ".frame"
-    style: QtObject {
-        property variant border: 2
-    }
-  }
-  */
-bool QmlThemeLoader::handleQmlMapping(QmlThemeLoader *loader, QTextStream &stream)
-{
-    QString params = QmlThemeLoader::readTillToken(stream, QRegExp("[;]"), QRegExp("[)\t\r\n\"]"));
-    QStringList mapping = params.split(',');
-
-    // we should have 3 elements in the list! if we don't we have an error!
-    bool ret = (mapping.count() == 3);
-    if (!ret)
-        ThemeEnginePrivate::setError(QString("Mapping has %1 parameter(s), should have 3!").
-                                     arg(mapping.count()));
-    else
-        loader->qmlMap.insert(mapping[0].trimmed().toLower(), qMakePair(mapping[1].trimmed(), mapping[2].trimmed()));
-
-    return ret;
-}
-
-/*!
-  \internal
-  Callback handling qml-import tags. Adds the import sentence to the import list
-  that will be added to the template creating the style rule, and the import path
-  to engine. The import path may be relative or absolute, and can contain "app"
-  and "sys" keywords, which result in application's current folder and global
-  theme's folder.
-  */
-bool QmlThemeLoader::handleQmlImport(QmlThemeLoader *loader, QTextStream &stream)
-{
-    QString param = QmlThemeLoader::readTillToken(stream, QRegExp("[;]"), QRegExp("[)\t\r\n]")).simplified();
-
-    if (param.isEmpty()) {
-        ThemeEnginePrivate::setError("Empty QML import statement!");
-        return false;
-    }
-
-    QStringList import = param.split(',');
-    QString importUrl = (import.count() >= 1) ? import[0].simplified().prepend("import ") : QString();
-    QString importPath = (import.count() < 2) ? QString() : import[1].simplified();
-
-    // check whether we have the import set
-    if (!loader->imports.contains(importUrl)) {
-        loader->imports += importUrl + '\n';
-
-        if (!importPath.isEmpty()) {
-            importPath = urlMacro(importPath, stream);
-            if (!loader->m_engine->importPathList().contains(importPath))
-                loader->m_engine->addImportPath(importPath);
-        }
-
-    } else {
-        // FIXME show warning instead of error, but continue parsing
-//        ThemeEnginePrivate::setError(QString("QML import %1 allready added!").
-//                                     arg(import[0]));
-        return true;
-    }
-
-    return true;
-}
-
-/*=============================================================================
-  CSS-LIKE THEME LOADER
-=============================================================================*/
-
-QmlThemeLoader::QmlThemeLoader(QQmlEngine *engine)
-{
-    m_engine = engine;
-    // fill the callback maps
-    rules["import url"] = handleImport;
-    rules["qml-mapping"] = handleQmlMapping;
-    rules["qml-import"] = handleQmlImport;
-}
-
-bool QmlThemeLoader::loadTheme(const QUrl &url, QStringList &themeFiles, StyleCache &cache)
-{
-    bool ok = true;
-    // add toolkit as default import due to Style type
-    imports = "import Ubuntu.Components 0.1\n";
-    // parses the theme
-    if (parseTheme(url)) {
-
-        normalizeStyles();
-        // build up the QML style tree
-        if (!generateStyleQml(cache)) {
-            ok = false;
-        } else
-            themeFiles<< url.path() << this->themeFiles;
-
-        // cleanup
-        ruleString.clear();
-        imports.clear();
-        qmlMap.clear();
-        selectorTable.clear();
-    }
-
-    return ok;
-}

=== removed file 'modules/Ubuntu/Components/plugin/qmlthemeloader_p.h'
--- modules/Ubuntu/Components/plugin/qmlthemeloader_p.h	2013-03-14 07:27:02 +0000
+++ modules/Ubuntu/Components/plugin/qmlthemeloader_p.h	1970-01-01 00:00:00 +0000
@@ -1,95 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Zsombor Egri <[e-mail]>
- */
-
-#ifndef QMLTHEMELOADER_P_H
-#define QMLTHEMELOADER_P_H
-
-#include "themeengine_p.h"
-#include "themeloader_p.h"
-#include <QtCore/QTextStream>
-
-// CSS-like theme loader
-class QmlThemeLoader;
-typedef bool (*ParserCallback)(QmlThemeLoader *loader, QTextStream &stream);
-
-typedef QHash<QString, QString> PropertyHash;
-
-class PropertyMap {
-public:
-    PropertyMap() : normalized(false){}
-    bool normalized;
-    PropertyHash properties;
-    inline bool merge(const PropertyMap &other, bool overrides)
-    {
-        bool result = false;
-        QHashIterator<QString, QString> i(other.properties);
-        while (i.hasNext()) {
-            i.next();
-            if (overrides || !properties.contains(i.key())) {
-                properties.insert(i.key(), i.value());
-                result = true;
-            }
-        }
-        return result;
-    }
-};
-
-class QmlThemeLoader : public ThemeLoader {
-    Q_INTERFACES(ThemeLoader)
-public:
-    QmlThemeLoader(QQmlEngine *engine);
-    virtual ~QmlThemeLoader(){}
-    bool loadTheme(const QUrl &path, QStringList &themeFiles, StyleCache &cache);
-
-private:
-    QStringList themeFiles;
-
-private:
-
-    static QString urlMacro(const QString &param, const QTextStream &stream);
-    static QString readChar(QTextStream &stream, const QRegExp &bypassTokens = QRegExp("[ \t\r\n]"));
-    static QString readTillToken(QTextStream &stream, const QRegExp &tokens, const QRegExp &bypassTokens = QRegExp(), bool excludeToken = true);
-    static QString readDeclarationBlock(QTextStream &stream);
-    static void parseDeclarationBlock(const QString &blockData, PropertyMap &properties, const QTextStream &stream);
-    static void patchDeclarationValue(QString &value, const QTextStream &stream);
-    void handleSelector(const Selector &path, const PropertyMap &newProperties);
-    void normalizeStyles();
-    bool updateRuleProperties(Selector &selector, PropertyMap &propertyMap, bool override);
-    bool normalizeSelector(const Selector &selector);
-    bool parseTheme(const QUrl &url);
-    bool parseAtRules(QTextStream &stream);
-    bool parseDeclarations(QString &data, QTextStream &stream);
-    bool generateStyleQml(StyleCache &cache);
-    QPair<QString, QString> selectorMapping(const Selector &selector);
-    void buildStyleAndDelegate(Selector &selector, PropertyHash &properties, QString &style, QString &delegate);
-
-    // @-rule handlers
-    static bool handleImport(QmlThemeLoader *loader, QTextStream &stream);
-    static bool handleQmlMapping(QmlThemeLoader *loader, QTextStream &stream);
-    static bool handleQmlImport(QmlThemeLoader *loader, QTextStream &stream);
-
-    QString imports;
-    QString ruleString;
-    QHash<QString, ParserCallback> rules;
-    QHash<QString, QPair<QString, QString> > qmlMap;
-    QHash<Selector, PropertyMap > selectorTable;
-};
-
-
-
-#endif // QMLTHEMELOADER_P_H

=== removed file 'modules/Ubuntu/Components/plugin/selector.cpp'
--- modules/Ubuntu/Components/plugin/selector.cpp	2013-04-26 09:51:27 +0000
+++ modules/Ubuntu/Components/plugin/selector.cpp	1970-01-01 00:00:00 +0000
@@ -1,339 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Zsombor Egri <[e-mail]>
- */
-
-#include "selector_p.h"
-#include "itemstyleattached.h"
-#include "itemstyleattached_p.h"
-#include "themeengine_p.h"
-#include "quickutils.h"
-#include <QtCore/QStringList>
-#include <QtCore/QRegularExpression>
-#include <QtQuick/QQuickItem>
-
-SelectorNode::SelectorNode() :
-    relationship(Descendant), ranking(RankNull)
-{}
-
-SelectorNode::SelectorNode(const SelectorNode &other):
-    className(other.className), styleClass(other.styleClass),
-    styleId(other.styleId), relationship(other.relationship), ranking(RankNull)
-{
-    updateRanking();
-}
-
-SelectorNode::SelectorNode(const SelectorNode &other, int ignore) :
-    className(other.className), relationship(Descendant), ranking(RankNull)
-{
-    if ((ignore & NoStyleId) != NoStyleId)
-        styleId = other.styleId;
-    styleClass = other.styleClass;
-    if ((ignore & NoDerivates) == NoDerivates)
-        styleClass.remove(derivates());
-    if ((ignore & NoRelation) != NoRelation)
-        relationship = other.relationship;
-    updateRanking();
-}
-
-/*!
-    \internal
-    Creates an instance of a SelectorNode by parsing the selectorString. The
-    sensitivity parameter configures the node so that during string conversion
-    and comparison ignores the relationship, the name both or none. This feature
-    is used when building up QmlTheme selectorTable.
-*/
-SelectorNode::SelectorNode(const QString &selectorString) :
-    relationship(Descendant), ranking(RankNull)
-{
-    styleClass = selectorString.toLower().trimmed();
-    if (styleClass.startsWith('>')) {
-        relationship = Child;
-        styleClass.remove('>');
-    }
-    int idIndex = styleClass.indexOf('#');
-    if (idIndex != -1) {
-        styleId = styleClass.mid(idIndex + 1).toLower();
-        styleClass = styleClass.left(idIndex);
-        if (idIndex > 1 && styleClass[0] == '.')
-            styleClass = styleClass.mid(1, idIndex - 1);
-    } else if (styleClass[0] == '.')
-        styleClass = styleClass.mid(1);
-    updateRanking();
-}
-/*!
- * \internal
- * Creates a selector node with the given type, class, id and relation.
- */
-SelectorNode::SelectorNode(const QString &stype, const QString &sclass, const QString &sid, SelectorNode::Relationship srelation) :
-    className(stype), styleClass(sclass), styleId(sid), relationship(srelation), ranking(RankNull)
-{
-    updateRanking();
-}
-
-/*!
- * \internal
- * Creates a selector node filling information gathered from the given item.
- */
-SelectorNode::SelectorNode(QQuickItem *item) :
-    relationship(Descendant), ranking(RankNull)
-{
-    update(item);
-}
-
-/*!
-    \internal
-    Converts a SelectorNode into string using "<relation> .<class>#<name>"
-    format. Depending on the ignore flags set, may ignore the relationship, derivates
-    and styleId. The default ignore flag is Nothing.
-  */
-//FIXME: remove ignore flags after the lookup is cleaned&fixed
-QString SelectorNode::toString(int ignore) const
-{
-    QString result;
-    if (((ignore & NoRelation) !=  NoRelation) &&
-            (relationship == SelectorNode::Child))
-        result += ">";
-    if (!styleClass.isEmpty())
-        result += "." + styleClass;
-    else if (!className.isEmpty()) {
-        result += '.' + className;
-    }
-    if ((ignore & NoDerivates) == NoDerivates)
-        result.remove(derivates());
-    if (((ignore & NoStyleId) !=  NoStyleId) && !styleId.isEmpty())
-        result += "#" + styleId;
-    return result;
-}
-
-/*!
- * \internal
- * The method updates the selector node by fetching information from the item.
- */
-void SelectorNode::update(QQuickItem *item)
-{
-    ItemStyleAttached *style = ThemeEnginePrivate::attachedStyle(item);
-    if (!style)
-        return;
-    className = QuickUtils::instance().className(item);
-    styleClass = style->d_ptr->styleClass;
-    styleId = style->d_ptr->styleId;
-    updateRanking();
-}
-
-/*!
- * \internal
- * The function returns the rank of the selector node based on the layer, which
- * is its index in the selector.
- * Each node has two bits reserved for ranking, where one bit specifies whether
- * the direct child separator is present and th eother bit specifies whether the
- * style ID is present. These bits are shifted leftwards with the layer -1 value,
- * layer 0 being the root node which is not in use.
- */
-unsigned SelectorNode::rank()
-{
-    return ranking;
-}
-
-bool SelectorNode::operator==(const SelectorNode &other) const
-{
-    QString myClass = (styleClass.isEmpty()) ? className : styleClass;
-    QString otherClass = (other.styleClass.isEmpty()) ? other.className : other.styleClass;
-
-    return (myClass == otherClass) && (styleId == other.styleId) && (relationship == other.relationship);
-}
-
-/*!
- * \internal
- * Returns the style type.
- * to QML.
- */
-QString SelectorNode::type() const
-{
-    return className;
-}
-
-/*!
- * \internal
- * Returns the style class and its derivates in one string that is presentable
- * to QML.
- */
-QString SelectorNode::getClass() const
-{
-    if (styleClass.indexOf('.') != -1)
-        return styleClass.left(styleClass.indexOf('.'));
-    return styleClass;
-}
-
-/*!
- * \internal
- * Returns the selectors the current one's properties are derived from.
- */
-QString SelectorNode::derivates() const
-{
-    QString result;
-    //cut the derivates from the style class
-    int derivesIndex = styleClass.indexOf('.');
-    if (derivesIndex != -1)
-        result = styleClass.mid(derivesIndex);
-
-    return result;
-}
-
-/*!
- * \internal
- * Returns the style ID;
- */
-QString SelectorNode::id() const
-{
-    return styleId;
-}
-
-/*!
- * \internal
- * Retiurns the reference to the relationship.
- */
-SelectorNode::Relationship SelectorNode::relation()
-{
-    return relationship;
-}
-
-/*!
-  \internal
-  Hash key for SelectorNode. Uses QString's hash function.
-  */
-uint qHash(const SelectorNode &key)
-{
-    return qHash(key.toString());
-}
-
-
-/*!
- * \internal
- * Converts a selector string into Selector object. Does not accept 32-node longer
- * selector;
- * Current support (ref: www.w3.org/TR/selector.html):
- *  - Type selectors, e.g: "Button"
- *  - Descendant selectors, e.g: "Dialog Button"
- *  - Child selectors, e.g: "Dialog>Button"
- *  - ID selectors, e.g: "Button#mySpecialButton"
- */
-Selector::Selector(const QString &string) :
-    m_owner(0)
-{
-    QString tmp(string.trimmed());
-    // prepare for split
-    if (tmp.contains('>')) {
-        tmp.replace(QRegularExpression("[ ]*(>)[ ]*"), ">").replace('>', "|>");
-    }
-    tmp.replace(' ', '|');
-
-    QStringList nodes = tmp.simplified().split('|');
-    QStringListIterator inodes(nodes);
-    inodes.toBack();
-    while (inodes.hasPrevious()) {
-        const QString &node = inodes.previous();
-        if (node.isEmpty())
-            continue;
-        prepend(SelectorNode(node));
-    }
-}
-
-/*!
- * \internal
- * Builds the selector for the given item.
- */
-Selector::Selector(QQuickItem *item) :
-    m_owner(item)
-{
-    SelectorNode::Relationship relation = SelectorNode::Child;
-    QQuickItem *parent = m_owner->parentItem();
-
-    prepend(SelectorNode(m_owner));
-
-    while (parent) {
-        if (!ThemeEnginePrivate::attachedStyle(parent))
-            relation = SelectorNode::Descendant;
-        else {
-            // update relationship
-            first().relationship = relation;
-            prepend(SelectorNode(parent));
-            relation = SelectorNode::Child;
-        }
-        parent = parent->parentItem();
-    }
-}
-
-/*!
-  \internal
-  Converts a style path back to selector string.
-*/
-QString Selector::toString() const
-{
-    QString result;
-
-    QListIterator<SelectorNode> i(*this);
-    while (i.hasNext()) {
-        SelectorNode node = i.next();
-        result += ' ' + node.toString();
-    }
-    result.replace(" >", ">");
-    return result.simplified();
-}
-
-/*!
- * \internal
- * The method calculates the ranking of the selector itself, which is a
- * combination of the node rankings. The node rankings being bitmasks each of
- * them consuming 2 bits implies that the maximum depth of the selector can be
- * not more than 32 nodes.
- */
-int64_t Selector::rank() const
-{
-    int64_t result = 0;
-    int nodes = size();
-    SelectorNode node;
-    int i;
-    for (i = nodes - 1; i >= 0; --i) {
-        node = at(i);
-        result |= ((int64_t)node.rank()) << 2 * i;
-    }
-    return result;
-}
-
-/*!
- * \internal
- * The method updates the selector by fetching information from the owner. This
- * method has meaning only if the selector was created using an item.
- */
-void Selector::update()
-{
-    if (!m_owner)
-        return;
-    last().update(m_owner);
-}
-
-
-
-/*!
-  \internal
-  Hash key for Selector. Uses QString's hash function.
-  */
-uint qHash(const Selector &key)
-{
-    return qHash(key.toString());
-}
-

=== removed file 'modules/Ubuntu/Components/plugin/selector_p.h'
--- modules/Ubuntu/Components/plugin/selector_p.h	2013-04-26 09:37:22 +0000
+++ modules/Ubuntu/Components/plugin/selector_p.h	1970-01-01 00:00:00 +0000
@@ -1,107 +0,0 @@
-/*
- * Copyright 2012 Canonical Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Author: Zsombor Egri <[e-mail]>
- */
-
-#ifndef SELECTOR_P_H
-#define SELECTOR_P_H
-
-#include <QtCore/QHash>
-#include <QtCore/QString>
-#include <QtCore/QList>
-
-class QQuickItem;
-class Selector;
-// node of a selector
-class SelectorNode {
-    public:
-    enum Relationship {
-        Child,
-        Descendant
-    };
-    enum IgnoreFlags {
-        IgnoreNone = 0,
-        NoRelation = 0x01,
-        NoStyleId = 0x02,
-        NoDerivates = 0x04,
-        IgnoreAll = NoRelation | NoStyleId | NoDerivates};
-    enum RankFlags {
-        RankNull = 0,
-        RankId = 0x01,
-        RankChild = 0x02,
-        RankFull = RankId | RankChild
-    };
-
-    SelectorNode();
-    SelectorNode(const SelectorNode &other);
-    SelectorNode(const SelectorNode &other, int ignore);
-    SelectorNode(const QString &selectorString);
-    SelectorNode(const QString &stype, const QString &sclass, const QString &sid, SelectorNode::Relationship srelation);
-    SelectorNode(QQuickItem *item);
-    inline bool isStrictRelationed() {
-        return (relationship == Child);
-    }
-    inline bool isEmpty() {
-        return className.isEmpty() && styleClass.isEmpty() && styleId.isEmpty();
-    }
-
-    QString toString(int ignore = IgnoreNone) const;
-    void update(QQuickItem *item);
-    unsigned rank();
-    bool operator==(const SelectorNode &other) const;
-    // getters
-    QString type() const;
-    QString getClass() const;
-    QString derivates() const;
-    QString id() const;
-    Relationship relation();
-private:
-    // hide them so we don't mess them accidentaly
-    QString className;
-    QString styleClass;
-    QString styleId;