1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent a21f91aa3ed60b4e95b47f45715dfda379dab7c8 |
2 # Parent 14be97741eabce611c291418a4c1774cae8b29ff |
3 |
3 |
4 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
4 diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul |
5 new file mode 100644 |
5 new file mode 100644 |
6 --- /dev/null |
6 --- /dev/null |
7 +++ b/browser/base/content/browser-kde.xul |
7 +++ b/browser/base/content/browser-kde.xul |
8 @@ -0,0 +1,1302 @@ |
8 @@ -0,0 +1,1311 @@ |
9 +#filter substitution |
9 +#filter substitution |
10 +<?xml version="1.0"?> |
10 +<?xml version="1.0"?> |
11 +# -*- Mode: HTML -*- |
11 +# -*- Mode: HTML -*- |
12 +# |
12 +# |
13 +# This Source Code Form is subject to the terms of the Mozilla Public |
13 +# This Source Code Form is subject to the terms of the Mozilla Public |
736 + <toolbar id="nav-bar" |
736 + <toolbar id="nav-bar" |
737 + aria-label="&navbarCmd.label;" |
737 + aria-label="&navbarCmd.label;" |
738 + fullscreentoolbar="true" mode="icons" customizable="true" |
738 + fullscreentoolbar="true" mode="icons" customizable="true" |
739 + iconsize="small" |
739 + iconsize="small" |
740 +#ifdef MOZ_DEV_EDITION |
740 +#ifdef MOZ_DEV_EDITION |
741 + defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,downloads-button,home-button,loop-button" |
741 + defaultset="urlbar-container,search-container,developer-button,bookmarks-menu-button,pocket-button,downloads-button,home-button,loop-button" |
742 +#else |
742 +#else |
743 + defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-button" |
743 + defaultset="urlbar-container,search-container,bookmarks-menu-button,pocket-button,downloads-button,home-button,loop-button" |
744 +#endif |
744 +#endif |
745 + customizationtarget="nav-bar-customization-target" |
745 + customizationtarget="nav-bar-customization-target" |
746 + overflowable="true" |
746 + overflowable="true" |
747 + overflowbutton="nav-bar-overflow-button" |
747 + overflowbutton="nav-bar-overflow-button" |
748 + overflowtarget="widget-overflow-list" |
748 + overflowtarget="widget-overflow-list" |
888 + context="placesContext" |
888 + context="placesContext" |
889 + openInTabs="children" |
889 + openInTabs="children" |
890 + oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" |
890 + oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" |
891 + onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" |
891 + onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" |
892 + onpopupshowing="BookmarkingUI.onPopupShowing(event); |
892 + onpopupshowing="BookmarkingUI.onPopupShowing(event); |
|
893 + BookmarkingUI.updatePocketItemVisibility('BMB_'); |
893 + BookmarkingUI.attachPlacesView(event, this);" |
894 + BookmarkingUI.attachPlacesView(event, this);" |
894 + tooltip="bhTooltip" popupsinherittooltip="true"> |
895 + tooltip="bhTooltip" popupsinherittooltip="true"> |
895 + <menuitem id="BMB_viewBookmarksSidebar" |
896 + <menuitem id="BMB_viewBookmarksSidebar" |
896 + class="subviewbutton" |
897 + class="subviewbutton" |
897 + label="&viewBookmarksSidebar2.label;" |
898 + label="&viewBookmarksSidebar2.label;" |
904 + class="menuitem-iconic subviewbutton" |
905 + class="menuitem-iconic subviewbutton" |
905 + label="&showAllBookmarks2.label;" |
906 + label="&showAllBookmarks2.label;" |
906 + command="Browser:ShowAllBookmarks" |
907 + command="Browser:ShowAllBookmarks" |
907 + key="manBookmarkKb"/> |
908 + key="manBookmarkKb"/> |
908 + <menuseparator/> |
909 + <menuseparator/> |
|
910 + <menuitem id="BMB_pocket" |
|
911 + class="menuitem-iconic bookmark-item subviewbutton" |
|
912 + label="&pocketMenuitem.label;" |
|
913 + oncommand="openUILink(Pocket.listURL, event);"/> |
|
914 + <menuseparator id="BMB_pocketSeparator"/> |
909 + <menuitem id="BMB_subscribeToPageMenuitem" |
915 + <menuitem id="BMB_subscribeToPageMenuitem" |
910 +#ifndef XP_MACOSX |
916 +#ifndef XP_MACOSX |
911 + class="menuitem-iconic subviewbutton" |
917 + class="menuitem-iconic subviewbutton" |
912 +#else |
918 +#else |
913 + class="subviewbutton" |
919 + class="subviewbutton" |
1305 +# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck. |
1311 +# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck. |
1306 +# Introducing the iframe dynamically, as needed, was found to be better than |
1312 +# Introducing the iframe dynamically, as needed, was found to be better than |
1307 +# starting with an empty iframe here in browser.xul from a Ts standpoint. |
1313 +# starting with an empty iframe here in browser.xul from a Ts standpoint. |
1308 +</deck> |
1314 +</deck> |
1309 + |
1315 + |
|
1316 +<script type="application/javascript" src="chrome://browser/content/pocket/pktApi.js"/> |
|
1317 +<script type="application/javascript" src="chrome://browser/content/pocket/main.js"/> |
|
1318 + |
1310 +</window> |
1319 +</window> |
1311 diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul |
1320 diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul |
1312 --- a/browser/base/content/browser.xul |
1321 --- a/browser/base/content/browser.xul |
1313 +++ b/browser/base/content/browser.xul |
1322 +++ b/browser/base/content/browser.xul |
1314 @@ -179,17 +179,17 @@ |
1323 @@ -179,17 +179,17 @@ |
1328 default="true" |
1337 default="true" |
1329 oncommand="StarUI.panel.hidePopup();"/> |
1338 oncommand="StarUI.panel.hidePopup();"/> |
1330 <button id="editBookmarkPanelDeleteButton" |
1339 <button id="editBookmarkPanelDeleteButton" |
1331 class="editBookmarkPanelBottomButton" |
1340 class="editBookmarkPanelBottomButton" |
1332 label="&editBookmark.cancel.label;" |
1341 label="&editBookmark.cancel.label;" |
1333 @@ -1228,17 +1228,17 @@ |
1342 @@ -1234,17 +1234,17 @@ |
1334 |
1343 |
1335 <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1344 <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> |
1336 <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1345 <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> |
1337 <vbox id="full-screen-warning-message" align="center"> |
1346 <vbox id="full-screen-warning-message" align="center"> |
1338 <description id="full-screen-domain-text"/> |
1347 <description id="full-screen-domain-text"/> |
1361 * content/browser/browser.css (content/browser.css) |
1370 * content/browser/browser.css (content/browser.css) |
1362 * content/browser/browser.js (content/browser.js) |
1371 * content/browser/browser.js (content/browser.js) |
1363 * content/browser/browser.xul (content/browser.xul) |
1372 * content/browser/browser.xul (content/browser.xul) |
1364 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1373 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1365 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1374 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
|
1375 content/browser/browser-pocket-en-US.properties (content/browser-pocket-en-US.properties) |
|
1376 content/browser/browser-pocket.dtd (content/browser-pocket.dtd) |
|
1377 content/browser/browser-pocket-de.properties (content/browser-pocket-de.properties) |
|
1378 content/browser/browser-pocket-es-ES.properties (content/browser-pocket-es-ES.properties) |
|
1379 content/browser/browser-pocket-ja.properties (content/browser-pocket-ja.properties) |
|
1380 content/browser/browser-pocket-ru.properties (content/browser-pocket-ru.properties) |
1366 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1381 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1367 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1382 * content/browser/chatWindow.xul (content/chatWindow.xul) |
1368 content/browser/content.js (content/content.js) |
|
1369 content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg) |
|
1370 content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg) |
|
1371 content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg) |
|
1372 content/browser/defaultthemes/1.preview.jpg (content/defaultthemes/1.preview.jpg) |
|
1373 content/browser/defaultthemes/2.footer.jpg (content/defaultthemes/2.footer.jpg) |
|
1374 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1383 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1375 --- a/browser/components/build/nsModule.cpp |
1384 --- a/browser/components/build/nsModule.cpp |
1376 +++ b/browser/components/build/nsModule.cpp |
1385 +++ b/browser/components/build/nsModule.cpp |
1377 @@ -8,17 +8,17 @@ |
1386 @@ -8,17 +8,17 @@ |
1378 #include "nsBrowserCompsCID.h" |
1387 #include "nsBrowserCompsCID.h" |