@@ -15,9 +15,7 @@
1515 */
1616
1717import QtQuick 2.4
18−
1918import Ubuntu.Components 1.3
20−import Ubuntu.Components.Themes 1.3
2119import Ubuntu.Components.Popups 1.3
2220import Utils 0.1
2321
@@ -35,20 +33,19 @@ Dialog {
3533
3634 default property alias columnContents: column.data
3735
38− onVisibleChanged: { if (!visible && dialogLoader) { dialogLoader.active = false; } }
36+ onVisibleChanged: {
37+ if (!visible && dialogLoader) {
38+ dialogLoader.active = false;
39+ }
40+ }
3941
4042 focus: true
4143
42− // FIXME: this is a hack because Dialog subtheming seems broken atm
43− // https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1555548
44− ThemeSettings {
45− id: themeHack
44+ theme: ThemeSettings {
45+ name: "Ubuntu.Components.Themes.Ambiance"
4646 }
4747
4848 Component.onCompleted: {
49− themeHack.palette.normal.overlay = "white";
50− themeHack.palette.normal.overlayText = UbuntuColors.slate;
51− __foreground.theme = themeHack
5249 show();
5350 }
5451