Scratch

Merge lp:~gero-bare/scratch/fix-1637173 into lp:~elementary-apps/scratch/scratch

  1. fix-1637173
  2. Merge into scratch
Proposed by Gero.Bare
Status: Needs review
Proposed branch: lp:~gero-bare/scratch/fix-1637173
Merge into: lp:~elementary-apps/scratch/scratch
Diff against target: 288 lines (+31/-31)
19 files modified
CMakeLists.txt (+4/-4)
plugins/filemanager/Settings.vala (+1/-1)
plugins/folder-manager/Settings.vala (+1/-1)
plugins/outline/CtagsSymbolResolver.vala (+1/-1)
plugins/outline/OutlinePlugin.vala (+1/-1)
plugins/outline/ValaProcessing/SymbolOutline.vala (+1/-1)
plugins/outline/icons/outline.gresource.xml (+1/-1)
plugins/source-tree/Settings.vala (+1/-1)
plugins/spell/Settings.vala (+1/-1)
plugins/terminal/Settings.vala (+1/-1)
plugins/terminal/terminal.vala (+2/-2)
schemas/CMakeLists.txt (+5/-5)
schemas/io.elementary.scratch.gschema.xml (+3/-3)
schemas/io.elementary.scratch.plugins.file-manager.gschema.xml (+1/-1)
schemas/io.elementary.scratch.plugins.folder-manager.gschema.xml (+1/-1)
schemas/io.elementary.scratch.plugins.spell.gschema.xml (+1/-1)
schemas/io.elementary.scratch.plugins.terminal.gschema.xml (+1/-1)
src/Scratch.vala (+1/-1)
src/Services/Settings.vala (+3/-3)
To merge this branch: bzr merge lp:~gero-bare/scratch/fix-1637173
Reviewer Review Type Date Requested Status
Zisu Andrei (community) Approve
Review via email: mp+309516@code.launchpad.net

Description of the change

Move schemes from /org/patheon to /io/elementary and all the references related.

To post a comment you must log in.
Revision history for this message
Zisu Andrei (matzipan) wrote :

Looks good to me.

review: Approve
Reply
Revision history for this message
MarkoD (markodolar) wrote :

After update, wouldn't this reset all user settings to default? I didn't notice any code that moves old settings to new scheme. Is it possible to do it or is not needed at all?

Reply
Revision history for this message
Zisu Andrei (matzipan) wrote :

It would reset everything to default. I don't think there's much worth. Scratch is pretty easy to set up.

Reply
Revision history for this message
MarkoD (markodolar) wrote :

I agree that settings are not that critical, what about any unsaved documents? They also don't open. (they still exist in hidden unsaved folder so user would have to know about it to recover them)

Reply
Revision history for this message
Zisu Andrei (matzipan) wrote :

Fair point. Gero, thoughts?

review: Needs Information
Reply
Revision history for this message
Gero.Bare (gero-bare) wrote :

> Fair point. Gero, thoughts?

I didn't thought in the documents and that's a really fair point.

This need to be discussed with the UX team, meanwhile we can't risk to lose documents.

So we need to put this on hold. Also I really don't know how to tackle this, maybe just move the files? A post inst script?

Reply
Revision history for this message
Zisu Andrei (matzipan) wrote :

Come to think of it, this issue will only hit daily users, which know how to fix this issue. The users which switch from Loki to Juno will do a fresh install anyway.

review: Approve
Reply

Unmerged revisions

1771. By Gero.Bare

