gallery-app

Merge lp:~seb128/gallery-app/delete-dialogs-tweaks into lp:gallery-app

  1. delete-dialogs-tweaks
  2. Merge into trunk
Proposed by Sebastien Bacher
Status: Approved
Approved by: Arthur Mello
Approved revision: 1247
Proposed branch: lp:~seb128/gallery-app/delete-dialogs-tweaks
Merge into: lp:gallery-app
Diff against target: 59 lines (+9/-8)
2 files modified
rc/qml/Components/DeleteDialog.qml (+4/-4)
rc/qml/MediaViewer/MediaViewer.qml (+5/-4)
To merge this branch: bzr merge lp:~seb128/gallery-app/delete-dialogs-tweaks
Reviewer Review Type Date Requested Status
Arthur Mello (community) Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+277868@code.launchpad.net

Commit message

Use descriptive labels and standard colors in delete dialogs

Description of the change

Use descriptive labels and standard colors in delete dialogs

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1247
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1204/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/132
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/132/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/308
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/967
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/808
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25236

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1204/rebuild

review: Approve (continuous-integration)
Reply
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1247
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1204/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/132
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/132/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/308
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/967
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/808
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25236

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1204/rebuild

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Arthur Mello (artmello) wrote :

lgtm

review: Approve
Reply

Unmerged revisions

1247. By Sebastien Bacher

Use descriptive labels and standard colors in delete dialogs

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'rc/qml/Components/DeleteDialog.qml'
2--- rc/qml/Components/DeleteDialog.qml 2015-11-05 18:10:29 +0000
3+++ rc/qml/Components/DeleteDialog.qml 2015-11-18 16:22:52 +0000
4@@ -33,8 +33,8 @@
5
6 Button {
7 objectName: "deleteDialogYes"
8- text: i18n.tr("Yes")
9- color: Gallery.HIGHLIGHT_BUTTON_COLOR
10+ text: i18n.tr("Delete")
11+ color: UbuntuColors.red
12 onClicked: {
13 dialogue.deleteClicked()
14 PopupUtils.close(dialogue);
15@@ -42,8 +42,8 @@
16 }
17 Button {
18 objectName: "deleteDialogNo"
19- text: i18n.tr("No")
20- gradient: UbuntuColors.greyGradient
21+ text: i18n.tr("Cancel")
22+ gradient: UbuntuColors.lightGrey
23 onClicked: PopupUtils.close(dialogue);
24 }
25 }
26
27=== modified file 'rc/qml/MediaViewer/MediaViewer.qml'
28--- rc/qml/MediaViewer/MediaViewer.qml 2015-11-05 18:10:29 +0000
29+++ rc/qml/MediaViewer/MediaViewer.qml 2015-11-18 16:22:52 +0000
30@@ -227,8 +227,8 @@
31
32 Button {
33 objectName: "deletePhotoDialogYes"
34- text: i18n.tr("Yes")
35- color: Gallery.HIGHLIGHT_BUTTON_COLOR
36+ text: i18n.tr("Delete")
37+ color: UbuntuColors.red
38 onClicked: {
39 PopupUtils.close(dialogue)
40 viewerWrapper.model.destroyMedia(galleryPhotoViewer.media, true);
41@@ -238,7 +238,8 @@
42 }
43 Button {
44 objectName: "deletePhotoDialogNo"
45- text: i18n.tr("No")
46+ text: i18n.tr("Cancel")
47+ color: UbuntuColors.lightGrey
48 onClicked: PopupUtils.close(dialogue)
49 }
50 }
51@@ -259,7 +260,7 @@
52 Button {
53 objectName: "removeFromAlbumButton"
54 text: i18n.tr("Remove from Album")
55- color: Gallery.HIGHLIGHT_BUTTON_COLOR
56+ color: UbuntuColors.red
57 onClicked: {
58 PopupUtils.close(dialogue)
59 viewerWrapper.model.removeMediaFromAlbum(album, galleryPhotoViewer.media);

Subscribers

People subscribed via source and target branches