git.iko.soy/unity8
on xenial help sign in
Updated transfer states. Fixed transferMenu tests
e941fe4Nick Dedekind
qml/Panel/Indicators/MenuItemFactory.qml+9−9
compare with xenial
unifiedsplit
@@ -549,7 +549,7 @@ Item {
549 property var runningState : transferState !== undefined ? transferState["state"] : undefined
549 property var runningState : transferState !== undefined ? transferState["state"] : undefined
550 property var secondsLeft : transferState !== undefined ? transferState["seconds-left"] : undefined
550 property var secondsLeft : transferState !== undefined ? transferState["seconds-left"] : undefined
551
551
552− active: runningState !== undefined && runningState !== Menus.TransferState.FINISHED
552+ active: runningState !== undefined && runningState !== Menus.TransferState.Finished
553 progress: transferState !== undefined ? transferState["percent"] : 0.0
553 progress: transferState !== undefined ? transferState["percent"] : 0.0
554
554
555 // TODO - Should be in the SDK
555 // TODO - Should be in the SDK
@@ -579,19 +579,19 @@ Item {
579
579
580 stateText: {
580 stateText: {
581 switch (runningState) {
581 switch (runningState) {
582− case Menus.TransferState.QUEUED:
582+ case Menus.TransferState.Queued:
583 return i18n.tr("In queue…");
583 return i18n.tr("In queue…");
584− case Menus.TransferState.HASHING:
584+ case Menus.TransferState.Hashing:
585− case Menus.TransferState.PROCESSING:
585+ case Menus.TransferState.Processing:
586− case Menus.TransferState.RUNNING:
586+ case Menus.TransferState.Running:
587 return timeRemaining === undefined ? i18n.tr("Downloading") : timeRemaining;
587 return timeRemaining === undefined ? i18n.tr("Downloading") : timeRemaining;
588− case Menus.TransferState.PAUSED:
588+ case Menus.TransferState.Paused:
589 return i18n.tr("Paused, tap to resume");
589 return i18n.tr("Paused, tap to resume");
590− case Menus.TransferState.CANCELED:
590+ case Menus.TransferState.Canceled:
591 return i18n.tr("Canceled");
591 return i18n.tr("Canceled");
592− case Menus.TransferState.FINISHED:
592+ case Menus.TransferState.Finished:
593 return i18n.tr("Finished");
593 return i18n.tr("Finished");
594− case Menus.TransferState.ERROR:
594+ case Menus.TransferState.Error:
595 return i18n.tr("Failed, tap to retry");
595 return i18n.tr("Failed, tap to retry");
596 }
596 }
597 return "";
597 return "";
tests/mocks/QMenuModel/QDBusActionGroup.qml+6−6
@@ -31,7 +31,7 @@ QtObject {
31 return {
31 return {
32 'valid': true,
32 'valid': true,
33 'state': {
33 'state': {
34− 'state': Menus.TransferState.QUEUED,
34+ 'state': Menus.TransferState.Queued,
35 'percent': 0.0
35 'percent': 0.0
36 }
36 }
37 }
37 }
@@ -39,7 +39,7 @@ QtObject {
39 return {
39 return {
40 'valid': true,
40 'valid': true,
41 'state': {
41 'state': {
42− 'state': Menus.TransferState.RUNNING,
42+ 'state': Menus.TransferState.Running,
43 'seconds-left': 100,
43 'seconds-left': 100,
44 'percent': 0.1
44 'percent': 0.1
45 }
45 }
@@ -48,7 +48,7 @@ QtObject {
48 return {
48 return {
49 'valid': true,
49 'valid': true,
50 'state': {
50 'state': {
51− 'state': Menus.TransferState.PAUSED,
51+ 'state': Menus.TransferState.Paused,
52 'seconds-left': 100,
52 'seconds-left': 100,
53 'percent': 0.5
53 'percent': 0.5
54 }
54 }
@@ -57,14 +57,14 @@ QtObject {
57 return {
57 return {
58 'valid': true,
58 'valid': true,
59 'state': {
59 'state': {
60− 'state': Menus.TransferState.CANCELED,
60+ 'state': Menus.TransferState.Canceled,
61 'percent': 0.4
61 'percent': 0.4
62 }
62 }
63 }
63 }
64 case "transfer-state.finished": return {
64 case "transfer-state.finished": return {
65 'valid': true,
65 'valid': true,
66 'state': {
66 'state': {
67− 'state': Menus.TransferState.FINISHED,
67+ 'state': Menus.TransferState.Finished,
68 'seconds-left': 0,
68 'seconds-left': 0,
69 'percent': 1.0
69 'percent': 1.0
70 }
70 }
@@ -73,7 +73,7 @@ QtObject {
73 return {
73 return {
74 'valid': true,
74 'valid': true,
75 'state': {
75 'state': {
76− 'state': Menus.TransferState.ERROR,
76+ 'state': Menus.TransferState.Error,
77 'seconds-left': 100,
77 'seconds-left': 100,
78 'percent': 0.0
78 'percent': 0.0
79 }
79 }
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+1−1
@@ -432,7 +432,7 @@ Item {
432
432
433 function test_create_transferMenu_data() {
433 function test_create_transferMenu_data() {
434 return [
434 return [
435− {tag: "queued", label: "testLabel1", enabled: true, active: true, icon: "file:///testIcon1", progress: 0, stateText: i18n.tr("In queue...") },
435+ {tag: "queued", label: "testLabel1", enabled: true, active: true, icon: "file:///testIcon1", progress: 0, stateText: i18n.tr("In queue…") },
436 {tag: "running", label: "testLabel2", enabled: true, active: true, icon: "file:///testIcon2", progress: 0.1, stateText: "1 minute, 40 seconds remaining" },
436 {tag: "running", label: "testLabel2", enabled: true, active: true, icon: "file:///testIcon2", progress: 0.1, stateText: "1 minute, 40 seconds remaining" },
437 {tag: "paused", label: "testLabel3", enabled: true, active: true, icon: "file:///testIcon3", progress: 0.5, stateText: i18n.tr("Paused, tap to resume") },
437 {tag: "paused", label: "testLabel3", enabled: true, active: true, icon: "file:///testIcon3", progress: 0.5, stateText: i18n.tr("Paused, tap to resume") },
438 {tag: "cancelled", label: "testLabel4", enabled: true, active: true, icon: "file:///testIcon4", progress: 0.4, stateText: i18n.tr("Canceled") },
438 {tag: "cancelled", label: "testLabel4", enabled: true, active: true, icon: "file:///testIcon4", progress: 0.4, stateText: i18n.tr("Canceled") },