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

define 'persistent-file-name' and 'svg-file-name' in metadata 

instead of 'DEFAULT-FILE-NAME' const
This commit is contained in:
abakkk 2020-01-10 12:32:28 +01:00
parent 4cc28cf100
commit aa0a984878
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
draw.js
View File

@ -47,7 +47,6 @@ const Prefs = Me.imports.prefs;
const _ = imports.gettext.domain(Me.metadata['gettext-domain']).gettext; 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 FILL_ICON_PATH = Me.dir.get_child('data').get_child('icons').get_child('fill-symbolic.svg').get_path(); const FILL_ICON_PATH = Me.dir.get_child('data').get_child('icons').get_child('fill-symbolic.svg').get_path();
const STROKE_ICON_PATH = Me.dir.get_child('data').get_child('icons').get_child('stroke-symbolic.svg').get_path(); const STROKE_ICON_PATH = Me.dir.get_child('data').get_child('icons').get_child('stroke-symbolic.svg').get_path();
@ -86,7 +85,7 @@ function getJsonFiles() {
let i = 0; let i = 0;
let fileInfo = enumerator.next_file(null); let fileInfo = enumerator.next_file(null);
while (fileInfo) { while (fileInfo) {
if (fileInfo.get_content_type().indexOf('json') != -1 && fileInfo.get_name() != `${DEFAULT_FILE_NAME}.json`) { if (fileInfo.get_content_type().indexOf('json') != -1 && fileInfo.get_name() != `${Me.metadata['persistent-file-name']}.json`) {
let file = enumerator.get_child(fileInfo); let file = enumerator.get_child(fileInfo);
jsonFiles.push({ name: fileInfo.get_name().slice(0, -5), jsonFiles.push({ name: fileInfo.get_name().slice(0, -5),
displayName: fileInfo.get_display_name().slice(0, -5), displayName: fileInfo.get_display_name().slice(0, -5),
@ -644,7 +643,7 @@ var DrawingArea = new Lang.Class({
} }
content += "\n</svg>"; content += "\n</svg>";
let filename = `${DEFAULT_FILE_NAME} ${getDateString()}.svg`; let filename = `${Me.metadata['svg-file-name']} ${getDateString()}.svg`;
let dir = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_PICTURES); let dir = GLib.get_user_special_dir(GLib.UserDirectory.DIRECTORY_PICTURES);
let path = GLib.build_filenamev([dir, filename]); let path = GLib.build_filenamev([dir, filename]);
if (GLib.file_test(path, GLib.FileTest.EXISTS)) if (GLib.file_test(path, GLib.FileTest.EXISTS))
@ -696,7 +695,7 @@ var DrawingArea = new Lang.Class({
GLib.file_set_contents(path, contents); GLib.file_set_contents(path, contents);
if (notify) if (notify)
this.emit('show-osd', 'document-save-symbolic', name, -1); this.emit('show-osd', 'document-save-symbolic', name, -1);
if (name != DEFAULT_FILE_NAME) { if (name != Me.metadata['persistent-file-name']) {
this.jsonName = name; this.jsonName = name;
this.lastJsonContents = contents; this.lastJsonContents = contents;
} }
@ -712,7 +711,7 @@ var DrawingArea = new Lang.Class({
}, },
savePersistent: function() { savePersistent: function() {
this._saveAsJson(DEFAULT_FILE_NAME); this._saveAsJson(Me.metadata['persistent-file-name']);
}, },
_loadJson: function(name, notify) { _loadJson: function(name, notify) {
@ -730,14 +729,14 @@ var DrawingArea = new Lang.Class({
if (notify) if (notify)
this.emit('show-osd', 'document-open-symbolic', name, -1); this.emit('show-osd', 'document-open-symbolic', name, -1);
if (name != DEFAULT_FILE_NAME) { if (name != Me.metadata['persistent-file-name']) {
this.jsonName = name; this.jsonName = name;
this.lastJsonContents = contents; this.lastJsonContents = contents;
} }
}, },
_loadPersistent: function() { _loadPersistent: function() {
this._loadJson(DEFAULT_FILE_NAME); this._loadJson(Me.metadata['persistent-file-name']);
}, },
loadJson: function(name, notify) { loadJson: function(name, notify) {
@ -1497,7 +1496,7 @@ var DrawingMenu = new Lang.Class({
this._updateDrawingNameMenuItem(); this._updateDrawingNameMenuItem();
this._populateOpenDrawingSubMenu(); this._populateOpenDrawingSubMenu();
}, },
invalidStrings: [DEFAULT_FILE_NAME, '/'], invalidStrings: [Me.metadata['persistent-file-name'], '/'],
primaryIconName: 'insert-text' }); primaryIconName: 'insert-text' });
this.saveDrawingSubMenu.addMenuItem(this.saveEntry.item); this.saveDrawingSubMenu.addMenuItem(this.saveEntry.item);
}, },

2
metadata.json
View File

@ -6,6 +6,8 @@
"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", "data-dir": "drawOnYourScreen",
"persistent-file-name": "persistent",
"svg-file-name": "DrawOnYourScreen",
"shell-version": [ "shell-version": [
"3.24", "3.24",
"3.26", "3.26",