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

KeyboardStatus: disambiguate duplicate short descriptions

Browse Source 
If two layouts have the same short description (for example, english
(US) and english (dvorak)), add a subscript for disambiguating
among them.

https://bugzilla.gnome.org/show_bug.cgi?id=650128
This commit is contained in:
Giovanni Campagna 2011-05-15 19:31:02 +02:00
parent a64e0e1f49
commit f99b4da4ec
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
js/ui/status/keyboard.js
View File

@ -79,6 +79,28 @@ XKBIndicator.prototype = {
});
},
_adjust_group_names: function(names) {
// Disambiguate duplicate names with a subscript
// This is O(N^2) to avoid sorting names
// but N <= 4 so who cares?
for (let i = 0; i < names.length; i++) {
let name = names[i];
let cnt = 0;
for (let j = i + 1; j < names.length; j++) {
if (names[j] == name) {
cnt++;
// U+2081 SUBSCRIPT ONE
names[j] = name + String.fromCharCode(0x2081 + cnt);
}
}
if (cnt != 0)
names[i] = name + '\u2081';
}
return names;
},
_sync_config: function() {
this._showFlags = this._config.if_flags_shown();
if (this._showFlags) {
@ -101,7 +123,7 @@ XKBIndicator.prototype = {
for (let i = 0; i < this._labelActors.length; i++)
this._labelActors[i].destroy();
let short_names = this._config.get_short_group_names();
let short_names = this._adjust_group_names(this._config.get_short_group_names());
this._selectedLayout = null;
this._layoutItems = [ ];