mozilla: comparison firefox-kde.patch

equal deleted inserted replaced

-:452af5d124ad
+:4babd1755310
 # HG changeset patch
-# Parent  2bfd3982be72061c3f5879a5fbceb4c33f96a0cd
+# Parent  ffcd96e120857e207bd357b2005f0b5bc776e375
 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1248 @@
+@@ -0,0 +1,1238 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
 +#
 +# This Source Code Form is subject to the terms of the Mozilla Public
 +      <toolbarbutton id="sidebar-switcher-bookmarks"
 +                     class="subviewbutton subviewbutton-iconic"
 +                     key="viewBookmarksSidebarKb"
 +                     observes="viewBookmarksSidebar"
 +                     oncommand="SidebarUI.show('viewBookmarksSidebar');">
-+         <observes element="viewBookmarksSidebar" attribute="checked"/>
++        <observes element="viewBookmarksSidebar" attribute="checked"/>
-+       </toolbarbutton>
++      </toolbarbutton>
 +      <toolbarbutton id="sidebar-switcher-history"
 +                     label="&historyButton.label;"
 +                     class="subviewbutton subviewbutton-iconic"
 +                     key="key_gotoHistory"
 +                     observes="viewHistorySidebar"
 +                     oncommand="SidebarUI.show('viewHistorySidebar');">
-+         <observes element="viewHistorySidebar" attribute="checked"/>
++        <observes element="viewHistorySidebar" attribute="checked"/>
-+       </toolbarbutton>
++      </toolbarbutton>
 +      <toolbarbutton id="sidebar-switcher-tabs"
 +                     label="&syncedTabs.sidebar.label;"
 +                     class="subviewbutton subviewbutton-iconic"
 +                     observes="viewTabsSidebar"
 +                     oncommand="SidebarUI.show('viewTabsSidebar');">
-+         <observes element="viewTabsSidebar" attribute="checked"/>
++        <observes element="viewTabsSidebar" attribute="checked"/>
-+       </toolbarbutton>
++      </toolbarbutton>
 +      <toolbarseparator/>
-+      <vbox id="sidebar-extensions"></vbox>
++      <!-- Extension toolbarbuttons go here. -->
-+      <toolbarseparator/>
++      <toolbarseparator id="sidebar-extensions-separator"/>
 +      <toolbarbutton id="sidebar-reverse-position"
 +                     class="subviewbutton"
 +                     oncommand="SidebarUI.reversePosition()"/>
 +      <toolbarseparator/>
 +      <toolbarbutton label="&sidebarMenuClose.label;"
 +           noautofocus="true"
 +           copyURL-title="&pageAction.copyLink.label;"
 +           emailLink-title="&emailPageCmd.label;"
 +           sendToDevice-title="&pageAction.sendTabToDevice.label;"
 +           sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;">
-+      <photonpanelmultiview id="pageActionPanelMultiView"
++      <panelmultiview id="pageActionPanelMultiView"
-+                            mainViewId="pageActionPanelMainView"
++                      mainViewId="pageActionPanelMainView"
-+                            viewCacheId="appMenu-viewCache">
++                      viewCacheId="appMenu-viewCache">
 +        <panelview id="pageActionPanelMainView"
 +                   context="pageActionContextMenu"
 +                   class="PanelUI-subView">
 +          <vbox class="panel-subview-body"/>
 +        </panelview>
-+      </photonpanelmultiview>
++      </panelmultiview>
 +    </panel>
 +    <panel id="pageActionFeedback"
 +           role="alert"
 +           type="arrow"
 +           hidden="true"
 +           flip="slide"
 +           position="bottomcenter topright"
 +           tabspecific="true"
 +           noautofocus="true"
 +           copyURLFeedback="&copyURLFeedback.label;"
-+           sendToDeviceFeedback="&sendToDeviceFeedback.label;">
++           sendToDeviceFeedback="&sendToDeviceFeedback.label;"
++           sendToDeviceOfflineFeedback="&sendToDeviceOfflineFeedback.label;">
 +      <hbox id="pageActionFeedbackAnimatableBox">
 +        <image id="pageActionFeedbackAnimatableImage"/>
 +      </hbox>
 +      <label id="pageActionFeedbackMessage"/>
 +    </panel>
 +#endif
 +  </hbox>
 +</vbox>
 +#endif
 +
