bad7b51 · unity8 · git.iko.soy

cmake/modules/autopilot.cmake+2−2

compare with xenial

unifiedsplit

@@ -2,7 +2,7 @@ add_custom_target(autopilot)

2

3function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)

4 add_custom_target(autopilot-${TEST_NAME}

5− COMMAND LANG=C UBUNTU_ICON_THEME=ubuntu-mobile QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python3 -m autopilot.run run ${TEST_SUITE}

5+ COMMAND LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python3 -m autopilot.run run ${TEST_SUITE}

6 WORKING_DIRECTORY ${WORKING_DIR}

7 DEPENDS fake_install

8 )

@@ -14,7 +14,7 @@ function(declare_autopilot_test TEST_NAME TEST_SUITE WORKING_DIR)

14 add_dependencies(autopilot autopilot-${TEST_NAME})

15

16 add_custom_target(autopilot2-${TEST_NAME}

17− COMMAND LANG=C UBUNTU_ICON_THEME=ubuntu-mobile QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python2 -m autopilot.run run ${TEST_SUITE}

17+ COMMAND LANG=C QML2_IMPORT_PATH=${SHELL_INSTALL_QML}/mocks python2 -m autopilot.run run ${TEST_SUITE}

18 WORKING_DIRECTORY ${WORKING_DIR}

19 DEPENDS fake_install

20 )

debian/changelog+6

@@ -1,3 +1,9 @@

1+unity8 (7.90-0ubuntu1) UNRELEASED; urgency=medium

2+

3+ * Adapt to suru theme.

4+

5+ -- Michał Sawicz <michal.sawicz@canonical.com> Fri, 23 May 2014 10:32:08 +0200

6+

1unity8 (7.89+14.10.20140627-0ubuntu1) utopic; urgency=low

7unity8 (7.89+14.10.20140627-0ubuntu1) utopic; urgency=low

2

8

3 [ Michael Terry ]

9 [ Michael Terry ]

debian/control+5−5

@@ -37,8 +37,8 @@ Build-Depends: cmake,

37 qtdeclarative5-dev-tools,

38 qtdeclarative5-private-dev (>= 5.2.1),

39 qtdeclarative5-qtmultimedia-plugin,

40− qtdeclarative5-ubuntu-settings-components,

40+ qtdeclarative5-ubuntu-settings-components (>= 0.2),

41− qtdeclarative5-ubuntu-ui-toolkit-plugin,

41+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.48),

42 ttf-ubuntu-font-family,

43Standards-Version: 3.9.4

44Homepage: http://launchpad.net/unity

@@ -51,7 +51,7 @@ Vcs-Browser: https://bazaar.launchpad.net/~unity-team/unity8/trunk

51Package: indicators-client

52Architecture: amd64 armhf i386

53Depends: qmenumodel-qml (>= 0.2.7),

54− qtdeclarative5-ubuntu-ui-toolkit-plugin,

54+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.48),

55 unity8 (= ${binary:Version}),

56 ${misc:Depends},

57 ${shlibs:Depends},

@@ -78,7 +78,7 @@ Depends: gsettings-desktop-schemas,

78 qmenumodel-qml (>= 0.2.7),

79 qml-module-qtquick-xmllistmodel,

80 qtdeclarative5-gsettings1.0,

81− qtdeclarative5-ubuntu-settings-components,

81+ qtdeclarative5-ubuntu-settings-components (>= 0.2),

82 unity-launcher-impl-3,

83 unity8-common (= ${source:Version}),

84 unity8-private (= ${binary:Version}),

@@ -99,7 +99,7 @@ Description: Unity 8 shell

99Package: unity8-common

100Architecture: all

101Depends: qtdeclarative5-ubuntu-thumbnailer0.1 | ubuntu-thumbnailer-impl,

102− qtdeclarative5-ubuntu-ui-toolkit-plugin,

102+ qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.48),

103 qtdeclarative5-unity-notifications-plugin | unity-notifications-impl,

104 ubuntu-thumbnailer-impl-0,

105 unity-application-impl-2,

include/paths.h.in−8

@@ -127,12 +127,4 @@ inline void appendImportPaths(QQmlEngine *engine, const QStringList &paths)

127 engine->setImportPathList(importPathList);

128}

129

130−inline void resolveIconTheme() {

131− const char *ubuntuIconTheme = getenv("UBUNTU_ICON_THEME");

132− if (ubuntuIconTheme == NULL) {

133− ubuntuIconTheme = "ubuntu-mobile";

134− }

135− QIcon::setThemeName(ubuntuIconTheme);

136−}

137−

138#endif

130#endif

plugins/Unity/Indicators/qml/MenuItemFactory.qml+1−1

