[Pkg-mozext-commits] [tabmixplus] 110/123: Use non-disabled image for our buttons in customizing tab. Backed out changeset 899b1590df60

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit 196e1ff43479191ae0c24598ab366ac32f7b5a11
Author: onemen <tabmix.onemen at gmail.com>
Date:   Mon Sep 15 17:32:47 2014 +0300

    Use non-disabled image for our buttons in customizing tab. Backed out changeset 899b1590df60
---
 chrome/content/minit/minit.js | 18 ------------------
 chrome/skin/tab.css           | 14 ++++++++------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/chrome/content/minit/minit.js b/chrome/content/minit/minit.js
index 5b6d162..ddb16b9 100644
--- a/chrome/content/minit/minit.js
+++ b/chrome/content/minit/minit.js
@@ -1020,13 +1020,6 @@ Tabmix.navToolbox = {
     gNavToolbox.addEventListener("customizationchange", this, false);
     this.toolboxChanged = false;
     this.customizeStarted = true;
-
-    // remove disabled state from our buttons when entring about:customizing tab
-    if (Tabmix.isVersion(280)) {
-      Tabmix.setItem("tmp_undocloseButton", "disabled", null);
-      Tabmix.setItem("tmp_closedwindows", "disabled", null);
-      Tabmix.setItem("tmp_sessionmanagerButton", "disabled", null);
-    }
   },
 
   customizeDone: function TMP_navToolbox_customizeDone(aToolboxChanged) {
@@ -1053,17 +1046,6 @@ Tabmix.navToolbox = {
     var optionWindow = Services.wm.getMostRecentWindow("mozilla:tabmixopt");
     if (optionWindow && optionWindow.gAppearancePane)
       optionWindow.gAppearancePane.toolbarButtons(window);
-
-    if (Tabmix.isVersion(280)) {
-      TMP_ClosedTabs.setButtonDisableState();
-      let SM = TabmixSessionManager;
-      let disabled = SM.enableManager || SM.enableBackup ?
-          SM.isClosedWindowsEmpty() : TabmixSvc.ss.getClosedWindowCount() == 0;
-      Tabmix.setItem("tmp_closedwindows", "disabled", disabled || null);
-      disabled = !Tabmix.prefs.getBoolPref("sessions.manager") ||
-                 SM.globalPrivateBrowsing;
-      Tabmix.setItem("tmp_sessionmanagerButton", "disabled", disabled || null);
-    }
   },
 
   updateToolboxItems: function TMP_navToolbox_updateToolboxItems() {
diff --git a/chrome/skin/tab.css b/chrome/skin/tab.css
index 1f20408..6bd2538 100644
--- a/chrome/skin/tab.css
+++ b/chrome/skin/tab.css
@@ -127,11 +127,11 @@
 
 #btn_undoclose { -moz-image-region: rect(0 24px 24px 0); }
 #btn_undoclose:hover { -moz-image-region: rect(24px 24px 48px 0); }
-#btn_undoclose[disabled=true] { -moz-image-region: rect(48px 24px 72px 0); }
+#main-window:not([customizing]) #btn_undoclose[disabled=true] { -moz-image-region: rect(48px 24px 72px 0); }
 
 toolbar[iconsize=small] #btn_undoclose, .closedtabs-icon > .menu-iconic-left{ -moz-image-region: rect(0 40px 16px 24px); }
 toolbar[iconsize=small] #btn_undoclose:hover, .closedtabs-icon:hover > .menu-iconic-left{ -moz-image-region: rect(16px 40px 32px 24px); }
-toolbar[iconsize=small] #btn_undoclose[disabled=true], .closedtabs-icon[disabled=true] > .menu-iconic-left{ -moz-image-region: rect(32px 40px 48px 24px); }
+#main-window:not([customizing]) toolbar[iconsize=small] #btn_undoclose[disabled=true], .closedtabs-icon[disabled=true] > .menu-iconic-left{ -moz-image-region: rect(32px 40px 48px 24px); }
 
 #btn_undoclose[type=menu-button] .toolbarbutton-icon {
    margin-right: 0px;
@@ -147,11 +147,11 @@ toolbar[iconsize=small] #btn_undoclose[disabled=true], .closedtabs-icon[disabled
 
 #btn_closedwindows { -moz-image-region: rect(0 24px 24px 0); }
 #btn_closedwindows:hover { -moz-image-region: rect(24px 24px 48px 0); }
-#btn_closedwindows[disabled=true] { -moz-image-region: rect(48px 24px 72px 0); }
+#main-window:not([customizing]) #btn_closedwindows[disabled=true] { -moz-image-region: rect(48px 24px 72px 0); }
 
 toolbar[iconsize=small] #btn_closedwindows, .closedwindows-icon >.menu-iconic-left{ -moz-image-region: rect(0 40px 16px 24px); }
 toolbar[iconsize=small] #btn_closedwindows:hover, .closedwindows-icon:hover >.menu-iconic-left{ -moz-image-region: rect(16px 40px 32px 24px)!important; }
-toolbar[iconsize=small] #btn_closedwindows[disabled=true], .closedwindows-icon[disabled=true] >.menu-iconic-left{ -moz-image-region: rect(32px 40px 48px 24px)!important; }
+#main-window:not([customizing]) toolbar[iconsize=small] #btn_closedwindows[disabled=true], .closedwindows-icon[disabled=true] >.menu-iconic-left{ -moz-image-region: rect(32px 40px 48px 24px)!important; }
 
 #btn_tabslist, #tm-tabsList {
   list-style-image: url(tabslist.png);
@@ -163,6 +163,7 @@ toolbar[iconsize=small] #btn_tabslist, #tm-tabsList > .menu-iconic-left{ -moz-im
 toolbar[iconsize=small] #btn_tabslist:hover, #tm-tabsList:hover > .menu-iconic-left{ -moz-image-region: rect(16px 40px 32px 24px); }
 toolbar[iconsize=small] #btn_tabslist[disabled=true], #tm-tabsList[disabled=true] > .menu-iconic-left{ -moz-image-region: rect(32px 40px 48px 24px); }
 
+
 #btn-sm-settings, .tabmix-menu-icon {
    list-style-image: url(tmpsmall.png);
 }
@@ -173,10 +174,11 @@ toolbar[iconsize=small] #btn_tabslist[disabled=true], #tm-tabsList[disabled=true
 }
 #btn_sessionmanager { -moz-image-region: rect(0 24px 24px 0); }
 #btn_sessionmanager:hover { -moz-image-region: rect(24px 24px 48px 0); }
-#btn_sessionmanager[disabled=true] { -moz-image-region: rect(48px 24px 72px 0); }
+#main-window:not([customizing]) #btn_sessionmanager[disabled=true] { -moz-image-region: rect(48px 24px 72px 0); }
+
 toolbar[iconsize=small] #btn_sessionmanager, .sessionmanager-icon > .menu-iconic-left{ -moz-image-region: rect(0 40px 16px 24px); }
 toolbar[iconsize=small] #btn_sessionmanager:hover, .sessionmanager-icon:hover > .menu-iconic-left{ -moz-image-region: rect(16px 40px 32px 24px); }
-toolbar[iconsize=small] #btn_sessionmanager[disabled=true], .sessionmanager-icon[disabled=true] > .menu-iconic-left{ -moz-image-region: rect(32px 40px 48px 24px); }
+#main-window:not([customizing]) toolbar[iconsize=small] #btn_sessionmanager[disabled=true], .sessionmanager-icon[disabled=true] > .menu-iconic-left{ -moz-image-region: rect(32px 40px 48px 24px); }
 
 /* fix dropmarker orient for toolbarbutton */
 .tabmix-button[type="menu"]:not([cui-areatype="menu-panel"]) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git