9c3448d · unity8 · git.iko.soy

Dash/DashBar.qml+2−2

compare with xenial

unifiedsplit

@@ -35,7 +35,7 @@ Item {

35

36 function startNavigation() {

37 timeout.stop()

38− panel.opened = true

38+ panel.open()

39 }

40

41 function stopNavigation() {

@@ -43,7 +43,7 @@ Item {

43 }

44

45 function finishNavigation() {

46− panel.opened = false

46+ panel.close()

47 }

48

49 Timer {

Dash/DashContent.qml+2−2

@@ -116,8 +116,8 @@ Item {

116 source: scopeMapper.map(scope.id)

117 objectName: scope.id + " loader"

118

119− readonly property bool previewShown: item.previewShown

119+ readonly property bool previewShown: item ? item.previewShown : false

120− readonly property bool moving: item.moving

120+ readonly property bool moving: item ? item.moving : false

121

122 // these are needed for autopilot tests

123 readonly property string scopeId: scope.id

Launcher/LauncherPanel.qml+87−46

@@ -21,6 +21,7 @@ import Unity 0.1

21import Unity.Launcher 0.1

22import Ubuntu.Components.Popups 0.1

23import "../Components/ListItems"

24+import "../Components/"

24

25

25Item {

26Item {

26 id: root

27 id: root

@@ -31,7 +32,7 @@ Item {

31 property bool inverted: true

32 property bool inverted: true

32 property bool dragging: false

33 property bool dragging: false

33 property bool moving: launcherListView.moving || launcherListView.flicking

34 property bool moving: launcherListView.moving || launcherListView.flicking

34− property bool preventHiding: moving || dndArea.draggedIndex >= 0 || dndArea.quickListPopover !== null || dndArea.pressed

35+ property bool preventHiding: moving || dndArea.draggedIndex >= 0 || quickList.state === "open" || dndArea.pressed

35 property int highlightIndex: -1

36 property int highlightIndex: -1

36

37

37 signal applicationSelected(string appId)

38 signal applicationSelected(string appId)

@@ -278,7 +279,6 @@ Item {

278 property bool postDragging: false

279 property bool postDragging: false

279 property int startX

280 property int startX

280 property int startY

281 property int startY

281− property var quickListPopover: null

282

283 onPressed: {

284 selectedItem = launcherListView.itemAt(mouseX, mouseY + launcherListView.realContentY)

@@ -357,11 +357,10 @@ Item {

357 draggedIndex = Math.floor((mouseY + launcherListView.realContentY) / launcherListView.realItemHeight);

358

359 // Opening QuickList

360− var quickListModel = launcherListView.model.get(draggedIndex).quickList

360+ quickList.item = selectedItem;

361− var quickListAppId = launcherListView.model.get(draggedIndex).appId

361+ quickList.model = launcherListView.model.get(draggedIndex).quickList;

362−

362+ quickList.appId = launcherListView.model.get(draggedIndex).appId;

363− quickListPopover = PopupUtils.open(popoverComponent, selectedItem,

363+ quickList.state = "open";

364− {model: quickListModel, appId: quickListAppId})

365

364

366 launcherListView.interactive = false

365 launcherListView.interactive = false

367

366

@@ -387,7 +386,7 @@ Item {

387 var distance = Math.max(Math.abs(mouseX - startX), Math.abs(mouseY - startY))

386 var distance = Math.max(Math.abs(mouseX - startX), Math.abs(mouseY - startY))

388 if (!preDragging && distance > units.gu(1.5)) {

387 if (!preDragging && distance > units.gu(1.5)) {

389 preDragging = true;

388 preDragging = true;

390− PopupUtils.close(quickListPopover)

389+ quickList.state = "";

391 }

390 }

392 if (distance > launcherListView.itemHeight) {

391 if (distance > launcherListView.itemHeight) {

393 selectedItem.dragging = true

392 selectedItem.dragging = true

@@ -482,53 +481,95 @@ Item {

482 }

481 }

483 }

482 }

484

483

485− Component {

484+ UbuntuShapeForItem {

486− id: popoverComponent

485+ id: quickListShape

486+ objectName: "quickListShape"

487+ anchors.fill: quickList

488+ opacity: quickList.state === "open" ? 0.8 : 0

489+ visible: opacity > 0

490+ rotation: root.rotation

491+

492+ Behavior on opacity {

493+ UbuntuNumberAnimation {}

494+ }

495+

496+ image: quickList

497+

498+ Image {

499+ anchors {

500+ right: parent.left

501+ rightMargin: -units.dp(4)

502+ verticalCenter: parent.verticalCenter

503+ verticalCenterOffset: -quickList.offset

504+ }

505+ height: units.gu(1)

506+ width: units.gu(2)

507+ source: "graphics/quicklist_tooltip.png"

508+ rotation: 90

509+ }

510+

511+ InverseMouseArea {

512+ anchors.fill: parent

513+ enabled: quickList.state == "open"

514+ onClicked: {

515+ quickList.state = ""

516+ }

517+ }

518+

519+ }

520+

521+ Rectangle {

522+ id: quickList

523+ objectName: "quickList"

524+ color: "#221e1c"

525+ width: units.gu(30)

526+ height: quickListColumn.height

527+ anchors {

528+ left: root.inverted ? undefined : parent.right

529+ right: root.inverted ? parent.left : undefined

530+ margins: units.gu(1)

487

531

488− Popover {

532+ }

489− id: popover

533+ y: itemCenter - (height / 2) + offset

490− property var model

534+ rotation: root.rotation

491− property string appId

492− contentWidth: quickListColumn.width

493− foregroundStyle: QuicklistForegroundStyle {}

494

535

495− // FIXME: There's a bug in the Popover positioning that it covers the item in case it is rotated.

536+ property var model

496− // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1204470

537+ property string appId

497− // For now, let's move the Popover around with callerMargin.

538+ property var item

498− // Remove popupMargin once the bug is fixed.

499− property int popupMargin: root.inverted ? launcherListView.itemHeight : 0;

500

539

501− callerMargin: units.gu(1) + popupMargin

540+ // internal

541+ property int itemCenter: item ? root.mapFromItem(quickList.item).y + (item.height / 2) : units.gu(1)

542+ property int offset: itemCenter + (height/2) + units.gu(1) > parent.height ? -itemCenter - (height/2) - units.gu(1) + parent.height :

543+ itemCenter - (height/2) < units.gu(1) ? (height/2) - itemCenter + units.gu(1) : 0

502

544

503− Column {

545+ Column {

504− id: quickListColumn

546+ id: quickListColumn

505− width: units.gu(30)

547+ width: parent.width

506− height: childrenRect.height

548+ height: childrenRect.height

507

549

508− Repeater {

550+ Repeater {

509− id: popoverRepeater

551+ id: popoverRepeater

510− model: popover.model

552+ model: quickList.model

511

553

512− ListItems.Standard {

554+ ListItems.Standard {

513− objectName: "quickListEntry" + index

555+ objectName: "quickListEntry" + index

514− text: (model.clickable ? "" : "") + model.label + (model.clickable ? "" : "")

556+ text: (model.clickable ? "" : "") + model.label + (model.clickable ? "" : "")

515− highlightWhenPressed: model.clickable

557+ highlightWhenPressed: model.clickable

516

558

517− // FIXME: This is a workaround for the theme not being context sensitive. I.e. the

559+ // FIXME: This is a workaround for the theme not being context sensitive. I.e. the

518− // ListItems don't know that they are sitting in a themed Popover where the color

560+ // ListItems don't know that they are sitting in a themed Popover where the color

519− // needs to be inverted.

561+ // needs to be inverted.

520− __foregroundColor: Theme.palette.selected.backgroundText

562+ __foregroundColor: Theme.palette.selected.backgroundText

521

563

522− onClicked: {

564+ onClicked: {

523− if (!model.clickable) {

565+ if (!model.clickable) {

524− return;

566+ return;

525− }

526− PopupUtils.close(popover);

527− // Unsetting model to prevent showing changing entries during fading out

528− // that may happen because of triggering an action.

529− LauncherModel.quickListActionInvoked(appId, index);

530− popoverRepeater.model = undefined;

531 }

567 }

568+ quickList.state = "";

569+ // Unsetting model to prevent showing changing entries during fading out

570+ // that may happen because of triggering an action.

571+ LauncherModel.quickListActionInvoked(quickList.appId, index);

572+ quickList.model = undefined;

532 }

573 }

533 }

574 }

534 }

575 }

Launcher/QuicklistForegroundStyle.qmldeleted−23

@@ -1,23 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−import Ubuntu.Components.Themes.Ambiance 0.1

18−

19−PopoverForegroundStyle {

20− bubbleColor: "#221e1c"

21− bubbleOpacity: 0.9

22− arrowSource: "graphics/quicklist_tooltip.png"

23−}

debian/changelog+11

@@ -1,3 +1,14 @@

1+unity8 (7.83+14.04.20131031-0ubuntu1) trusty; urgency=low

2+

3+ [ Michał Sawicz ]

4+ * Use setenv as early as possible to avoid setenv and getenv clashing

5+ in multi-threaded situations. (LP: #1240866)

6+

7+ [ Ubuntu daily release ]

8+ * Automatic snapshot from revision 482

9+

10+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 31 Oct 2013 20:10:56 +0000

11+

1unity8 (7.83+14.04.20131028.1-0ubuntu1) trusty; urgency=low

12unity8 (7.83+14.04.20131028.1-0ubuntu1) trusty; urgency=low

2

13

3 * New rebuild forced

14 * New rebuild forced

main.cpp+8−8

@@ -78,14 +78,6 @@ void resolveIconTheme() {

78

79int startShell(int argc, const char** argv, void* server)

80{

81− /* Workaround Qt platform integration plugin not advertising itself

82− as having the following capabilities:

83− - QPlatformIntegration::ThreadedOpenGL

84− - QPlatformIntegration::BufferQueueingOpenGL

85− */

86− setenv("QML_FORCE_THREADED_RENDERER", "1", 1);

87− setenv("QML_FIXED_ANIMATION_STEP", "1", 1);

88−

89 const bool isUbuntuMirServer = qgetenv("QT_QPA_PLATFORM") == "ubuntumirserver";

81 const bool isUbuntuMirServer = qgetenv("QT_QPA_PLATFORM") == "ubuntumirserver";

90

82

91 QGuiApplication::setApplicationName("Unity 8");

83 QGuiApplication::setApplicationName("Unity 8");

@@ -186,6 +178,14 @@ int startShell(int argc, const char** argv, void* server)

186

178

187int main(int argc, const char *argv[])

179int main(int argc, const char *argv[])

188{

180{

181+ /* Workaround Qt platform integration plugin not advertising itself

182+ as having the following capabilities:

183+ - QPlatformIntegration::ThreadedOpenGL

184+ - QPlatformIntegration::BufferQueueingOpenGL

185+ */

186+ setenv("QML_FORCE_THREADED_RENDERER", "1", 1);

187+ setenv("QML_FIXED_ANIMATION_STEP", "1", 1);

188+

189 // For ubuntumirserver/ubuntumirclient

190 if (qgetenv("QT_QPA_PLATFORM").startsWith("ubuntumir")) {

191 setenv("QT_QPA_PLATFORM", "ubuntumirserver", 1);

plugins/Unity/Indicators/CMakeLists.txt+1

@@ -36,6 +36,7 @@ set(IndicatorsQML_SOURCES

36 unitymenumodelcache.cpp

37 unitymenumodelstack.cpp

38 visibleindicatorsmodel.cpp

39+ timeformatter.cpp

39)

40)

40add_definitions(-DUNITYINDICATORS_LIBRARY)

41add_definitions(-DUNITYINDICATORS_LIBRARY)

41

42

plugins/Unity/Indicators/Messaging/qml/MessageMenuItemFactory.qml+3−4

@@ -22,7 +22,6 @@ import QtQuick 2.0

22import Ubuntu.Components 0.1

23import Unity.Indicators 0.1 as Indicators

24import QMenuModel 0.1 as QMenuModel

25−import "utils.js" as Utils

26

25

27Indicators.BaseMenuItem {

26Indicators.BaseMenuItem {

28 id: menuItem

27 id: menuItem

@@ -65,7 +64,7 @@ Indicators.BaseMenuItem {

65 SimpleTextMessage {

64 SimpleTextMessage {

66 // text

65 // text

67 title: menu && menu.label ? menu.label : ""

66 title: menu && menu.label ? menu.label : ""

68− time: menu ? Utils.formatDate(menu.ext.xCanonicalTime) : ""

67+ time: menu ? menu.ext.xCanonicalTime : 0

69 message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""

68 message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""

70 // icons

69 // icons

71 avatar: menu && menu.ext.icon !== undefined ? menu.ext.icon : "qrc:/indicators/artwork/messaging/default_contact.png"

70 avatar: menu && menu.ext.icon !== undefined ? menu.ext.icon : "qrc:/indicators/artwork/messaging/default_contact.png"

@@ -90,7 +89,7 @@ Indicators.BaseMenuItem {

90

89

91 // text

90 // text

92 title: menu && menu.label ? menu.label : ""

91 title: menu && menu.label ? menu.label : ""

93− time: menu ? Utils.formatDate(menu.ext.xCanonicalTime) : ""

92+ time: menu ? menu.ext.xCanonicalTime : 0

94 message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""

93 message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""

95 replyButtonText: actionsDescription && actionsDescription[0].label ? actionsDescription[0].label : "Send"

94 replyButtonText: actionsDescription && actionsDescription[0].label ? actionsDescription[0].label : "Send"

96 // icons

95 // icons

@@ -126,7 +125,7 @@ Indicators.BaseMenuItem {

126

125

127 // text

126 // text

128 title: menu && menu.label ? menu.label : ""

127 title: menu && menu.label ? menu.label : ""

129− time: menu ? Utils.formatDate(menu.ext.xCanonicalTime) : ""

128+ time: menu ? menu.ext.xCanonicalTime : ""

130 message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""

129 message: menu && menu.ext.xCanonicalText ? menu.ext.xCanonicalText : ""

131 actionButtonText: actionsDescription && actionsDescription[0].label ? actionsDescription[0].label : "Call back"

130 actionButtonText: actionsDescription && actionsDescription[0].label ? actionsDescription[0].label : "Call back"

132 replyButtonText: actionsDescription && actionsDescription[1].label ? actionsDescription[1].label : "Send"

131 replyButtonText: actionsDescription && actionsDescription[1].label ? actionsDescription[1].label : "Send"

plugins/Unity/Indicators/Messaging/qml/SimpleTextMessage.qml+9−2

@@ -20,19 +20,20 @@

20

21import QtQuick 2.0

22import Ubuntu.Components 0.1

23+import Unity.Indicators 0.1

23

24

24HeroMessage {

25HeroMessage {

25 id: __heroMessage

26 id: __heroMessage

26

27

27 property string title: ""

28 property string title: ""

28− property string time: ""

29+ property var time

29 property string message: ""

30 property string message: ""

30

31

31 property alias footer: footerLoader.sourceComponent

32 property alias footer: footerLoader.sourceComponent

32

33

33 expandedHeight: fullMessage.y + fullMessage.height + units.gu(2)

34 expandedHeight: fullMessage.y + fullMessage.height + units.gu(2)

34 heroMessageHeader.titleText.text: title

35 heroMessageHeader.titleText.text: title

35− heroMessageHeader.subtitleText.text: time

36+ heroMessageHeader.subtitleText.text: timeFormatter.timeString

36 heroMessageHeader.bodyText.text: message

37 heroMessageHeader.bodyText.text: message

37

38

38 Item {

39 Item {

@@ -49,6 +50,12 @@ HeroMessage {

49 opacity: 0.0

50 opacity: 0.0

50 enabled: false

51 enabled: false

51

52

53+ TimeFormatter {

54+ id: timeFormatter

55+ time: __heroMessage.time

56+ format: "hh:mm - MMM dd"

57+ }

58+

52 Label {

59 Label {

53 id: bodyText

60 id: bodyText

54 anchors {

61 anchors {

plugins/Unity/Indicators/Messaging/qml/SnapDecision.qml+9−3

@@ -21,13 +21,13 @@

21import QtQuick 2.0

22import Ubuntu.Components 0.1

23import Unity.Indicators 0.1 as Indicators

24−import "utils.js" as Utils

24+import Unity.Indicators 0.1

25

26HeroMessage {

27 id: snapDecision

28

29 property string title: ""

30− property string time: ""

30+ property var time

31 property string message: ""

32

33 property bool activateEnabled: true

@@ -41,7 +41,7 @@ HeroMessage {

41 heroMessageHeader.titleText.text: title

42 heroMessageHeader.subtitleText.text: message

43 heroMessageHeader.subtitleText.color: "#e8e1d0"

44− heroMessageHeader.bodyText.text: time

44+ heroMessageHeader.bodyText.text: timeFormatter.timeString

45 heroMessageHeader.bodyText.color: "#8f8f88"

46

47 signal activate

@@ -59,6 +59,12 @@ HeroMessage {

59 height: units.gu(4)

60 opacity: 0.0

61

62+ TimeFormatter {

63+ id: timeFormatter

64+ time: snapDecision.time

65+ format: "hh:mm - MMM dd"

66+ }

67+

62 Button {

68 Button {

63 text: "Message"

69 text: "Message"

64 color: "#bababa"

70 color: "#bababa"

plugins/Unity/Indicators/Messaging/qml/utils.jsdeleted−27

@@ -1,27 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU Lesser General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU Lesser General Public License for more details.

12− *

13− * You should have received a copy of the GNU Lesser General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− *

16− * Authors:

17− * Renato Araujo Oliveira Filho <renato@canonical.com>

18− * Olivier Tilloy <olivier.tilloy@canonical.com>

19− */

20−

21−.pragma library

22−

23−function formatDate(timestamp) {

24− // timestamp is in microseconds since epoch

25− var date = new Date(timestamp / 1000);

26− return Qt.formatDateTime(date, "hh:mm - MMM dd");

27−}

plugins/Unity/Indicators/plugin.cpp+2

@@ -33,6 +33,7 @@

33#include "unitymenumodelcache.h"

34#include "unitymenumodelstack.h"

35#include "visibleindicatorsmodel.h"

36+#include "timeformatter.h"

36

37

37static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {

38static QObject* menuModelCacheSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {

38 Q_UNUSED(engine);

39 Q_UNUSED(engine);

@@ -51,6 +52,7 @@ void Indicators2Plugin::registerTypes(const char *uri)

51 qmlRegisterType<RootActionState>(uri, 0, 1, "RootActionState");

52 qmlRegisterType<RootActionState>(uri, 0, 1, "RootActionState");

52 qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");

53 qmlRegisterType<ModelPrinter>(uri, 0, 1, "ModelPrinter");

53 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");

54 qmlRegisterType<VisibleIndicatorsModel>(uri, 0, 1, "VisibleIndicatorsModel");

55+ qmlRegisterType<TimeFormatter>(uri, 0, 1, "TimeFormatter");

54

56

55 qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);

57 qmlRegisterSingletonType<UnityMenuModelCache>(uri, 0, 1, "UnityMenuModelCache", menuModelCacheSingleton);

56

58

plugins/Unity/Indicators/qml/IndicatorPage.qml+27−6

@@ -34,11 +34,36 @@ IndicatorBase {

34 Indicators.UnityMenuModelStack {

35 id: menuStack

36 head: contentActive ? main.menuModel : null

37+

38+ property var rootMenu: null

39+

40+ onTailChanged: {

41+ if (!tail) {

42+ rootMenu = null;

43+ } else if (rootMenu != tail) {

44+ if (tail.get(0, "type") === rootMenuType) {

45+ rootMenu = menuStack.tail.submenu(0);

46+ push(rootMenu, 0);

47+ } else {

48+ rootMenu = null;

49+ }

50+ }

51+ }

52+ }

53+

54+ Connections {

55+ target: menuStack.tail

56+ onRowsInserted: {

57+ if (menuStack.rootMenu !== menuStack.tail && menuStack.tail.get(0, "type") === rootMenuType) {

58+ menuStack.rootMenu = menuStack.tail.submenu(0);

59+ menuStack.push(menuStack.rootMenu, 0);

60+ }

61+ }

37 }

62 }

38

63

39 ListView {

64 ListView {

40 id: mainMenu

65 id: mainMenu

41− model: menuStack.tail ? menuStack.tail : null

66+ model: menuStack.rootMenu

42

67

43 anchors {

68 anchors {

44 fill: parent

69 fill: parent

@@ -102,7 +127,7 @@ IndicatorBase {

102

127

103 Loader {

128 Loader {

104 id: loader

129 id: loader

105− asynchronous: true

130+ asynchronous: false

106

131

107 property int modelIndex: index

132 property int modelIndex: index

108

133

@@ -114,10 +139,6 @@ IndicatorBase {

114 sourceComponent: factory.load(model)

139 sourceComponent: factory.load(model)

115

140

116 onLoaded: {

141 onLoaded: {

117− if (model.type === rootMenuType) {

118− menuStack.push(mainMenu.model.submenu(index));

119− }

120−

121 if (item.hasOwnProperty("menuSelected")) {

142 if (item.hasOwnProperty("menuSelected")) {

122 item.menuSelected = Qt.binding(function() { return mainMenu.selectedIndex == index; });

143 item.menuSelected = Qt.binding(function() { return mainMenu.selectedIndex == index; });

123 item.selectMenu.connect(function() { mainMenu.selectedIndex = index; });

144 item.selectMenu.connect(function() { mainMenu.selectedIndex = index; });

plugins/Unity/Indicators/timeformatter.cppnew file+172

@@ -0,0 +1,172 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Author: Lars Uebernickel <lars.uebernickel@canonical.com>

17+ */

18+

19+#include "timeformatter.h"

20+

21+#include <gio/gio.h>

22+#include <QDateTime>

23+

24+struct TimeFormatterPrivate

25+{

26+ TimeFormatter *formatter;

27+

28+ QString format;

29+ QString timeString;

30+ qint64 time;

31+

32+ GDBusConnection *system_bus;

33+ guint subscription_id;

34+ GCancellable *cancellable;

35+};

36+

37+static void

38+timedate1_properties_changed (GDBusConnection *connection,

39+ const gchar *sender_name,

40+ const gchar *object_path,

41+ const gchar *interface_name,

42+ const gchar *signal_name,

43+ GVariant *parameters,

44+ gpointer user_data)

45+{

46+ Q_UNUSED(connection);

47+ Q_UNUSED(sender_name);

48+ Q_UNUSED(object_path);

49+ Q_UNUSED(interface_name);

50+ Q_UNUSED(signal_name);

51+

52+ TimeFormatterPrivate *priv = (TimeFormatterPrivate *)user_data;

53+ GVariant *changed;

54+ GVariantIter *iter;

55+ const gchar *name;

56+

57+ if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(sa{sv}as)")))

58+ return;

59+

60+ g_variant_get (parameters, "(s@a{sv}as)", NULL, &changed, &iter);

61+

62+ if (g_variant_lookup (changed, "Timezone", "s", NULL)) {

63+ priv->formatter->update();

64+ }

65+ else {

66+ while (g_variant_iter_next (iter, "&s", &name)) {

67+ if (g_str_equal (name, "Timezone")) {

68+ priv->formatter->update();

69+ break;

70+ }

71+ }

72+ }

73+

74+ g_variant_unref (changed);

75+ g_variant_iter_free (iter);

76+}

77+

78+static void

79+got_bus(GObject *object, GAsyncResult *result, gpointer user_data)

80+{

81+ Q_UNUSED(object);

82+

83+ TimeFormatterPrivate *priv = (TimeFormatterPrivate *)user_data;

84+ GError *error = NULL;

85+

86+ priv->system_bus = g_bus_get_finish (result, &error);

87+ if (priv->system_bus == NULL) {

88+ if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))

89+ qWarning("TimeFormatter: cannot connect to the system bus: %s", error->message);

90+ g_error_free (error);

91+ return;

92+ }

93+

94+ /* Listen to the PropertiesChanged on the org.freedesktop.timedate1

95+ * interface from any sender. In practice, this signal will only be sent

96+ * from timedated (we can trust other processes on the system bus to behave

97+ * nicely). That way, we don't have to watch timedated's well-known name

98+ * and keep the process alive.

99+ */

100+ priv->subscription_id = g_dbus_connection_signal_subscribe (priv->system_bus,

101+ NULL, /* sender */

102+ "org.freedesktop.DBus.Properties",

103+ "PropertiesChanged",

104+ NULL,

105+ "org.freedesktop.timedate1",

106+ G_DBUS_SIGNAL_FLAGS_NONE,

107+ timedate1_properties_changed,

108+ priv, NULL);

109+}

110+

111+TimeFormatter::TimeFormatter(QObject *parent): QObject(parent)

112+{

113+ priv = new TimeFormatterPrivate;

114+ priv->formatter = this;

115+ priv->time = 0;

116+ priv->format = "yyyy-MM-dd hh:mm";

117+ priv->system_bus = NULL;

118+ priv->subscription_id = 0;

119+ priv->cancellable = g_cancellable_new ();

120+

121+ g_bus_get (G_BUS_TYPE_SYSTEM, priv->cancellable, got_bus, priv);

122+}

123+

124+TimeFormatter::~TimeFormatter()

125+{

126+ if (priv->system_bus) {

127+ g_dbus_connection_signal_unsubscribe (priv->system_bus, priv->subscription_id);

128+ g_object_unref (priv->system_bus);

129+ }

130+

131+ g_cancellable_cancel (priv->cancellable);

132+ g_object_unref (priv->cancellable);

133+}

134+

135+QString TimeFormatter::format() const

136+{

137+ return priv->format;

138+}

139+

140+QString TimeFormatter::timeString() const

141+{

142+ return priv->timeString;

143+}

144+

145+qint64 TimeFormatter::time() const

146+{

147+ return priv->time;

148+}

149+

150+void TimeFormatter::setFormat(const QString &format)

151+{

152+ if (priv->format != format) {

153+ priv->format = format;

154+ Q_EMIT formatChanged(priv->format);

155+ update();

156+ }

157+}

158+

159+void TimeFormatter::setTime(qint64 time)

160+{

161+ if (priv->time != time) {

162+ priv->time = time;

163+ Q_EMIT timeChanged(priv->time);

164+ update();

165+ }

166+}

167+

168+void TimeFormatter::update()

169+{

170+ priv->timeString = QDateTime::fromMSecsSinceEpoch(priv->time / 1000).toString(priv->format);

171+ Q_EMIT timeStringChanged(priv->timeString);

172+}

plugins/Unity/Indicators/timeformatter.hnew file+54

@@ -0,0 +1,54 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Author: Lars Uebernickel <lars.uebernickel@canonical.com>

17+ */

18+

19+#ifndef TIME_FORMATTER_H

20+#define TIME_FORMATTER_H

21+

22+#include "unityindicatorsglobal.h"

23+#include <QObject>

24+

25+class UNITYINDICATORS_EXPORT TimeFormatter : public QObject

26+{

27+ Q_OBJECT

28+ Q_PROPERTY(QString format READ format WRITE setFormat NOTIFY formatChanged)

29+ Q_PROPERTY(QString timeString READ timeString NOTIFY timeStringChanged)

30+ Q_PROPERTY(qint64 time READ time WRITE setTime NOTIFY timeChanged)

31+

32+public:

33+ TimeFormatter(QObject *parent = 0);

34+ ~TimeFormatter();

35+

36+ QString format() const;

37+ QString timeString() const;

38+ qint64 time() const;

39+

40+ void setFormat(const QString &format);

41+ void setTime(qint64 time);

42+

43+ void update();

44+

45+Q_SIGNALS:

46+ void formatChanged(const QString &format);

47+ void timeStringChanged(const QString &timeString);

48+ void timeChanged(qint64 time);

49+

50+private:

51+ struct TimeFormatterPrivate *priv;

52+};

53+

54+#endif

po/fa.ponew file+223

@@ -0,0 +1,223 @@

1+# Persian translation for unity8

3+# This file is distributed under the same license as the unity8 package.

4+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.

5+#

6+msgid ""

7+msgstr ""

8+"Project-Id-Version: unity8\n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10+"POT-Creation-Date: 2013-10-11 12:12+0200\n"

11+"PO-Revision-Date: 2013-10-31 19:02+0000\n"

12+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

13+"Language-Team: Persian <fa@li.org>\n"

14+"MIME-Version: 1.0\n"

15+"Content-Type: text/plain; charset=UTF-8\n"

16+"Content-Transfer-Encoding: 8bit\n"

17+"Plural-Forms: nplurals=1; plural=0;\n"

18+"X-Launchpad-Export-Date: 2013-11-01 06:44+0000\n"

19+"X-Generator: Launchpad (build 16820)\n"

20+

21+#: Applications/applications.js:23

22+msgid "Phone"

23+msgstr ""

24+

25+#: Applications/applications.js:29

26+msgid "Camera"

27+msgstr ""

28+

29+#: Applications/applications.js:35

30+msgid "Gallery"

31+msgstr ""

32+

33+#: Applications/applications.js:40

34+msgid "Facebook"

35+msgstr ""

36+

37+#: Applications/applications.js:46

38+msgid "Browser"

39+msgstr ""

40+

41+#: Applications/applications.js:51

42+msgid "Twitter"

43+msgstr ""

44+

45+#: Applications/applications.js:57

46+msgid "GMail"

47+msgstr ""

48+

49+#: Applications/applications.js:62

50+msgid "Weather"

51+msgstr ""

52+

53+#: Applications/applications.js:68

54+msgid "Notepad"

55+msgstr ""

56+

57+#: Applications/applications.js:74

58+msgid "Calendar"

59+msgstr ""

60+

61+#: Applications/applications.js:80

62+msgid "Media Player"

63+msgstr ""

64+

65+#: Applications/applications.js:86

66+msgid "Evernote"

67+msgstr ""

68+

69+#: Applications/applications.js:91

70+msgid "Map"

71+msgstr ""

72+

73+#: Applications/applications.js:96

74+msgid "Pinterest"

75+msgstr ""

76+

77+#: Applications/applications.js:101

78+msgid "SoundCloud"

79+msgstr ""

80+

81+#: Applications/applications.js:106

82+msgid "Wikipedia"

83+msgstr ""

84+

85+#: Applications/applications.js:111

86+msgid "YouTube"

87+msgstr ""

88+

89+#: Components/EdgeDemoOverlay.qml:149

90+msgid "Skip intro"

91+msgstr ""

92+

93+#: Components/EdgeDemo.qml:112

94+msgid "Right edge"

95+msgstr ""

96+

97+#: Components/EdgeDemo.qml:113

98+msgid "Try swiping from the right edge to unlock the phone"

99+msgstr ""

100+

101+#: Components/EdgeDemo.qml:144

102+msgid "Top edge"

103+msgstr ""

104+

105+#: Components/EdgeDemo.qml:145

106+msgid "Try swiping from the top edge to access the indicators"

107+msgstr ""

108+

109+#: Components/EdgeDemo.qml:170

110+msgid "Close"

111+msgstr ""

112+

113+#: Components/EdgeDemo.qml:171

114+msgid "Swipe up again to close the settings screen"

115+msgstr ""

116+

117+#: Components/EdgeDemo.qml:198

118+msgid "Left edge"

119+msgstr ""

120+

121+#: Components/EdgeDemo.qml:199

122+msgid "Swipe from the left to reveal the launcher for quick access to apps"

123+msgstr ""

124+

125+#: Components/EdgeDemo.qml:226

126+msgid "Well done"

127+msgstr ""

128+

129+#: Components/EdgeDemo.qml:227

130+msgid ""

131+"You have now mastered the edge gestures and can start using the "

132+"phone Tap anywhere to start"

133+msgstr ""

134+

135+#: Components/PageHeader.qml:341

136+msgid "Recent searches"

137+msgstr ""

138+

139+#. TRANSLATORS: Number of persons who rated this app

140+#. TRANSLATORS: Number of persons who rated this app/video/whatever

141+#: Dash/Apps/AppInfo.qml:73 Dash/Previews/Header.qml:93

142+#, qt-format

143+msgid "(%1)"

144+msgstr ""

145+

146+#. TRANSLATORS: Number of persons who wrote reviews for this app

147+#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever

148+#: Dash/Apps/AppInfo.qml:85 Dash/Previews/Header.qml:105

149+#, qt-format

150+msgid "%1 review"

151+msgid_plural "%1 reviews"

152+msgstr[0] ""

153+msgstr[1] ""

154+

155+#: Dash/Apps/AppPreview.qml:126

156+msgid "Rate this"

157+msgstr ""

158+

159+#: Dash/Previews/Reviews.qml:74

160+msgid "Add a review"

161+msgstr ""

162+

163+#: Dash/Previews/Reviews.qml:86

164+msgid "Review"

165+msgstr ""

166+

167+#: Dash/Previews/Reviews.qml:121

168+msgid "Send"

169+msgstr ""

170+

171+#: Dash/Previews/Reviews.qml:139

172+msgid "Comments:"

173+msgstr ""

174+

175+#: Greeter/Lockscreen.qml:142

176+msgid "Emergency Call"

177+msgstr ""

178+

179+#: Greeter/PassphraseLockscreen.qml:59

180+#, qt-format

181+msgid "Hello %1"

182+msgstr ""

183+

184+#: Greeter/PassphraseLockscreen.qml:59

185+msgid "Hello"

186+msgstr ""

187+

188+#: Hud/HudParametrizedActionsPage.qml:132

189+msgid "Confirm"

190+msgstr ""

191+

192+#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372

193+msgid "Type or say a command"

194+msgstr ""

195+

196+#: Hud/Hud.qml:84

197+msgid "Loading. Please Wait..."

198+msgstr ""

199+

200+#: Hud/Hud.qml:89

201+msgid "Speak Now..."

202+msgstr ""

203+

204+#: Hud/Hud.qml:94

205+msgid "Speaking..."

206+msgstr ""

207+

208+#: Panel/SearchIndicator.qml:27

209+msgid "Search"

210+msgstr ""

211+

212+#: plugins/Unity/scope.cpp:398

213+msgid "Sorry, there is nothing that matches your search."

214+msgstr ""

215+

216+#: plugins/Unity/showallfilteroption.cpp:41

217+msgid "All"

218+msgstr ""

219+

220+#: Shell.qml:438

221+#, qt-format

222+msgid "Please enter %1"

223+msgstr ""

run_on_device+24−4

@@ -1,4 +1,4 @@

1−#!/bin/sh

1+#!/bin/bash

2CODE_DIR=shell

3USER=phablet

4USER_ID=32011

@@ -17,6 +17,8 @@ SUDO="echo $PASSWORD | sudo -S"

17NUM_JOBS='$(( `grep -c ^processor /proc/cpuinfo` + 1 ))'

18FLIPPED=false

19CHROOT_PREFIX="/data/ubuntu"

20+SSH_WAS_STARTED=0

21+SSH_STARTED=0

20

22

21usage() {

23usage() {

22 echo "usage: run_on_device [OPTIONS]\n"

24 echo "usage: run_on_device [OPTIONS]\n"

@@ -32,7 +34,15 @@ usage() {

32 exit 1

34 exit 1

33}

35}

34

36

37+start_ssh() {

38+ if [ $SSH_STARTED -eq 0 ]; then

39+ exec_with_adb initctl start ssh

40+ SSH_STARTED=1

41+ fi

42+}

43+

35exec_with_ssh() {

44exec_with_ssh() {

45+ start_ssh

36 ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -t $USER@$TARGET_IP -p $TARGET_SSH_PORT sudo -u $USER -i bash -ic \"$@\"

46 ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -t $USER@$TARGET_IP -p $TARGET_SSH_PORT sudo -u $USER -i bash -ic \"$@\"

37}

47}

38

48

@@ -52,7 +62,7 @@ adb_root() {

52install_ssh_key() {

62install_ssh_key() {

53 ssh-keygen -R $TARGET_IP

63 ssh-keygen -R $TARGET_IP

54 HOME_DIR="${CHROOT_PREFIX}/home/phablet"

64 HOME_DIR="${CHROOT_PREFIX}/home/phablet"

55− adb push ~/.ssh/phone_rsa.pub $HOME_DIR/.ssh/authorized_keys

65+ adb push ~/.ssh/id_rsa.pub $HOME_DIR/.ssh/authorized_keys

56 adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh

66 adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh

57 adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh/authorized_keys

67 adb shell chown $USER_ID:$USER_ID $HOME_DIR/.ssh/authorized_keys

58 adb shell chmod 700 $HOME_DIR/.ssh

68 adb shell chmod 700 $HOME_DIR/.ssh

@@ -65,8 +75,6 @@ setup_adb_forwarding() {

65}

75}

66

76

67install_dependencies() {

77install_dependencies() {

68− exec_with_adb rm /etc/init/ssh.override

69− exec_with_adb service ssh start

70 exec_with_adb apt-get update

78 exec_with_adb apt-get update

71 exec_with_ssh $SUDO apt-get -y install build-essential rsync bzr ccache gdb ninja-build devscripts equivs

79 exec_with_ssh $SUDO apt-get -y install build-essential rsync bzr ccache gdb ninja-build devscripts equivs

72}

80}

@@ -74,6 +82,7 @@ install_dependencies() {

74sync_code() {

82sync_code() {

75 [ -e .bzr ] && bzr export --uncommitted --format=dir /tmp/$CODE_DIR

83 [ -e .bzr ] && bzr export --uncommitted --format=dir /tmp/$CODE_DIR

76 [ -e .git ] && git checkout-index -a -f --prefix=/tmp/$CODE_DIR/

84 [ -e .git ] && git checkout-index -a -f --prefix=/tmp/$CODE_DIR/

85+ start_ssh

77 rsync -crlOzv --delete --exclude builddir -e "ssh -p $TARGET_SSH_PORT -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" /tmp/$CODE_DIR/ $USER@$TARGET_IP:$CODE_DIR/

86 rsync -crlOzv --delete --exclude builddir -e "ssh -p $TARGET_SSH_PORT -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" /tmp/$CODE_DIR/ $USER@$TARGET_IP:$CODE_DIR/

78 rm -rf /tmp/$CODE_DIR

87 rm -rf /tmp/$CODE_DIR

79}

88}

@@ -96,7 +105,9 @@ run() {

96 fi

105 fi

97

106

98 exec_with_ssh "stop unity8"

107 exec_with_ssh "stop unity8"

108+ exec_with_ssh "start maliit-server"

99 exec_with_ssh "cd $CODE_DIR/ && ./run $ARGS -- $RUN_OPTIONS"

109 exec_with_ssh "cd $CODE_DIR/ && ./run $ARGS -- $RUN_OPTIONS"

110+ exec_with_ssh "stop maliit-server"

100 exec_with_ssh "start unity8"

111 exec_with_ssh "start unity8"

101}

112}

102

113

@@ -130,6 +141,12 @@ if [ "`adb shell 'grep -q Ubuntu /etc/lsb-release 2> /dev/null && echo -n FLIPPE

130 fi

141 fi

131fi

142fi

132

143

144+status_output=$(exec_with_adb initctl status ssh)

145+if [[ $status_output == "ssh start/running, process "* ]]; then

146+ SSH_WAS_STARTED=1

147+fi

148+SSH_STARTED=$SSH_WAS_STARTED

149+

133if $SETUP; then

150if $SETUP; then

134 echo "Setting up environment for building shell.."

151 echo "Setting up environment for building shell.."

135 install_ssh_key

152 install_ssh_key

@@ -144,3 +161,6 @@ else

144 run

161 run

145fi

162fi

146

163

164+if [ $SSH_WAS_STARTED -eq 0 ]; then

165+ exec_with_adb initctl stop ssh

166+fi

tests/autopilot/unity8/process_helpers.pynew file+116

@@ -0,0 +1,116 @@

1+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-

2+#

3+# Unity Autopilot Utilities

5+#

6+# This program is free software: you can redistribute it and/or modify

7+# it under the terms of the GNU General Public License as published by

8+# the Free Software Foundation, either version 3 of the License, or

9+# (at your option) any later version.

10+#

11+# This program is distributed in the hope that it will be useful,

12+# but WITHOUT ANY WARRANTY; without even the implied warranty of

13+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

14+# GNU General Public License for more details.

15+#

16+# You should have received a copy of the GNU General Public License

17+# along with this program. If not, see <http://www.gnu.org/licenses/>.

18+#

19+

20+from autopilot.introspection import (

21+ get_proxy_object_for_existing_process,

22+ ProcessSearchError,

23+)

24+import subprocess

25+from unity8.shell.emulators import UnityEmulatorBase

26+from unity8.shell.emulators.main_window import MainWindow

27+

28+

29+class CannotAccessUnity(Exception):

30+ pass

31+

32+

33+def unlock_unity():

34+ """Helper function that attempts to unlock the unity greeter.

35+

36+ :raises RuntimeError: if the greeter attempts and fails to be unlocked.

37+

38+ :raises RuntimeWarning: when the greeter cannot be found because it is

39+ already unlocked.

40+ :raises CannotAccessUnity: if unity is not introspectable or cannot be

41+ found on dbus.

42+ :raises CannotAccessUnity: if unity's upstart status is not "start" or the

43+ upstart job cannot be found at all.

44+

45+ """

46+ pid = _get_unity_pid()

47+ try:

48+ unity = get_proxy_object_for_existing_process(

49+ pid=pid,

50+ emulator_base=UnityEmulatorBase,

51+ )

52+ main_window = MainWindow(unity)

53+

54+ greeter = main_window.get_greeter()

55+ if greeter is None:

56+ raise RuntimeWarning("Greeter appears to be already unlocked.")

57+ greeter.swipe()

58+ except ProcessSearchError as e:

59+ raise CannotAccessUnity(

60+ "Cannot introspect unity, make sure that it has been started "

61+ "with testability. Perhaps use the function "

62+ "'restart_unity_with_testability' this module provides."

63+ "(%s)"

64+ % str(e)

65+ )

66+

67+

68+def restart_unity_with_testability():

69+ """Restarts (or just starts) unity8 with the testability driver loaded

70+

71+ :raises subprocess.CalledProcessError: if unable to stop or start the

72+ unity8 upstart job.

73+

74+ """

75+ status = _get_unity_status()

76+ if "start/" in status:

77+ try:

78+ print("Stopping unity.")

79+ subprocess.check_call([

80+ 'initctl',

81+ 'stop',

82+ 'unity8',

83+ ])

84+ except subprocess.CalledProcessError as e:

85+ e.args += ("Failed to stop running instance of unity8", )

86+ raise

87+

88+ try:

89+ print("Starting unity with testability.")

90+ subprocess.check_call([

91+ 'initctl',

92+ 'start',

93+ 'unity8',

94+ 'QT_LOAD_TESTABILITY=1',

95+ ])

96+ except subprocess.CalledProcessError as e:

97+ e.args += ("Failed to start unity8 with testability ", )

98+ raise

99+

100+

101+def _get_unity_status():

102+ try:

103+ return subprocess.check_output([

104+ 'initctl',

105+ 'status',

106+ 'unity8'

107+ ])

108+ except subprocess.CalledProcessError as e:

109+ raise CannotAccessUnity("Unable to get unity's status: %s" % str(e))

110+

111+

112+def _get_unity_pid():

113+ status = _get_unity_status()

114+ if not "start/" in status:

115+ raise CannotAccessUnity("Unity is not in the running state.")

116+ return int(status.split()[-1])

tests/plugins/Unity/Indicators/CMakeLists.txt+1

@@ -30,4 +30,5 @@ run_tests(

30 indicatorsmodeltest

31 menucontentactivatortest

32 rootactionstatetest

33+ timeformattertest

33 )

34 )

tests/plugins/Unity/Indicators/timeformattertest.cppnew file+55

@@ -0,0 +1,55 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU Lesser General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ *

16+ * Author: Lars Uebernickel <lars.uebernickel@canonical.com>

17+ */

18+

19+#include "timeformatter.h"

20+

21+#include <QtTest>

22+#include <QDebug>

23+

24+class TimeFormatterTest : public QObject

25+{

26+ Q_OBJECT

27+private Q_SLOTS:

28+

29+ void initTestCase()

30+ {

31+ setenv("UNITY_TEST_ENV", "1", 1);

32+ }

33+

34+ void cleanupTestCase()

35+ {

36+ unsetenv("UNITY_TEST_ENV");

37+ }

38+

39+ void testFormat()

40+ {

41+ const QString format = "hh:mm dd.MM.yy";

42+

43+ QDateTime time = QDateTime::currentDateTime();

44+

45+ TimeFormatter formatter;

46+ formatter.setTime(time.toMSecsSinceEpoch() * 1000);

47+ formatter.setFormat(format);

48+

49+ QCOMPARE(formatter.timeString(), time.toString(format));

50+ }

51+};

52+

53+QTEST_GUILESS_MAIN(TimeFormatterTest)

54+

55+#include "timeformattertest.moc"

tests/qmltests/Launcher/tst_Launcher.qml+47−11

@@ -363,25 +363,60 @@ Item {

363 var draggedItem = findChild(launcher, "launcherDelegate5")

364 var item0 = findChild(launcher, "launcherDelegate0")

365 var fakeDragItem = findChild(launcher, "fakeDragItem")

366− var dndArea = findChild(launcher, "dndArea")

366+ var quickListShape = findChild(launcher, "quickListShape")

367

368 // Initial state

369− compare(dndArea.quickListPopover, null)

369+ compare(quickListShape.visible, false)

370

371 // Doing longpress

372 mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)

373 tryCompare(fakeDragItem, "visible", true) // Wait longpress happening

374− verify(dndArea.quickListPopover != null)

374+ tryCompare(quickListShape, "visible", true)

375

376 // Dragging a bit (> 1.5 gu)

377 mouseMove(draggedItem, -units.gu(2), draggedItem.height / 2)

378

379 // QuickList needs to be closed when a drag operation starts

380− tryCompare(dndArea, "quickListPopover", null)

380+ tryCompare(quickListShape, "visible", false)

381

382 mouseRelease(draggedItem);

383 }

384

385+ function test_quicklist_positioning_data() {

386+ return [

387+ {tag: "top", flickTo: "top", itemIndex: 0},

388+ {tag: "bottom", flickTo: "bottom", itemIndex: 9}

389+ ];

390+ }

391+

392+ function test_quicklist_positioning(data) {

393+ revealer.dragLauncherIntoView();

394+ var quickList = findChild(launcher, "quickList")

395+ var draggedItem = findChild(launcher, "launcherDelegate" + data.itemIndex)

396+ var quickListShape = findChild(launcher, "quickListShape")

397+

398+ // Position launcher to where we need it

399+ var listView = findChild(launcher, "launcherListView");

400+ listView.flick(0, units.gu(200) * (data.flickTo === "top" ? 1 : -1));

401+ tryCompare(listView, "flicking", false);

402+

403+ // Doing longpress

404+ mousePress(draggedItem, draggedItem.width / 2, draggedItem.height / 2)

405+ tryCompare(quickListShape, "opacity", 0.8)

406+ mouseRelease(draggedItem);

407+

408+ verify(quickList.y >= units.gu(1))

409+ verify(quickList.y + quickList.height + units.gu(1) <= launcher.height)

410+

411+ // Click somewhere in the empty space to dismiss the quicklist

412+ mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));

413+ tryCompare(quickListShape, "visible", false)

414+

415+ // Click somewhere in the empty space to dismiss the launcher

416+ mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));

417+ revealer.waitUntilLauncherDisappears()

418+ }

419+

385 function test_quicklist_click_data() {

420 function test_quicklist_click_data() {

386 return [

421 return [

387 {tag: "non-clickable", index: 1, clickable: false },

422 {tag: "non-clickable", index: 1, clickable: false },

@@ -392,19 +427,20 @@ Item {

392 function test_quicklist_click(data) {

427 function test_quicklist_click(data) {

393 revealer.dragLauncherIntoView();

428 revealer.dragLauncherIntoView();

394 var clickedItem = findChild(launcher, "launcherDelegate5")

429 var clickedItem = findChild(launcher, "launcherDelegate5")

395− var dndArea = findChild(launcher, "dndArea")

430+ var quickList = findChild(launcher, "quickList")

431+ var quickListShape = findChild(launcher, "quickListShape")

396

432

397 // Initial state

433 // Initial state

398− compare(dndArea.quickListPopover, null)

434+ tryCompare(quickListShape, "visible", false)

399

435

400 // Doing longpress

436 // Doing longpress

401 mousePress(clickedItem, clickedItem.width / 2, clickedItem.height / 2)

437 mousePress(clickedItem, clickedItem.width / 2, clickedItem.height / 2)

402 tryCompare(clickedItem, "itemOpacity", 0) // Wait for longpress to happen

438 tryCompare(clickedItem, "itemOpacity", 0) // Wait for longpress to happen

403− verify(dndArea.quickListPopover != null)

439+ verify(quickListShape.visible, "QuickList must be visible")

404

440

405 mouseRelease(clickedItem);

441 mouseRelease(clickedItem);

406

442

407− var quickListEntry = findChild(dndArea.quickListPopover, "quickListEntry" + data.index)

443+ var quickListEntry = findChild(quickList, "quickListEntry" + data.index)

408

444

409 signalSpy.clear();

445 signalSpy.clear();

410 signalSpy.signalName = "quickListTriggered"

446 signalSpy.signalName = "quickListTriggered"

@@ -413,7 +449,7 @@ Item {

413

449

414 if (data.clickable) {

450 if (data.clickable) {

415 // QuickList needs to be closed when some clickable item is clicked

451 // QuickList needs to be closed when some clickable item is clicked

416− tryCompare(dndArea, "quickListPopover", null)

452+ tryCompare(quickListShape, "visible", false)

417

453

418 compare(signalSpy.count, 1, "Quicklist signal wasn't triggered")

454 compare(signalSpy.count, 1, "Quicklist signal wasn't triggered")

419 compare(signalSpy.signalArguments[0][0], LauncherModel.get(5).appId)

455 compare(signalSpy.signalArguments[0][0], LauncherModel.get(5).appId)

@@ -422,13 +458,13 @@ Item {

422 } else {

458 } else {

423

459

424 // QuickList must not be closed when a non-clickable item is clicked

460 // QuickList must not be closed when a non-clickable item is clicked

425− verify(dndArea.quickListPopover != null)

461+ verify(quickListShape.visible, "QuickList must be visible")

426

462

427 compare(signalSpy.count, 0, "Quicklist signal must NOT be triggered when clicking a non-clickable item")

463 compare(signalSpy.count, 0, "Quicklist signal must NOT be triggered when clicking a non-clickable item")

428

464

429 // Click somewhere in the empty space to dismiss the quicklist

465 // Click somewhere in the empty space to dismiss the quicklist

430 mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));

466 mouseClick(launcher, launcher.width - units.gu(1), units.gu(1));

431− tryCompare(dndArea, "quickListPopover", null)

467+ tryCompare(quickListShape, "visible", false)

432 }

468 }

433 }

469 }

434 }

470 }