-+<deck flex="1" id="tab-view-deck">
++  <toolbox id="navigator-toolbox">
-+<vbox flex="1" id="browser-panel">
-+
-+  <toolbox id="navigator-toolbox" mode="icons">
 +    <!-- Menu -->
 +    <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
-+             mode="icons" iconsize="small"
++             mode="icons"
 +#ifdef MENUBAR_CAN_AUTOHIDE
 +             toolbarname="&menubarCmd.label;"
 +             accesskey="&menubarCmd.accesskey;"
 +             autohide="true"
 +#endif
 +
 +    <toolbar id="TabsToolbar"
 +             fullscreentoolbar="true"
 +             customizable="true"
 +             mode="icons"
-+             iconsize="small"
 +             aria-label="&tabsToolbar.label;"
 +             context="toolbar-context-menu"
 +             collapsed="true">
 +
 +#ifdef CAN_DRAW_IN_TITLEBAR
 +    </toolbar>
 +
 +    <toolbar id="nav-bar"
 +             aria-label="&navbarCmd.label;"
 +             fullscreentoolbar="true" mode="icons" customizable="true"
-+             iconsize="small"
 +             customizationtarget="nav-bar-customization-target"
 +             overflowable="true"
 +             overflowbutton="nav-bar-overflow-button"
 +             overflowtarget="widget-overflow-list"
 +             overflowpanel="widget-overflow"
 +                         tooltiptext="&urlbar.screenBlocked.tooltip;"/>
 +                  <image data-permission-id="persistent-storage" class="blocked-permission-icon persistent-storage-icon" role="button"
 +                         tooltiptext="&urlbar.persistentStorageBlocked.tooltip;"/>
 +                  <image data-permission-id="popup" class="blocked-permission-icon popup-icon" role="button"
 +                         tooltiptext="&urlbar.popupBlocked.tooltip;"/>
++                  <image data-permission-id="canvas" class="blocked-permission-icon canvas-icon" role="button"
++                         tooltiptext="&urlbar.canvasBlocked.tooltip;"/>
 +                </box>
 +                <box id="notification-popup-box"
 +                     hidden="true"
 +                     onmouseover="document.getElementById('identity-box').classList.add('no-hover');"
 +                     onmouseout="document.getElementById('identity-box').classList.remove('no-hover');"
 +                       hidden="true"
 +                       tooltip="dynamic-shortcut-tooltip"/>
 +
 +        <toolbarbutton id="library-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
 +                       removable="true"
-+                       onmousedown="PanelUI.showSubView('appMenu-libraryView', this, null, event);"
++                       onmousedown="PanelUI.showSubView('appMenu-libraryView', this, event);"
 +                       closemenu="none"
 +                       cui-areatype="toolbar"
 +                       tooltiptext="&libraryButton.tooltip;"
 +                       label="&places.library.title;"/>
 +
 +                       tooltiptext="&fullScreenClose.tooltip;"
 +                       oncommand="BrowserTryToCloseWindow();"/>
 +      </hbox>
 +    </toolbar>
 +
-+    <toolbarset id="customToolbars" context="toolbar-context-menu"/>
-+
 +    <toolbar id="PersonalToolbar"
-+             mode="icons" iconsize="small"
++             mode="icons"
 +             class="chromeclass-directories"
 +             context="toolbar-context-menu"
 +             toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
 +             collapsed="true"
 +             customizable="true">
 +                    key="manBookmarkKb"/>
 +        </menupopup>
 +      </toolbarbutton>
 +
 +      <toolbaritem id="search-container"
-+                   class="chromeclass-toolbar-additional panel-wide-item"
++                   class="chromeclass-toolbar-additional"
 +                   title="&searchItem.title;"
 +                   align="center"
 +                   flex="100"
 +                   persist="width">
 +        <searchbar id="searchbar" flex="1"/>
 +  </html:div>
 +
 +  <vbox id="browser-bottombox" layer="true">
 +    <notificationbox id="global-notificationbox" notificationside="bottom"/>
 +  </vbox>
-+
-+</vbox>
-+# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck.
-+#     Introducing the iframe dynamically, as needed, was found to be better than
-+#     starting with an empty iframe here in browser.xul from a Ts standpoint.
-+</deck>
 +
 +</window>
 diff --git a/browser/base/jar.mn b/browser/base/jar.mn
 --- a/browser/base/jar.mn
 +++ b/browser/base/jar.mn

changeset 1036	4babd1755310
parent 1033	51bfdd19b9e9
child 1045	f645c886d36b