Skip to content

Commit b47ee55

Browse files
committed
Install as different application
1 parent 285c9ea commit b47ee55

File tree

7 files changed

+20
-20
lines changed

7 files changed

+20
-20
lines changed

data/io.elementary.code.desktop.in.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ Name=@NAME@
44
Comment=Edit code files
55
GenericName=Code Editor
66
Exec=@EXEC_NAME@ %U
7-
Icon=io.elementary.code
87
Terminal=false
98
Categories=Development;GTK;IDE;WebDevelopment;
109
Keywords=text;IDE;scratch;code;

data/io.elementary.code.gschema.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<schemalist>
3-
<enum id="io.elementary.code.window-states">
3+
<enum id="com.github.jeremypw.code-testing.window-states">
44
<value nick="Normal" value="0" />
55
<value nick="Maximized" value="1" />
66
<value nick="Fullscreen" value="2" />
77
</enum>
8-
<enum id="io.elementary.code.draw-spaces-states">
8+
<enum id="com.github.jeremypw.code-testing.draw-spaces-states">
99
<value nick="Never" value="0" />
1010
<value nick="For Selection" value="1" />
1111
<value nick="Always" value="2" />
1212
<value nick="Current" value="4" />
1313
</enum>
14-
<enum id="io.elementary.code.case-sensitive-mode">
14+
<enum id="com.github.jeremypw.code-testing.case-sensitive-mode">
1515
<value nick="never" value="0" />
1616
<value nick="mixed" value="1" />
1717
<value nick="always" value="2" />
1818
</enum>
1919

20-
<schema path="/io/elementary/code/saved-state/" id="io.elementary.code.saved-state" gettext-domain="io.elementary.code">
21-
<key name="window-state" enum="io.elementary.code.window-states">
20+
<schema path="/com/github/jeremypw/code-testing/saved-state/" id="com.github.jeremypw.code-testing.saved-state" gettext-domain="com.github.jeremypw.code-testing">
21+
<key name="window-state" enum="com.github.jeremypw.code-testing.window-states">
2222
<default>"Normal"</default>
2323
<summary>The saved state of the window.</summary>
2424
<description>The saved state of the window.</description>
@@ -65,7 +65,7 @@
6565
</key>
6666
</schema>
6767

68-
<schema path="/io/elementary/code/settings/" id="io.elementary.code.settings" gettext-domain="io.elementary.code">
68+
<schema path="/com/github/jeremypw/code-testing/settings/" id="com.github.jeremypw.code-testing.settings" gettext-domain="com.github.jeremypw.code-testing">
6969
<key type="as" name="plugins-enabled">
7070
<default>['brackets-completion', 'detect-indent', 'editorconfig']</default>
7171
<summary>Enabled Plugins</summary>
@@ -106,7 +106,7 @@
106106
<summary>Highlight Matching Brackets</summary>
107107
<description>Whether Code should highlight matching brackets.</description>
108108
</key>
109-
<key name="draw-spaces" enum="io.elementary.code.draw-spaces-states">
109+
<key name="draw-spaces" enum="com.github.jeremypw.code-testing.draw-spaces-states">
110110
<default>"For Selection"</default>
111111
<summary>Draw spaces and tabs with symbols</summary>
112112
<description>Draw spaces and tabs with symbols. "Never" is deprecated and not exposed in the UI.</description>
@@ -187,7 +187,7 @@
187187
<summary>Whether search term is a regex expression</summary>
188188
<description>Whether the search should use the search term as a regex expression for matching.</description>
189189
</key>
190-
<key name="case-sensitive-search" enum="io.elementary.code.case-sensitive-mode">
190+
<key name="case-sensitive-search" enum="com.github.jeremypw.code-testing.case-sensitive-mode">
191191
<default>'mixed'</default>
192192
<summary>When text search is case sensitive</summary>
193193
<description>Whether the text search is case sensitive never, always or only when search term is mixed case</description>
@@ -199,7 +199,7 @@
199199
</key>
200200
</schema>
201201

202-
<schema path="/io/elementary/code/services/" id="io.elementary.code.services" gettext-domain="io.elementary.code">
202+
<schema path="/com/github/jeremypw/code-testing/services/" id="com.github.jeremypw.code-testing.services" gettext-domain="com.github.jeremypw.code-testing">
203203
<key name="paste-format-code" type="s">
204204
<default>'None'</default>
205205
<summary>Default PasteBin text highlight</summary>
@@ -217,7 +217,7 @@
217217
</key>
218218
</schema>
219219

