73666 - Double cancel buttons in profile manager

Status: VERIFIED FIXED

(SeaMonkey :: Startup & Profiles, defect)

Description

[Tracy Walker [:tracy]]

seen again on commercial builds:

windows 2001-03-27-06-trunk
linux 2001-03-27-05-mtrunk
mac 2001-03-27-12-trunk

-highlight a profile to delete
-click delete profile

a dialogue comes up with three buttons:  "okay"  and two "cancel"

one of the two cancel buttons used to be "delete files"

Comment 1

[R.K.Aa.]

similar "double cancel" reported in bug 73613.

Comment 2

[John Morrison]

  9   try {
 10     okButton.setAttribute("value", bundle.getString("dontDeleteFiles"));
 11     Button2.setAttribute("value", bundle.getString("deleteFiles"));
 12     cancelButton.setAttribute("value", bundle.getString("cancel"));
 13   } catch(e) {
 
... "label" not "value", encore fois.

Comment 3

[[e-mail] (gone - use [e-mail] instead)]

Attachment: Patch, should fix.

Comment 4

[[e-mail] (gone - use [e-mail] instead)]

Blake, Ben - please review.

Comment 5

[[e-mail] (gone - use [e-mail] instead)]

Shoot, I need to update my tree (this has the "Yah" stuff.)
Just a sec.

Comment 6

[[e-mail] (gone - use [e-mail] instead)]

Okay, so that "Yah" stuff in the attributes is present (my tree was up-to-date).
 These labels aren't ever apparent to the user, so I guess they're fine as is.

Comment 7

[John Morrison]

r=Yah, baby!

Comment 8

[Blake Ross]

...Not that those fallback defaults should even exist, but how about removing 
those `Yah's while you're at it?

mao, is there any chance you overwrote these changes in another checkin? I 
thought I fixed these cases already.

r=blake

Comment 9

[Mark Olson]

blake, cvs log says I'm ok, the file never got updated.

As far as the Yah's go, cvs log sez:
v1.2: Workaround for bug 26265, to handle failure to load string bundle at
startup. r=ben, a=leaf

Based on the fact that 26265 is fixed, the try{} should be unnecessary.

Comment 10

[[e-mail] (gone - use [e-mail] instead)]

Can I just remove the whole conditional try() and catch() statements then? And 
get rid of the "Yah".  If so, I'll post a new patch.

Comment 11

[timeless]

sounds good to me

Comment 12

[[e-mail] (gone - use [e-mail] instead)]

Attachment: Patch, please review.

Comment 13

[[e-mail] (gone - use [e-mail] instead)]

Crap-o-la.  (I deleted my tree, this didn't have the label changes, I'll 
re-attach.) Just a sec..

Comment 14

[[e-mail] (gone - use [e-mail] instead)]

Attachment: Here comes another one...

Comment 15

[John Morrison]

Um, you must mean something else (wrong file attached again?).

Comment 16

[[e-mail] (gone - use [e-mail] instead)]

cvs diff -u somehow got confused on that file, but I can assure you the changes
I made are in the patch and the local file:

*Took out the try() and catch() statements
*Un-indented the declarations that were associated with the above
*Changed value to label

Everything else should be intact.  Basically, diff subtracted the whole file,
and added the changes in (and claimed it was a new batch of code entirely.)

Comment 17

[[e-mail] (gone - use [e-mail] instead)]

Attachment: diff -wbu

Comment 18

[John Morrison]

Right, but you're resetting the localized labels, with hardcoded labels by
just yanking the try/catch lines and leaving both alternative actions in 
place:

+  okButton.setAttribute("label", bundle.getString("dontDeleteFiles"));
+  Button2.setAttribute("label", bundle.getString("deleteFiles"));
+  cancelButton.setAttribute("label", bundle.getString("cancel"));
+  okButton.setAttribute( "label", "Don't Delete Files" );
+  Button2.setAttribute( "label", "Delete Files" );
+  cancelButton.setAttribute( "label", "Cancel" );

Comment 19

[[e-mail] (gone - use [e-mail] instead)]

re-assigning to someone has a clue (I don't)

Comment 20

[John Morrison]

Attachment: You were right there, but just one change; can someone r=/sr= and checkin

Comment 21

[John Morrison]

Attachment: ... and now tying the record for most tries at a 13 line patch ... (use this one)

Comment 22

[timeless]

r=timeless

Comment 23

[Grace Bush]

*** Bug 73193 has been marked as a duplicate of this bug. ***

Comment 24

[John Morrison]

Anyone want to check this in (I can't). 

ben can you give this the sr=?

Comment 25

[Grace Bush]

*** Bug 74156 has been marked as a duplicate of this bug. ***

Comment 26

[John Morrison]

------- Additional Comments From John Morrison 2001-03-28 19:56 -------

Anyone want to check this in (I can't). 

ben can you give this the sr=?

Comment 27

[Grace Bush]

*** Bug 75776 has been marked as a duplicate of this bug. ***

Comment 28

[John Morrison]

-> blake.  ben can you give this trivial fix the sr=? Thanks.

Comment 29

[Blake Ross]

cc'ing alec for sr. he actually reads bugmail ;)

Comment 30

[Alec Flett]

sr=alecf

Comment 31

[Blake Ross]

Fix checked in.

Comment 32

[Tracy Walker [:tracy]]

verified fixed:

windows 2001-04-16-06-trunk
linux 2001-04-16-05-trunk
mac 2001-04-16-04-trunk