@@ -165,7 +165,7 @@ Item {

165

166 Component {

167 id: standardMenu;

168− ListItems.Standard {

168+ Menus.StandardMenu {

169 objectName: "standardMenu"

170 property QtObject menuData: null

171 property int menuIndex: -1

qml/Launcher/LauncherDelegate.qml+1

@@ -63,6 +63,7 @@ Item {

63 id: iconImage

64 sourceSize.width: iconShape.width

65 sourceSize.height: iconShape.height

66+ fillMode: Image.PreserveAspectCrop

66 source: root.iconName

67 source: root.iconName

67 }

68 }

69 }

qml/Panel/Indicators/DefaultIndicatorWidget.qml+13−29

@@ -19,12 +19,13 @@

19

20import QtQuick 2.0

21import Ubuntu.Components 0.1

22+import Ubuntu.Settings.Components 0.1

22import Unity.Indicators 0.1 as Indicators

23import Unity.Indicators 0.1 as Indicators

23

24

24Indicators.IndicatorBase {

25Indicators.IndicatorBase {

25 id: indicatorWidget

26 id: indicatorWidget

26

27

27− property int iconSize: height

28+ property int iconSize: units.gu(2)

28 property alias leftLabel: itemLeftLabel.text

29 property alias leftLabel: itemLeftLabel.text

29 property alias rightLabel: itemRightLabel.text

30 property alias rightLabel: itemRightLabel.text

30 property var icons: undefined

31 property var icons: undefined

@@ -34,7 +35,6 @@ Indicators.IndicatorBase {

34

35

35 Row {

36 Row {

36 id: itemRow

37 id: itemRow

37− width: childrenRect.width

38 objectName: "itemRow"

39 anchors {

40 top: parent.top

@@ -44,7 +44,7 @@ Indicators.IndicatorBase {

44

45 Label {

46 id: itemLeftLabel

47− width: guRoundUp(implicitWidth)

47+ width: contentWidth + units.gu(1)

48 objectName: "leftLabel"

49 color: Theme.palette.selected.backgroundText

50 opacity: 0.8

@@ -52,10 +52,10 @@ Indicators.IndicatorBase {

52 fontSize: "medium"

53 anchors.verticalCenter: parent.verticalCenter

54 visible: text != ""

55+ horizontalAlignment: Text.AlignHCenter

55 }

56 }

56

57

57 Row {

58 Row {

58− width: childrenRect.width

59 anchors {

60 top: parent.top

61 bottom: parent.bottom

@@ -65,22 +65,16 @@ Indicators.IndicatorBase {

65 model: indicatorWidget.icons

66

67 Item {

68− width: guRoundUp(itemImage.width)

68+ width: itemImage.width + units.gu(1)

69− height: indicatorWidget.iconSize

69+ anchors { top: parent.top; bottom: parent.bottom }

70

71− Image {

71+ StatusIcon {

72 id: itemImage

73− objectName: "itemImage"

73+ height: indicatorWidget.iconSize

74− visible: source != ""

74+ anchors.centerIn: parent

75 source: modelData

76− height: parent.height

76+ sets: ["status", "actions"]

77− anchors.horizontalCenter: parent.horizontalCenter

77+ color: "#CCCCCC"

78− fillMode: Image.PreserveAspectFit

79−

80− sourceSize {

81− width: indicatorWidget.iconSize

82− height: indicatorWidget.iconSize

83− }

84 }

78 }

85 }

79 }

86 }

80 }

@@ -88,7 +82,7 @@ Indicators.IndicatorBase {

88

82

89 Label {

83 Label {

90 id: itemRightLabel

84 id: itemRightLabel

91− width: guRoundUp(implicitWidth)

85+ width: contentWidth + units.gu(1)

92 objectName: "rightLabel"

86 objectName: "rightLabel"

93 color: Theme.palette.selected.backgroundText

87 color: Theme.palette.selected.backgroundText

94 opacity: 0.8

88 opacity: 0.8

@@ -96,20 +90,10 @@ Indicators.IndicatorBase {

96 fontSize: "medium"

90 fontSize: "medium"

97 anchors.verticalCenter: parent.verticalCenter

91 anchors.verticalCenter: parent.verticalCenter

98 visible: text != ""

92 visible: text != ""

93+ horizontalAlignment: Text.AlignHCenter

99 }

94 }

100 }

95 }

101

96

102− // TODO: Use toolkit function https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1242575

103− function guRoundUp(width) {

104− if (width == 0) {

105− return 0;

106− }

107− var gu1 = units.gu(1.0);

108− var mod = (width % gu1);

109−

110− return mod == 0 ? width : width + (gu1 - mod);

111− }

112−

113 onRootActionStateChanged: {

97 onRootActionStateChanged: {

114 if (rootActionState == undefined) {

98 if (rootActionState == undefined) {

115 leftLabel = "";

99 leftLabel = "";

qml/Panel/Panel.qml+1−1

@@ -21,7 +21,7 @@ import "../Components"

21Item {

22 id: root

23 readonly property real panelHeight: units.gu(3) + units.dp(2)

24− property real indicatorsMenuWidth: (shell.width > units.gu(60)) ? units.gu(40) : shell.width

24+ property real indicatorsMenuWidth: width

25 property alias indicators: indicatorsMenu

26 property bool fullscreenMode: false

27 property bool searchVisible: true

run.sh−6

@@ -57,12 +57,6 @@ if $KEYLOCK; then

57 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/builddir/tests/mocks/libusermetrics:$PWD/builddir/tests/mocks/LightDM/single-passphrase

58fi

59

60−# Force icon theme if running on the desktop, otherwise gnome theme (if running

61−# on Ubuntu Desktop) will be used and icons won't be found

62−if [ -n "$DESKTOP_SESSION" ]; then

63− export UBUNTU_ICON_THEME=ubuntu-mobile

64−fi

65−

66QML_PHONE_SHELL_ARGS=""

60QML_PHONE_SHELL_ARGS=""

67if $MOUSE_TOUCH; then

61if $MOUSE_TOUCH; then

68 QML_PHONE_SHELL_ARGS="$QML_PHONE_SHELL_ARGS -mousetouch"

62 QML_PHONE_SHELL_ARGS="$QML_PHONE_SHELL_ARGS -mousetouch"

src/Panel/Indicators/client/indicatorsclient.cpp−1

@@ -32,7 +32,6 @@ IndicatorsClient::IndicatorsClient(int &argc, char **argv)

32 m_view(0)

33{

34 m_application = new QApplication(argc, argv);

35− resolveIconTheme();

36

35

37 QStringList args = m_application->arguments();

36 QStringList args = m_application->arguments();

38

37

src/main.cpp−2

@@ -96,8 +96,6 @@ Load the testability driver");

96 indicatorProfile = "phone";

97 }

98

99− resolveIconTheme();

100−

101 ApplicationArguments qmlArgs;

99 ApplicationArguments qmlArgs;

102 if (parser.isSet(windowGeometryOption) &&

100 if (parser.isSet(windowGeometryOption) &&

103 parser.value(windowGeometryOption).split('x').size() == 2)

101 parser.value(windowGeometryOption).split('x').size() == 2)

tests/qmltests/Panel/Indicators/tst_DefaultIndicatorWidget.qml+2−40

@@ -41,12 +41,6 @@ Item {

41

42 iconSize: units.gu(3.2)

43 height: units.gu(3)

44−

45− rootActionState {

46− icons: [ "image://theme/audio-volume-high", "image://theme/audio-volume-low" ]

47− leftLabel: "left"

48− rightLabel: "right"

49− }

50 }

44 }

51

45

52 UT.UnityTestCase {

46 UT.UnityTestCase {

@@ -57,41 +51,9 @@ Item {

57 widget.rootActionState.icons = [];

51 widget.rootActionState.icons = [];

58 widget.rootActionState.leftLabel = "";

52 widget.rootActionState.leftLabel = "";

59 widget.rootActionState.rightLabel = "";

53 widget.rootActionState.rightLabel = "";

60− wait(50);

54+ waitForRendering(widget)

61− }

62−

63− function test_guRoundedWidth_data() {

64− return [

65− { tag: "empty", icons: [], leftLabel: "", rightLabel: "" },

66− { tag: "1-icon-no-label", icons: [ "image://theme/audio-volume-high" ], leftLabel: "", rightLabel: "" },

67− { tag: "2-icon-no-label", icons: [ "image://theme/audio-volume-high", "image://theme/audio-volume-low" ], leftLabel: "", rightLabel: "" },

68− { tag: "no-icon-l-label", icons: [], leftLabel: "left", rightLabel: "" },

69− { tag: "no-icon-lr-label", icons: [], leftLabel: "left", rightLabel: "right" },

70− { tag: "1-icon-l-label", icons: [ "image://theme/audio-volume-high" ], leftLabel: "left", rightLabel: "" },

71− { tag: "1-icon-lr-label", icons: [ "image://theme/audio-volume-high" ], leftLabel: "left", rightLabel: "right" },

72− { tag: "2-icon-l-label", icons: [ "image://theme/audio-volume-high", "image://theme/audio-volume-low" ], leftLabel: "left", rightLabel: "" },

73− { tag: "2-icon-lr-label", icons: [ "image://theme/audio-volume-high", "image://theme/audio-volume-low" ], leftLabel: "left", rightLabel: "right" }

74− ];

75− }

76−

77− function test_guRoundedWidth(data) {

78− widget.rootActionState.icons = data.icons

79− widget.rootActionState.leftLabel = data.leftLabel;

80− widget.rootActionState.rightLabel = data.rightLabel;

81− wait(50);

82−

83− compare(widget.width, guRoundUp(widget.width));

84− }

85− }

86−

87− // TODO: Use toolkit function https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1242575

88− function guRoundUp(width) {

89− if (width == 0) {

90− return 0;

91 }

55 }

92− var gu1 = units.gu(1.0);

93− var mod = (width % gu1);

94

56

95− return mod == 0 ? width : width + (gu1 - mod);

57+ // FIXME: add tests

96 }

58 }

97}

59}

tools/scopetool.cpp−2

@@ -77,8 +77,6 @@ int main(int argc, char *argv[])

77 tracker.reset(new RegistryTracker(extraScopes, systemScopes, serverScopes));

78 }

79

80− resolveIconTheme();

81−

82 bindtextdomain("unity8", translationDirectory().toUtf8().data());

80 bindtextdomain("unity8", translationDirectory().toUtf8().data());

83

81

84 QQuickView* view = new QQuickView();

82 QQuickView* view = new QQuickView();