[Pkg-mozext-commits] [tabmixplus] 17/34: Add comment about disabled 'Place on left side' close button, see changeset d667fe42b66e

[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 ca5a54401ceef311ac0a7d91a1f6abd988795f63
Author: onemen <tabmix.onemen at gmail.com>
Date:   Sun Jun 12 13:13:36 2016 +0300

    Add comment about disabled 'Place on left side' close button, see changeset d667fe42b66e
---
 chrome/content/preferences/appearance.js  | 10 +++++++---
 chrome/content/preferences/appearance.xul |  3 ++-
 chrome/locale/en-US/pref-tabmix.dtd       |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/chrome/content/preferences/appearance.js b/chrome/content/preferences/appearance.js
index 7227a10..1f919ac 100644
--- a/chrome/content/preferences/appearance.js
+++ b/chrome/content/preferences/appearance.js
@@ -21,10 +21,14 @@ var gAppearancePane = {
       Tabmix.setItem("squaredTabs", "hidden", true);
     }
 
-    let disableButtonOnLefSide = !browserWindow.Tabmix.defaultCloseButtons ||
-        browserWindow.Tabmix.extensions.treeStyleTab;
+    let treeStyleTab = browserWindow.Tabmix.extensions.treeStyleTab;
+    let disableButtonOnLefSide = !browserWindow.Tabmix.defaultCloseButtons || treeStyleTab;
+    let comment = $("onLeftDisabled");
     Tabmix.setItem("tabXLeft", "disabled", disableButtonOnLefSide || null);
-    Tabmix.setItem("onLeftDisabled", "hidden", browserWindow.Tabmix.defaultCloseButtons || null);
+    Tabmix.setItem(comment, "hidden", !disableButtonOnLefSide || null);
+    if (treeStyleTab) {
+      comment.value = comment.getAttribute("tst");
+    }
 
     // browser.allTabs.previews
     if (!TabmixSvc.isPaleMoon) {
diff --git a/chrome/content/preferences/appearance.xul b/chrome/content/preferences/appearance.xul
index ebee0f2..6e645cb 100644
--- a/chrome/content/preferences/appearance.xul
+++ b/chrome/content/preferences/appearance.xul
@@ -242,7 +242,8 @@
                 <label value="&widthPixels.label;" observes="obs_showTabX"/>
               </hbox>
             </hbox>
-            <label id="onLeftDisabled" value="&onLeftDisabled.label;" hidden="true"
+            <label id="onLeftDisabled" value="&onLeftDisabled.label;"
+                   tst="&onLeftDisabled.tst.label;" hidden="true"
                    style="text-decoration: underline; color: #CC0000;"/>
           </groupbox>
           <groupbox flex="1">
diff --git a/chrome/locale/en-US/pref-tabmix.dtd b/chrome/locale/en-US/pref-tabmix.dtd
index 7948b0d..ae5aa03 100644
--- a/chrome/locale/en-US/pref-tabmix.dtd
+++ b/chrome/locale/en-US/pref-tabmix.dtd
@@ -178,6 +178,7 @@
 <!ENTITY widthTo.label "to">
 <!ENTITY widthPixels.label "pixels">
 <!ENTITY onLeftDisabled.label "Can't place button on left side with the current theme">
+<!ENTITY onLeftDisabled.tst.label "Can't place button on left side when treeStyleTab installed">
 <!ENTITY flexTabs.label "Tab width fits to tab title">
 <!ENTITY bookastitle.label "Use bookmark name as tab title">
 <!-- LOCALIZATION NOTE:          change this only if you need to change the width -->

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