Merge lp:~amigadave/unity-scope-gdrive/google-drive-rename into lp:unity-scope-gdrive

Proposed by David King on 2012-10-25
Status: Merged
Approved by: Alberto Mardegan on 2012-10-25
Approved revision: 26
Merged at revision: 26
Proposed branch: lp:~amigadave/unity-scope-gdrive/google-drive-rename
Merge into: lp:unity-scope-gdrive
Diff against target: 187 lines (+45/-47)
8 files modified
MANIFEST.in (+4/-4)
README (+24/-26)
gdrive.scope (+2/-2)
setup.cfg (+2/-2)
unity-scope-gdrive (+2/-2)
unity-scope-gdrive.application.in (+6/-6)
unity-scope-gdrive.desktop (+3/-3)
unity-scope-gdrive.service (+2/-2)
To merge this branch: bzr merge lp:~amigadave/unity-scope-gdrive/google-drive-rename
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) 2012-10-25 Approve on 2012-10-25
Review via email: mp+131351@code.launchpad.net

Description of the change

Use Google Drive not Google Docs in user-visible strings

To post a comment you must log in.
Alberto Mardegan (mardy) wrote :

Great!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2012-09-19 09:53:20 +0000
3+++ MANIFEST.in 2012-10-25 09:40:32 +0000
4@@ -1,7 +1,7 @@
5 include build_i18n_ext.py
6-include unity-scope-gdocs.service
7-include gdocs.scope
8+include unity-scope-gdrive.service
9+include gdrive.scope
10 include po/*
11-include unity-scope-gdocs.application.in
12-include unity-scope-gdocs
13+include unity-scope-gdrive.application.in
14+include unity-scope-gdrive
15 include COPYING
16
17=== modified file 'README'
18--- README 2012-08-14 13:57:11 +0000
19+++ README 2012-10-25 09:40:32 +0000
20@@ -1,26 +1,28 @@
21-Sample Unity Lens Daemon written in Python
22-------------------------------------------
23+Sample Unity scope Daemon written in Python
24+-------------------------------------------
25
26 Dependencies
27 ------------
28-Introspection data for libunity, libdee, and libdbusmenu-glib
29-
30-gir1.2-unity-4.0
31-gir1.2-dee-0.5
32-gir1.2-dbusmenu-glib-0.4
33-libaccounts-glib
34-libsignon-glib
35-
36-Trying out the lens
37--------------------
38-
39-You can install the lens like this:
40+
41+Introspection data for libunity, libdee, libaccounts-glib, libsignon-glib and
42+libgdata:
43+
44+gir1.2-unity-5.0
45+gir1.2-dee-1.0
46+gir1.2-accounts-1.0
47+gir1.2-signon-1.0
48+gir1.2-gdata-0.0
49+
50+Trying out the scope
51+--------------------
52+
53+You can install the scope like this:
54
55 python setup.py install --prefix=/usr
56
57 Then run the daemon with:
58
59- ./unity-lens-gdocs
60+ ./unity-scope-gdrive
61
62 And from another terminal restart Unity like this:
63
64@@ -29,20 +31,16 @@
65 [the setsid ^^ is a small trick to detach the unity process from the terminal
66 so you can close it if you want. A bit like 'unity &' just better ;-) ]
67
68-Past this step you can freely Control-C the lens daemon to stop it,
69+Past this step you can freely Control-C the scope daemon to stop it,
70 do some changes, and restart it. No need to restart Unity, it will find
71 the newly started daemon automatically.
72
73-Getting rid of the Lens
74--------------------------------
75-Just remove the gdocs.lens file. Fx, by issuing:
76-
77- sudo rm /usr/share/unity/lenses/gdocs/gdocs.lens
78-
79-You may want to remove the icon as well, but that's no issue if you don't:
80-
81- sudo rm /usr/share/unity/lenses/gdocs/gdocs.svg
82+Getting rid of the scope
83+------------------------
84+
85+Just remove the gdrive.scope file. For example, by issuing:
86+
87+ sudo rm /usr/share/unity/lenses/files/gdrive.scope
88
89 With that done, restart Unity once again with 'setsid unity' and all should
90 be back to normal.
91-
92
93=== renamed file 'gdocs.scope' => 'gdrive.scope'
94--- gdocs.scope 2012-07-24 12:21:51 +0000
95+++ gdrive.scope 2012-10-25 09:40:32 +0000
96@@ -1,3 +1,3 @@
97 [Scope]
98-DBusName=net.launchpad.Unity.Scope.GDocs
99-DBusPath=/net/launchpad/unity/scope/gdocs
100+DBusName=net.launchpad.Unity.Scope.GDrive
101+DBusPath=/net/launchpad/unity/scope/gdrive
102
103=== modified file 'setup.cfg'
104--- setup.cfg 2012-09-19 09:53:20 +0000
105+++ setup.cfg 2012-10-25 09:40:32 +0000
106@@ -2,5 +2,5 @@
107 i18n=True
108
109 [build_i18n]
110-domain=unity-scope-gdocs
111-xml_files_no_trans=[('share/accounts/applications', ('unity-scope-gdocs.application.in',))]
112+domain=unity-scope-gdrive
113+xml_files_no_trans=[('share/accounts/applications', ('unity-scope-gdrive.application.in',))]
114
115=== renamed file 'unity-scope-gdocs' => 'unity-scope-gdrive'
116--- unity-scope-gdocs 2012-10-16 08:12:16 +0000
117+++ unity-scope-gdrive 2012-10-25 09:40:32 +0000
118@@ -24,7 +24,7 @@
119 #
120 # The primary bus name we grab *must* match what we specify in our .scope file
121 #
122-BUS_NAME = "net.launchpad.Unity.Scope.GDocs"
123+BUS_NAME = "net.launchpad.Unity.Scope.GDrive"
124 # Map Google Docs types to the values of the "type" filter
125 TYPE_MAP = {
126 "document": "documents",
127@@ -38,7 +38,7 @@
128 class Daemon:
129
130 def __init__ (self):
131- self._scope = Unity.Scope.new ("/net/launchpad/unity/scope/gdocs")
132+ self._scope = Unity.Scope.new ("/net/launchpad/unity/scope/gdrive")
133 self._scope.search_in_global = True;
134 self._preferences = Unity.PreferencesManager.get_default()
135 self._preferences.connect ("notify::remote-content-search",
136
137=== renamed file 'unity-scope-gdocs.application.in' => 'unity-scope-gdrive.application.in'
138--- unity-scope-gdocs.application.in 2012-09-19 11:39:19 +0000
139+++ unity-scope-gdrive.application.in 2012-10-25 09:40:32 +0000
140@@ -1,13 +1,13 @@
141 <?xml version="1.0" encoding="UTF-8" ?>
142-<application id="unity-scope-gdocs">
143- <_description>Google Docs search plugin</_description>
144- <translations>unity-scope-gdocs</translations>
145- <desktop-entry>unity-scope-gdocs.desktop</desktop-entry>
146+<application id="unity-scope-gdrive">
147+ <_description>Google Drive search plugin</_description>
148+ <translations>unity-scope-gdrive</translations>
149+ <desktop-entry>unity-scope-gdrive.desktop</desktop-entry>
150
151
152 <services>
153- <service id="google-docs">
154- <_description>Search your Google Docs files</_description>
155+ <service id="google-drive">
156+ <_description>Search your Google Drive files</_description>
157 </service>
158 </services>
159
160
161=== renamed file 'unity-scope-gdocs.desktop' => 'unity-scope-gdrive.desktop'
162--- unity-scope-gdocs.desktop 2012-09-19 12:16:29 +0000
163+++ unity-scope-gdrive.desktop 2012-10-25 09:40:32 +0000
164@@ -1,9 +1,9 @@
165 [Desktop Entry]
166 Categories=Office;
167 Exec=
168-GenericName=unity-scope-gdocs
169-Icon=unity-scope-gdocs
170-Name=Google Documents scope for Unity
171+GenericName=unity-scope-gdrive
172+Icon=unity-scope-gdrive
173+Name=Google Drive scope for Unity
174 NoDisplay=true
175 Terminal=false
176 Type=Application
177
178=== renamed file 'unity-scope-gdocs.png' => 'unity-scope-gdrive.png'
179=== renamed file 'unity-scope-gdocs.service' => 'unity-scope-gdrive.service'
180--- unity-scope-gdocs.service 2012-07-24 12:21:51 +0000
181+++ unity-scope-gdrive.service 2012-10-25 09:40:32 +0000
182@@ -1,3 +1,3 @@
183 [D-BUS Service]
184-Name=net.launchpad.Unity.Scope.GDocs
185-Exec=/usr/lib/unity-lens-files/unity-scope-gdocs
186+Name=net.launchpad.Unity.Scope.GDrive
187+Exec=/usr/lib/unity-lens-files/unity-scope-gdrive

Subscribers

People subscribed via source and target branches