Commit 2ea214bf authored by Dão Gottwald's avatar Dão Gottwald
Browse files

Bug 465076 - Ctrl+Tab / All Tabs design revision (pref'd off). r=enn

parent ae24ecb7

browser/app/profile/firefox.js

+2 −1
Original line number Diff line number Diff line
@@ -358,7 +358,8 @@ pref("browser.tabs.closeButtons", 1); 
// false  return to the adjacent tab (old default)

pref("browser.tabs.selectOwnerOnClose", true);



pref("browser.ctrlTab.previews", true);

pref("browser.allTabs.previews", false);

pref("browser.ctrlTab.previews", false);

pref("browser.ctrlTab.recentlyUsedLimit", 7);



// Default bookmark sorting

browser/base/content/browser-menubar.inc

+6 −0
Original line number Diff line number Diff line
@@ -441,6 +441,12 @@ 
                          type="checkbox"

                          command="View:FullScreen"/>

#endif

                <menuitem id="menu_showAllTabs"

                          hidden="true"

                          accesskey="&showAllTabsCmd.accesskey;"

                          label="&showAllTabsCmd.label;"

                          command="Browser:ShowAllTabs"

                          key="key_showAllTabs"/>

                <menuseparator hidden="true" id="documentDirection-separator"/>

                <menuitem id="documentDirection-swap"

                          hidden="true"

browser/base/content/browser-sets.inc

+4 −1
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
    </command>

    <command id="Browser:NextTab" oncommand="gBrowser.mTabContainer.advanceSelectedTab(1, true);"/>

    <command id="Browser:PrevTab" oncommand="gBrowser.mTabContainer.advanceSelectedTab(-1, true);"/>

    <command id="Browser:ShowAllTabs" oncommand="allTabs.open();"/>

    <command id="cmd_fullZoomReduce"  oncommand="FullZoom.reduce()"/>

    <command id="cmd_fullZoomEnlarge" oncommand="FullZoom.enlarge()"/>

    <command id="cmd_fullZoomReset"   oncommand="FullZoom.reset()"/>
@@ -318,6 +319,8 @@ 
    <key id="key_fullZoomReset"   key="&fullZoomResetCmd.commandkey;"    command="cmd_fullZoomReset"   modifiers="accel"/>

    <key                          key="&fullZoomResetCmd.commandkey2;"   command="cmd_fullZoomReset"   modifiers="accel"/>



    <key id="key_showAllTabs" command="Browser:ShowAllTabs" keycode="VK_TAB" modifiers="control,shift"/>



    <key id="key_switchTextDirection" key="&bidiSwitchTextDirectionItem.commandkey;" command="cmd_switchTextDirection" modifiers="accel,shift" />



    <key id="key_privatebrowsing" command="Tools:PrivateBrowsing" key="&privateBrowsingCmd.commandkey;" modifiers="accel,shift"/>

browser/base/content/browser-tabPreviews.js

+747 −396

File changed.

Preview size limit exceeded, changes collapsed.

browser/base/content/browser-tabPreviews.xml

+38 −10
Original line number Diff line number Diff line
@@ -41,21 +41,49 @@ 
          xmlns="http://www.mozilla.org/xbl"

          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

          xmlns:xbl="http://www.mozilla.org/xbl">

  <binding id="ctrlTab-thumbnail">

    <content align="center">

  <binding id="ctrlTab-preview" extends="chrome://global/content/bindings/button.xml#button-base">

    <content pack="center">

      <xul:stack>

        <xul:vbox class="ctrlTab-preview-inner" align="center" pack="center"

                  xbl:inherits="width=canvaswidth">

          <xul:hbox class="tabPreview-canvas" xbl:inherits="style=canvasstyle">

            <children/>

      <xul:label xbl:inherits="value=label,crop"/>

          </xul:hbox>

          <xul:label xbl:inherits="value=label,crop" class="plain"/>

        </xul:vbox>

        <xul:hbox class="ctrlTab-favicon-container" xbl:inherits="hidden=noicon">

          <xul:image class="ctrlTab-favicon" xbl:inherits="src=image"/>

        </xul:hbox>

      </xul:stack>

    </content>

    <handlers>

      <handler event="click" button="0" action="ctrlTab.selectThumbnail(this);"/>

      <handler event="click" button="1" action="gBrowser.removeTab(this._tab);"/>

      <handler event="mouseover" action="ctrlTab._mouseOverFocus(this);"/>

      <handler event="command" action="ctrlTab.pick(this);"/>

      <handler event="click" button="1" action="ctrlTab.remove(this);"/>

#ifdef XP_MACOSX

# Control+click is a right click on OS X

      <handler event="click" button="2"><![CDATA[

        if (!ctrlTab.sticky)

          ctrlTab.selectThumbnail(this);

      ]]></handler>

      <handler event="click" button="2" action="ctrlTab.pick(this);"/>

#endif

    </handlers>

  </binding>



  <binding id="allTabs-preview" extends="chrome://global/content/bindings/button.xml#button-base">

    <content pack="center" align="center">

      <xul:stack>

        <xul:vbox class="allTabs-preview-inner" align="center" pack="center">

          <xul:hbox class="tabPreview-canvas" xbl:inherits="style=canvasstyle">

            <children/>

          </xul:hbox>

          <xul:label flex="1" xbl:inherits="value=label,crop" class="allTabs-preview-label plain"/>

        </xul:vbox>

        <xul:hbox class="allTabs-favicon-container">

          <xul:image class="allTabs-favicon" xbl:inherits="src=image"/>

        </xul:hbox>

      </xul:stack>

    </content>

    <handlers>

      <handler event="command" action="allTabs.pick(this);"/>

      <handler event="click" button="1" action="gBrowser.removeTab(this._tab);"/>

    </handlers>

  </binding>

</bindings>