Merge lp:~tcfox54-gmail/ubuntu/precise/rhythmbox/add_quicklist into lp:ubuntu/precise/rhythmbox

Proposed by Trenton Fox
Status: Merged
Merge reported by: Michael Terry
Merged at revision: not available
Proposed branch: lp:~tcfox54-gmail/ubuntu/precise/rhythmbox/add_quicklist
Merge into: lp:ubuntu/precise/rhythmbox
Diff against target: 31 lines (+22/-0)
1 file modified
data/rhythmbox.desktop.in.in (+22/-0)
To merge this branch: bzr merge lp:~tcfox54-gmail/ubuntu/precise/rhythmbox/add_quicklist
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Michael Hall Pending
Review via email: mp+96943@code.launchpad.net

This proposal supersedes a proposal from 2012-02-22.

Description of the change

Adds an Unity quicklist for play, pause, next, previous, and stop.
Fixed the quicklist to meet specifications.

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote : Posted in a previous version of this proposal

Thanks so much for your submission!

Recently a new FreeDesktop.org specification[1] has been approved for providing desktop-agnostic shortcuts. The Quicklist documentation has been updated to coincide with this new spec[2].

Since this is now an official standard, and will benefit environments other than Unity, we encourage you to change your code to match. This will require the following changes:
1) Change "X-Ayatana-Desktop-Shortcuts" to just "Actions"
2) Change each section from "[<action> Shortcut Group]" to "[Desktop Action <action>]"
3) Remove "TargetEnvironment=Unity"
4) Change your Name= entry to use Title Case[3] (capitalizing important words)

Please update this merge proposal with these changes so they can be included in the upcoming release of Ubuntu. Please also make sure you submit them to the upstream developers so they can be included there in future versions.

[1] http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s08.html
[2] https://wiki.ubuntu.com/Unity/LauncherAPI#Quicklists
[3] http://en.wikipedia.org/wiki/Title_case#Headings_and_publication_titles

review: Needs Fixing
Revision history for this message
Sebastien Bacher (seb128) wrote : Posted in a previous version of this proposal

Setting to "Work in progress" please set back to "Needs review" when you update so it shows again on the sponsoring list

Revision history for this message
Trenton Fox (tcfox54-gmail) wrote : Posted in a previous version of this proposal

I have pulled the branch down but do not know how to update it to this merge request. Could either of you point me in the right direction? I would really love to get the quicklist into 12.04.

Revision history for this message
Michael Hall (mhall119) wrote : Posted in a previous version of this proposal

If you just bzr push lp:~tcfox54-gmail/ubuntu/precise/rhythmbox/add_quicklist again, it will update this merge proposal with the latest revision.

Revision history for this message
Trenton Fox (tcfox54-gmail) wrote : Posted in a previous version of this proposal

I initially tried this, but it came up as diverged. I went through the
instructions to fix that and tried to push it again. However, it said it
was still diverged. :/

On Sun, Mar 11, 2012 at 1:34 PM, Michael Hall <email address hidden> wrote:

> If you just bzr push
> lp:~tcfox54-gmail/ubuntu/precise/rhythmbox/add_quicklist again, it will
> update this merge proposal with the latest revision.
> --
>
> https://code.launchpad.net/~tcfox54-gmail/ubuntu/precise/rhythmbox/add_quicklist/+merge/94266<https://code.launchpad.net/%7Etcfox54-gmail/ubuntu/precise/rhythmbox/add_quicklist/+merge/94266>
> You are the owner of
> lp:~tcfox54-gmail/ubuntu/precise/rhythmbox/add_quicklist.
>

Revision history for this message
Michael Hall (mhall119) wrote : Posted in a previous version of this proposal

Ah, right, because you did an uncommit and then another commit, they will have diverged. If you add --overwrite to your bzr push, it'll replace what's here with your new branch.

Revision history for this message
Michael Terry (mterry) wrote :

Thanks for the patch! I pushed it in and filed an upstream bug about it. https://bugzilla.gnome.org/show_bug.cgi?id=672180

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'data/debian'
2=== added directory 'data/debian/patches'
3=== modified file 'data/rhythmbox.desktop.in.in'
4--- data/rhythmbox.desktop.in.in 2010-08-24 17:19:03 +0000
5+++ data/rhythmbox.desktop.in.in 2012-03-11 23:02:17 +0000
6@@ -16,3 +16,25 @@
7 X-GNOME-Bugzilla-Component=general
8 X-GNOME-Bugzilla-OtherBinaries=rhythmbox-client;rhythmbox-metadata;
9 X-GNOME-Bugzilla-Version=@VERSION@
10+Actions=Play;Pause;Next;Previous;Stop;
11+
12+[Desktop Action Play]
13+Name=Play
14+Exec=rhythmbox-client --play
15+
16+[Desktop Action Pause]
17+Name=Pause
18+Exec=rhythmbox-client --pause
19+
20+[Desktop Action Next]
21+Name=Next
22+Exec=rhythmbox-client --next
23+
24+[Desktop Action Previous]
25+Name=Previous
26+Exec=rhythmbox-client --previous
27+
28+[Desktop Action Stop]
29+Name=Stop
30+Exec=rhythmbox-client --stop
31+

Subscribers

People subscribed via source and target branches

to all changes: