Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 158739 Tabbed Browsing, OS X: Command+Enter checkbox text displayed in 3 lines (should be 1 line)

Browse Source 
r=doron sr=jag
This commit is contained in:
timeless%mac.com 2002-09-04 03:35:58 +00:00
parent 6006ebb339
commit 7edc5fcee1
11 changed files with 92 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/mac/build_scripts/MozillaBuildList.pm
View File

@ -627,6 +627,7 @@ sub ProcessJarManifests()
CreateJarFromManifest(":mozilla:xpfe:components:download-manager:resources:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:xpfe:components:download-manager:resources:mac:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:xpfe:components:prefwindow:resources:content:mac:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:xpfe:components:prefwindow:resources:locale:en-US:mac:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:xpfe:components:prefwindow:resources:locale:en-US:unix:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:xpfe:components:prefwindow:resources:locale:en-US:win:jar.mn", $chrome_dir, \%jars);
CreateJarFromManifest(":mozilla:xpfe:communicator:resources:locale:en-US:mac:jar.mn", $chrome_dir, \%jars);

21
xpfe/components/prefwindow/resources/content/pref-tabs.xul
View File

@ -23,27 +23,22 @@
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-tabs.dtd">
<!DOCTYPE page [
<!ENTITY % platformCommunicationDTD SYSTEM "chrome://communicator-platform/locale/pref/platformPrefOverlay.dtd">
%platformCommunicationDTD;
<!ENTITY % tabsDTD SYSTEM "chrome://communicator/locale/pref/pref-tabs.dtd">
%tabsDTD;
]>
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="parent.initPanel('chrome://communicator/content/pref/pref-tabs.xul');
loadPanel();"
onload="parent.initPanel('chrome://communicator/content/pref/pref-tabs.xul');"
headertitle="&tabHeader.label;">
<script type="application/x-javascript">
<![CDATA[
var _elementIDs = ["tabStrip", "tabBackground", "middleClick", "urlBar"];
function loadPanel() {
if (navigator.platform.indexOf("Mac") != -1) {
var string = document.getElementById("macUrlbarPref");
var checkbox = document.getElementById("urlBar");
checkbox.label = string.getAttribute("label");
}
}
]]>
</script>
<data id="macUrlbarPref" label="&urlbarMac.label;"/>
<groupbox id="generalTabPreferences" align="start">
<caption label="&tabDisplay.label;"/>
<checkbox id="tabStrip"
@ -61,7 +56,7 @@
prefstring="browser.tabs.opentabfor.middleclick"/>
<checkbox id="urlBar"
label="&urlbarWinUnix.label;"
label="&urlbar.label;"
prefstring="browser.tabs.opentabfor.urlbar"/>
</groupbox>

2
xpfe/components/prefwindow/resources/locale/en-US/Makefile.in
View File

@ -26,7 +26,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = unix win
DIRS = mac unix win
include $(topsrcdir)/config/rules.mk

48
xpfe/components/prefwindow/resources/locale/en-US/mac/Makefile.in Normal file
View File

@ -0,0 +1,48 @@
# ***** BEGIN LICENSE BLOCK *****
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
# http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
# The Original Code is preference localization for macos
#
# The Initial Developer of the Original Code is mozilla.org
#
# Portions created by the Initial Developer are Copyright (C) 2002
# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 2 or later (the "GPL"), or
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
# in which case the provisions of the GPL or the LGPL are applicable instead
# of those above. If you wish to allow use of your version of this file only
# under the terms of either the GPL or the LGPL, and not to allow others to
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
DEPTH = ../../../../../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
NO_JAR_AUTO_REG=1
include $(topsrcdir)/config/rules.mk

26
xpfe/components/prefwindow/resources/locale/en-US/mac/contents-platform.rdf Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
<!-- list all the locale being supplied by this package -->
<RDF:Seq about="urn:mozilla:locale:root">
<RDF:li resource="urn:mozilla:locale:en-US"/>
</RDF:Seq>
<!-- locale information -->
<RDF:Description about="urn:mozilla:locale:en-US"
chrome:author="mozilla.org"
chrome:name="en-US"
chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
<chrome:packages>
<RDF:Seq about="urn:mozilla:locale:en-US:packages">
<RDF:li resource="urn:mozilla:locale:en-US:communicator-platform"/>
</RDF:Seq>
</chrome:packages>
</RDF:Description>
<!-- Version Information. State that we work only with major version of this
package. -->
<RDF:Description about="urn:mozilla:locale:en-US:communicator-platform"
chrome:localeVersion="1.1b"/>
</RDF:RDF>

3
xpfe/components/prefwindow/resources/locale/en-US/mac/jar.mn Normal file
View File

@ -0,0 +1,3 @@
en-mac.jar:
locale/en-US/communicator-platform/contents.rdf (contents-platform.rdf)
locale/en-US/communicator-platform/pref/platformPrefOverlay.dtd (platformPrefOverlay.dtd)

1
xpfe/components/prefwindow/resources/locale/en-US/mac/platformPrefOverlay.dtd Normal file
View File

@ -0,0 +1 @@
<!ENTITY urlbar.label "Command+Enter in the Location bar">

3
xpfe/components/prefwindow/resources/locale/en-US/pref-tabs.dtd
View File

@ -4,6 +4,3 @@
<!ENTITY background.label "Load links in the background">
<!ENTITY openTabs.label "Open tabs instead of windows for">
<!ENTITY middleClick.label "Middle-click or control-click of links in a Web page">
<!ENTITY urlbarWinUnix.label "Control+Enter in the Location bar">
<!ENTITY urlbarMac.label "Command+Enter in the Location bar">

4
xpfe/components/prefwindow/resources/locale/en-US/unix/jar.mn
View File

@ -1,3 +1,3 @@
en-unix.jar:
locale/en-US/communicator-platform/contents.rdf (contents-platform.rdf)
locale/en-US/communicator-platform/pref/platformPrefOverlay.dtd
locale/en-US/communicator-platform/contents.rdf (contents-platform.rdf)
locale/en-US/communicator-platform/pref/platformPrefOverlay.dtd (platformPrefOverlay.dtd)

1
xpfe/components/prefwindow/resources/locale/en-US/unix/platformPrefOverlay.dtd
View File

@ -0,0 +1 @@
<!ENTITY urlbar.label "Control+Enter in the Location bar">

1
xpfe/components/prefwindow/resources/locale/en-US/win/platformPrefOverlay.dtd
View File

@ -6,3 +6,4 @@
<!ENTITY defaultPendingText "&brandShortName; will be set as your default browser when you click OK.">
<!ENTITY makeDefaultText "Set &brandShortName; as your default browser.">
<!ENTITY urlbar.label "Control+Enter in the Location bar">