282182 - sync xpfe general.xml with toolkit general.xml

Status: RESOLVED FIXED

(Core :: XUL, defect)

Description

[Mike Connor [:mconnor]]

Comment 1

[Serge Gautherie (:sgautherie)]

Attachment: (Av1) 2005.03.08 X2T diff report

Diff from Xpfe to Toolkit version.

These came from Toolkit versions
{{
1.7	ben%bengoodger.com	2004-11-30 20:48		Aviary branch
landing
1.4	chanial%noos.fr 2003-11-19 21:14		convert
chrome://global/content/widgets to chrome://global/content/bindings
1.2	hyatt%mozilla.org	2003-08-10 01:04		Initial commit
of alternate stylesheet support in Firebird.
}}

Comment 2

[Justin Wood (:Callek)]

Hmm, if the diff is current (by date I would imagine so) then I do not personally see a problem syncing this and grabbing toolkits version from now on.  Chris?

Comment 3

[Serge Gautherie (:sgautherie)]

Attachment: (Av2) <general.xml>

(In reply to comment #2)
> Hmm, if the diff is current (by date I would imagine so) then I do not
> personally see a problem syncing this and grabbing toolkits version from now
> on.  Chris?

Updated to current Trunk; untested.

Comment 4

[[e-mail]]

Comment on attachment 217751 [details] [diff] [review]
(Av2) <general.xml>

>+  <binding id="statusbarpanel-menu-iconic" display="xul:menu" extends="chrome://global/content/bindings/general.xml#statusbarpanel">
I can live with the fact that DanM mistakenly put the binding in xpfe in a different place than hyatt put it in toolkit, but at least he had the sense to wrap it on to two lines.

>+  <binding id="statusbarpanel-iconic-text" display="xul:button"
This needs a xul.css change and possibly theme changes too.

Comment 5

[Serge Gautherie (:sgautherie)]

Attachment: (Av3-XPFE-Bw) <general.xml>++

(In reply to comment #4)
> >+  <binding id="statusbarpanel-iconic-text" display="xul:button"
> This needs a xul.css change and possibly theme changes too.

Here is what I found about the themes:
[[
/toolkit/themes/gnomestripe/global/global.css, line 160 -- .statusbarpanel-iconic, .statusbarpanel-iconic-text, .statusbarpanel-menu-iconic {
/toolkit/themes/winstripe/global/global.css, line 159 -- .statusbarpanel-iconic, .statusbarpanel-iconic-text, .statusbarpanel-menu-iconic {

159 .statusbarpanel-iconic,  .statusbarpanel-iconic-text, .statusbarpanel-menu-iconic {
160   padding: 0px 1px 0px 1px;
161 }
]]
But I'm not too sure what to do from there: helpwanted.

Comment 6

[[e-mail]]

Comment on attachment 219547 [details] [diff] [review]
(Av3-XPFE-Bw) <general.xml>++

Looks like we won't need any theme-specific changes.

Comment 7

[Serge Gautherie (:sgautherie)]

Attachment: (Av3-XPFE) <general.xml>++ [Checkin: Comment 9 & 11]

Av3-XPFE-Bw, with full diff.

Keeping
[[
(Av3-XPFE-Bw) <general.xml>++   	 patch   	2006-04-23 16:17 PDT  	2.38 KB  	neil: review+
]]

Comment 8

[Serge Gautherie (:sgautherie)]

Attachment: (Bv1-TK) <general.xml> [Checkin: Comment 12 & 13]

Comment 4 suggestion and space nits to synchronize wih XPFE file.

Comment 9

[Serge Gautherie (:sgautherie)]

Comment on attachment 219626 [details] [diff] [review]
(Av3-XPFE) <general.xml>++
[Checkin: Comment 9 & 11]


Checkin: { 2006-05-01 05:06	neil%parkwaycc.co.uk }

'approval-branch-1.8.1=?': (SeaMonkey only)
Simple U.I. code synchronisation (was Toolkit->XPFE, now Trunk->branch), no
risk.
It applies cleanly to the branch:
[[
patching file mozilla/xpfe/global/resources/content/xul.css
Hunk #1 succeeded at 779 (offset -5 lines).
patching file mozilla/xpfe/global/resources/content/bindings/general.xml
]]

Comment 10

[Serge Gautherie (:sgautherie)]

Comment on attachment 219627 [details] [diff] [review]
(Bv1-TK) <general.xml>
[Checkin: Comment 12 & 13]

'approval-branch-1.8.1=?': (Toolkit only)
Trivial U.I. code synchronisation (was Toolkit<->XPFE, now Trunk->branch), no
risk.
Requesting approval even if r+ has not been granted yet, as this has no impact on features.

Comment 11

[Serge Gautherie (:sgautherie)]

Comment on attachment 219626 [details] [diff] [review]
(Av3-XPFE) <general.xml>++
[Checkin: Comment 9 & 11]


Checkin: { 2006-05-05 07:00	bugzilla%standard8.demon.co.uk 	MOZILLA_1_8_BRANCH }

Comment 12

[Serge Gautherie (:sgautherie)]

Comment on attachment 219627 [details] [diff] [review]
(Bv1-TK) <general.xml>
[Checkin: Comment 12 & 13]


Checkin: { 2006-05-13 04:08	bugzilla%standard8.demon.co.uk 	mozilla/toolkit/content/widgets/general.xml 	1.14 }

Comment 13

[Serge Gautherie (:sgautherie)]

Comment on attachment 219627 [details] [diff] [review]
(Bv1-TK) <general.xml>
[Checkin: Comment 12 & 13]


Checkin: {
2006-05-18 10:03	bugzilla%standard8.demon.co.uk 	mozilla/toolkit/content/widgets/general.xml 	1.11.8.5 	MOZILLA_1_8_BRANCH
}

Comment 14

[Serge Gautherie (:sgautherie)]

[Mozilla/5.0 (Windows; U; Win98; en-US; rv:1.8.1a2) Gecko/20060518 SeaMonkey/1.1a] (nightly) (W98SE)
[Mozilla/5.0 (Windows; U; Win98; en-US; rv:1.8.1a2) Gecko/20060519 BonEcho/2.0a2] (nightly) (W98SE)

V.Fixed on MOZILLA_1_8_BRANCH for both apps: simply checked the installed files.