Light-Weight Text Editor for Gnome

Merge lp:~bilalakhtar/gedit/unity-quicklist into lp:~ubuntu-desktop/gedit/ubuntu

Proposed by Bilal Akhtar on 2011-06-07
Status: Merged
Merged at revision: 68
Proposed branch: lp:~bilalakhtar/gedit/unity-quicklist
Merge into: lp:~ubuntu-desktop/gedit/ubuntu
Diff against target: 70 lines (+47/-0) 3 files modified
To merge this branch: bzr merge lp:~bilalakhtar/gedit/unity-quicklist
Reviewer Review Type Date Requested Status
Didier Roche 2011-06-07 Approve on 2011-06-27
Ubuntu Sponsors Team 2011-06-07 Pending
Review via email: mp+63696@code.launchpad.net

Description of the Change

This patch adds a static Unity quicklist for Gedit.

This branch merge is a part of the blueprint https://blueprints.launchpad.net/ubuntu/+spec/desktop-o-default-apps-unity-integration

To post a comment you must log in.
Robert Roth (evfool) wrote :

Patch looks fine, although some guidelines on capitalization would be nice, as it's starting to get inconsistent already: gnome-screenshot does have some items with only the first letters capitalized, update manager has items with all words capitalized, and now gedit's following that. It would be worth noting that gedit uses "Create a new document" as a tooltip on the new toolbar button, so we could use the same thing, and have the translations, and also stick to consistency.

Didier Roche (didrocks) wrote :

After talking to JohnLea: "10:13:36 JohnLea | didrocks; First letter of each line capitalized, names all capitalized. e.g. "Create a new document" and "Open Office" are both correct ". He will update the guidelines shortly with that

Didier Roche (didrocks) wrote :

After discussing on IRC with Bilal, 2 things will be needed to be done:
1. Follow the above guideline about capitalization
2. Forward that upstream and using the tagging guideline to reference it as in https://wiki.ubuntu.com/Unity/LauncherAPI?action=AttachFile&do=view&target=02_add_unity_quicklist_support.patch

Translations will be handled through launchpad, the patch is correct for that :)
Thanks a lot Bilal, just ping me once both are done :)

review: Needs Fixing
Didier Roche (didrocks) wrote :

Looks good, thanks!

You didn't bump the version (still gedit (3.1.1-0ubuntu1)). I'll do it now for you ;)

review: Approve

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2011-06-27 09:32:21 +0000
3+++ debian/changelog 2011-06-27 11:54:30 +0000
4@@ -1,5 +1,12 @@
5 gedit (3.1.1-0ubuntu1) oneiric; urgency=low
6
7+ * debian/patches/07_unity_quicklist.patch: Add Unity static quicklist
8+ items for Create a New Document and Open a New Window.
9+
10+ -- Bilal Akhtar <bilalakhtar@ubuntu.com> Tue, 07 Jun 2011 17:54:14 +0530
11+
12+gedit (3.1.1-0ubuntu1) oneiric; urgency=low
13+
14 * New upstream release.
15 * debian/control.in:
16 - Require GTK+ 3.1.6
17
18=== added file 'debian/patches/07_unity_quicklist.patch'
19--- debian/patches/07_unity_quicklist.patch 1970-01-01 00:00:00 +0000
20+++ debian/patches/07_unity_quicklist.patch 2011-06-27 11:54:30 +0000
21@@ -0,0 +1,39 @@
22+Description: Add unity quicklist
23+ This patch adds two static unity quicklist items to gedit:
24+ "Create a New Document" and "Open a New Window"
25+Author: Bilal Akhtar <bilalakhtar@ubuntu.com>
26+Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=653470
27+--- a/data/gedit.desktop.in
28++++ b/data/gedit.desktop.in
29+@@ -16,3 +16,14 @@
30+ X-GNOME-Bugzilla-Component=general
31+ X-GNOME-Bugzilla-Version=3.0.4
32+ X-GNOME-Bugzilla-ExtraInfoScript=/opt/gnome/libexec/gedit/gedit-bugreport.sh
33++X-Ayatana-Desktop-Shortcuts=NewDocument;NewWindow;
34++
35++[NewDocument Shortcut Group]
36++_Name=Create a new document
37++Exec=gedit --new-document
38++TargetEnvironment=Unity
39++
40++[NewWindow Shortcut Group]
41++_Name=Open a new window
42++Exec=gedit --new-window
43++TargetEnvironment=Unity
44+--- a/data/gedit.desktop.in.in
45++++ b/data/gedit.desktop.in.in
46+@@ -16,3 +16,14 @@
47+ X-GNOME-Bugzilla-Component=general
48+ X-GNOME-Bugzilla-Version=@VERSION@
49+ X-GNOME-Bugzilla-ExtraInfoScript=@prefix@/share/gedit/gedit-bugreport
50++X-Ayatana-Desktop-Shortcuts=NewDocument;NewWindow;
51++
52++[NewDocument Shortcut Group]
53++_Name=Create a new document
54++Exec=gedit --new-document
55++TargetEnvironment=Unity
56++
57++[NewWindow Shortcut Group]
58++_Name=Open a new window
59++Exec=gedit --new-window
60++TargetEnvironment=Unity
61
62=== modified file 'debian/patches/series'
63--- debian/patches/series 2011-06-01 08:26:28 +0000
64+++ debian/patches/series 2011-06-27 11:54:30 +0000
65@@ -2,4 +2,5 @@
66 01_gedit-bugreport-location.patch
67 05_menu_label.patch
68 06_lp_401692.patch
69+07_unity_quicklist.patch
70 99_ltmain_as-needed.patch

Subscribers

People subscribed via source and target branches

to all changes: