mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out changeset 9226bc3ca03c (bug 1688700) for causing failures on browser_preferences_usage.js.

This commit is contained in:
Butkovits Atila 2021-01-28 01:09:22 +02:00
Родитель 4748dcb616
Коммит df8358b5bb
6 изменённых файлов: 21 добавлений и 154 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
browser/base/content/browser.js
Просмотреть файл

@ -6566,7 +6566,6 @@ const nodeToTooltipMap = {
"downloads-button": "downloads.tooltip",
"fullscreen-button": "fullscreenButton.tooltip",
"appMenu-fullscreen-button": "fullscreenButton.tooltip",
"appMenu-fullscreen-button2": "fullscreenButton.tooltip",
"new-window-button": "newWindowButton.tooltip",
"new-tab-button": "newTabButton.tooltip",
"tabs-newtab-button": "newTabButton.tooltip",
@ -6577,11 +6576,8 @@ const nodeToTooltipMap = {
"appMenu-copy-button": "copy-button.tooltip",
"appMenu-paste-button": "paste-button.tooltip",
"appMenu-zoomEnlarge-button": "zoomEnlarge-button.tooltip",
"appMenu-zoomEnlarge-button2": "zoomEnlarge-button.tooltip",
"appMenu-zoomReset-button": "zoomReset-button.tooltip",
"appMenu-zoomReset-button2": "zoomReset-button.tooltip",
"appMenu-zoomReduce-button": "zoomReduce-button.tooltip",
"appMenu-zoomReduce-button2": "zoomReduce-button.tooltip",
"reader-mode-button": "reader-mode-button.tooltip",
"print-button": "printButton.tooltip",
};
@ -6592,7 +6588,6 @@ const nodeToShortcutMap = {
"downloads-button": "key_openDownloads",
"fullscreen-button": "key_fullScreen",
"appMenu-fullscreen-button": "key_fullScreen",
"appMenu-fullscreen-button2": "key_fullScreen",
"new-window-button": "key_newNavigator",
"new-tab-button": "key_newNavigatorTab",
"tabs-newtab-button": "key_newNavigatorTab",
@ -6603,11 +6598,8 @@ const nodeToShortcutMap = {
"appMenu-copy-button": "key_copy",
"appMenu-paste-button": "key_paste",
"appMenu-zoomEnlarge-button": "key_fullZoomEnlarge",
"appMenu-zoomEnlarge-button2": "key_fullZoomEnlarge",
"appMenu-zoomReset-button": "key_fullZoomReset",
"appMenu-zoomReset-button2": "key_fullZoomReset",
"appMenu-zoomReduce-button": "key_fullZoomReduce",
"appMenu-zoomReduce-button2": "key_fullZoomReduce",
"reader-mode-button": "key_toggleReaderMode",
"print-button": "printKb",
};

118
browser/base/content/browser.xhtml
Просмотреть файл

@ -954,124 +954,26 @@
<panelview id="appMenu-protonMainView" class="PanelUI-subView"
descriptionheightworkaround="true">
<vbox class="panel-subview-body">
<toolbarbutton id="appMenu-new-tab-button2"
class="subviewbutton subviewbutton-iconic"
label="&tabCmd.label;"
key="key_newNavigatorTab"
command="cmd_newNavigatorTab"/>
<toolbarbutton id="appMenu-new-window-button2"
class="subviewbutton subviewbutton-iconic"
data-l10n-id="appmenuitem-new-window"
label="&newNavigatorCmd.label;"
key="key_newNavigator"
command="cmd_newNavigator"/>
<toolbarbutton id="appMenu-new-private-window-button2"
class="subviewbutton subviewbutton-iconic"
data-l10n-id="appmenuitem-new-private-window"
key="key_privatebrowsing"
command="Tools:PrivateBrowsing"/>
<toolbarseparator/>
<toolbarbutton id="appMenu-bookmarks-button"
<toolbarbutton id="appMenu-library-button2"
class="subviewbutton subviewbutton-iconic subviewbutton-nav"
data-l10n-id="library-bookmarks-menu"
label="&places.library.title;"
closemenu="none"
oncommand="BookmarkingUI.showSubView(this);"/>
<toolbarbutton id="appMenu-history-button"
class="subviewbutton subviewbutton-iconic subviewbutton-nav"
label="&historyMenu.label;"
closemenu="none"
oncommand="PanelUI.showSubView('PanelUI-history', this)"/>
<toolbarbutton id="appMenu-downloads-button"
class="subviewbutton subviewbutton-iconic"
label="&libraryDownloads.label;"
key="key_openDownloads"
command="Tools:Downloads"/>
<toolbarbutton id="appMenu-passwords-button"
class="subviewbutton subviewbutton-iconic"
data-l10n-id="appmenuitem-passwords"
oncommand="LoginHelper.openPasswordManager(window, { entryPoint: 'mainmenu' })"
/>
<toolbarbutton id="appMenu-extensions-themes-button"
class="subviewbutton subviewbutton-iconic"
data-l10n-id="appmenuitem-extensions-and-themes"
key="key_openAddons"
command="Tools:Addons"
/>
<toolbarseparator/>
<toolbarbutton id="appMenu-print-button2"
class="subviewbutton subviewbutton-iconic"
label="&printCmd.label;"
key="printKb"
#ifdef XP_MACOSX
command="cmd_print"
#else
command="cmd_printPreview"
#endif
/>
<toolbarbutton id="appMenu-save-file-button2"
class="subviewbutton"
data-l10n-id="appmenuitem-save-page"
key="key_savePage"
command="Browser:SavePage"/>
<toolbarbutton id="appMenu-find-button2"
class="subviewbutton subviewbutton-iconic"
data-l10n-id="appmenuitem-find-in-page"
key="key_find"
command="cmd_find"/>
<toolbaritem id="appMenu-zoom-controls2" class="toolbaritem-combined-buttons" closemenu="none">
<!-- Use a spacer, because panel sizing code gets confused when using CSS methods. -->
<spacer class="before-label"/>
<label value="&fullZoom.label;"/>
<!-- This spacer keeps the scrollbar from overlapping the view. -->
<spacer class="after-label"/>
<toolbarbutton id="appMenu-zoomReduce-button2"
class="subviewbutton subviewbutton-iconic"
command="cmd_fullZoomReduce"
data-l10n-id="appmenuitem-zoom-reduce"
tooltip="dynamic-shortcut-tooltip"/>
<toolbarbutton id="appMenu-zoomReset-button2"
class="subviewbutton"
command="cmd_fullZoomReset"
tooltip="dynamic-shortcut-tooltip"/>
<toolbarbutton id="appMenu-zoomEnlarge-button2"
class="subviewbutton subviewbutton-iconic"
command="cmd_fullZoomEnlarge"
data-l10n-id="appmenuitem-zoom-enlarge"
tooltip="dynamic-shortcut-tooltip"/>
<toolbarseparator orient="vertical"/>
<toolbarbutton id="appMenu-fullscreen-button2"
class="subviewbutton subviewbutton-iconic"
label="&fullScreenCmd.label;"
observes="View:FullScreen"
type="checkbox"
closemenu="auto"
onclick="if (event.button == 0) this.closest('panel').hidePopup();"
tooltip="dynamic-shortcut-tooltip"/>
</toolbaritem>
<toolbarseparator/>
<toolbarbutton id="appMenu-settings-button"
class="subviewbutton subviewbutton-iconic"
data-l10n-id="appmenuitem-settings"
#ifdef XP_MACOSX
key="key_preferencesCmdMac"
#endif
oncommand="openPreferences()"/>
<toolbarbutton id="appMenu-more-button2"
class="subviewbutton subviewbutton-nav"
data-l10n-id="appmenuitem-more-tools"
closemenu="none"
oncommand="PanelUI.showSubView('appMenu-moreView', this)"/>
<toolbarbutton id="appMenu-help-button2"
class="subviewbutton subviewbutton-iconic subviewbutton-nav"
label="&appMenuHelp.label;"
closemenu="none"
oncommand="PanelUI.showSubView('PanelUI-helpView', this)"/>
#ifndef XP_MACOSX
oncommand="PanelUI.showSubView('appMenu-libraryView', this)"/>
<toolbarseparator/>
<toolbarbutton id="appMenu-quit-button2"
class="subviewbutton subviewbutton-iconic"
data-l10n-id="appmenuitem-exit"
command="cmd_quitApplication"/>
#ifdef XP_WIN
data-l10n-id="menu-quit-button-win"
#else
data-l10n-id="menu-quit-button"
#endif
key="key_quitApplication"
command="cmd_quitApplication"/>
</vbox>
</panelview>

15
browser/locales/en-US/browser/appmenu.ftl
Просмотреть файл

@ -13,21 +13,6 @@ appmenuitem-new-window =
.label = New Window
appmenuitem-new-private-window =
.label = New Private Window
appmenuitem-passwords =
.label = Passwords
appmenuitem-extensions-and-themes =
.label = Extensions and Themes
appmenuitem-find-in-page =
.label = Find In Page…
appmenuitem-more-tools =
.label = More Tools
appmenuitem-exit =
.label = Exit
# Settings is now used to access the browser settings across all platforms,
# instead of Options or Preferences.
appmenuitem-settings =
.label = Settings
## Zoom and Fullscreen Controls

4
browser/modules/ZoomUI.jsm
Просмотреть файл

@ -131,9 +131,7 @@ async function updateZoomUI(aBrowser, aAnimate = false) {
let appMenuZoomReset = PanelMultiView.getViewNode(
win.document,
Services.prefs.getBoolPref("browser.proton.appmenu.enabled", false)
? "appMenu-zoomReset-button2"
: "appMenu-zoomReset-button"
"appMenu-zoomReset-button"
);
// Exit early if UI elements aren't present.

18
browser/themes/shared/customizableui/panelUI.inc.css
Просмотреть файл

@ -1312,14 +1312,12 @@ panelmultiview .toolbaritem-combined-buttons > spacer.after-label {
padding: 4px 5px;
}
#appMenu-zoom-controls > .subviewbutton,
#appMenu-zoom-controls2 > .subviewbutton {
#appMenu-zoom-controls > .subviewbutton {
margin-inline-start: 10px;
}
/* Unset the min-height constraint, because that works better for a text-only button. */
#appMenu-zoomReset-button,
#appMenu-zoomReset-button2 {
#appMenu-zoomReset-button {
min-height: unset;
border: 1px solid var(--panel-separator-color);
border-radius: 10000px;
@ -1327,24 +1325,20 @@ panelmultiview .toolbaritem-combined-buttons > spacer.after-label {
background-color: var(--arrowpanel-dimmed);
}
#appMenu-zoomReset-button@buttonStateHover@,
#appMenu-zoomReset-button2@buttonStateHover@ {
#appMenu-zoomReset-button@buttonStateHover@ {
background-color: var(--arrowpanel-dimmed-further);
}
#appMenu-zoomReset-button@buttonStateActive@,
#appMenu-zoomReset-button2@buttonStateActive@ {
#appMenu-zoomReset-button@buttonStateActive@ {
background-color: var(--arrowpanel-dimmed-even-further);
}
#appMenu-zoomReset-button > .toolbarbutton-text,
#appMenu-zoomReset-button2 > .toolbarbutton-text {
#appMenu-zoomReset-button > .toolbarbutton-text {
min-width: calc(3ch + 8px);
text-align: center;
}
#appMenu-zoom-controls > toolbarseparator[orient="vertical"] + .subviewbutton,
#appMenu-zoom-controls2 > toolbarseparator[orient="vertical"] + .subviewbutton {
#appMenu-zoom-controls > toolbarseparator[orient="vertical"] + .subviewbutton {
margin-inline-start: 0;
}

12
browser/themes/shared/menupanel.inc.css
Просмотреть файл

@ -76,23 +76,19 @@
list-style-image: url(chrome://browser/skin/quit.svg);
}
#appMenu-zoomEnlarge-button,
#appMenu-zoomEnlarge-button2 {
#appMenu-zoomEnlarge-button {
list-style-image: url(chrome://browser/skin/zoom-in.svg);
}
#appMenu-zoomReduce-button,
#appMenu-zoomReduce-button2 {
#appMenu-zoomReduce-button {
list-style-image: url(chrome://browser/skin/zoom-out.svg);
}
#appMenu-fullscreen-button,
#appMenu-fullscreen-button2 {
#appMenu-fullscreen-button {
list-style-image: url(chrome://browser/skin/fullscreen.svg);
}
#appMenu-fullscreen-button[checked],
#appMenu-fullscreen-button2[checked] {
#appMenu-fullscreen-button[checked] {
list-style-image: url(chrome://browser/skin/fullscreen-exit.svg);
}