Merge lp:~elementary-apps/switchboard/about-in-quicklist into lp:~elementary-pantheon/switchboard/switchboard

Proposed by Julián Unrrein
Status: Merged
Approved by: Danielle Foré
Approved revision: 474
Merged at revision: 471
Proposed branch: lp:~elementary-apps/switchboard/about-in-quicklist
Merge into: lp:~elementary-pantheon/switchboard/switchboard
Diff against target: 36 lines (+9/-2)
2 files modified
data/switchboard.desktop (+7/-1)
src/Switchboard.vala (+2/-1)
To merge this branch: bzr merge lp:~elementary-apps/switchboard/about-in-quicklist
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
David Gomes (community) Approve
Review via email: mp+229326@code.launchpad.net

Commit message

Add option to show the About dialog in the static quicklist (.desktop file).

Description of the change

Add option to show the About dialog in the static quicklist (.desktop file).

This needs "make pot" after merging.

To post a comment you must log in.
Revision history for this message
Julián Unrrein (junrrein) wrote :

Adding elementar-design to check what the string should be.

Revision history for this message
David Gomes (davidgomes) wrote :

Approving. Which string Julian, "About"?

review: Approve
Revision history for this message
Cody Garver (codygarver) wrote :

He might mean "About Switchboard" vs "About System Settings"

Revision history for this message
Julián Unrrein (junrrein) wrote :

Or just simply "About".

Revision history for this message
Danielle Foré (danrabbit) wrote :

should be "About System Settings" to be consistent with how Switchboard is presented and to follow the precedence that Files already set.

Revision history for this message
Julián Unrrein (junrrein) wrote :

String changed, should be good to go.

Revision history for this message
Julián Unrrein (junrrein) wrote :

I dropped the TargetEnvironment line since it seems the spec doesn't require them (http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#extra-actions) and doing so doesn't break the quicklist for either Pantheon or Unity.

Revision history for this message
RabbitBot (rabbitbot-a) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message
Cody Garver (codygarver) :
review: Approve
Revision history for this message
Rico Tzschichholz (ricotz) wrote :

@junrrein: You even linked to the spec, but why not using the proper syntax?

[Desktop Entry]
Version=1.0
Type=Application
Name=Foo Viewer
Comment=The best viewer for Foo objects available!
TryExec=fooview
Exec=fooview %F
Icon=fooview
MimeType=image/x-foo;
Actions=Gallery;Create;

[Desktop Action Gallery]
Exec=fooview --gallery
Name=Browse Gallery

[Desktop Action Create]
Exec=fooview --create-new
Name=Create a new Foo!
Icon=fooview-new

Revision history for this message
Julián Unrrein (junrrein) wrote :

@ricotz: Because I merely limited myself to copy the syntax already used in other projects.

Thanks for the insight. I will resubmit this branch using the fd.o syntax and update my other branches accordingly.

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

Hmm, ok.

Just as a note, there is also the way of using "gapplication" to trigger an action of DbusActivatebale apps, like polari does:

[Desktop Action connections]
Name=Show connections
Exec=gapplication action org.gnome.Polari connections

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/switchboard.desktop'
2--- data/switchboard.desktop 2014-04-14 20:39:34 +0000
3+++ data/switchboard.desktop 2014-08-02 19:13:42 +0000
4@@ -8,4 +8,10 @@
5 Categories=GNOME;GTK;System;
6 X-GNOME-Keywords=Center;Control;Panel;Preferences;System;
7 X-AppInstall-Keywords=Center;Control;Panel;Preferences;System;
8-X-GNOME-Gettext-Domain=switchboard
9\ No newline at end of file
10+X-GNOME-Gettext-Domain=switchboard
11+
12+X-Ayatana-Desktop-Shortcuts=AboutDialog
13+
14+[AboutDialog Shortcut Group]
15+Name=About System Settings
16+Exec=switchboard --about
17\ No newline at end of file
18
19=== modified file 'src/Switchboard.vala'
20--- src/Switchboard.vala 2014-07-28 09:33:03 +0000
21+++ src/Switchboard.vala 2014-08-02 19:13:42 +0000
22@@ -365,7 +365,7 @@
23
24 if (search_box.sensitive)
25 search_box.has_focus = true;
26-
27+
28 return true;
29 }
30
31@@ -491,4 +491,5 @@
32 #if TRANSLATION
33 _("Change system and user settings");
34 _("Center;Control;Panel;Preferences;System;");
35+_("About System Settings");
36 #endif

Subscribers

People subscribed via source and target branches