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

change imports 

* Extension -> Me
* ExtensionJs -> Extension
* Use ExtensionUtils instead of convenience with GS 3.32+
This commit is contained in:
abakkk 2020-01-05 15:44:51 +01:00
parent bc5acc7472
commit f4ff709fd3
3 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
draw.js
View File

@ -40,22 +40,22 @@ const Screenshot = imports.ui.screenshot;
const Tweener = imports.ui.tweener; const Tweener = imports.ui.tweener;
const ExtensionUtils = imports.misc.extensionUtils; const ExtensionUtils = imports.misc.extensionUtils;
const Extension = ExtensionUtils.getCurrentExtension(); const Me = ExtensionUtils.getCurrentExtension();
const Convenience = Extension.imports.convenience; const Convenience = ExtensionUtils.getSettings ? ExtensionUtils : Me.imports.convenience;
const ExtensionJs = Extension.imports.extension; const Extension = Me.imports.extension;
const Prefs = Extension.imports.prefs; const Prefs = Me.imports.prefs;
const _ = imports.gettext.domain(Extension.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 DEFAULT_FILE_NAME = 'DrawOnYourScreen';
const DATA_SUB_DIR = 'drawOnYourScreen' const DATA_SUB_DIR = 'drawOnYourScreen'
const FILL_ICON_PATH = Extension.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 = Extension.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();
const LINEJOIN_ICON_PATH = Extension.dir.get_child('icons').get_child('linejoin-symbolic.svg').get_path(); const LINEJOIN_ICON_PATH = Me.dir.get_child('icons').get_child('linejoin-symbolic.svg').get_path();
const LINECAP_ICON_PATH = Extension.dir.get_child('icons').get_child('linecap-symbolic.svg').get_path(); const LINECAP_ICON_PATH = Me.dir.get_child('icons').get_child('linecap-symbolic.svg').get_path();
const DASHED_LINE_ICON_PATH = Extension.dir.get_child('icons').get_child('dashed-line-symbolic.svg').get_path(); const DASHED_LINE_ICON_PATH = Me.dir.get_child('icons').get_child('dashed-line-symbolic.svg').get_path();
const FULL_LINE_ICON_PATH = Extension.dir.get_child('icons').get_child('full-line-symbolic.svg').get_path(); const FULL_LINE_ICON_PATH = Me.dir.get_child('icons').get_child('full-line-symbolic.svg').get_path();
var Shapes = { NONE: 0, LINE: 1, ELLIPSE: 2, RECTANGLE: 3, TEXT: 4 }; var Shapes = { NONE: 0, LINE: 1, ELLIPSE: 2, RECTANGLE: 3, TEXT: 4 };
var TextState = { DRAWING: 0, WRITING: 1 }; var TextState = { DRAWING: 0, WRITING: 1 };
@ -406,7 +406,7 @@ var DrawingArea = new Lang.Class({
setPointerCursor: function(pointerCursorName) { setPointerCursor: function(pointerCursorName) {
if (!this.currentPointerCursorName || this.currentPointerCursorName != pointerCursorName) { if (!this.currentPointerCursorName || this.currentPointerCursorName != pointerCursorName) {
this.currentPointerCursorName = pointerCursorName; this.currentPointerCursorName = pointerCursorName;
ExtensionJs.setCursor(pointerCursorName); Extension.setCursor(pointerCursorName);
} }
}, },
@ -1188,7 +1188,7 @@ var DrawingMenu = new Lang.Class({
} else { } else {
this.area.updatePointerCursor(); this.area.updatePointerCursor();
// actionMode has changed, set previous actionMode in order to keep internal shortcuts working // actionMode has changed, set previous actionMode in order to keep internal shortcuts working
Main.actionMode = ExtensionJs.DRAWING_ACTION_MODE | Shell.ActionMode.NORMAL; Main.actionMode = Extension.DRAWING_ACTION_MODE | Shell.ActionMode.NORMAL;
this.area.grab_key_focus(); this.area.grab_key_focus();
} }
}, },
@ -1254,7 +1254,7 @@ var DrawingMenu = new Lang.Class({
this.menu.addMenuItem(fontSection); this.menu.addMenuItem(fontSection);
this.fontSection = fontSection; this.fontSection = fontSection;
let manager = ExtensionJs.manager; let manager = Extension.manager;
this._addSwitchItemWithCallback(this.menu, _("Hide panel and dock"), manager.hiddenList ? true : false, manager.togglePanelAndDockOpacity.bind(manager)); this._addSwitchItemWithCallback(this.menu, _("Hide panel and dock"), manager.hiddenList ? true : false, manager.togglePanelAndDockOpacity.bind(manager));
this._addSwitchItemWithCallback(this.menu, _("Add a drawing background"), this.area.hasBackground, this.area.toggleBackground.bind(this.area)); this._addSwitchItemWithCallback(this.menu, _("Add a drawing background"), this.area.hasBackground, this.area.toggleBackground.bind(this.area));
this._addSwitchItemWithCallback(this.menu, _("Square drawing area"), this.area.isSquareArea, this.area.toggleSquareArea.bind(this.area)); this._addSwitchItemWithCallback(this.menu, _("Square drawing area"), this.area.isSquareArea, this.area.toggleSquareArea.bind(this.area));
@ -1314,18 +1314,18 @@ var DrawingMenu = new Lang.Class({
target[targetProperty] = Math.max(Math.round(value * 50), 0); target[targetProperty] = Math.max(Math.round(value * 50), 0);
label.set_text(target[targetProperty] + " px"); label.set_text(target[targetProperty] + " px");
if (target[targetProperty] === 0) if (target[targetProperty] === 0)
label.add_style_class_name(ExtensionJs.WARNING_COLOR_STYLE_CLASS_NAME); label.add_style_class_name(Extension.WARNING_COLOR_STYLE_CLASS_NAME);
else else
label.remove_style_class_name(ExtensionJs.WARNING_COLOR_STYLE_CLASS_NAME); label.remove_style_class_name(Extension.WARNING_COLOR_STYLE_CLASS_NAME);
}); });
} else { } else {
slider.connect('notify::value', () => { slider.connect('notify::value', () => {
target[targetProperty] = Math.max(Math.round(slider.value * 50), 0); target[targetProperty] = Math.max(Math.round(slider.value * 50), 0);
label.set_text(target[targetProperty] + " px"); label.set_text(target[targetProperty] + " px");
if (target[targetProperty] === 0) if (target[targetProperty] === 0)
label.add_style_class_name(ExtensionJs.WARNING_COLOR_STYLE_CLASS_NAME); label.add_style_class_name(Extension.WARNING_COLOR_STYLE_CLASS_NAME);
else else
label.remove_style_class_name(ExtensionJs.WARNING_COLOR_STYLE_CLASS_NAME); label.remove_style_class_name(Extension.WARNING_COLOR_STYLE_CLASS_NAME);
}); });
} }

