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

Status: VERIFIED FIXED

(SeaMonkey :: Preferences, defect)

Description

[sairuh (rarely reading bugmail)]

interesting little regression. this is Mac only (at least on OS X), and is not a
problem on linux or win2k.

1. open Preferences window.
2. go to the Tabbed Browsing panel.

observe: the checkbox text "Command+Enter in the Location bar" is displayed over
3 lines, like so:

Command+Enter
in the Location
bar

this is problem in both the branch and trunk, commercial and mozilla, and occurs
in both modern and classic themes.

i'm seeing it with 2002.07.22 builds, but did not see it with a branch build
from 2002.07.18.

i couldn't find an lxr entry that might point to why this is happening (at least
with pref-tabs.xul or pref-tabs.dtd. what other things could've caused this?

anyhow, it is trivial, considering how it doesn't even work (bug 141578).

Comment 1

[sairuh (rarely reading bugmail)]

(when looking at branch comm bits on OS X) this is fine with the
2002.07.21.05-1.0 build. this is broken with the 2002.07.22.05-1.0 (branch comm)
build.

Comment 2

[nnooiissee]

Not much to add except that I have been fooling around with this.

1) go to chrome://communicator/content/pref/pref-tabs.xul
2) go to javascript:loadPanel();

Note that when the text changes the line breaking changes.

Comment 3

[Don Crandall]

Attachment: Changed a variable from &urlbarWinUnix to &urlbarMac

A variable for the Windows and Unix version got into this file. 

This bug is also applicable to the Mac OS 9 version.

Comment 4

[nnooiissee]

Not that I'm an expert here, but I don't think that is the correct fix.

Also the diff doesn't seem to be right. Attack of the Mac line endings? cat
pref-tabs.xul | tr "\r" "\n" > pref-tabs.xul.converted

Comment 5

[Don Crandall]

Um, if this is the wrong fix, many appologies. 
However, this seems to fix the described problem on Mac OS X 10.1.5

The attachment is an unedited diff generated by patchmaker. Am I to edit this
file to show only the one word or line that was changed?

Comment 6

[Don Crandall]

Oops! My first comment incorrectly stated the variable name.

That's label="urlbarMac.label;"

As opposed to label="urlbarWinUnix.label;"

Please pardon the error.

Comment 7

[Don Crandall]

I still did it wrong!!

That's label="&urlbarMac.label;"

As opposed to label="&urlbarWinUnix.label;"

Sorry, I need to pay attention a little better.

Comment 8

[nnooiissee]

Don,

Yes it does fix the problem for Macs, but that file is cross platform and with
your patch every platform would say "Command" instead of seeing "Control" on
Windows and *nix.

As to the patch, no you are not supposed to edit it, but Patch Maker thinks the
entire file is one line. Are you using PM in OS X?

Windows, Unix, and Mac all have different sequences of characters to denote
where lines break. When you use a file with Mac line breaks with a *nix utility
(as diff probably is) it sees the file as all one line. Hard for it to pick out
which lines have changed when it thinks there is only one line. You want to get
the file converted to Unix line breaks before running PM on it.

I know of two easy ways to change line breaks: 1) Open it in BB Edit. Choose
save as. Hit the options button. Select Unix from the Line Breaks menu. 2) (OS X
only) Run terminal. cd to the directory where pref-tabs.xul lives. Enter the
command "cat pref-tabs.xul | tr "\r" "\n" > pref-tabs.xul.con ; mv
pref-tabs.xul.con pref-tabs.xul".

However, be warned I don't really know how PM works so I probably just gave you
a load of erroneous directions.

Comment 9

[Don Crandall]

Ack!!!

I'm using the wrong text editor!

Yes, I'm am using OS X.

Also, the patch does not appear as others do on bugzilla. Do I edit the diff
files to show only the lines that are changed, framed perhaps by a few lines
before it and after using the "+++" and "---" to denote adds and removes?

I admit I'm new at this, so any advise is appreciated. Feel free to email me on
this issue.

Thanks

Comment 10

[Don Crandall]

Ok, diregard the longer paragraph in my last comment, I'll correct the problem
when I get home.

I do appreciate you patience...

Comment 11

[Don Crandall]

Ok, I see the problem with the patch.

the loadpanel functon is supposed to load the correct item when it detects the
Mac platform.

Many apologies for the inconvennience.

Comment 12

[timeless]

Attachment: proposed patch

ok, this patch isn't a completely valid patch, but here goes.
1. mozilla/xpfe/components/prefwindow/resources/locale/en-US/mac needs to be
created. it should be a clone of
xpfe/components/prefwindow/resources/locale/en-US/unix
2. apply this patch.
3. prey that the patch applies to the right directory for the mac changes
4. build on mac win and unix
if everyone is happy, then we do this. Testers wanted.

Comment 13

[Joe Francis]

in response to comment #8, if you are on windows just open the patch in VC and
save it out again.  it will convert line endings for you.  I'll wager there is a
simmple solution on unix too.

Comment 14

[timeless]

Attachment: version that works

ok, jfrancis lent me his afternoon and we got a version that works.

first point: the unix jar.mn was broken, it never worked right :-)
the other change I made was to fix the chrome url

Comment 15

[Doron Rosenberg (IBM)]

Comment on attachment 97701 [details] [diff] [review]
version that works

perhaps add your name or mozilla.org to the creator part of the license

Comment 16

[jag (Peter Annema)]

Did you accidentily copy the CVS directory?

Index: xpfe/components/prefwindow/resources/locale/en-US/mac/platformPrefOverlay.dtd
===================================================================
RCS file:
/cvsroot/mozilla/xpfe/components/prefwindow/resources/locale/en-US/unix/platformPrefOverlay.dtd,v
retrieving revision 1.2
diff -u -r1.2 platformPrefOverlay.dtd
--- xpfe/components/prefwindow/resources/locale/en-US/mac/platformPrefOverlay.dtd	11 Jan 2001 23:37:49 -0000	1.2
+++ xpfe/components/prefwindow/resources/locale/en-US/mac/platformPrefOverlay.dtd	4 Sep 2002 00:20:28 -0000
@@ -0,0 +1 @@
+<!ENTITY urlbar.label "Command+Enter in the Location bar">


Note the RCS file line there.

Comment 17

[jag (Peter Annema)]

Comment on attachment 97701 [details] [diff] [review]
version that works

sr=jag

Comment 18

[timeless]

checked in

Comment 19

[nnooiissee]

Might this be a canidate for 1.0.2? I ask this partially because I don't know
what the scope of likely fixes is for that. Are polish fixes such as this wanted?

Comment 20

[sairuh (rarely reading bugmail)]

vrfy'd fixed on mac 10.1.5, 2002.09.19.08 comm trunk.