all: remove all GSettings usage
Since GSettings is not supported in extensions in 3.2, all settings have been replaced by constants in JS files (except for user-theme, whose only purpose is to actually bridge GSettings to the shell). Customizations are still supported in master, and distributions packaging these extensions for system-wide install may consider reverting this bug.
This commit is contained in:
Giovanni Campagna
@@ -1,14 +1,3 @@
|
||||
EXTENSION_ID = dock
|
||||
|
||||
include ../../extension.mk
|
||||
|
||||
gschemas_in = $(gschemabase).dock.gschema.xml.in
|
||||
|
||||
@INTLTOOL_XML_NOMERGE_RULE@
|
||||
|
||||
gsettings_SCHEMAS = $(gschemas_in:.xml.in=.xml)
|
||||
|
||||
@GSETTINGS_RULES@
|
||||
|
||||
CLEANFILES += $(gschemas_in:.xml.in=.valid) $(gsettings_SCHEMAS)
|
||||
EXTRA_DIST += $(gschemas_in)
|
||||
|
||||
@@ -25,15 +25,6 @@ const AltTab = imports.ui.altTab;
|
||||
const Gettext = imports.gettext.domain('gnome-shell-extensions');
|
||||
const _ = Gettext.gettext;
|
||||
|
||||
// Settings
|
||||
const DOCK_SETTINGS_SCHEMA = 'org.gnome.shell.extensions.dock';
|
||||
const DOCK_POSITION_KEY = 'position';
|
||||
const DOCK_SIZE_KEY = 'size';
|
||||
const DOCK_HIDE_KEY = 'autohide';
|
||||
const DOCK_EFFECTHIDE_KEY = 'hide-effect';
|
||||
const DOCK_AUTOHIDE_ANIMATION_TIME_KEY = 'hide-effect-duration';
|
||||
|
||||
|
||||
//hide
|
||||
//const autohide_animation_time = 0.3;
|
||||
|
||||
@@ -49,6 +40,15 @@ const AutoHideEffect = {
|
||||
MOVE: 2
|
||||
};
|
||||
|
||||
// Settings
|
||||
const DOCK_POSITION = PositionMode.RIGHT;
|
||||
const DOCK_SIZE = 48;
|
||||
const DOCK_AUTOHIDE = true;
|
||||
const DOCK_EFFECTHIDE = AutoHideEffect.MOVE;
|
||||
const DOCK_AUTOHIDE_ANIMATION_TIME = 0.3;
|
||||
// Do not change anything below this line (it is intentionally duplicate to keep in
|
||||
// sync with master branch)
|
||||
|
||||
let position = PositionMode.RIGHT;
|
||||
let dockicon_size = 48;
|
||||
let hideable = true;
|
||||
@@ -340,15 +340,11 @@ Dock.prototype = {
|
||||
this._favorites = [];
|
||||
|
||||
// Load Settings
|
||||
this._settings = new Gio.Settings({ schema: DOCK_SETTINGS_SCHEMA });
|
||||
position = this._settings.get_enum(DOCK_POSITION_KEY);
|
||||
dockicon_size = this._settings.get_int(DOCK_SIZE_KEY);
|
||||
hideDock = hideable = this._settings.get_boolean(DOCK_HIDE_KEY);
|
||||
hideEffect = this._settings.get_enum(DOCK_EFFECTHIDE_KEY);
|
||||
autohide_animation_time = this._settings.get_double(DOCK_AUTOHIDE_ANIMATION_TIME_KEY);
|
||||
//global.log("POSITION: " + position);
|
||||
//global.log("dockicon_size: " + dockicon_size);
|
||||
|
||||
position = DOCK_POSITION;
|
||||
dockicon_size = DOCK_SIZE;
|
||||
hideDock = hideable = DOCK_AUTOHIDE;
|
||||
hideEffect = DOCK_EFFECTHIDE;
|
||||
autohide_animation_time = DOCK_AUTOHIDE_ANIMATION_TIME;
|
||||
|
||||
this._spacing = 4;
|
||||
this._item_size = dockicon_size;
|
||||
@@ -382,72 +378,6 @@ Dock.prototype = {
|
||||
}));
|
||||
Main.layoutManager.addChrome(this.actor);
|
||||
|
||||
//hidden
|
||||
this._settings.connect('changed::'+DOCK_POSITION_KEY, Lang.bind(this, function (){
|
||||
if (!this._settings)
|
||||
return;
|
||||
|
||||
let primary = Main.layoutManager.primaryMonitor;
|
||||
position = this._settings.get_enum(DOCK_POSITION_KEY);
|
||||
this.actor.y=primary.y;
|
||||
this._redisplay();
|
||||
}));
|
||||
|
||||
this._settings.connect('changed::'+DOCK_SIZE_KEY, Lang.bind(this, function (){
|
||||
if (!this._settings)
|
||||
return;
|
||||
|
||||
dockicon_size = this._settings.get_int(DOCK_SIZE_KEY);
|
||||
this._redisplay();
|
||||
}));
|
||||
|
||||
this._settings.connect('changed::'+DOCK_HIDE_KEY, Lang.bind(this, function (){
|
||||
if (!this._settings)
|
||||
return;
|
||||
|
||||
hideable = this._settings.get_boolean(DOCK_HIDE_KEY);
|
||||
if (hideable){
|
||||
hideDock=false;
|
||||
this._hideDock();
|
||||
} else {
|
||||
hideDock=true;
|
||||
this._showDock();
|
||||
}
|
||||
}));
|
||||
|
||||
this._settings.connect('changed::'+DOCK_EFFECTHIDE_KEY, Lang.bind(this, function () {
|
||||
if (!this._settings)
|
||||
return;
|
||||
|
||||
hideEffect = this._settings.get_enum(DOCK_EFFECTHIDE_KEY);
|
||||
|
||||
switch (hideEffect) {
|
||||
case AutoHideEffect.RESCALE:
|
||||
this._item_size=dockicon_size;
|
||||
break;
|
||||
case AutoHideEffect.RESIZE:
|
||||
this.actor.set_scale (1,1);
|
||||
break;
|
||||
case AutoHideEffect.MOVE:
|
||||
;
|
||||
}
|
||||
this.actor.disconnect(this._leave_event);
|
||||
this.actor.disconnect(this._enter_event);
|
||||
|
||||
this._selectFunctionsHide ();
|
||||
|
||||
this._leave_event = this.actor.connect('leave-event', Lang.bind(this, this._hideDock));
|
||||
this._enter_event = this.actor.connect('enter-event', Lang.bind(this, this._showDock));
|
||||
this._redisplay();
|
||||
}));
|
||||
|
||||
this._settings.connect('changed::'+DOCK_AUTOHIDE_ANIMATION_TIME_KEY, Lang.bind(this,function (){
|
||||
if (!this._settings)
|
||||
return;
|
||||
|
||||
autohide_animation_time = this._settings.get_double(DOCK_AUTOHIDE_ANIMATION_TIME_KEY);
|
||||
}));
|
||||
|
||||
this._leave_event = this.actor.connect('leave-event', Lang.bind(this, this._hideDock));
|
||||
this._enter_event = this.actor.connect('enter-event', Lang.bind(this, this._showDock));
|
||||
|
||||
@@ -483,14 +413,13 @@ Dock.prototype = {
|
||||
this.actor.destroy();
|
||||
|
||||
// Break reference cycles
|
||||
this._settings = null;
|
||||
this._appSystem = null;
|
||||
this._tracker = null;
|
||||
},
|
||||
|
||||
// fuctions hide
|
||||
_restoreHideDock: function(){
|
||||
hideable = this._settings.get_boolean(DOCK_HIDE_KEY);
|
||||
hideable = DOCK_AUTOHIDE;
|
||||
},
|
||||
|
||||
_disableHideDock: function (){
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
<schemalist gettext-domain="gnome-shell-extensions">
|
||||
<enum id='org.gnome.shell.extensions.dock.PositionMode'>
|
||||
<value nick='left' value='0'/>
|
||||
<value nick='right' value='1'/>
|
||||
</enum>
|
||||
<enum id='org.gnome.shell.extensions.dock.AutoHideEffect'>
|
||||
<value nick='resize' value='0'/>
|
||||
<value nick='rescale' value='1'/>
|
||||
<value nick='move' value='2'/>
|
||||
</enum>
|
||||
|
||||
<schema id="org.gnome.shell.extensions.dock" path="/org/gnome/shell/extensions/dock/">
|
||||
<key name="position" enum="org.gnome.shell.extensions.dock.PositionMode">
|
||||
<default>'right'</default>
|
||||
<_summary>Position of the dock</_summary>
|
||||
<_description>Sets the position of the dock in the screen. Allowed values are 'right' or 'left'</_description>
|
||||
</key>
|
||||
<key name="size" type="i">
|
||||
<default>48</default>
|
||||
<_summary>Icon size</_summary>
|
||||
<_description>Sets icon size of the dock.</_description>
|
||||
</key>
|
||||
<key name="autohide" type="b">
|
||||
<default>true</default>
|
||||
<_summary>Enable/disable autohide</_summary>
|
||||
</key>
|
||||
<key name="hide-effect" enum="org.gnome.shell.extensions.dock.AutoHideEffect">
|
||||
<default>'resize'</default>
|
||||
<_summary>Autohide effect</_summary>
|
||||
<_description>Sets the effect of the hide dock. Allowed values are 'resize' or 'rescale'</_description>
|
||||
</key>
|
||||
<key name="hide-effect-duration" type="d">
|
||||
<default>0.3</default>
|
||||
<_summary>Autohide duration</_summary>
|
||||
<_description>Sets the time duration of the autohide effect.</_description>
|
||||
</key>
|
||||
</schema>
|
||||
</schemalist>
|
||||
Reference in New Issue
Block a user