wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1060623 - Theme switcher in customize mode should only show the five most recently used lightweight themes. r=jaws

Browse Source
This commit is contained in:
Dão Gottwald 2014-09-17 21:41:35 +02:00
parent 1d5771592f
commit 2e076436b1
2 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
browser/components/customizableui/CustomizeMode.jsm
View File

@ -1261,19 +1261,27 @@ CustomizeMode.prototype = {
},
onLWThemesMenuShowing: function(aEvent) {
AddonManager.getAddonsByTypes(["theme"], function(aThemes) {
function buildToolbarButton(doc, aTheme) {
function previewTheme(aEvent) {
LightweightThemeManager.previewTheme(aEvent.target.theme);
}
function resetPreview() {
LightweightThemeManager.resetPreview();
}
const DEFAULT_THEME_ID = "{972ce4c6-7e08-4474-a285-3208198ce6fd}";
const RECENT_LWT_COUNT = 5;
function previewTheme(aEvent) {
LightweightThemeManager.previewTheme(aEvent.target.theme);
}
function resetPreview() {
LightweightThemeManager.resetPreview();
}
AddonManager.getAddonByID(DEFAULT_THEME_ID, function(aDefaultTheme) {
let doc = this.window.document;
function buildToolbarButton(aTheme) {
let tbb = doc.createElement("toolbarbutton");
tbb.theme = aTheme;
tbb.setAttribute("label", aTheme.name);
tbb.setAttribute("image", aTheme.iconURL);
tbb.setAttribute("tooltiptext", aTheme.description);
if (aTheme.description)
tbb.setAttribute("tooltiptext", aTheme.description);
tbb.setAttribute("tabindex", "0");
tbb.classList.add("customization-lwtheme-menu-theme");
tbb.setAttribute("aria-checked", aTheme.isActive);
@ -1289,24 +1297,27 @@ CustomizeMode.prototype = {
return tbb;
}
const DEFAULT_THEME_ID = "{972ce4c6-7e08-4474-a285-3208198ce6fd}";
// Order the themes so the Default theme is always at the beginning.
aThemes.sort((a,b) => {a.id != DEFAULT_THEME_ID});
let doc = this.window.document;
let themes = [aDefaultTheme];
let lwts = LightweightThemeManager.usedThemes;
if (lwts.length > RECENT_LWT_COUNT)
lwts.length = RECENT_LWT_COUNT;
let currentLwt = LightweightThemeManager.currentTheme;
for (let lwt of lwts) {
lwt.isActive = !!currentLwt && (lwt.id == currentLwt.id);
themes.push(lwt);
}
let footer = doc.getElementById("customization-lwtheme-menu-footer");
let panel = footer.parentNode;
let themesInMyThemesSection = 0;
let recommendedLabel = doc.getElementById("customization-lwtheme-menu-recommended");
for (let theme of aThemes) {
// Only allow the Default full theme to be shown in this list.
if ("skinnable" in theme &&
theme.id != DEFAULT_THEME_ID) {
continue;
}
let tbb = buildToolbarButton(doc, theme);
for (let theme of themes) {
let tbb = buildToolbarButton(theme);
tbb.addEventListener("command", function() {
this.theme.userDisabled = false;
if ("userDisabled" in this.theme)
this.theme.userDisabled = false;
else
LightweightThemeManager.currentTheme = this.theme;
this.parentNode.hidePopup();
});
panel.insertBefore(tbb, recommendedLabel);
@ -1321,7 +1332,7 @@ CustomizeMode.prototype = {
for (let theme of recommendedThemes) {
theme.name = sb.GetStringFromName("lightweightThemes." + theme.id + ".name");
theme.description = sb.GetStringFromName("lightweightThemes." + theme.id + ".description");
let tbb = buildToolbarButton(doc, theme);
let tbb = buildToolbarButton(theme);
tbb.addEventListener("command", function() {
LightweightThemeManager.setLocalTheme(this.theme);
recommendedThemes = recommendedThemes.filter((aTheme) => { return aTheme.id != this.theme.id; });

2
toolkit/mozapps/extensions/LightweightThemeManager.jsm
View File

@ -398,8 +398,6 @@ this.LightweightThemeManager = {
function AddonWrapper(aTheme) {
this.__defineGetter__("id", function AddonWrapper_idGetter() aTheme.id + ID_SUFFIX);
this.__defineGetter__("type", function AddonWrapper_typeGetter() ADDON_TYPE);
this.__defineGetter__("headerURL", function AddonWrapper_headerURLGetter() aTheme.headerURL);
this.__defineGetter__("footerURL", function AddonWrapper_footerURLGetter() aTheme.footerURL);
this.__defineGetter__("isActive", function AddonWrapper_isActiveGetter() {
let current = LightweightThemeManager.currentTheme;
if (current)