git.iko.soy/unity8
on xenial help sign in
Updated transfer states. Fixed transferMenu tests
commite941fe4f8377399bb32d0dd72117c9d98487a606 authorNick Dedekind <nicholas.dedekind@gmail.com> dateFri 4 Jul 2014, 18:53 (12 years ago) parent8db1d72
3 files changed+16−16
compare with xenial
unifiedsplit
qml/Panel/Indicators/MenuItemFactory.qml+9−9 tests/mocks/QMenuModel/QDBusActionGroup.qml+6−6 tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+1−1
qml/Panel/Indicators/MenuItemFactory.qml+9−9
@@ -549,7 +549,7 @@ Item {
549549 property var runningState : transferState !== undefined ? transferState["state"] : undefined
550550 property var secondsLeft : transferState !== undefined ? transferState["seconds-left"] : undefined
551551
552− active: runningState !== undefined && runningState !== Menus.TransferState.FINISHED
552+ active: runningState !== undefined && runningState !== Menus.TransferState.Finished
553553 progress: transferState !== undefined ? transferState["percent"] : 0.0
554554
555555 // TODO - Should be in the SDK
@@ -579,19 +579,19 @@ Item {
579579
580580 stateText: {
581581 switch (runningState) {
582− case Menus.TransferState.QUEUED:
582+ case Menus.TransferState.Queued:
583583 return i18n.tr("In queue…");
584− case Menus.TransferState.HASHING:
585− case Menus.TransferState.PROCESSING:
586− case Menus.TransferState.RUNNING:
584+ case Menus.TransferState.Hashing:
585+ case Menus.TransferState.Processing:
586+ case Menus.TransferState.Running:
587587 return timeRemaining === undefined ? i18n.tr("Downloading") : timeRemaining;
588− case Menus.TransferState.PAUSED:
588+ case Menus.TransferState.Paused:
589589 return i18n.tr("Paused, tap to resume");
590− case Menus.TransferState.CANCELED:
590+ case Menus.TransferState.Canceled:
591591 return i18n.tr("Canceled");
592− case Menus.TransferState.FINISHED:
592+ case Menus.TransferState.Finished:
593593 return i18n.tr("Finished");
594− case Menus.TransferState.ERROR:
594+ case Menus.TransferState.Error:
595595 return i18n.tr("Failed, tap to retry");
596596 }
597597 return "";
tests/mocks/QMenuModel/QDBusActionGroup.qml+6−6
@@ -31,7 +31,7 @@ QtObject {
3131 return {
3232 'valid': true,
3333 'state': {
34− 'state': Menus.TransferState.QUEUED,
34+ 'state': Menus.TransferState.Queued,
3535 'percent': 0.0
3636 }
3737 }
@@ -39,7 +39,7 @@ QtObject {
3939 return {
4040 'valid': true,
4141 'state': {
42− 'state': Menus.TransferState.RUNNING,
42+ 'state': Menus.TransferState.Running,
4343 'seconds-left': 100,
4444 'percent': 0.1
4545 }
@@ -48,7 +48,7 @@ QtObject {
4848 return {
4949 'valid': true,
5050 'state': {
51− 'state': Menus.TransferState.PAUSED,
51+ 'state': Menus.TransferState.Paused,
5252 'seconds-left': 100,
5353 'percent': 0.5
5454 }
@@ -57,14 +57,14 @@ QtObject {
5757 return {
5858 'valid': true,
5959 'state': {
60− 'state': Menus.TransferState.CANCELED,
60+ 'state': Menus.TransferState.Canceled,
6161 'percent': 0.4
6262 }
6363 }
6464 case "transfer-state.finished": return {
6565 'valid': true,
6666 'state': {
67− 'state': Menus.TransferState.FINISHED,
67+ 'state': Menus.TransferState.Finished,
6868 'seconds-left': 0,
6969 'percent': 1.0
7070 }
@@ -73,7 +73,7 @@ QtObject {
7373 return {
7474 'valid': true,
7575 'state': {
76− 'state': Menus.TransferState.ERROR,
76+ 'state': Menus.TransferState.Error,
7777 'seconds-left': 100,
7878 'percent': 0.0
7979 }
tests/qmltests/Panel/Indicators/tst_MenuItemFactory.qml+1−1
@@ -432,7 +432,7 @@ Item {
432432
433433 function test_create_transferMenu_data() {
434434 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…") },
436436 {tag: "running", label: "testLabel2", enabled: true, active: true, icon: "file:///testIcon2", progress: 0.1, stateText: "1 minute, 40 seconds remaining" },
437437 {tag: "paused", label: "testLabel3", enabled: true, active: true, icon: "file:///testIcon3", progress: 0.5, stateText: i18n.tr("Paused, tap to resume") },
438438 {tag: "cancelled", label: "testLabel4", enabled: true, active: true, icon: "file:///testIcon4", progress: 0.4, stateText: i18n.tr("Canceled") },