[Pkg-mozext-commits] [tabmixplus] 46/51: Revert changeset 877f955099cf 'Disable moveTabOnDragging when user set tabBarMode preference to multi-row' and change the label

[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 537a86613ffa3e866bc958b0b97b4e38d69adcff
Author: onemen <tabmix.onemen at gmail.com>
Date:   Mon Jan 26 09:35:09 2015 +0200

    Revert changeset 877f955099cf 'Disable moveTabOnDragging when user set tabBarMode preference to multi-row' and change the label
---
 chrome/content/preferences/mouse.xul | 5 +----
 chrome/locale/en-US/pref-tabmix.dtd  | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/chrome/content/preferences/mouse.xul b/chrome/content/preferences/mouse.xul
index 03ef48b..1b4706d 100644
--- a/chrome/content/preferences/mouse.xul
+++ b/chrome/content/preferences/mouse.xul
@@ -52,8 +52,6 @@
                   onchange="gMousePane.updatedblClickTabbar(this);"/>
       <preference id="pref_dblclick_changesize"    name="extensions.tabmix.tabbar.dblclick_changesize"
                   type="bool" inverted="true"/>
-      <preference id="pref_disableMoveTab"    name="extensions.tabmix.tabBarMode"         type="int"
-                  notChecked="2"/>
     </preferences>
 
     <!-- pane content -->
@@ -90,7 +88,7 @@
           <groupbox flex="1">
             <!-- drop indicator -->
             <checkbox_tmp id="moveTabOnDragging" label="&moveTabOnDragging.label;" preference="pref_moveTabOnDragging"
-                          observes="obs_disableMoveTab"/>
+                          style="width: 470px;"/>
             <!-- drop indicator -->
             <hbox id="dropIndicator">
               <label value="&dropIndicator.label;:"/>
@@ -207,7 +205,6 @@
       <broadcaster id="obs_mouseHoverSelect"/>
       <broadcaster id="obs_tabFlip"/>
       <broadcaster id="obs_tabbarscrolling"/>
-      <broadcaster id="obs_disableMoveTab"/>
     </broadcasterset>
 
   </prefpane>
diff --git a/chrome/locale/en-US/pref-tabmix.dtd b/chrome/locale/en-US/pref-tabmix.dtd
index 7641e12..ed67b2c 100644
--- a/chrome/locale/en-US/pref-tabmix.dtd
+++ b/chrome/locale/en-US/pref-tabmix.dtd
@@ -132,7 +132,7 @@
 <!ENTITY tabBarSpace.label "Extra spaces on both sides">
 <!ENTITY tabBarSpace.tooltip "For clicking and dropping something on tab bar">
 <!ENTITY tabbar.label "Hide tab bar when only one tab is open">
-<!ENTITY moveTabOnDragging.label "When dragging a tab move it directly">
+<!ENTITY moveTabOnDragging.label "When dragging a tab move it directly (applies only when tabs are in single row)">
 <!ENTITY dropIndicator.label "Drop indicator">
 <!ENTITY dropIndicator-native.label "Native style">
 <!ENTITY dropIndicator-builtin.label "Built-in style">

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