23
extension.js
View File

@ -31,10 +31,11 @@ const Main = imports.ui.main;
const OsdWindow = imports.ui.osdWindow; const OsdWindow = imports.ui.osdWindow;
const PanelMenu = imports.ui.panelMenu; const PanelMenu = imports.ui.panelMenu;
const Extension = imports.misc.extensionUtils.getCurrentExtension(); const ExtensionUtils = imports.misc.extensionUtils;
const Convenience = Extension.imports.convenience; const Me = ExtensionUtils.getCurrentExtension();
const Draw = Extension.imports.draw; const Convenience = ExtensionUtils.getSettings && ExtensionUtils.initTranslations ? ExtensionUtils : Me.imports.convenience;
const _ = imports.gettext.domain(Extension.metadata["gettext-domain"]).gettext; const Draw = Me.imports.draw;
const _ = imports.gettext.domain(Me.metadata["gettext-domain"]).gettext;
const GS_VERSION = Config.PACKAGE_VERSION; const GS_VERSION = Config.PACKAGE_VERSION;
@ -92,14 +93,14 @@ var AreaManager = new Lang.Class({
this.desktopSettingHandler = this.settings.connect('changed::drawing-on-desktop', this.onDesktopSettingChanged.bind(this)); this.desktopSettingHandler = this.settings.connect('changed::drawing-on-desktop', this.onDesktopSettingChanged.bind(this));
this.persistentSettingHandler = this.settings.connect('changed::persistent-drawing', this.onPersistentSettingChanged.bind(this)); this.persistentSettingHandler = this.settings.connect('changed::persistent-drawing', this.onPersistentSettingChanged.bind(this));
if (Extension.stylesheet) { if (Me.stylesheet) {
this.stylesheetMonitor = Extension.stylesheet.monitor(Gio.FileMonitorFlags.NONE, null); this.stylesheetMonitor = Me.stylesheet.monitor(Gio.FileMonitorFlags.NONE, null);
this.stylesheetChangedHandler = this.stylesheetMonitor.connect('changed', (monitor, file, otherFile, eventType) => { this.stylesheetChangedHandler = this.stylesheetMonitor.connect('changed', (monitor, file, otherFile, eventType) => {
if ((eventType != 0 && eventType != 3) || !Extension.stylesheet.query_exists(null)) if ((eventType != 0 && eventType != 3) || !Me.stylesheet.query_exists(null))
return; return;
let theme = St.ThemeContext.get_for_stage(global.stage).get_theme(); let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
theme.unload_stylesheet(Extension.stylesheet); theme.unload_stylesheet(Me.stylesheet);
theme.load_stylesheet(Extension.stylesheet); theme.load_stylesheet(Me.stylesheet);
}); });
} }
}, },
@ -216,8 +217,8 @@ var AreaManager = new Lang.Class({
}, },
openStylesheetFile: function() { openStylesheetFile: function() {
if (Extension.stylesheet && Extension.stylesheet.query_exists(null)) if (Me.stylesheet && Me.stylesheet.query_exists(null))
Gio.AppInfo.launch_default_for_uri(Extension.stylesheet.get_uri(), global.create_app_launch_context(0, -1)); Gio.AppInfo.launch_default_for_uri(Me.stylesheet.get_uri(), global.create_app_launch_context(0, -1));
if (this.activeArea) if (this.activeArea)
this.toggleDrawing(); this.toggleDrawing();
}, },

8
prefs.js
View File

@ -26,10 +26,10 @@ const Lang = imports.lang;
const Mainloop = imports.mainloop; const Mainloop = imports.mainloop;
const ExtensionUtils = imports.misc.extensionUtils; const ExtensionUtils = imports.misc.extensionUtils;
const Extension = ExtensionUtils.getCurrentExtension(); const Me = ExtensionUtils.getCurrentExtension();
const Convenience = Extension.imports.convenience; const Convenience = ExtensionUtils.getSettings && ExtensionUtils.initTranslations ? ExtensionUtils : Me.imports.convenience;
const Metadata = Extension.metadata; const Metadata = Me.metadata;
const _ = imports.gettext.domain(Extension.metadata["gettext-domain"]).gettext; const _ = imports.gettext.domain(Me.metadata["gettext-domain"]).gettext;
const _GTK = imports.gettext.domain('gtk30').gettext; const _GTK = imports.gettext.domain('gtk30').gettext;
const MARGIN = 10; const MARGIN = 10;