morgan/gnome-shell-extension-freon
1
0
Fork 0
mirror of https://github.com/morgan9e/gnome-shell-extension-freon synced 2026-04-14 00:14:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

update for gnome-shell 3.32 #126

Browse Source
This commit is contained in:
UshakovVasilii
2019-03-20 22:11:27 +03:00
parent 6f9d334cef
commit 98630647dd
6 changed files with 14 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
freon@UshakovVasilii_Github.yahoo.com/bumblebeeNvidiaUtil.js
View File

@@ -69,7 +69,7 @@ var BumblebeeNvidiaUtil = class extends CommandLineUtil.CommandLineUtil {
execute(callback) {
if(this._active)
this.parent(callback);
super.execute(callback);
else
this._output = [];
}
@@ -95,7 +95,7 @@ var BumblebeeNvidiaUtil = class extends CommandLineUtil.CommandLineUtil {
}
destroy(){
this.parent();
super.destroy();
this._lockMonitor.disconnect(this._lockMonitor.id);
}

93
freon@UshakovVasilii_Github.yahoo.com/convenience.js
View File

@@ -1,93 +0,0 @@
/* -*- mode: js; js-basic-offset: 4; indent-tabs-mode: nil -*- */
/*
Copyright (c) 2011-2012, Giovanni Campagna <scampa.giovanni@gmail.com>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the GNOME nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
const Gettext = imports.gettext;
const Gio = imports.gi.Gio;
const Config = imports.misc.config;
const ExtensionUtils = imports.misc.extensionUtils;
/**
* initTranslations:
* @domain: (optional): the gettext domain to use
*
* Initialize Gettext to load translations from extensionsdir/locale.
* If @domain is not provided, it will be taken from metadata['gettext-domain']
*/
function initTranslations(domain) {
let extension = ExtensionUtils.getCurrentExtension();
domain = domain || extension.metadata['gettext-domain'];
// check if this extension was built with "make zip-file", and thus
// has the locale files in a subfolder
// otherwise assume that extension has been installed in the
// same prefix as gnome-shell
let localeDir = extension.dir.get_child('locale');
if (localeDir.query_exists(null))
Gettext.bindtextdomain(domain, localeDir.get_path());
else
Gettext.bindtextdomain(domain, Config.LOCALEDIR);
}
/**
* getSettings:
* @schema: (optional): the GSettings schema id
*
* Builds and return a GSettings schema for @schema, using schema files
* in extensionsdir/schemas. If @schema is not provided, it is taken from
* metadata['settings-schema'].
*/
function getSettings(schema) {
let extension = ExtensionUtils.getCurrentExtension();
schema = schema || extension.metadata['settings-schema'];
const GioSSS = Gio.SettingsSchemaSource;
// check if this extension was built with "make zip-file", and thus
// has the schema files in a subfolder
// otherwise assume that extension has been installed in the
// same prefix as gnome-shell (and therefore schemas are available
// in the standard folders)
let schemaDir = extension.dir.get_child('schemas');
let schemaSource;
if (schemaDir.query_exists(null))
schemaSource = GioSSS.new_from_directory(schemaDir.get_path(),
GioSSS.get_default(),
false);
else
schemaSource = GioSSS.get_default();
let schemaObj = schemaSource.lookup(schema, true);
if (!schemaObj)
throw new Error('Schema ' + schema + ' could not be found for extension '
+ extension.metadata.uuid + '. Please check your installation.');
return new Gio.Settings({ settings_schema: schemaObj });
}

18
freon@UshakovVasilii_Github.yahoo.com/extension.js
View File

@@ -7,9 +7,10 @@ const Mainloop = imports.mainloop;
const Clutter = imports.gi.Clutter;
const Gio = imports.gi.Gio;
const GLib = imports.gi.GLib;
const GObject = imports.gi.GObject;
const Me = imports.misc.extensionUtils.getCurrentExtension();
const Convenience = Me.imports.convenience;
const ExtensionUtils = imports.misc.extensionUtils;
const Me = ExtensionUtils.getCurrentExtension();
const UDisks2 = Me.imports.udisks2;
const AticonfigUtil = Me.imports.aticonfigUtil;
const NvidiaUtil = Me.imports.nvidiaUtil;
@@ -46,12 +47,11 @@ function _makeLogFunction(prefix) {
}
}
const FreonMenuButton = class extends PanelMenu.Button {
const FreonMenuButton = GObject.registerClass(class Freon_FreonMenuButton extends PanelMenu.Button {
_init() {
super._init(St.Align.START);
constructor(){
super(St.Align.START);
this._settings = Convenience.getSettings();
this._settings = ExtensionUtils.getSettings();
var _debugFunc = _makeLogFunction('DEBUG');
this.debug = this._settings.get_boolean('debug') ? _debugFunc : () => {};
@@ -619,12 +619,12 @@ const FreonMenuButton = class extends PanelMenu.Button {
get positionInPanel(){
return this._settings.get_string('position-in-panel');
}
};
});
let freonMenu;
function init(extensionMeta) {
Convenience.initTranslations();
ExtensionUtils.initTranslations();
}
function enable() {

2
freon@UshakovVasilii_Github.yahoo.com/nvidiaUtil.js
View File

@@ -8,7 +8,7 @@ const CommandLineUtil = Me.imports.commandLineUtil;
var NvidiaUtil = class extends CommandLineUtil.CommandLineUtil {
constructor() {
this.parent();
super();
let path = GLib.find_program_in_path('nvidia-settings');
this._argv = path ? [path, '-q', 'gpucoretemp', '-t'] : null;
this._labels = [];

3
freon@UshakovVasilii_Github.yahoo.com/smartctlUtil.js
View File

@@ -6,7 +6,7 @@ const CommandLineUtil = Me.imports.commandLineUtil;
var smartctlUtil = class extends CommandLineUtil.CommandLineUtil {
constructor() {
this.parent();
super();
let path = GLib.find_program_in_path('smartctl');
this._argv = path ? [path, '-x', '/dev/nvme0'] : null;
}
@@ -46,4 +46,3 @@ var smartctlUtil = class extends CommandLineUtil.CommandLineUtil {
}
};

3
freon@UshakovVasilii_Github.yahoo.com/udisks2.js
View File

@@ -33,7 +33,6 @@ const Async = {
var UDisks2 = class {
constructor(callback) {
this.parent();
this._udisksProxies = [];
this._get_drive_ata_proxies((proxies) => {
this._udisksProxies = proxies;
@@ -49,7 +48,7 @@ var UDisks2 = class {
get updated (){
return this._updated;
}
set updated (updated){
this._updated = updated;
}