Move schemas from /org/pantheon to /io/elementary

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-09-01 04:13:38 +0000
3+++ CMakeLists.txt 2016-10-27 21:13:40 +0000
4@@ -106,8 +106,8 @@
5 add_subdirectory (po)
6
7 # Data
8-configure_file_translation(${CMAKE_SOURCE_DIR}/data/org.pantheon.scratch.desktop.in ${CMAKE_BINARY_DIR}/data/org.pantheon.scratch.desktop ${CMAKE_SOURCE_DIR}/po/)
9-configure_file_translation(${CMAKE_SOURCE_DIR}/data/org.pantheon.scratch.appdata.xml.in ${CMAKE_BINARY_DIR}/data/org.pantheon.scratch.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
10+configure_file_translation(${CMAKE_SOURCE_DIR}/data/io.elementary.scratch.desktop.in ${CMAKE_BINARY_DIR}/data/io.elementary.scratch.desktop ${CMAKE_SOURCE_DIR}/po/)
11+configure_file_translation(${CMAKE_SOURCE_DIR}/data/io.elementary.scratch.appdata.xml.in ${CMAKE_BINARY_DIR}/data/io.elementary.scratch.appdata.xml ${CMAKE_SOURCE_DIR}/po/)
12
13-install (FILES ${CMAKE_BINARY_DIR}/data/org.pantheon.scratch.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications)
14-install (FILES ${CMAKE_BINARY_DIR}/data/org.pantheon.scratch.appdata.xml DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/appdata)
15+install (FILES ${CMAKE_BINARY_DIR}/data/io.elementary.scratch.desktop DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications)
16+install (FILES ${CMAKE_BINARY_DIR}/data/io.elementary.scratch.appdata.xml DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/appdata)
17
18=== renamed file 'data/org.pantheon.scratch.appdata.xml.in' => 'data/io.elementary.scratch.appdata.xml.in'
19=== renamed file 'data/org.pantheon.scratch.desktop.in' => 'data/io.elementary.scratch.desktop.in'
20=== modified file 'plugins/filemanager/Settings.vala'
21--- plugins/filemanager/Settings.vala 2013-07-16 15:56:38 +0000
22+++ plugins/filemanager/Settings.vala 2016-10-27 21:13:40 +0000
23@@ -25,7 +25,7 @@
24 */
25 internal class Settings : Granite.Services.Settings {
26
27- private const string SCHEMA = "org.pantheon.scratch.plugins.file-manager";
28+ private const string SCHEMA = "io.elementary.scratch.plugins.file-manager";
29
30 public string opened_folder { get; set; }
31
32
33=== modified file 'plugins/folder-manager/Settings.vala'
34--- plugins/folder-manager/Settings.vala 2013-05-31 10:38:24 +0000
35+++ plugins/folder-manager/Settings.vala 2016-10-27 21:13:40 +0000
36@@ -25,7 +25,7 @@
37 */
38 internal class Settings : Granite.Services.Settings {
39
40- private const string SCHEMA = "org.pantheon.scratch.plugins.folder-manager";
41+ private const string SCHEMA = "io.elementary.scratch.plugins.folder-manager";
42
43 public string[] opened_folders { get; set; }
44
45
46=== modified file 'plugins/outline/CtagsSymbolResolver.vala'
47--- plugins/outline/CtagsSymbolResolver.vala 2016-01-14 19:33:06 +0000
48+++ plugins/outline/CtagsSymbolResolver.vala 2016-10-27 21:13:40 +0000
49@@ -21,7 +21,7 @@
50 }
51
52 public class CtagsSymbolOutline : Object, SymbolOutline {
53- public const string OUTLINE_RESOURCE_URI = "resource:///org/pantheon/scratch/plugin/outline/";
54+ public const string OUTLINE_RESOURCE_URI = "resource:///io/elementary/scratch/plugin/outline/";
55 public Scratch.Services.Document doc { get; protected set; }
56 Granite.Widgets.SourceList store;
57 Granite.Widgets.SourceList.ExpandableItem root;
58
59=== modified file 'plugins/outline/OutlinePlugin.vala'
60--- plugins/outline/OutlinePlugin.vala 2016-01-14 19:33:06 +0000
61+++ plugins/outline/OutlinePlugin.vala 2016-10-27 21:13:40 +0000
62@@ -36,7 +36,7 @@
63 construct {
64 views = new Gee.LinkedList<SymbolOutline> ();
65 weak Gtk.IconTheme default_theme = Gtk.IconTheme.get_default ();
66- default_theme.add_resource_path ("/org/pantheon/scratch/plugin/outline");
67+ default_theme.add_resource_path ("/io/elementary/scratch/plugin/outline");
68 }
69
70 public void activate () {
71
72=== modified file 'plugins/outline/ValaProcessing/SymbolOutline.vala'
73--- plugins/outline/ValaProcessing/SymbolOutline.vala 2016-01-14 19:33:06 +0000
74+++ plugins/outline/ValaProcessing/SymbolOutline.vala 2016-10-27 21:13:40 +0000
75@@ -1,6 +1,6 @@
76
77 public class ValaSymbolOutline : Object, SymbolOutline {
78- public const string OUTLINE_RESOURCE_URI = "resource:///org/pantheon/scratch/plugin/outline/";
79+ public const string OUTLINE_RESOURCE_URI = "resource:///io/elementary/scratch/plugin/outline/";
80 public Scratch.Services.Document doc { get; protected set; }
81 public Granite.Widgets.SourceList store { get; private set; }
82 Granite.Widgets.SourceList.ExpandableItem root;
83
84=== modified file 'plugins/outline/icons/outline.gresource.xml'
85--- plugins/outline/icons/outline.gresource.xml 2016-01-14 19:33:06 +0000
86+++ plugins/outline/icons/outline.gresource.xml 2016-10-27 21:13:40 +0000
87@@ -1,6 +1,6 @@
88 <?xml version="1.0" encoding="UTF-8"?>
89 <gresources>
90- <gresource prefix="/org/pantheon/scratch/plugin/outline">
91+ <gresource prefix="/io/elementary/scratch/plugin/outline">
92 <file alias="lang-class-abstract.svg" compressed="true" preprocess="xml-stripblanks">abstractclass.svg</file>
93 <file alias="lang-method-abstract.svg" compressed="true" preprocess="xml-stripblanks">abstractmethod.svg</file>
94 <file alias="lang-property-abstract.svg" compressed="true" preprocess="xml-stripblanks">abstractproperty.svg</file>
95
96=== modified file 'plugins/source-tree/Settings.vala'
97--- plugins/source-tree/Settings.vala 2013-07-06 23:13:43 +0000
98+++ plugins/source-tree/Settings.vala 2016-10-27 21:13:40 +0000
99@@ -25,7 +25,7 @@
100 */
101 internal class Settings : Granite.Services.Settings {
102
103- private const string SCHEMA = "org.pantheon.scratch.plugins.folder-manager";
104+ private const string SCHEMA = "io.elementary.scratch.plugins.folder-manager";
105
106 public string[] opened_folders { get; set; }
107
108
109=== modified file 'plugins/spell/Settings.vala'
110--- plugins/spell/Settings.vala 2015-09-10 00:54:45 +0000
111+++ plugins/spell/Settings.vala 2016-10-27 21:13:40 +0000
112@@ -25,7 +25,7 @@
113 */
114 internal class Settings : Granite.Services.Settings {
115
116- private const string SCHEMA = "org.pantheon.scratch.plugins.spell";
117+ private const string SCHEMA = "io.elementary.scratch.plugins.spell";
118
119 public string language { get; set; }
120
121
122=== modified file 'plugins/terminal/Settings.vala'
123--- plugins/terminal/Settings.vala 2015-01-31 21:19:55 +0000
124+++ plugins/terminal/Settings.vala 2016-10-27 21:13:40 +0000
125@@ -29,7 +29,7 @@
126 */
127 internal class Settings : Granite.Services.Settings {
128
129- private const string SCHEMA = "org.pantheon.scratch.plugins.terminal";
130+ private const string SCHEMA = "io.elementary.scratch.plugins.terminal";
131
132 public int position { get; set; }
133 public string last_opened_path { get; set; }
134
135=== modified file 'plugins/terminal/terminal.vala'
136--- plugins/terminal/terminal.vala 2016-10-08 20:52:37 +0000
137+++ plugins/terminal/terminal.vala 2016-10-27 21:13:40 +0000
138@@ -219,9 +219,9 @@
139
140 // Set font, allow-bold, audible-bell, background, foreground, and palette of pantheon-terminal
141 var schema_source = SettingsSchemaSource.get_default ();
142- var terminal_schema = schema_source.lookup ("org.pantheon.terminal.settings", true);
143+ var terminal_schema = schema_source.lookup ("io.elementary.terminal.settings", true);
144 if (terminal_schema != null) {
145- var pantheon_terminal_settings = new GLib.Settings ("org.pantheon.terminal.settings");
146+ var pantheon_terminal_settings = new GLib.Settings ("io.elementary.terminal.settings");
147
148 font_name = pantheon_terminal_settings.get_string ("font");
149
150
151=== modified file 'schemas/CMakeLists.txt'
152--- schemas/CMakeLists.txt 2015-09-10 00:54:45 +0000
153+++ schemas/CMakeLists.txt 2016-10-27 21:13:40 +0000
154@@ -1,6 +1,6 @@
155 include(GSettings)
156-add_schema("org.pantheon.scratch.gschema.xml")
157-add_schema("org.pantheon.scratch.plugins.folder-manager.gschema.xml")
158-add_schema("org.pantheon.scratch.plugins.file-manager.gschema.xml")
159-add_schema("org.pantheon.scratch.plugins.terminal.gschema.xml")
160-add_schema("org.pantheon.scratch.plugins.spell.gschema.xml")
161+add_schema("io.elementary.scratch.gschema.xml")
162+add_schema("io.elementary.scratch.plugins.folder-manager.gschema.xml")
163+add_schema("io.elementary.scratch.plugins.file-manager.gschema.xml")
164+add_schema("io.elementary.scratch.plugins.terminal.gschema.xml")
165+add_schema("io.elementary.scratch.plugins.spell.gschema.xml")
166
167=== renamed file 'schemas/org.pantheon.scratch.gschema.xml' => 'schemas/io.elementary.scratch.gschema.xml'
168--- schemas/org.pantheon.scratch.gschema.xml 2016-04-13 05:03:04 +0000
169+++ schemas/io.elementary.scratch.gschema.xml 2016-10-27 21:13:40 +0000
170@@ -5,7 +5,7 @@
171 <value nick="Maximized" value="1" />
172 <value nick="Fullscreen" value="2" />
173 </enum>
174- <schema path="/org/pantheon/scratch/saved-state/" id="org.pantheon.scratch.saved-state" gettext-domain="scratch">
175+ <schema path="/io/elementary/scratch/saved-state/" id="io.elementary.scratch.saved-state" gettext-domain="scratch">
176 <key name="window-state" enum="scratch-window-states">
177 <default>"Normal"</default>
178 <summary>The saved state of the window.</summary>
179@@ -48,7 +48,7 @@
180 <description></description>
181 </key>
182 </schema>
183- <schema path="/org/pantheon/scratch/settings/" id="org.pantheon.scratch.settings" gettext-domain="scratch">
184+ <schema path="/io/elementary/scratch/settings/" id="io.elementary.scratch.settings" gettext-domain="scratch">
185 <key type="as" name="plugins-enabled">
186 <default>['detect-indent', 'folder-manager', 'contractor']</default>
187 <summary>Enabled Plugins</summary>
188@@ -145,7 +145,7 @@
189 <description>Restore the focused document from a previous session when opening Scratch.</description>
190 </key>
191 </schema>
192- <schema path="/org/pantheon/scratch/services/" id="org.pantheon.scratch.services" gettext-domain="scratch">
193+ <schema path="/io/elementary/scratch/services/" id="io.elementary.scratch.services" gettext-domain="scratch">
194 <key name="paste-format-code" type="s">
195 <default>'None'</default>
196 <summary>Default PasteBin text highlight</summary>
197
198=== renamed file 'schemas/org.pantheon.scratch.plugins.file-manager.gschema.xml' => 'schemas/io.elementary.scratch.plugins.file-manager.gschema.xml'
199--- schemas/org.pantheon.scratch.plugins.file-manager.gschema.xml 2013-07-16 15:56:38 +0000
200+++ schemas/io.elementary.scratch.plugins.file-manager.gschema.xml 2016-10-27 21:13:40 +0000
201@@ -1,6 +1,6 @@
202 <?xml version="1.0" encoding="UTF-8"?>
203 <schemalist>
204- <schema path="/org/pantheon/scratch/plugins/file-manager/" id="org.pantheon.scratch.plugins.file-manager" gettext-domain="scratch">
205+ <schema path="/io/elementary/scratch/plugins/file-manager/" id="io.elementary.scratch.plugins.file-manager" gettext-domain="scratch">
206 <key name="opened-folder" type="s">
207 <default>''</default>
208 <summary>Opened folder.</summary>
209
210=== renamed file 'schemas/org.pantheon.scratch.plugins.folder-manager.gschema.xml' => 'schemas/io.elementary.scratch.plugins.folder-manager.gschema.xml'
211--- schemas/org.pantheon.scratch.plugins.folder-manager.gschema.xml 2013-05-31 10:38:24 +0000
212+++ schemas/io.elementary.scratch.plugins.folder-manager.gschema.xml 2016-10-27 21:13:40 +0000
213@@ -1,6 +1,6 @@
214 <?xml version="1.0" encoding="UTF-8"?>
215 <schemalist>
216- <schema path="/org/pantheon/scratch/plugins/folder-manager/" id="org.pantheon.scratch.plugins.folder-manager" gettext-domain="scratch">
217+ <schema path="/io/elementary/scratch/plugins/folder-manager/" id="io.elementary.scratch.plugins.folder-manager" gettext-domain="scratch">
218 <key name="opened-folders" type="as">
219 <default>[]</default>
220 <summary>Opened folders.</summary>
221
222=== renamed file 'schemas/org.pantheon.scratch.plugins.spell.gschema.xml' => 'schemas/io.elementary.scratch.plugins.spell.gschema.xml'
223--- schemas/org.pantheon.scratch.plugins.spell.gschema.xml 2015-09-10 01:15:57 +0000
224+++ schemas/io.elementary.scratch.plugins.spell.gschema.xml 2016-10-27 21:13:40 +0000
225@@ -1,6 +1,6 @@
226 <?xml version="1.0" encoding="UTF-8"?>
227 <schemalist>
228- <schema path="/org/pantheon/scratch/plugins/spell/" id="org.pantheon.scratch.plugins.spell" gettext-domain="scratch">
229+ <schema path="/io/elementary/scratch/plugins/spell/" id="io.elementary.scratch.plugins.spell" gettext-domain="scratch">
230 <key name="language" type="s">
231 <default>'en_US'</default>
232 <summary>Selected Spellcheck Language</summary>
233
234=== renamed file 'schemas/org.pantheon.scratch.plugins.terminal.gschema.xml' => 'schemas/io.elementary.scratch.plugins.terminal.gschema.xml'
235--- schemas/org.pantheon.scratch.plugins.terminal.gschema.xml 2015-01-11 17:50:46 +0000
236+++ schemas/io.elementary.scratch.plugins.terminal.gschema.xml 2016-10-27 21:13:40 +0000
237@@ -1,6 +1,6 @@
238 <?xml version="1.0" encoding="UTF-8"?>
239 <schemalist>
240- <schema path="/org/pantheon/scratch/plugins/terminal/" id="org.pantheon.scratch.plugins.terminal" gettext-domain="scratch">
241+ <schema path="/io/elementary/scratch/plugins/terminal/" id="io.elementary.scratch.plugins.terminal" gettext-domain="scratch">
242 <key name="position" type="i">
243 <default>0</default>
244 <summary>Terminal position</summary>
245
246=== modified file 'src/Scratch.vala'
247--- src/Scratch.vala 2016-09-01 04:13:38 +0000
248+++ src/Scratch.vala 2016-10-27 21:13:40 +0000
249@@ -50,7 +50,7 @@
250 app_years = "2011-2015";
251 app_icon = "accessories-text-editor";
252 app_launcher = "scratch-text-editor.desktop";
253- application_id = "org.pantheon." + app_cmd_name.down ();
254+ application_id = "io.elementary.%s".printf(app_cmd_name.down ());
255 main_url = "https://launchpad.net/scratch";
256 bug_url = "https://bugs.launchpad.net/scratch";
257 help_url = "https://elementary.io/help/scratch";
258
259=== modified file 'src/Services/Settings.vala'
260--- src/Services/Settings.vala 2016-04-13 05:03:04 +0000
261+++ src/Services/Settings.vala 2016-10-27 21:13:40 +0000
262@@ -40,7 +40,7 @@
263 public int vp_size { get; set; }
264
265 public SavedState () {
266- base ("org.pantheon.scratch.saved-state");
267+ base ("io.elementary.scratch.saved-state");
268 }
269
270 }
271@@ -68,7 +68,7 @@
272 public bool show_mini_map { get; set; }
273
274 public Settings () {
275- base ("org.pantheon.scratch.settings");
276+ base ("io.elementary.scratch.settings");
277 }
278
279 }
280@@ -80,7 +80,7 @@
281 public bool set_private { get; set; }
282
283 public ServicesSettings () {
284- base ("org.pantheon.scratch.services");
285+ base ("io.elementary.scratch.services");
286 }
287
288 }

Subscribers

People subscribed via source and target branches