isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the workspaces view key to the gconf schema

Browse Source 
Also rename the key to make it less ambiguous, and change its value
from an int to a string.

https://bugzilla.gnome.org/show_bug.cgi?id=609871
This commit is contained in:
Dan Winship 2010-02-13 16:39:13 -05:00
parent b8a9eec14f
commit e5ba414f2d
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
data/gnome-shell.schemas
View File

@ -164,6 +164,21 @@
</locale> </locale>
</schema> </schema>
<schema>
<key>/schemas/desktop/gnome/shell/overview/workspaces_view</key>
<applyto>/desktop/gnome/shell/overview/workspaces_view</applyto>
<owner>gnome-shell</owner>
<type>string</type>
<default>single</default>
<locale name="C">
<short>Overview workspace view mode</short>
<long>
The selected workspace view mode in the overview.
Supported values are "single" and "grid".
</long>
</locale>
</schema>
</schemalist> </schemalist>
</gconfschemafile> </gconfschemafile>

26
js/ui/workspacesView.js
View File

@ -25,10 +25,13 @@ const WORKSPACE_SWITCH_TIME = 0.25;
// Note that mutter has a compile-time limit of 36 // Note that mutter has a compile-time limit of 36
const MAX_WORKSPACES = 16; const MAX_WORKSPACES = 16;
// The values here are also used for gconf, and the key and value
// names must match
const WorkspacesViewType = { const WorkspacesViewType = {
SINGLE: 0, SINGLE: 'single',
MOSAIC: 1 GRID: 'grid'
}; };
const WORKSPACES_VIEW_KEY = 'overview/workspaces_view';
function GenericWorkspacesView(width, height, x, y, animate) { function GenericWorkspacesView(width, height, x, y, animate) {
this._init(width, height, x, y, animate); this._init(width, height, x, y, animate);
@ -950,24 +953,27 @@ function WorkspacesViewSwitch() {
} }
WorkspacesViewSwitch.prototype = { WorkspacesViewSwitch.prototype = {
VIEW_KEY: 'view',
_init: function() { _init: function() {
this._gconf = Shell.GConf.get_default(); this._gconf = Shell.GConf.get_default();
this._mosaicViewButton = null; this._mosaicViewButton = null;
this._singleViewButton = null; this._singleViewButton = null;
this._currentViewType = this._gconf.get_int(this.VIEW_KEY);
this._controlsBar = null; this._controlsBar = null;
let view = this._gconf.get_string(WORKSPACES_VIEW_KEY).toUpperCase();
if (view in WorkspacesViewType)
this._currentViewType = WorkspacesViewType[view];
else
this._currentViewType = WorkspacesViewType.SINGLE;
}, },
_setView: function(view) { _setView: function(view) {
this._mosaicViewButton.set_checked(WorkspacesViewType.MOSAIC == view); this._mosaicViewButton.set_checked(WorkspacesViewType.GRID == view);
this._singleViewButton.set_checked(WorkspacesViewType.SINGLE == view); this._singleViewButton.set_checked(WorkspacesViewType.SINGLE == view);
if (this._currentViewType == view) if (this._currentViewType == view)
return; return;
this._currentViewType = view; this._currentViewType = view;
this._gconf.set_int(this.VIEW_KEY, view); this._gconf.set_string(WORKSPACES_VIEW_KEY, view);
this.emit('view-changed'); this.emit('view-changed');
}, },
@ -975,7 +981,7 @@ WorkspacesViewSwitch.prototype = {
switch (this._currentViewType) { switch (this._currentViewType) {
case WorkspacesViewType.SINGLE: case WorkspacesViewType.SINGLE:
return new SingleView(width, height, x, y, animate); return new SingleView(width, height, x, y, animate);
case WorkspacesViewType.MOSAIC: case WorkspacesViewType.GRID:
return new MosaicView(width, height, x, y, animate); return new MosaicView(width, height, x, y, animate);
default: default:
return new MosaicView(width, height, x, y, animate); return new MosaicView(width, height, x, y, animate);
@ -988,7 +994,7 @@ WorkspacesViewSwitch.prototype = {
this._mosaicViewButton = new St.Button({ style_class: "workspace-controls switch-mosaic" }); this._mosaicViewButton = new St.Button({ style_class: "workspace-controls switch-mosaic" });
this._mosaicViewButton.set_toggle_mode(true); this._mosaicViewButton.set_toggle_mode(true);
this._mosaicViewButton.connect('clicked', Lang.bind(this, function() { this._mosaicViewButton.connect('clicked', Lang.bind(this, function() {
this._setView(WorkspacesViewType.MOSAIC); this._setView(WorkspacesViewType.GRID);
})); }));
actor.add(this._mosaicViewButton, {'y-fill' : false, 'y-align' : St.Align.START}); actor.add(this._mosaicViewButton, {'y-fill' : false, 'y-align' : St.Align.START});
@ -999,7 +1005,7 @@ WorkspacesViewSwitch.prototype = {
})); }));
actor.add(this._singleViewButton, {'y-fill' : false, 'y-align' : St.Align.START}); actor.add(this._singleViewButton, {'y-fill' : false, 'y-align' : St.Align.START});
if (this._currentViewType == WorkspacesViewType.MOSAIC) if (this._currentViewType == WorkspacesViewType.GRID)
this._mosaicViewButton.set_checked(true); this._mosaicViewButton.set_checked(true);
else else
this._singleViewButton.set_checked(true); this._singleViewButton.set_checked(true);