nosklo
/
DrawOnYourScreen
mirror of https://codeberg.org/som/DrawOnYourScreen
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace DATA_SUB_DIR const with 'data-dir' metadata property

This commit is contained in:
abakkk 2020-01-06 15:32:38 +01:00
parent 8159ff3f7a
commit 738d06cde6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
draw.js
View File

@ -48,7 +48,6 @@ const _ = imports.gettext.domain(Me.metadata['gettext-domain']).gettext;
const GS_VERSION = Config.PACKAGE_VERSION; const GS_VERSION = Config.PACKAGE_VERSION;
const DEFAULT_FILE_NAME = 'DrawOnYourScreen'; const DEFAULT_FILE_NAME = 'DrawOnYourScreen';
const DATA_SUB_DIR = 'drawOnYourScreen'
const FILL_ICON_PATH = Me.dir.get_child('icons').get_child('fill-symbolic.svg').get_path(); const FILL_ICON_PATH = Me.dir.get_child('icons').get_child('fill-symbolic.svg').get_path();
const STROKE_ICON_PATH = Me.dir.get_child('icons').get_child('stroke-symbolic.svg').get_path(); const STROKE_ICON_PATH = Me.dir.get_child('icons').get_child('stroke-symbolic.svg').get_path();
@ -72,7 +71,7 @@ function getDateString() {
} }
function getJsonFiles() { function getJsonFiles() {
let directory = Gio.File.new_for_path(GLib.build_filenamev([GLib.get_user_data_dir(), DATA_SUB_DIR])); let directory = Gio.File.new_for_path(GLib.build_filenamev([GLib.get_user_data_dir(), Me.metadata['data-dir']]));
if (!directory.query_exists(null)) if (!directory.query_exists(null))
return []; return [];
@ -673,7 +672,7 @@ var DrawingArea = new Lang.Class({
this._stopDrawing(); this._stopDrawing();
} }
let dir = GLib.build_filenamev([GLib.get_user_data_dir(), DATA_SUB_DIR]); let dir = GLib.build_filenamev([GLib.get_user_data_dir(), Me.metadata['data-dir']]);
if (!GLib.file_test(dir, GLib.FileTest.EXISTS)) if (!GLib.file_test(dir, GLib.FileTest.EXISTS))
GLib.mkdir_with_parents(dir, 0o700); GLib.mkdir_with_parents(dir, 0o700);
let path = GLib.build_filenamev([dir, `${name}.json`]); let path = GLib.build_filenamev([dir, `${name}.json`]);
@ -718,7 +717,7 @@ var DrawingArea = new Lang.Class({
_loadJson: function(name, notify) { _loadJson: function(name, notify) {
let dir = GLib.get_user_data_dir(); let dir = GLib.get_user_data_dir();
let path = GLib.build_filenamev([dir, DATA_SUB_DIR, `${name}.json`]); let path = GLib.build_filenamev([dir, Me.metadata['data-dir'], `${name}.json`]);
if (!GLib.file_test(path, GLib.FileTest.EXISTS)) if (!GLib.file_test(path, GLib.FileTest.EXISTS))
return; return;

1
metadata.json
View File

@ -5,6 +5,7 @@
"url": "https://framagit.org/abakkk/DrawOnYourScreen", "url": "https://framagit.org/abakkk/DrawOnYourScreen",
"settings-schema": "org.gnome.shell.extensions.draw-on-your-screen", "settings-schema": "org.gnome.shell.extensions.draw-on-your-screen",
"gettext-domain": "draw-on-your-screen", "gettext-domain": "draw-on-your-screen",
"data-dir": "drawOnYourScreen",
"shell-version": [ "shell-version": [
"3.24", "3.24",
"3.26", "3.26",