220-
<schema path="/io/elementary/code/folder-manager/" id="io.elementary.code.folder-manager">
220+
<schema path="/com/github/jeremypw/code-testing/folder-manager/" id="com.github.jeremypw.code-testing.folder-manager">
221221
<key name="opened-folders" type="as">
222222
<default>[]</default>
223223
<summary>Opened folders.</summary>

data/meson.build

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ install_data([
2525
install_data(
2626
'io.elementary.code.gschema.xml',
2727
'io.elementary.code.plugins.spell.gschema.xml',
28+
rename: ['com.github.jeremypw.code-testing.gschema.xml', 'com.github.jeremypw.code-testing.plugins.spell.gschema.xml'],
2829
install_dir: get_option('prefix') / get_option('datadir') / 'glib-2.0' / 'schemas'
2930
)
3031

@@ -46,7 +47,7 @@ desktop_in_file = configure_file(
4647

4748
desktop_file = i18n.merge_file(
4849
input: desktop_in_file,
49-
output: 'io.elementary.code.desktop',
50+
output: meson.project_name() + '.desktop',
5051
po_dir: meson.project_source_root () / 'po' / 'extra',
5152
type: 'desktop',
5253
install_dir: get_option('datadir') / 'applications',

meson.build

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
project(
2-
'io.elementary.code',
2+
'com.github.jeremypw.code-testing',
33
'vala', 'c',
44
meson_version: '>= 0.58.0',
55
version: '7.4.0'
66
)
77

8+
original_project_name = 'io.elementary.code'
9+
810
add_project_arguments([
911
'-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name())
1012
],
@@ -41,7 +43,7 @@ posix_dep = meson.get_compiler('vala').find_library('posix')
4143
vte_dep = dependency('vte-2.91')
4244

4345
code_resources = gnome.compile_resources(
44-
'code-resources', 'data/' + meson.project_name() + '.gresource.xml',
46+
'code-resources', 'data/' + original_project_name + '.gresource.xml',
4547
source_dir: 'data'
4648
)
4749

plugins/fuzzy-search/fuzzy-search-indexer.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public class Scratch.Services.FuzzySearchIndexer : GLib.Object {
7575
processing_queue = new Gee.ConcurrentList<IndexerMessage> ();
7676
project_paths = new Gee.HashMap<string, Services.SearchProject> ();
7777

78-
folder_settings = new GLib.Settings ("io.elementary.code.folder-manager");
78+
folder_settings = new GLib.Settings (Constants.PROJECT_NAME + ".folder-manager");
7979
folder_settings.changed["opened-folders"].connect (handle_opened_projects_change);
8080
}
8181

plugins/fuzzy-search/fuzzy-search.vala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class Scratch.Plugins.FuzzySearch: Peas.ExtensionBase, Scratch.Services.A
5454

5555
window = w;
5656

57-
folder_settings = new GLib.Settings ("io.elementary.code.folder-manager");
57+
folder_settings = new GLib.Settings (Constants.PROJECT_NAME + ".folder-manager");
5858
add_actions ();
5959
folder_settings.changed["opened-folders"].connect (handle_opened_projects_change);
6060
});
@@ -118,9 +118,7 @@ public class Scratch.Plugins.FuzzySearch: Peas.ExtensionBase, Scratch.Services.A
118118
}
119119

120120
private void fuzzy_find () {
121-
var settings = new GLib.Settings ("io.elementary.code.folder-manager");
122-
123-
string[] opened_folders = settings.get_strv ("opened-folders");
121+
string[] opened_folders = folder_settings.get_strv ("opened-folders");
124122
if (opened_folders == null || opened_folders.length < 1) {
125123
return;
126124
}

src/FolderManager/FileView.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public class Scratch.FolderManager.FileView : Code.Widgets.SourceList, Code.Pane
7373
icon_name = "folder-symbolic";
7474
title = _("Folders");
7575

76-
settings = new GLib.Settings ("io.elementary.code.folder-manager");
76+
settings = new GLib.Settings (Constants.PROJECT_NAME + ".folder-manager");
7777

7878
git_manager = Scratch.Services.GitManager.get_instance ();
7979

0 commit comments

Comments
 (0)