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

Fixing 70746: major xul syntax changes. If you use xul, this WILL affect you! Read n.p.m.xpfe for details on the changes and how you can fix your code. r=hewitt sr=hyatt, ben

This commit is contained in:
blakeross%telocity.com 2001-03-22 00:59:29 +00:00
Родитель 2d5770e2c1
Коммит 0b2dd2b2d2
415 изменённых файлов: 11945 добавлений и 11941 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
content/shared/public/nsXULAtomList.h
Просмотреть файл

@ -218,6 +218,7 @@ XUL_ATOM(persist, "persist")
XUL_ATOM(ref, "ref")
XUL_ATOM(command, "command")
XUL_ATOM(value, "value")
XUL_ATOM(label, "label")
XUL_ATOM(width, "width")
XUL_ATOM(height, "height")
XUL_ATOM(left, "left")

2
content/xul/content/src/nsXULElement.cpp
Просмотреть файл

@ -4231,7 +4231,7 @@ nsXULElement::GetMappedAttributeImpact(const nsIAtom* aAttribute,
aHint = NS_STYLE_HINT_CONTENT; // by default, never map attributes to style
if (aAttribute == nsXULAtoms::value || aAttribute == nsXULAtoms::flex ||
aAttribute == nsXULAtoms::progresstext) {
aAttribute == nsXULAtoms::label) {
// VERY IMPORTANT! This has a huge positive performance impact!
aHint = NS_STYLE_HINT_ATTRCHANGE;
}

8
directory/xpcom/tests/example.xul
Просмотреть файл

@ -30,8 +30,8 @@
<treechildren flex="1">
<treeitem uri="?child">
<treerow>
<treecell class="treecell-indent" value="?drink" flex="1" />
<treecell value="?givenname" flex="1" />
<treecell class="treecell-indent" label="?drink" flex="1" />
<treecell label="?givenname" flex="1" />
</treerow>
</treeitem>
</treechildren>
@ -47,8 +47,8 @@
<treehead>
<treerow id="headRow">
<treecell value="Drink" flex="1" />
<treecell value="Given Name" flex="1" />
<treecell label="Drink" flex="1" />
<treecell label="Given Name" flex="1" />
</treerow>
</treehead>
</tree>

2
editor/base/nsEditorShell.cpp
Просмотреть файл

@ -5203,7 +5203,7 @@ nsresult nsEditorShell::EndPageLoad(nsIDOMWindow *aDOMWindow,
nsAutoString doneText;
GetBundleString(NS_LITERAL_STRING("LoadingDone"), doneText);
SetChromeAttribute(mDocShell, "statusText", "value", doneText);
SetChromeAttribute(mDocShell, "statusText", "label", doneText);
// Display an Alert dialog if the page cannot be edited...
if (mCloseWindowWhenLoaded)

2
editor/composer/src/nsEditorShell.cpp
Просмотреть файл

@ -5203,7 +5203,7 @@ nsresult nsEditorShell::EndPageLoad(nsIDOMWindow *aDOMWindow,
nsAutoString doneText;
GetBundleString(NS_LITERAL_STRING("LoadingDone"), doneText);
SetChromeAttribute(mDocShell, "statusText", "value", doneText);
SetChromeAttribute(mDocShell, "statusText", "label", doneText);
// Display an Alert dialog if the page cannot be edited...
if (mCloseWindowWhenLoaded)

34
editor/ui/composer/content/EditorCommandsOverlay.xul
Просмотреть файл

@ -54,29 +54,29 @@
</commandset>
-->
<menupopup id="tableInsertPopup">
<menuitem value="&insertTableCmd.label;" accesskey="&tabletable.accesskey;" observes="cmd_InsertTable"/>
<menuitem label="&insertTableCmd.label;" accesskey="&tabletable.accesskey;" observes="cmd_InsertTable"/>
<menuseparator />
<menuitem value="&tableRowAbove.label;" accesskey="&tablerow.accesskey;" observes="cmd_InsertRowAbove"/>
<menuitem value="&tableRowBelow.label;" accesskey="&tablerowbelow.accesskey;" observes="cmd_InsertRowBelow"/>
<menuitem label="&tableRowAbove.label;" accesskey="&tablerow.accesskey;" observes="cmd_InsertRowAbove"/>
<menuitem label="&tableRowBelow.label;" accesskey="&tablerowbelow.accesskey;" observes="cmd_InsertRowBelow"/>
<menuseparator />
<menuitem value="&tableColumnBefore.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_InsertColumnBefore"/>
<menuitem value="&tableColumnAfter.label;" accesskey="&tablecolumnafter.accesskey;" observes="cmd_InsertColumnAfter"/>
<menuitem label="&tableColumnBefore.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_InsertColumnBefore"/>
<menuitem label="&tableColumnAfter.label;" accesskey="&tablecolumnafter.accesskey;" observes="cmd_InsertColumnAfter"/>
<menuseparator />
<menuitem value="&tableCellBefore.label;" accesskey="&tablecell.accesskey;" observes="cmd_InsertCellBefore"/>
<menuitem value="&tableCellAfter.label;" accesskey="&tablecellafter.accesskey;" observes="cmd_InsertCellAfter"/>
<menuitem label="&tableCellBefore.label;" accesskey="&tablecell.accesskey;" observes="cmd_InsertCellBefore"/>
<menuitem label="&tableCellAfter.label;" accesskey="&tablecellafter.accesskey;" observes="cmd_InsertCellAfter"/>
</menupopup>
<menupopup id="tableSelectPopup">
<menuitem id="menu_SelectTable" value="&tableTable.label;" accesskey="&tabletable.accesskey;" observes="cmd_SelectTable" />
<menuitem id="menu_SelectRow" value="&tableRow.label;" accesskey="&tablerow.accesskey;" observes="cmd_SelectRow" />
<menuitem id="menu_SelectColumn" value="&tableColumn.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_SelectColumn" />
<menuitem id="menu_SelectCell" value="&tableCell.label;" accesskey="&tablecell.accesskey;" observes="cmd_SelectCell" />
<menuitem id="menu_SelectAllCells" value="&tableAllCells.label;" accesskey="&tableallcells.accesskey;" observes="cmd_SelectAllCells" />
<menuitem id="menu_SelectTable" label="&tableTable.label;" accesskey="&tabletable.accesskey;" observes="cmd_SelectTable" />
<menuitem id="menu_SelectRow" label="&tableRow.label;" accesskey="&tablerow.accesskey;" observes="cmd_SelectRow" />
<menuitem id="menu_SelectColumn" label="&tableColumn.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_SelectColumn" />
<menuitem id="menu_SelectCell" label="&tableCell.label;" accesskey="&tablecell.accesskey;" observes="cmd_SelectCell" />
<menuitem id="menu_SelectAllCells" label="&tableAllCells.label;" accesskey="&tableallcells.accesskey;" observes="cmd_SelectAllCells" />
</menupopup>
<menupopup id="tableDeletePopup">
<menuitem id="menu_DeleteTable" value="&tableTable.label;" accesskey="&tabletable.accesskey;" observes="cmd_DeleteTable"/>
<menuitem id="menu_DeleteRow" value="&tableRows.label;" accesskey="&tablerow.accesskey;" observes="cmd_DeleteRow"/>
<menuitem id="menu_DeleteColumn" value="&tableColumns.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_DeleteColumn"/>
<menuitem id="menu_DeleteCell" value="&tableCells.label;" accesskey="&tablecell.accesskey;" observes="cmd_DeleteCell"/>
<menuitem id="menu_DeleteCellContents" value="&tableCellContents.label;" accesskey="&tablecellcontents.accesskey;" observes="cmd_DeleteCellContents"/>
<menuitem id="menu_DeleteTable" label="&tableTable.label;" accesskey="&tabletable.accesskey;" observes="cmd_DeleteTable"/>
<menuitem id="menu_DeleteRow" label="&tableRows.label;" accesskey="&tablerow.accesskey;" observes="cmd_DeleteRow"/>
<menuitem id="menu_DeleteColumn" label="&tableColumns.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_DeleteColumn"/>
<menuitem id="menu_DeleteCell" label="&tableCells.label;" accesskey="&tablecell.accesskey;" observes="cmd_DeleteCell"/>
<menuitem id="menu_DeleteCellContents" label="&tableCellContents.label;" accesskey="&tablecellcontents.accesskey;" observes="cmd_DeleteCellContents"/>
</menupopup>
</overlay>

22
editor/ui/composer/content/EditorContextMenu.js
Просмотреть файл

@ -61,9 +61,9 @@ function EditorFillContextMenu(event, contextMenuNode)
var haveEdit =
IsMenuItemShowing("menu_cut_cm") ||
IsMenuItemShowing("menu_copy_cm") ||
IsMenuItemShowing("menu_paste_cm") ||
IsMenuItemShowing("menu_delete_cm");
IsMenuItemShowing("menu_copy_cm") ||
IsMenuItemShowing("menu_paste_cm") ||
IsMenuItemShowing("menu_delete_cm");
var haveStyle =
IsMenuItemShowing("removeStylesMenuitem_cm") ||
@ -92,7 +92,7 @@ function EditorFillContextMenu(event, contextMenuNode)
var menutext = window.editorShell.GetString("SaveImageAs").replace(/%NAME%/,imageName);
saveImageMenuItem.setAttribute('value',menutext);
saveImageMenuItem.setAttribute('label',menutext);
var onCommand = "savePage('"+ imagePtr.getAttribute("src") + "',true)";
saveImageMenuItem.setAttribute('oncommand',onCommand);
@ -159,7 +159,7 @@ function ShowMenuItem(id, showItem)
{
//var showing = (item.getAttribute("collapsed") !="true");
//if(showItem != showing ? "true" : "")
item.setAttribute("collapsed", showItem ? "" : "true");
item.setAttribute("collapsed", showItem ? "" : "true");
}
else
dump("ShowMenuItem: item id="+id+" not found\n");
@ -167,11 +167,11 @@ function ShowMenuItem(id, showItem)
function IsMenuItemShowing(menuID)
{
var item = document.getElementById(menuID);
if(item)
{
var item = document.getElementById(menuID);
if(item)
{
var show = item.getAttribute("collapsed") != "true";
return(item.getAttribute("collapsed") !="true");
}
return false;
return(item.getAttribute("collapsed") !="true");
}
return false;
}

78
editor/ui/composer/content/EditorContextMenuOverlay.xul
Просмотреть файл

@ -31,72 +31,72 @@
<popupset id="editorContentContextSet">
<popup id="editorContentContext"
oncreate="EditorFillContextMenu(event, this);"
ondestroy="EditorCleanupContextMenu(event, this);">
<menuitem id="menu_undo_cm" value="&undoCmd.label;" accesskey="&undo.accesskey;" observes="cmd_undo"/>
<menuitem id="menu_redo_cm" value="&redoCmd.label;" accesskey="&redo.accesskey;" observes="cmd_redo"/>
ondestroy="EditorCleanupContextMenu(event, this);">
<menuitem id="menu_undo_cm" label="&undoCmd.label;" accesskey="&undo.accesskey;" observes="cmd_undo"/>
<menuitem id="menu_redo_cm" label="&redoCmd.label;" accesskey="&redo.accesskey;" observes="cmd_redo"/>
<menuseparator id="undoredo-separator"/>
<menuitem id="menu_cut_cm" value="&cutCmd.label;" accesskey="&cut.accesskey;" observes="cmd_cut"/>
<menuitem id="menu_copy_cm" value="&copyCmd.label;" accesskey="&copy.accesskey;" observes="cmd_copy"/>
<menuitem id="menu_paste_cm" value="&pasteCmd.label;" accesskey="&paste.accesskey;" observes="cmd_paste"/>
<menuitem id="menu_delete_cm" value="&deleteCmd.label;" accesskey="&delete.accesskey;" observes="cmd_delete"/>
<menuseparator id="edit-separator"/>
<menuitem id="menu_cut_cm" label="&cutCmd.label;" accesskey="&cut.accesskey;" observes="cmd_cut"/>
<menuitem id="menu_copy_cm" label="&copyCmd.label;" accesskey="&copy.accesskey;" observes="cmd_copy"/>
<menuitem id="menu_paste_cm" label="&pasteCmd.label;" accesskey="&paste.accesskey;" observes="cmd_paste"/>
<menuitem id="menu_delete_cm" label="&deleteCmd.label;" accesskey="&delete.accesskey;" observes="cmd_delete"/>
<menuseparator id="edit-separator"/>
<menuitem id="menu_selectAll_cm" value="&selectAllCmd.label;" accesskey="&selectall.accesskey;"
<menuitem id="menu_selectAll_cm" label="&selectAllCmd.label;" accesskey="&selectall.accesskey;"
observes="cmd_selectAll"/>
<menuseparator id="selectAll-separator"/>
<menuseparator id="selectAll-separator"/>
<!-- Value and accesskey set at runtime from strings -->
<!-- label and accesskey set at runtime from strings -->
<menuitem id="removeStylesMenuitem_cm"
observes="cmd_removeStyles"/>
<menuitem id="createLink_cm" value="&createLinkCmd.label;" accesskey="&createlink.accesskey;"
<menuitem id="createLink_cm" label="&createLinkCmd.label;" accesskey="&createlink.accesskey;"
observes="cmd_link" />
<!-- Value and accesskey set at runtime from strings -->
<!-- label and accesskey set at runtime from strings -->
<menuitem id="removeLinksMenuitem_cm" observes="cmd_removeLinks"/>
<menuseparator id="styles-separator"/>
<menuseparator id="styles-separator"/>
<!-- Value and accesskey are set in InitObjectProperties -->
<!-- label and accesskey are set in InitObjectProperties -->
<menuitem id="objectProperties_cm" observes="cmd_objectProperties"/>
<menuitem id="menu_saveImage_cm"/>
<menuseparator id="property-separator"/>
<!-- Can't get submenus to load from a shared overlay -->
<menu id="tableInsertMenu_cm" value="&tableInsertMenu2.label;" accesskey="&tableinsertmenu.accesskey;">
<menu id="tableInsertMenu_cm" label="&tableInsertMenu2.label;" accesskey="&tableinsertmenu.accesskey;">
<menupopup>
<menuitem value="&insertTableCmd.label;" accesskey="&tabletable.accesskey;" observes="cmd_InsertTable"/>
<menuitem label="&insertTableCmd.label;" accesskey="&tabletable.accesskey;" observes="cmd_InsertTable"/>
<menuseparator />
<menuitem value="&tableRowAbove.label;" accesskey="&tablerow.accesskey;" observes="cmd_InsertRowAbove"/>
<menuitem value="&tableRowBelow.label;" accesskey="&tablerowbelow.accesskey;" observes="cmd_InsertRowBelow"/>
<menuitem label="&tableRowAbove.label;" accesskey="&tablerow.accesskey;" observes="cmd_InsertRowAbove"/>
<menuitem label="&tableRowBelow.label;" accesskey="&tablerowbelow.accesskey;" observes="cmd_InsertRowBelow"/>
<menuseparator />
<menuitem value="&tableColumnBefore.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_InsertColumnBefore"/>
<menuitem value="&tableColumnAfter.label;" accesskey="&tablecolumnafter.accesskey;" observes="cmd_InsertColumnAfter"/>
<menuitem label="&tableColumnBefore.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_InsertColumnBefore"/>
<menuitem label="&tableColumnAfter.label;" accesskey="&tablecolumnafter.accesskey;" observes="cmd_InsertColumnAfter"/>
<menuseparator />
<menuitem value="&tableCellBefore.label;" accesskey="&tablecell.accesskey;" observes="cmd_InsertCellBefore"/>
<menuitem value="&tableCellAfter.label;" accesskey="&tablecellafter.accesskey;" observes="cmd_InsertCellAfter"/>
<menuitem label="&tableCellBefore.label;" accesskey="&tablecell.accesskey;" observes="cmd_InsertCellBefore"/>
<menuitem label="&tableCellAfter.label;" accesskey="&tablecellafter.accesskey;" observes="cmd_InsertCellAfter"/>
</menupopup>
</menu>
<menu id="tableSelectMenu_cm" value="&tableSelectMenu2.label;" accesskey="&tableselectmenu.accesskey;">
<menu id="tableSelectMenu_cm" label="&tableSelectMenu2.label;" accesskey="&tableselectmenu.accesskey;">
<menupopup>
<menuitem id="menu_SelectTable" value="&tableTable.label;" accesskey="&tabletable.accesskey;" observes="cmd_SelectTable" />
<menuitem id="menu_SelectRow" value="&tableRow.label;" accesskey="&tablerow.accesskey;" observes="cmd_SelectRow" />
<menuitem id="menu_SelectColumn" value="&tableColumn.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_SelectColumn" />
<menuitem id="menu_SelectCell" value="&tableCell.label;" accesskey="&tablecell.accesskey;" observes="cmd_SelectCell" />
<menuitem id="menu_SelectAllCells" value="&tableAllCells.label;" accesskey="&tableallcells.accesskey;" observes="cmd_SelectAllCells" />
<menuitem id="menu_SelectTable" label="&tableTable.label;" accesskey="&tabletable.accesskey;" observes="cmd_SelectTable" />
<menuitem id="menu_SelectRow" label="&tableRow.label;" accesskey="&tablerow.accesskey;" observes="cmd_SelectRow" />
<menuitem id="menu_SelectColumn" label="&tableColumn.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_SelectColumn" />
<menuitem id="menu_SelectCell" label="&tableCell.label;" accesskey="&tablecell.accesskey;" observes="cmd_SelectCell" />
<menuitem id="menu_SelectAllCells" label="&tableAllCells.label;" accesskey="&tableallcells.accesskey;" observes="cmd_SelectAllCells" />
</menupopup>
</menu>
<menu id="tableDeleteMenu_cm" value="&tableDeleteMenu2.label;" accesskey="&tabledeletemenu.accesskey;">
<menu id="tableDeleteMenu_cm" label="&tableDeleteMenu2.label;" accesskey="&tabledeletemenu.accesskey;">
<menupopup>
<menuitem id="menu_DeleteTable" value="&tableTable.label;" accesskey="&tabletable.accesskey;" observes="cmd_DeleteTable"/>
<menuitem id="menu_DeleteRow" value="&tableRows.label;" accesskey="&tablerow.accesskey;" observes="cmd_DeleteRow"/>
<menuitem id="menu_DeleteColumn" value="&tableColumns.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_DeleteColumn"/>
<menuitem id="menu_DeleteCell" value="&tableCells.label;" accesskey="&tablecell.accesskey;" observes="cmd_DeleteCell"/>
<menuitem id="menu_DeleteCellContents" value="&tableCellContents.label;" accesskey="&tablecellcontents.accesskey;" observes="cmd_DeleteCellContents"/>
<menuitem id="menu_DeleteTable" label="&tableTable.label;" accesskey="&tabletable.accesskey;" observes="cmd_DeleteTable"/>
<menuitem id="menu_DeleteRow" label="&tableRows.label;" accesskey="&tablerow.accesskey;" observes="cmd_DeleteRow"/>
<menuitem id="menu_DeleteColumn" label="&tableColumns.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_DeleteColumn"/>
<menuitem id="menu_DeleteCell" label="&tableCells.label;" accesskey="&tablecell.accesskey;" observes="cmd_DeleteCell"/>
<menuitem id="menu_DeleteCellContents" label="&tableCellContents.label;" accesskey="&tablecellcontents.accesskey;" observes="cmd_DeleteCellContents"/>
</menupopup>
</menu>
<!-- menu value is set in InitTableMenu -->
<menuitem id="joinTableCells_cm" value="&tableJoinCells.label;" accesskey="&tablejoincells.accesskey;" observes="cmd_JoinTableCells"/>
<menuitem id="splitTableCell_cm" value="&tableSplitCell.label;" accesskey="&tablesplitcell.accesskey;" observes="cmd_SplitTableCell"/>
<menuitem id="tableOrCellColor_cm" value="&tableOrCellColor.label;" accesskey="&tableOrCellColor.accesskey;" observes="cmd_TableOrCellColor"/>
<!-- menu label is set in InitTableMenu -->
<menuitem id="joinTableCells_cm" label="&tableJoinCells.label;" accesskey="&tablejoincells.accesskey;" observes="cmd_JoinTableCells"/>
<menuitem id="splitTableCell_cm" label="&tableSplitCell.label;" accesskey="&tablesplitcell.accesskey;" observes="cmd_SplitTableCell"/>
<menuitem id="tableOrCellColor_cm" label="&tableOrCellColor.label;" accesskey="&tableOrCellColor.accesskey;" observes="cmd_TableOrCellColor"/>
</popup>
</popupset>

6
editor/ui/composer/content/TextEditorAppShell.xul
Просмотреть файл

@ -55,7 +55,7 @@
<commandset id="globalEditMenuItems"/>
<commandset id="selectEditMenuItems"/>
<commandset id="undoEditMenuItems"/>
<commandset id="clipboardEditMenuItems"/>
<commandset id="clipboardEditMenuItems"/>
<commandset id="commonEditorMenuItems"/>
<commandset id="composerEditMenuItems"/>
@ -74,14 +74,14 @@
<broadcaster id="Editor:Throbber" busy="false"/>
</broadcasterset>
<!-- keys are appended from the overlay -->
<!-- keys are appended from the overlay -->
<keyset id="keyset"/>
<menubar id="main-menubar" class="chromeclass-menubar">
<menu id="fileMenu"/>
<menu id="editMenu"/>
<menu value="&viewMenu.label;" accesskey="&viewmenu.accesskey;">
<menu label="&viewMenu.label;" accesskey="&viewmenu.accesskey;">
<!-- id pulls in "Show Sidebar" item from sidebarOverlay -->
<menupopup id="menu_View_Popup">
<menu id="viewToolbar"/>

100
editor/ui/composer/content/editor.js
Просмотреть файл

@ -338,12 +338,12 @@ function FindAndSelectEditorWindowWithURL(urlToMatch)
var window = windowManagerInterface.convertISupportsToDOMWindow( enumerator.getNext() );
if ( window )
{
if (editorShell.checkOpenWindowForURLMatch(urlToMatch, window))
{
window.focus();
return true;
}
}
if (editorShell.checkOpenWindowForURLMatch(urlToMatch, window))
{
window.focus();
return true;
}
}
}
// not found
@ -491,7 +491,7 @@ function updateCharsetPopupMenu(menuPopup)
for (var i = 0; i < menuPopup.childNodes.length; i++)
{
var menuItem = menuPopup.childNodes[i];
menuItem.setAttribute('disabled', 'true');
menuItem.setAttribute('disabled', 'true');
}
}
}
@ -519,7 +519,7 @@ function onParagraphFormatChange(paraMenuList, commandID)
{
//Selection is the "mixed" ( > 1 style) state
paraMenuList.selectedItem = null;
paraMenuList.setAttribute("value",GetString('Mixed'));
paraMenuList.setAttribute("label",GetString('Mixed'));
}
else
{
@ -528,7 +528,7 @@ function onParagraphFormatChange(paraMenuList, commandID)
for (var i=0; i < menuItems.length; i++)
{
var menuItem = menuItems.item(i);
if (menuItem.data == state)
if (menuItem.value == state)
{
paraMenuList.selectedItem = menuItem;
break;
@ -555,7 +555,7 @@ function onFontFaceChange(fontFaceMenuList, commandID)
{
//Selection is the "mixed" ( > 1 style) state
fontFaceMenuList.selectedItem = null;
fontFaceMenuList.setAttribute("value",GetString('Mixed'));
fontFaceMenuList.setAttribute("label",GetString('Mixed'));
}
else
{
@ -564,7 +564,7 @@ function onFontFaceChange(fontFaceMenuList, commandID)
for (var i=0; i < menuItems.length; i++)
{
var menuItem = menuItems.item(i);
if (menuItem.getAttribute("value") && (menuItem.data.toLowerCase() == state.toLowerCase()))
if (menuItem.getAttribute("label") && (menuItem.value.toLowerCase() == state.toLowerCase()))
{
fontFaceMenuList.selectedItem = menuItem;
break;
@ -589,7 +589,7 @@ function onFontSizeChange(fontSizeMenulist, commandID)
{
// If we don't match anything, set to "0 (normal)"
var newIndex = 2;
var size = fontSizeMenulist.getAttribute("size");
var size = fontSizeMenulist.getAttribute("size");
if ( size == "mixed")
{
// No single type selected
@ -670,7 +670,7 @@ function initFontFaceMenu(menuPopup)
for (var i = 3; i < children.length; i++)
{
var menuItem = children[i];
var faceType = menuItem.getAttribute("data");
var faceType = menuItem.getAttribute("value");
if (faceType)
{
@ -1121,8 +1121,8 @@ function CollapseItem(id, collapse)
var item = document.getElementById(id);
if (item)
{
if(collapse != (item.getAttribute("collapsed") == "true"))
item.setAttribute("collapsed", collapse ? "true" : "");
if(collapse != (item.getAttribute("collapsed") == "true"))
item.setAttribute("collapsed", collapse ? "true" : "");
}
}
@ -1131,8 +1131,8 @@ function DisableItem(id, disable)
var item = document.getElementById(id);
if (item)
{
if(disable != (item.getAttribute("disabled") == "true"))
item.setAttribute("disabled", disable ? "true" : "");
if(disable != (item.getAttribute("disabled") == "true"))
item.setAttribute("disabled", disable ? "true" : "");
}
}
@ -1314,11 +1314,11 @@ function EditorOpenUrl(url)
}
else
{
// open new window
// open new window
window.openDialog("chrome://editor/content",
"_blank",
"chrome,dialog=no,all",
url);
"_blank",
"chrome,dialog=no,all",
url);
}
}
}
@ -1432,11 +1432,11 @@ function AppendRecentMenuitem(menupopup, title, url, menuIndex)
if (title)
itemString += "]";
menuItem.setAttribute("value", itemString);
menuItem.setAttribute("data", url);
menuItem.setAttribute("label", itemString);
menuItem.setAttribute("value", url);
if (accessKey != " ")
menuItem.setAttribute("accesskey", accessKey);
menuItem.setAttribute("oncommand", "EditorOpenUrl(getAttribute('data'))");
menuItem.setAttribute("oncommand", "EditorOpenUrl(getAttribute('value'))");
menupopup.appendChild(menuItem);
}
}
@ -1535,7 +1535,7 @@ function InitObjectPropertiesMenuitem(id)
menuStr = menuStr.replace(/%obj%/,"").replace(/^\s+/, "");
}
menuItem.setAttribute("value", menuStr);
menuItem.setAttribute("label", menuStr);
menuItem.setAttribute("accesskey",GetString("ObjectPropertiesAccessKey"));
return name;
}
@ -2060,7 +2060,7 @@ function GetPrefsService()
}
catch(ex)
{
dump("failed to get prefs service!\n");
dump("failed to get prefs service!\n");
}
}
@ -2094,7 +2094,7 @@ function InitJoinCellMenuitem(id)
else
menuText = GetString("JoinCellToRight");
menuItem.setAttribute("value",menuText);
menuItem.setAttribute("label",menuText);
menuItem.setAttribute("accesskey",GetString("JoinCellAccesskey"));
}
@ -2107,12 +2107,12 @@ function InitRemoveStylesMenuitems(removeStylesId, removeLinksId)
var isCollapsed = editorShell.editorSelection.isCollapsed;
if (stylesItem)
{
stylesItem.setAttribute("value", isCollapsed ? GetString("StopTextStyles") : GetString("RemoveTextStyles"));
stylesItem.setAttribute("label", isCollapsed ? GetString("StopTextStyles") : GetString("RemoveTextStyles"));
stylesItem.setAttribute("accesskey", GetString("RemoveTextStylesAccesskey"));
}
if (linkItem)
{
linkItem.setAttribute("value", isCollapsed ? GetString("StopLinks") : GetString("RemoveLinks"));
linkItem.setAttribute("label", isCollapsed ? GetString("StopLinks") : GetString("RemoveLinks"));
linkItem.setAttribute("accesskey", GetString("RemoveLinksAccesskey"));
// Note: disabling text style is a pain since there are so many - forget it!
@ -2256,7 +2256,7 @@ function SwitchInsertCharToThisWindow(windowWithDialog)
if (windowWithDialog && "InsertCharWindow" in windowWithDialog &&
windowWithDialog.InsertCharWindow)
{
// Move dialog association to the current window
// Move dialog association to the current window
window.InsertCharWindow = windowWithDialog.InsertCharWindow;
windowWithDialog.InsertCharWindow = null;
@ -2274,20 +2274,20 @@ function SwitchInsertCharToThisWindow(windowWithDialog)
function FindEditorWithInsertCharDialog()
{
// Find window with an InsertCharsWindow and switch association to this one
var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
var enumerator = windowManagerInterface.getEnumerator( null );
var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
var enumerator = windowManagerInterface.getEnumerator( null );
while ( enumerator.hasMoreElements() )
{
var tempWindow = enumerator.getNext();
while ( enumerator.hasMoreElements() )
{
var tempWindow = enumerator.getNext();
if (tempWindow != window && "InsertCharWindow" in tempWindow &&
if (tempWindow != window && "InsertCharWindow" in tempWindow &&
tempWindow.InsertCharWindow)
{
{
return tempWindow;
}
}
}
}
return null;
}
@ -2316,29 +2316,29 @@ function EditorFindOrCreateInsertCharWindow()
// or close it if none found (May be a mail composer)
function SwitchInsertCharToAnotherEditorOrClose()
{
if ("InsertCharWindow" in window && window.InsertCharWindow)
if ("InsertCharWindow" in window && window.InsertCharWindow)
{
var windowManager = Components.classes['@mozilla.org/rdf/datasource;1?name=window-mediator'].getService();
var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
var enumerator = windowManagerInterface.getEnumerator( null );
var windowManagerInterface = windowManager.QueryInterface( Components.interfaces.nsIWindowMediator);
var enumerator = windowManagerInterface.getEnumerator( null );
// TODO: Fix this to search for command controllers and look for "cmd_InsertChars"
// For now, detect just Web Composer and HTML Mail Composer
while ( enumerator.hasMoreElements() )
{
var tempWindow = enumerator.getNext();
if (tempWindow != window && tempWindow.editorShell &&
while ( enumerator.hasMoreElements() )
{
var tempWindow = enumerator.getNext();
if (tempWindow != window && tempWindow.editorShell &&
tempWindow.gIsHTMLEditor || tempWindow.editorShell.editorType == "htmlmail")
// tempWindow.editorShell.editorDocument.commandDispatcher.getControllerForCommand("cmd_InsertChars"))
{
{
tempWindow.InsertCharWindow = window.InsertCharWindow;
window.InsertCharWindow = null;
tempWindow.InsertCharWindow.editorShell = tempWindow.editorShell;
tempWindow.InsertCharWindow.opener = tempWindow;
return;
}
}
}
}
// Didn't find another editor - close the dialog
window.InsertCharWindow.close();
}

18
editor/ui/composer/content/editor.xul
Просмотреть файл

@ -100,7 +100,7 @@
<broadcaster id="Editor:Throbber" busy="false"/>
</broadcasterset>
<!-- keys are appended from the overlay -->
<!-- keys are appended from the overlay -->
<keyset id="keyset"/>
<toolbox class="toolbox-top" id="EditorToolbox">
@ -108,7 +108,7 @@
<menu id="fileMenu"/>
<menu id="editMenu"/>
<menu id="viewMenu" value="&viewMenu.label;" accesskey="&viewmenu.accesskey;">
<menu id="viewMenu" label="&viewMenu.label;" accesskey="&viewmenu.accesskey;">
<!-- id pulls in "Show Sidebar" item from sidebarOverlay -->
<menupopup id="menu_View_Popup">
<menu id="viewToolbar"/>
@ -124,7 +124,7 @@
<menu id="insertMenu"/>
<menu id="formatMenu" value="&formatMenu.label;" accesskey="&formatmenu.accesskey;">
<menu id="formatMenu" label="&formatMenu.label;" accesskey="&formatmenu.accesskey;">
<menupopup id="formatMenuPopup">
<menuitem id="objectProperties"/>
<menuitem id="colorsAndBackground"/>
@ -235,11 +235,11 @@
<box id="EditModeToolbar" hidden="true" autostretch="never" valign="middle" persist="hidden collapsed">
<tabbox id="EditModeTabbox" class="tabbox-bottom" flex="1">
<tab id="NormalModeButton"/>
<tab id="TagModeButton"/>
<tab id="SourceModeButton"/>
<tab id="PreviewModeButton"/>
</tabbox>
<tab id="NormalModeButton"/>
<tab id="TagModeButton"/>
<tab id="SourceModeButton"/>
<tab id="PreviewModeButton"/>
</tabbox>
</box>
<!-- Some of this is from globarOverlay.xul -->
@ -248,7 +248,7 @@
<progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0">
<observes element="Editor:Throbber" attribute="busy"/>
</progressmeter>
<statusbarpanel id="statusText" value="&statusText.label;" flex="1" crop="right"/>
<statusbarpanel id="statusText" label="&statusText.label;" flex="1" crop="right"/>
</statusbar>
</box> <!-- appcontent -->

480
editor/ui/composer/content/editorOverlay.xul
Просмотреть файл

@ -64,7 +64,7 @@
<key id="savekb" key="&filesave.keybinding;" observes="cmd_save" modifiers="accel"/>
<key id="closekb" key="&fileclose.keybinding;" observes="cmd_close" modifiers="accel"/>
<key id="printkb" key="&fileprint.keybinding;" observes="cmd_print" modifiers="accel"/>
<key id="key_quit"/>
<key id="key_quit"/>
<key id="key_undo"/>
<key id="key_redo"/>
<key id="key_cut"/>
@ -94,17 +94,17 @@
<!-- commands updated when the editor gets created -->
<commandset id="commonEditorMenuItems"
commandupdater="true"
events="create"
oncommandupdate="goUpdateComposerMenuItems(this)"
commandupdater="true"
events="create"
oncommandupdate="goUpdateComposerMenuItems(this)"
>
<command id="cmd_open" oncommand="goDoCommand('cmd_open')"/>
<command id="cmd_openRemote" value="&openremoteCmd.label;" oncommand="goDoCommand('cmd_openRemote')"/>
<command id="cmd_close" value="&closeCmd.label;" oncommand="goDoCommand('cmd_close')"/>
<command id="cmd_openRemote" label="&openremoteCmd.label;" oncommand="goDoCommand('cmd_openRemote')"/>
<command id="cmd_close" label="&closeCmd.label;" oncommand="goDoCommand('cmd_close')"/>
<command id="cmd_printSetup" value="&printSetupCmd.label;" oncommand="goDoCommand('cmd_printSetup')"/>
<command id="cmd_printSetup" label="&printSetupCmd.label;" oncommand="goDoCommand('cmd_printSetup')"/>
<!--
<command id="cmd_printPreview" value="&printPreviewCmd.label;" oncommand="goDoCommand('cmd_printPreview')"/>
<command id="cmd_printPreview" label="&printPreviewCmd.label;" oncommand="goDoCommand('cmd_printPreview')"/>
-->
<command id="cmd_print" oncommand="goDoCommand('cmd_print')"/>
@ -112,9 +112,9 @@
</commandset>
<commandset id="composerMenuItems"
commandupdater="true"
events="create"
oncommandupdate="goUpdateComposerMenuItems(this)"
commandupdater="true"
events="create"
oncommandupdate="goUpdateComposerMenuItems(this)"
>
<!-- format menu -->
<command id="cmd_listProperties" oncommand="goDoCommand('cmd_listProperties')"/>
@ -127,38 +127,38 @@
<command id="cmd_hline" oncommand="goDoCommand('cmd_hline')"/>
<command id="cmd_table" oncommand="goDoCommand('cmd_table')"/>
<command id="cmd_objectProperties" oncommand="goDoCommand('cmd_objectProperties')"/>
<command id="cmd_insertChars" oncommand="goDoCommand('cmd_insertChars')" value="&insertCharsCmd.label;"/>
<command id="cmd_insertHTML" oncommand="goDoCommand('cmd_insertHTML')" value="&insertHTMLCmd.label;"/>
<command id="cmd_insertChars" oncommand="goDoCommand('cmd_insertChars')" label="&insertCharsCmd.label;"/>
<command id="cmd_insertHTML" oncommand="goDoCommand('cmd_insertHTML')" label="&insertHTMLCmd.label;"/>
<command id="cmd_smiley" state="" oncommand="goDoCommand('cmd_smiley')"/>
<command id="cmd_insertBreak" oncommand="goDoCommand('cmd_insertBreak')"/>
<command id="cmd_insertBreakAll" oncommand="goDoCommand('cmd_insertBreakAll')"/>
<command id="cmd_NormalMode" oncommand="goDoCommand('cmd_NormalMode')" value="&NormalMode.label;"/>
<command id="cmd_AllTagsMode" oncommand="goDoCommand('cmd_AllTagsMode')" value="&AllTagsMode.label;"/>
<command id="cmd_NormalMode" oncommand="goDoCommand('cmd_NormalMode')" label="&NormalMode.label;"/>
<command id="cmd_AllTagsMode" oncommand="goDoCommand('cmd_AllTagsMode')" label="&AllTagsMode.label;"/>
<command id="cmd_HTMLSourceMode" oncommand="goDoCommand('cmd_HTMLSourceMode')"/>
<command id="cmd_PreviewMode" oncommand="goDoCommand('cmd_PreviewMode')" value="&PreviewMode.label;"/>
<command id="cmd_PreviewMode" oncommand="goDoCommand('cmd_PreviewMode')" label="&PreviewMode.label;"/>
</commandset>
<commandset id="composerSaveMenuItems"
commandupdater="true"
events="create, save"
oncommandupdate="goUpdateComposerMenuItems(this)"
commandupdater="true"
events="create, save"
oncommandupdate="goUpdateComposerMenuItems(this)"
>
<command id="cmd_save" value="&saveCmd.label;" oncommand="goDoCommand('cmd_save')"/>
<command id="cmd_saveAs" value="&saveAsCmd.label;" oncommand="goDoCommand('cmd_saveAs')"/>
<command id="cmd_exportToText" value="&exportToTextCmd.label;" oncommand="goDoCommand('cmd_exportToText')"/>
<command id="cmd_saveAsCharset" value="&saveAsCharsetCmd.label;" oncommand="goDoCommand('cmd_saveAsCharset')"/>
<command id="cmd_revert" value="&fileRevert.label;" oncommand="goDoCommand('cmd_revert')"/>
<command id="cmd_save" label="&saveCmd.label;" oncommand="goDoCommand('cmd_save')"/>
<command id="cmd_saveAs" label="&saveAsCmd.label;" oncommand="goDoCommand('cmd_saveAs')"/>
<command id="cmd_exportToText" label="&exportToTextCmd.label;" oncommand="goDoCommand('cmd_exportToText')"/>
<command id="cmd_saveAsCharset" label="&saveAsCharsetCmd.label;" oncommand="goDoCommand('cmd_saveAsCharset')"/>
<command id="cmd_revert" label="&fileRevert.label;" oncommand="goDoCommand('cmd_revert')"/>
<command id="cmd_preview" oncommand="goDoCommand('cmd_preview')"/>
<command id="cmd_editSendPage" value="&sendPageCmd.label;" accesskey="&sendPage.accesskey;" oncommand="goDoCommand('cmd_editSendPage')"/>
<command id="cmd_editSendPage" label="&sendPageCmd.label;" accesskey="&sendPage.accesskey;" oncommand="goDoCommand('cmd_editSendPage')"/>
</commandset>
<!-- edit menu commands. These get updated by code in globalOverlay.js -->
<commandset id="composerEditMenuItems"
commandupdater="true"
events="create"
oncommandupdate="goUpdateComposerMenuItems(this)"
>
commandupdater="true"
events="create"
oncommandupdate="goUpdateComposerMenuItems(this)"
>
<command id="cmd_undo"/>
<command id="cmd_redo"/>
<command id="cmd_cut"/>
@ -170,19 +170,19 @@
<command id="cmd_preferences" oncommand="goDoCommand('cmd_preferences')"/>
<command id="cmd_find" oncommand="goDoCommand('cmd_find')"/>
<command id="cmd_findNext" oncommand="goDoCommand('cmd_findNext')" value="&findAgainCmd.label;"/>
<command id="cmd_findNext" oncommand="goDoCommand('cmd_findNext')" label="&findAgainCmd.label;"/>
<command id="cmd_replace" oncommand="goDoCommand('cmd_replace')" />
<command id="cmd_spelling" oncommand="goDoCommand('cmd_spelling')"/>
<command id="cmd_pasteQuote" oncommand="goDoCommand('cmd_pasteQuote')" value="&pasteAsQuotationCmd.label;"/>
<command id="cmd_pasteQuote" oncommand="goDoCommand('cmd_pasteQuote')" label="&pasteAsQuotationCmd.label;"/>
</commandset>
<!-- style related commands that update on creation, and on selection change -->
<commandset id="composerStyleMenuItems"
commandupdater="true"
events="create, style"
oncommandupdate="goUpdateComposerMenuItems(this)"
>
commandupdater="true"
events="create, style"
oncommandupdate="goUpdateComposerMenuItems(this)"
>
<command id="cmd_bold" state="false" oncommand="goDoCommand('cmd_bold')"/>
<command id="cmd_italic" state="false" oncommand="goDoCommand('cmd_italic')"/>
<command id="cmd_underline" state="false" oncommand="goDoCommand('cmd_underline')"/>
@ -269,10 +269,10 @@
<command id="cmd_newEditorTemplate"/>
<command id="cmd_newEditorDraft"/>
<command id="cmd_viewCompToolbar" oncommand="goToggleToolbar('EditToolbar','cmd_viewCompToolbar');" checked="true"/>
<command id="cmd_viewFormatToolbar" oncommand="goToggleToolbar('FormatToolbar','cmd_viewFormatToolbar');" checked="true"/>
<command id="cmd_viewEditModeToolbar" oncommand="goToggleToolbar('EditModeToolbar','cmd_viewEditModeToolbar');" checked="false"/>
<command id="cmd_viewtaskbar" oncommand="goToggleToolbar('taskbar','cmd_viewtaskbar');" checked="true"/>
<command id="cmd_viewCompToolbar" oncommand="goToggleToolbar('EditToolbar','cmd_viewCompToolbar');" checked="true"/>
<command id="cmd_viewFormatToolbar" oncommand="goToggleToolbar('FormatToolbar','cmd_viewFormatToolbar');" checked="true"/>
<command id="cmd_viewEditModeToolbar" oncommand="goToggleToolbar('EditModeToolbar','cmd_viewEditModeToolbar');" checked="false"/>
<command id="cmd_viewtaskbar" oncommand="goToggleToolbar('taskbar','cmd_viewtaskbar');" checked="true"/>
<!-- Obsolete; these will go away -->
<command id="Editor:Font:Size" fontsize=""/>
@ -280,20 +280,20 @@
<!-- File menu items -->
<!-- Note: globalOverlay.xul uses menu_newEditor, but we want different menu item text
so we use our own id, value, and accesskey but connect to the same global key and broadcaster node
so we use our own id, label, and accesskey but connect to the same global key and broadcaster node
-->
<menu id="fileMenu" value="&fileMenu.label;" accesskey="&filemenu.accesskey;">
<menu id="fileMenu" label="&fileMenu.label;" accesskey="&filemenu.accesskey;">
<menupopup id="menu_FilePopup">
<menuitem id="menu_newBlankPage" value="&newBlankPageCmd.label;" accesskey="&newBlankPage.accesskey;" key="key_newBlankPage" observes="cmd_newEditor"/>
<menu id="menu_editNew" value="&newMenu.label;" accesskey="&newMenu.accesskey;">
<menuitem id="menu_newBlankPage" label="&newBlankPageCmd.label;" accesskey="&newBlankPage.accesskey;" key="key_newBlankPage" observes="cmd_newEditor"/>
<menu id="menu_editNew" label="&newMenu.label;" accesskey="&newMenu.accesskey;">
<menupopup id="menu_NewPopup">
<!-- From globalOverlay.xul -->
<menuitem id="menu_newNavigator" observes="cmd_newNavigator"/>
</menupopup>
</menu>
<menuitem accesskey="&fileopenremote.accesskey;" key="openremoteeditorkb" observes="cmd_openRemote"/>
<menuitem accesskey="&fileopen.accesskey;" key="openeditorkb" observes="cmd_open" value="&openFileCmd.label;"/>
<menu id="menu_RecentFiles" accesskey="&filerecentmenu.accesskey;" value="&fileRecentMenu.label;" oncreate="BuildRecentMenu(false)">
<menuitem accesskey="&fileopen.accesskey;" key="openeditorkb" observes="cmd_open" label="&openFileCmd.label;"/>
<menu id="menu_RecentFiles" accesskey="&filerecentmenu.accesskey;" label="&fileRecentMenu.label;" oncreate="BuildRecentMenu(false)">
<menupopup id="menupopup_RecentFiles"/>
<!-- menuitems appended at runtime -->
</menu>
@ -306,17 +306,17 @@
<menuitem accesskey="&fileexporttotext.accesskey;" observes="cmd_exportToText"/>
<menuitem accesskey="&filerevert.accesskey;" observes="cmd_revert"/>
<menuseparator/>
<menuitem value="&previewCmd.label;" accesskey="&filepreview.accesskey;" observes="cmd_preview"/>
<menuitem label="&previewCmd.label;" accesskey="&filepreview.accesskey;" observes="cmd_preview"/>
<!-- menuitem id="menu_SendPage" is merged here from mailEditorOverlay.xul,
where "position" is assumed to be 14. Change that value if menu position changes. -->
where "position" is assumed to be 14. Change that label if menu position changes. -->
<menuitem accesskey="&fileprintsetup.accesskey;" observes="cmd_printSetup" />
<menuitem accesskey="&fileprint.accesskey;" observes="cmd_print" value="&printCmd.label;"/>
<menuitem accesskey="&fileprint.accesskey;" observes="cmd_print" label="&printCmd.label;"/>
<menuseparator/>
<!-- The Exit/Quit item is merged from platformGlobalOverlay.xul -->
</menupopup>
</menu>
<menu id="editMenu" value="&editMenu.label;" accesskey="&editmenu.accesskey;">
<menu id="editMenu" label="&editMenu.label;" accesskey="&editmenu.accesskey;">
<menupopup id="edEditMenuPopup" oncreate="EditorInitEditMenu()">
<!-- from utilityOverlay.xul -->
<menuitem id="menu_undo"/>
@ -329,117 +329,117 @@
<menuseparator id="edEditMenuSep2" />
<menuitem id="menu_selectAll"/>
<menuseparator id="sep_find" class="hide-in-IM"/>
<menuitem id="menu_find" accesskey="&editfind.accesskey;" key="findkb" observes="cmd_find" value="&findCmd.label;"/>
<menuitem id="menu_find" accesskey="&editfind.accesskey;" key="findkb" observes="cmd_find" label="&findCmd.label;"/>
<menuitem id="menu_findnext" accesskey="&editfindnext.accesskey;" key="findnextkb" observes="cmd_findNext"/>
<menuitem id="menu_replace" observes="cmd_replace" value="&replaceCmd.label;"/>
<menuitem id="menu_replace" observes="cmd_replace" label="&replaceCmd.label;"/>
<menuseparator id="sep_checkspelling" class="hide-in-IM" />
<menuitem id="menu_checkspelling" accesskey="&editcheckspelling.accesskey;" key="checkspellingkb" observes="cmd_spelling" value="&checkSpellingCmd.label;"/>
<menuitem id="menu_checkspelling" accesskey="&editcheckspelling.accesskey;" key="checkspellingkb" observes="cmd_spelling" label="&checkSpellingCmd.label;"/>
<menuseparator/>
<menuitem id="menu_preferences" observes="cmd_preferences"/>
</menupopup>
</menu>
<!-- view menu items -->
<menu id="viewToolbar" value="&viewToolbarsMenu.label;" accesskey="&viewToolbarsMenu.accesskey;">
<menu id="viewToolbar" label="&viewToolbarsMenu.label;" accesskey="&viewToolbarsMenu.accesskey;">
<menupopup>
<menuitem id="viewComposerToolbar" value="&compositionToolbarCmd.label;" type="checkbox" accesskey="&compositiontb.accesskey;" observes="cmd_viewCompToolbar" />
<menuitem id="viewFormatToolbar" value="&formattingToolbarCmd.label;" type="checkbox" accesskey="&formattingtb.accesskey;" observes="cmd_viewFormatToolbar" />
<menuitem id="viewEditModeToolbar" value="&editmodeToolbarCmd.label;" type="checkbox" accesskey="&editmodetb.accesskey;" observes="cmd_viewEditModeToolbar" />
<menuitem id="viewTaskBar" value="&taskbarCmd.label;" type="checkbox" accesskey="&taskbarCmd.accesskey;" observes="cmd_viewtaskbar" />
<menuitem id="viewComposerToolbar" label="&compositionToolbarCmd.label;" type="checkbox" accesskey="&compositiontb.accesskey;" observes="cmd_viewCompToolbar" />
<menuitem id="viewFormatToolbar" label="&formattingToolbarCmd.label;" type="checkbox" accesskey="&formattingtb.accesskey;" observes="cmd_viewFormatToolbar" />
<menuitem id="viewEditModeToolbar" label="&editmodeToolbarCmd.label;" type="checkbox" accesskey="&editmodetb.accesskey;" observes="cmd_viewEditModeToolbar" />
<menuitem id="viewTaskBar" label="&taskbarCmd.label;" type="checkbox" accesskey="&taskbarCmd.accesskey;" observes="cmd_viewtaskbar" />
</menupopup>
</menu>
<menuitem id="viewNormalMode" type="radio" name="1" accesskey="&NormalMode.accesskey;" observes="cmd_NormalMode"/>
<menuitem id="viewAllTagsMode" type="radio" name="1" accesskey="&AllTagsMode.accesskey;" observes="cmd_AllTagsMode"/>
<menuitem id="viewSourceMode" type="radio" name="1" accesskey="&HTMLSourceMode.accesskey;" observes="cmd_HTMLSourceMode" value="&HTMLSourceMode.label;"/>
<menuitem id="viewSourceMode" type="radio" name="1" accesskey="&HTMLSourceMode.accesskey;" observes="cmd_HTMLSourceMode" label="&HTMLSourceMode.label;"/>
<menuitem id="viewPreviewMode" type="radio" name="1" accesskey="&PreviewMode.accesskey;" observes="cmd_PreviewMode"/>
<menupopup id = "composerCharsetMenuPopup" oncreate="updateCharsetPopupMenu(this)" />
<!-- Insert menu -->
<menu id="insertMenu" value="&insertMenu.label;" accesskey="&insertmenu.accesskey;">
<menu id="insertMenu" label="&insertMenu.label;" accesskey="&insertmenu.accesskey;">
<menupopup>
<menuitem accesskey="&insertlink.accesskey;" observes="cmd_link" value="&insertLinkCmd.label;" />
<menuitem accesskey="&insertanchor.accesskey;" observes="cmd_anchor" value="&insertAnchorCmd.label;"/>
<menuitem accesskey="&insertimage.accesskey;" observes="cmd_image" value="&insertImageCmd.label;"/>
<menuitem accesskey="&inserthline.accesskey;" observes="cmd_hline" value="&insertHLineCmd.label;"/>
<menuitem accesskey="&inserttable.accesskey;" observes="cmd_InsertTable" value="&insertTableCmd.label;"/>
<menuitem accesskey="&insertlink.accesskey;" observes="cmd_link" label="&insertLinkCmd.label;" />
<menuitem accesskey="&insertanchor.accesskey;" observes="cmd_anchor" label="&insertAnchorCmd.label;"/>
<menuitem accesskey="&insertimage.accesskey;" observes="cmd_image" label="&insertImageCmd.label;"/>
<menuitem accesskey="&inserthline.accesskey;" observes="cmd_hline" label="&insertHLineCmd.label;"/>
<menuitem accesskey="&inserttable.accesskey;" observes="cmd_InsertTable" label="&insertTableCmd.label;"/>
<menuitem accesskey="&HTMLSourceMode.accesskey;" observes="cmd_insertHTML" key="inserthtmlkb"/>
<menuitem accesskey="&insertchars.accesskey;" observes="cmd_insertChars" />
<menuseparator/>
<!-- Activate this after Enter key inserts P tag and not BR
<menuitem accesskey="&insertbreak.accesskey;" observes="cmd_insertBreak" value="&insertBreakCmd.label;"/>
<menuitem accesskey="&insertbreak.accesskey;" observes="cmd_insertBreak" label="&insertBreakCmd.label;"/>
-->
<menuitem accesskey="&insertbreakall.accesskey;" observes="cmd_insertBreakAll" value="&insertBreakAllCmd.label;"/>
<menuitem accesskey="&insertbreakall.accesskey;" observes="cmd_insertBreakAll" label="&insertBreakAllCmd.label;"/>
</menupopup>
</menu>
<!-- Format Menu -->
<menupopup id="formatMenuPopup" oncreate="EditorInitFormatMenu()">
<!-- Font face submenu -->
<menu id="fontFaceMenu" value="&fontfaceMenu.label;" accesskey="&formatfontmenu.accesskey;"
<menu id="fontFaceMenu" label="&fontfaceMenu.label;" accesskey="&formatfontmenu.accesskey;"
position="1">
<menupopup oncommand="doStatefulCommand('cmd_fontFace', event.target.data)" oncreate="initFontFaceMenu(this)">
<menuitem value="&fontVarWidth.label;" accesskey="&fontvarwidth.accesskey;" data="" type="radio" name="1"/>
<menuitem value="&fontFixedWidth.label;" accesskey="&fontfixedwidth.accesskey;" data="tt" type="radio" name="1" key="fontfixedwidthkb"/>
<menupopup oncommand="doStatefulCommand('cmd_fontFace', event.target.value)" oncreate="initFontFaceMenu(this)">
<menuitem label="&fontVarWidth.label;" accesskey="&fontvarwidth.accesskey;" value="" type="radio" name="1"/>
<menuitem label="&fontFixedWidth.label;" accesskey="&fontfixedwidth.accesskey;" value="tt" type="radio" name="1" key="fontfixedwidthkb"/>
<menuseparator/>
<menuitem value="&fontHelveticaFont.label;" accesskey="&fonthelvetica.accesskey;" data="Helvetica, Arial, sans-serif" type="radio" name="2" />
<menuitem value="&fontTimes.label;" accesskey="&fonttimes.accesskey;" data="Times New Roman, Times, serif" type="radio" name="2" />
<menuitem value="&fontCourier.label;" accesskey="&fontcourier.accesskey;" data="Courier New, Courier, mono" type="radio" name="2" />
<menuitem label="&fontHelveticaFont.label;" accesskey="&fonthelvetica.accesskey;" value="Helvetica, Arial, sans-serif" type="radio" name="2" />
<menuitem label="&fontTimes.label;" accesskey="&fonttimes.accesskey;" value="Times New Roman, Times, serif" type="radio" name="2" />
<menuitem label="&fontCourier.label;" accesskey="&fontcourier.accesskey;" value="Courier New, Courier, mono" type="radio" name="2" />
</menupopup>
</menu>
<!-- Font size submenu -->
<menu id="fontSizeMenu" value="&fontsizeMenu.label;"
<menu id="fontSizeMenu" label="&fontsizeMenu.label;"
accesskey="&formatsizemenu.accesskey;"
position="2">
<menupopup oncreate="initFontSizeMenu(this)">
<menuitem value="&decreaseFontSize.label;" accesskey="&decreasefontsize.accesskey;" observes="cmd_decreaseFont" type="radio" name="1" key="decreasefontsizekb"/>
<menuitem value="&increaseFontSize.label;" accesskey="&increasefontsize.accesskey;" observes="cmd_increaseFont" type="radio" name="1" key="increasefontsizekb"/>
<menuitem label="&decreaseFontSize.label;" accesskey="&decreasefontsize.accesskey;" observes="cmd_decreaseFont" type="radio" name="1" key="decreasefontsizekb"/>
<menuitem label="&increaseFontSize.label;" accesskey="&increasefontsize.accesskey;" observes="cmd_increaseFont" type="radio" name="1" key="increasefontsizekb"/>
<menuseparator/>
<!-- Not supported in current font size implementation
<menuitem value="&size-xx-smallCmd.label;" accesskey="&size-xx-small.accesskey;" oncommand="EditorSetFontSize('xx-small')" type="radio" name="2" />
<menuitem label="&size-xx-smallCmd.label;" accesskey="&size-xx-small.accesskey;" oncommand="EditorSetFontSize('xx-small')" type="radio" name="2" />
-->
<menuitem value="&size-x-smallCmd.label;" accesskey="&size-x-small.accesskey;" oncommand="EditorSetFontSize('x-small')" type="radio" name="2" />
<menuitem value="&size-smallCmd.label;" accesskey="&size-small.accesskey;" oncommand="EditorSetFontSize('small')" type="radio" name="2" />
<menuitem value="&size-mediumCmd.label;" accesskey="&size-medium.accesskey;" oncommand="EditorSetFontSize('medium')" type="radio" name="2" />
<menuitem value="&size-largeCmd.label;" accesskey="&size-large.accesskey;" oncommand="EditorSetFontSize('large')" type="radio" name="2" />
<menuitem value="&size-x-largeCmd.label;" accesskey="&size-x-large.accesskey;" oncommand="EditorSetFontSize('x-large')" type="radio" name="2" />
<menuitem value="&size-xx-largeCmd.label;" accesskey="&size-xx-large.accesskey;" oncommand="EditorSetFontSize('xx-large')" type="radio" name="2" />
<menuitem label="&size-x-smallCmd.label;" accesskey="&size-x-small.accesskey;" oncommand="EditorSetFontSize('x-small')" type="radio" name="2" />
<menuitem label="&size-smallCmd.label;" accesskey="&size-small.accesskey;" oncommand="EditorSetFontSize('small')" type="radio" name="2" />
<menuitem label="&size-mediumCmd.label;" accesskey="&size-medium.accesskey;" oncommand="EditorSetFontSize('medium')" type="radio" name="2" />
<menuitem label="&size-largeCmd.label;" accesskey="&size-large.accesskey;" oncommand="EditorSetFontSize('large')" type="radio" name="2" />
<menuitem label="&size-x-largeCmd.label;" accesskey="&size-x-large.accesskey;" oncommand="EditorSetFontSize('x-large')" type="radio" name="2" />
<menuitem label="&size-xx-largeCmd.label;" accesskey="&size-xx-large.accesskey;" oncommand="EditorSetFontSize('xx-large')" type="radio" name="2" />
</menupopup>
</menu>
<!-- Font style submenu -->
<menu id="fontStyleMenu" value="&fontStyleMenu.label;"
<menu id="fontStyleMenu" label="&fontStyleMenu.label;"
accesskey="&formatstylemenu.accesskey;"
position="3">
<menupopup oncreate="initFontStyleMenu(this)" oncommand="goDoCommand(event.target.observes)">
<menuitem value="&styleBoldCmd.label;" accesskey="&stylebold.accesskey;" observes="cmd_bold" type="checkbox" key="boldkb"/>
<menuitem value="&styleItalicCmd.label;" accesskey="&styleitalic.accesskey;" observes="cmd_italic" type="checkbox" key="italickb" />
<menuitem value="&styleUnderlineCmd.label;" accesskey="&styleunderline.accesskey;" observes="cmd_underline" type="checkbox" key="underlinekb"/>
<menuitem value="&styleStrikeThruCmd.label;" accesskey="&stylestrikethru.accesskey;" observes="cmd_strikethrough" type="checkbox"/>
<menuitem value="&styleSuperscriptCmd.label;" accesskey="&stylesuperscript.accesskey;" observes="cmd_superscript" type="checkbox"/>
<menuitem value="&styleSubscriptCmd.label;" accesskey="&stylesubscript.accesskey;" observes="cmd_subscript" type="checkbox"/>
<menuitem value="&styleNonbreakingCmd.label;" accesskey="&stylenonbreaking.accesskey;" observes="cmd_nobreak" type="checkbox"/>
<menuitem label="&styleBoldCmd.label;" accesskey="&stylebold.accesskey;" observes="cmd_bold" type="checkbox" key="boldkb"/>
<menuitem label="&styleItalicCmd.label;" accesskey="&styleitalic.accesskey;" observes="cmd_italic" type="checkbox" key="italickb" />
<menuitem label="&styleUnderlineCmd.label;" accesskey="&styleunderline.accesskey;" observes="cmd_underline" type="checkbox" key="underlinekb"/>
<menuitem label="&styleStrikeThruCmd.label;" accesskey="&stylestrikethru.accesskey;" observes="cmd_strikethrough" type="checkbox"/>
<menuitem label="&styleSuperscriptCmd.label;" accesskey="&stylesuperscript.accesskey;" observes="cmd_superscript" type="checkbox"/>
<menuitem label="&styleSubscriptCmd.label;" accesskey="&stylesubscript.accesskey;" observes="cmd_subscript" type="checkbox"/>
<menuitem label="&styleNonbreakingCmd.label;" accesskey="&stylenonbreaking.accesskey;" observes="cmd_nobreak" type="checkbox"/>
<menuseparator/>
<menuitem value="&styleEm.label;" accesskey="&styleEm.accesskey;" observes="cmd_em" type="checkbox"/>
<menuitem value="&styleStrong.label;" accesskey="&styleStrong.accesskey;" observes="cmd_strong" type="checkbox"/>
<menuitem value="&styleCite.label;" accesskey="&styleCite.accesskey;" observes="cmd_cite" type="checkbox"/>
<menuitem value="&styleAbbr.label;" accesskey="&styleAbbr.accesskey;" observes="cmd_abbr" type="checkbox"/>
<menuitem value="&styleAcronym.label;" accesskey="&styleAcronym.accesskey;" observes="cmd_acronym" type="checkbox"/>
<menuitem value="&styleCode.label;" accesskey="&styleCode.accesskey;" observes="cmd_code" type="checkbox"/>
<menuitem value="&styleSamp.label;" accesskey="&styleSamp.accesskey;" observes="cmd_samp" type="checkbox"/>
<menuitem value="&styleVar.label;" accesskey="&styleVar.accesskey;" observes="cmd_var" type="checkbox"/>
<menuitem label="&styleEm.label;" accesskey="&styleEm.accesskey;" observes="cmd_em" type="checkbox"/>
<menuitem label="&styleStrong.label;" accesskey="&styleStrong.accesskey;" observes="cmd_strong" type="checkbox"/>
<menuitem label="&styleCite.label;" accesskey="&styleCite.accesskey;" observes="cmd_cite" type="checkbox"/>
<menuitem label="&styleAbbr.label;" accesskey="&styleAbbr.accesskey;" observes="cmd_abbr" type="checkbox"/>
<menuitem label="&styleAcronym.label;" accesskey="&styleAcronym.accesskey;" observes="cmd_acronym" type="checkbox"/>
<menuitem label="&styleCode.label;" accesskey="&styleCode.accesskey;" observes="cmd_code" type="checkbox"/>
<menuitem label="&styleSamp.label;" accesskey="&styleSamp.accesskey;" observes="cmd_samp" type="checkbox"/>
<menuitem label="&styleVar.label;" accesskey="&styleVar.accesskey;" observes="cmd_var" type="checkbox"/>
</menupopup>
</menu>
<menuitem id="fontColor" value="&formatFontColor.label;"
<menuitem id="fontColor" label="&formatFontColor.label;"
accesskey="&formatfontcolor.accesskey;"
oncommand="EditorSelectColor('Text');"
position="4"/>
<menuseparator position="5"/>
<!-- Value and accesskey set at runtime from strings -->
<!-- label and accesskey set at runtime from strings -->
<menuitem id="removeStylesMenuitem" key="removestyleskb"
observes="cmd_removeStyles"
position="6"/>
@ -449,59 +449,59 @@
<menuseparator position="8"/>
<!-- Note: the 'Init' menu methods for Paragraph, List, and Align
assume that the id = 'menu_'+tagName (the 'data' value),
assume that the id = 'menu_'+tagName (the 'data' label),
except for the first ('none') item
-->
<!-- Paragraph Style submenu -->
<menu id="paragraphMenu" value="&paragraphMenu.label;"
<menu id="paragraphMenu" label="&paragraphMenu.label;"
accesskey="&formatparagraphmenu.accesskey;"
position="9" oncreate="InitParagraphMenu()">
<menupopup oncommand="doStatefulCommand('cmd_paragraphState', event.target.getAttribute('data'))">
<menuitem id="menu_bodyText" type="radio" name="1" value="&bodyTextCmd.label;" accesskey="&bodytext.accesskey;" data=""/>
<menuitem id="menu_p" type="radio" name="1" value="&paragraphParagraphCmd.label;" accesskey="&paragraphparagraph.accesskey;" data="p"/>
<menuitem id="menu_h1" type="radio" name="1" value="&heading1Cmd.label;" accesskey="&heading1.accesskey;" data="h1"/>
<menuitem id="menu_h2" type="radio" name="1" value="&heading2Cmd.label;" accesskey="&heading2.accesskey;" data="h2"/>
<menuitem id="menu_h3" type="radio" name="1" value="&heading3Cmd.label;" accesskey="&heading3.accesskey;" data="h3"/>
<menuitem id="menu_h4" type="radio" name="1" value="&heading4Cmd.label;" accesskey="&heading4.accesskey;" data="h4"/>
<menuitem id="menu_h5" type="radio" name="1" value="&heading5Cmd.label;" accesskey="&heading5.accesskey;" data="h5"/>
<menuitem id="menu_h6" type="radio" name="1" value="&heading6Cmd.label;" accesskey="&heading6.accesskey;" data="h6"/>
<menuitem id="menu_address" type="radio" name="1" value="&paragraphAddressCmd.label;" accesskey="&paragraphaddress.accesskey;" data="address"/>
<menuitem id="menu_pre" type="radio" name="1" value="&paragraphPreformatCmd.label;" accesskey="&paragraphpreformat.accesskey;" data="pre"/>
<menuitem id="menu_bodyText" type="radio" name="1" label="&bodyTextCmd.label;" accesskey="&bodytext.accesskey;" value=""/>
<menuitem id="menu_p" type="radio" name="1" label="&paragraphParagraphCmd.label;" accesskey="&paragraphparagraph.accesskey;" value="p"/>
<menuitem id="menu_h1" type="radio" name="1" label="&heading1Cmd.label;" accesskey="&heading1.accesskey;" value="h1"/>
<menuitem id="menu_h2" type="radio" name="1" label="&heading2Cmd.label;" accesskey="&heading2.accesskey;" value="h2"/>
<menuitem id="menu_h3" type="radio" name="1" label="&heading3Cmd.label;" accesskey="&heading3.accesskey;" value="h3"/>
<menuitem id="menu_h4" type="radio" name="1" label="&heading4Cmd.label;" accesskey="&heading4.accesskey;" value="h4"/>
<menuitem id="menu_h5" type="radio" name="1" label="&heading5Cmd.label;" accesskey="&heading5.accesskey;" value="h5"/>
<menuitem id="menu_h6" type="radio" name="1" label="&heading6Cmd.label;" accesskey="&heading6.accesskey;" value="h6"/>
<menuitem id="menu_address" type="radio" name="1" label="&paragraphAddressCmd.label;" accesskey="&paragraphaddress.accesskey;" value="address"/>
<menuitem id="menu_pre" type="radio" name="1" label="&paragraphPreformatCmd.label;" accesskey="&paragraphpreformat.accesskey;" value="pre"/>
<menuseparator/>
<menuitem id="menu_blockquote" type="checkbox" value="&paragraphBlockquoteCmd.label;" accesskey="&paragraphblockquote.accesskey;" data="blockquote"/>
<menuitem id="menu_blockquote" type="checkbox" label="&paragraphBlockquoteCmd.label;" accesskey="&paragraphblockquote.accesskey;" value="blockquote"/>
</menupopup>
</menu>
<!-- List Style submenu -->
<menu id="listMenu" value="&formatlistMenu.label;"
<menu id="listMenu" label="&formatlistMenu.label;"
accesskey="&formatlistmenu.accesskey;"
position="10" oncreate="InitListMenu()">
<menupopup>
<menuitem id="menu_noList" type="radio" name="1" value="&noneCmd.label;" accesskey="&none.accesskey;" observes="cmd_removeList"/>
<menuitem id="menu_ul" type="radio" name="1" value="&listBulletCmd.label;" accesskey="&listbullet.accesskey;" observes="cmd_ul"/>
<menuitem id="menu_ol" type="radio" name="1" value="&listNumberedCmd.label;" accesskey="&listnumbered.accesskey;" observes="cmd_ol"/>
<menuitem id="menu_dt" type="radio" name="1" value="&listTermCmd.label;" accesskey="&listterm.accesskey;" observes="cmd_dt"/>
<menuitem id="menu_dd" type="radio" name="1" value="&listDefinitionCmd.label;" accesskey="&listdefinition.accesskey;" observes="cmd_dd"/>
<menuitem id="menu_noList" type="radio" name="1" label="&noneCmd.label;" accesskey="&none.accesskey;" observes="cmd_removeList"/>
<menuitem id="menu_ul" type="radio" name="1" label="&listBulletCmd.label;" accesskey="&listbullet.accesskey;" observes="cmd_ul"/>
<menuitem id="menu_ol" type="radio" name="1" label="&listNumberedCmd.label;" accesskey="&listnumbered.accesskey;" observes="cmd_ol"/>
<menuitem id="menu_dt" type="radio" name="1" label="&listTermCmd.label;" accesskey="&listterm.accesskey;" observes="cmd_dt"/>
<menuitem id="menu_dd" type="radio" name="1" label="&listDefinitionCmd.label;" accesskey="&listdefinition.accesskey;" observes="cmd_dd"/>
<menuseparator/>
<menuitem id="listProps" value="&listProps.label;" accesskey="&listprops.accesskey;" observes="cmd_listProperties"/>
<menuitem id="listProps" label="&listProps.label;" accesskey="&listprops.accesskey;" observes="cmd_listProperties"/>
</menupopup>
</menu>
<menuseparator position="11"/>
<menuitem id="increaseIndent" value="&increaseIndent.label;" accesskey="&increaseindent.accesskey;" key="increaseindentkb"
<menuitem id="increaseIndent" label="&increaseIndent.label;" accesskey="&increaseindent.accesskey;" key="increaseindentkb"
observes="cmd_indent" position="12"/>
<menuitem id="decreaseIndent" value="&decreaseIndent.label;" accesskey="&decreaseindent.accesskey;" key="decreaseindentkb"
<menuitem id="decreaseIndent" label="&decreaseIndent.label;" accesskey="&decreaseindent.accesskey;" key="decreaseindentkb"
observes="cmd_outdent" position="13"/>
<menu id="alignMenu" value="&alignMenu.label;" accesskey="&formatalignmenu.accesskey;"
<menu id="alignMenu" label="&alignMenu.label;" accesskey="&formatalignmenu.accesskey;"
oncreate="InitAlignMenu()"
position="14">
<!-- Align submenu -->
<menupopup oncommand="doStatefulCommand('cmd_align', event.target.getAttribute('data'))">
<menuitem id="menu_left" value="&alignLeft.label;" accesskey="&alignleft.accesskey;" type="radio" name="1" data="left"/>
<menuitem id="menu_center" value="&alignCenter.label;" accesskey="&aligncenter.accesskey;" type="radio" name="1" data="center"/>
<menuitem id="menu_right" value="&alignRight.label;" accesskey="&alignright.accesskey;" type="radio" name="1" data="right"/>
<menuitem id="menu_justify" value="&alignJustify.label;" accesskey="&alignjustify.accesskey;" type="radio" name="1" data="justify"/>
<menuitem id="menu_left" label="&alignLeft.label;" accesskey="&alignleft.accesskey;" type="radio" name="1" value="left"/>
<menuitem id="menu_center" label="&alignCenter.label;" accesskey="&aligncenter.accesskey;" type="radio" name="1" value="center"/>
<menuitem id="menu_right" label="&alignRight.label;" accesskey="&alignright.accesskey;" type="radio" name="1" value="right"/>
<menuitem id="menu_justify" label="&alignJustify.label;" accesskey="&alignjustify.accesskey;" type="radio" name="1" value="justify"/>
</menupopup>
</menu>
<menuseparator position="15"/>
@ -510,59 +510,59 @@
</menupopup>
<!-- Next 3 are items to append at the bottom of the formatMenuPopup -->
<!-- Value and accesskey filled in during menu creation -->
<!-- label and accesskey filled in during menu creation -->
<menuitem id="objectProperties"
oncommand="goDoCommand('cmd_objectProperties')"/>
<!-- Dont use 'observes', must call command correctly -->
<menuitem id="pageProperties" value="&pageProperties.label;"
<menuitem id="pageProperties" label="&pageProperties.label;"
accesskey="&pageproperties.accesskey;"
oncommand="goDoCommand('cmd_pageProperties')"/>
<menuitem id="colorsAndBackground" value="&colorsAndBackground.label;"
<menuitem id="colorsAndBackground" label="&colorsAndBackground.label;"
accesskey="&colorsandbackground.accesskey;"
oncommand="goDoCommand('cmd_colorProperties')"/>
<menu id="tableMenu" value="&tableMenu.label;" accesskey="&tablemenu.accesskey;">
<menu id="tableMenu" label="&tableMenu.label;" accesskey="&tablemenu.accesskey;">
<menupopup oncreate="EditorInitTableMenu()">
<!-- From EditorCommandOverlay.xul (shared with context popup) -->
<menu id="tableInsertMenu" value="&tableInsertMenu.label;" accesskey="&tableinsertmenu.accesskey;">
<menu id="tableInsertMenu" label="&tableInsertMenu.label;" accesskey="&tableinsertmenu.accesskey;">
<menupopup>
<menuitem value="&insertTableCmd.label;" accesskey="&tabletable.accesskey;" observes="cmd_InsertTable"/>
<menuitem label="&insertTableCmd.label;" accesskey="&tabletable.accesskey;" observes="cmd_InsertTable"/>
<menuseparator />
<menuitem value="&tableRowAbove.label;" accesskey="&tablerow.accesskey;" observes="cmd_InsertRowAbove"/>
<menuitem value="&tableRowBelow.label;" accesskey="&tablerowbelow.accesskey;" observes="cmd_InsertRowBelow"/>
<menuitem label="&tableRowAbove.label;" accesskey="&tablerow.accesskey;" observes="cmd_InsertRowAbove"/>
<menuitem label="&tableRowBelow.label;" accesskey="&tablerowbelow.accesskey;" observes="cmd_InsertRowBelow"/>
<menuseparator />
<menuitem value="&tableColumnBefore.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_InsertColumnBefore"/>
<menuitem value="&tableColumnAfter.label;" accesskey="&tablecolumnafter.accesskey;" observes="cmd_InsertColumnAfter"/>
<menuitem label="&tableColumnBefore.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_InsertColumnBefore"/>
<menuitem label="&tableColumnAfter.label;" accesskey="&tablecolumnafter.accesskey;" observes="cmd_InsertColumnAfter"/>
<menuseparator />
<menuitem value="&tableCellBefore.label;" accesskey="&tablecell.accesskey;" observes="cmd_InsertCellBefore"/>
<menuitem value="&tableCellAfter.label;" accesskey="&tablecellafter.accesskey;" observes="cmd_InsertCellAfter"/>
<menuitem label="&tableCellBefore.label;" accesskey="&tablecell.accesskey;" observes="cmd_InsertCellBefore"/>
<menuitem label="&tableCellAfter.label;" accesskey="&tablecellafter.accesskey;" observes="cmd_InsertCellAfter"/>
</menupopup>
</menu>
<menu id="tableSelectMenu" value="&tableSelectMenu.label;" accesskey="&tableselectmenu.accesskey;">
<menu id="tableSelectMenu" label="&tableSelectMenu.label;" accesskey="&tableselectmenu.accesskey;">
<menupopup id="tableSelectPopup">
<menuitem id="menu_SelectTable" value="&tableTable.label;" accesskey="&tabletable.accesskey;" observes="cmd_SelectTable" />
<menuitem id="menu_SelectRow" value="&tableRow.label;" accesskey="&tablerow.accesskey;" observes="cmd_SelectRow" />
<menuitem id="menu_SelectColumn" value="&tableColumn.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_SelectColumn" />
<menuitem id="menu_SelectCell" value="&tableCell.label;" accesskey="&tablecell.accesskey;" observes="cmd_SelectCell" />
<menuitem id="menu_SelectAllCells" value="&tableAllCells.label;" accesskey="&tableallcells.accesskey;" observes="cmd_SelectAllCells" />
<menuitem id="menu_SelectTable" label="&tableTable.label;" accesskey="&tabletable.accesskey;" observes="cmd_SelectTable" />
<menuitem id="menu_SelectRow" label="&tableRow.label;" accesskey="&tablerow.accesskey;" observes="cmd_SelectRow" />
<menuitem id="menu_SelectColumn" label="&tableColumn.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_SelectColumn" />
<menuitem id="menu_SelectCell" label="&tableCell.label;" accesskey="&tablecell.accesskey;" observes="cmd_SelectCell" />
<menuitem id="menu_SelectAllCells" label="&tableAllCells.label;" accesskey="&tableallcells.accesskey;" observes="cmd_SelectAllCells" />
</menupopup>
</menu>
<menu id="tableDeleteMenu" value="&tableDeleteMenu.label;" accesskey="&tabledeletemenu.accesskey;">
<menu id="tableDeleteMenu" label="&tableDeleteMenu.label;" accesskey="&tabledeletemenu.accesskey;">
<menupopup id="tableDeletePopup">
<menuitem id="menu_DeleteTable" value="&tableTable.label;" accesskey="&tabletable.accesskey;" observes="cmd_DeleteTable"/>
<menuitem id="menu_DeleteRow" value="&tableRows.label;" accesskey="&tablerow.accesskey;" observes="cmd_DeleteRow"/>
<menuitem id="menu_DeleteColumn" value="&tableColumns.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_DeleteColumn"/>
<menuitem id="menu_DeleteCell" value="&tableCells.label;" accesskey="&tablecell.accesskey;" observes="cmd_DeleteCell"/>
<menuitem id="menu_DeleteCellContents" value="&tableCellContents.label;" accesskey="&tablecellcontents.accesskey;" observes="cmd_DeleteCellContents"/>
<menuitem id="menu_DeleteTable" label="&tableTable.label;" accesskey="&tabletable.accesskey;" observes="cmd_DeleteTable"/>
<menuitem id="menu_DeleteRow" label="&tableRows.label;" accesskey="&tablerow.accesskey;" observes="cmd_DeleteRow"/>
<menuitem id="menu_DeleteColumn" label="&tableColumns.label;" accesskey="&tablecolumn.accesskey;" observes="cmd_DeleteColumn"/>
<menuitem id="menu_DeleteCell" label="&tableCells.label;" accesskey="&tablecell.accesskey;" observes="cmd_DeleteCell"/>
<menuitem id="menu_DeleteCellContents" label="&tableCellContents.label;" accesskey="&tablecellcontents.accesskey;" observes="cmd_DeleteCellContents"/>
</menupopup>
</menu>
<menuseparator />
<!-- menu value is set in InitTableMenu -->
<menuitem id="menu_JoinTableCells" value="&tableJoinCells.label;" accesskey="&tablejoincells.accesskey;" observes="cmd_JoinTableCells"/>
<menuitem id="menu_SlitTableCell" value="&tableSplitCell.label;" accesskey="&tablesplitcell.accesskey;" observes="cmd_SplitTableCell"/>
<!-- menu label is set in InitTableMenu -->
<menuitem id="menu_JoinTableCells" label="&tableJoinCells.label;" accesskey="&tablejoincells.accesskey;" observes="cmd_JoinTableCells"/>
<menuitem id="menu_SlitTableCell" label="&tableSplitCell.label;" accesskey="&tablesplitcell.accesskey;" observes="cmd_SplitTableCell"/>
<menuseparator />
<menuitem id="menu_TableOrCellColor" value="&tableOrCellColor.label;" accesskey="&tableOrCellColor.accesskey;" observes="cmd_TableOrCellColor"/>
<menuitem id="menu_tableProperties" value="&tableProperties.label;" accesskey="&tableProperties.accesskey;" observes="cmd_editTable"/>
<menuitem id="menu_TableOrCellColor" label="&tableOrCellColor.label;" accesskey="&tableOrCellColor.accesskey;" observes="cmd_TableOrCellColor"/>
<menuitem id="menu_tableProperties" label="&tableProperties.label;" accesskey="&tableProperties.accesskey;" observes="cmd_editTable"/>
</menupopup>
</menu>
@ -573,25 +573,25 @@
</button>
<menupopup id="smilyPopup" flex="100%">
<menuitem oncommand="doStatefulCommand('cmd_smiley', ':-)' )">
<button class="plain" id="insert-smile" align="left" value="&smiley1Cmd.label;"/>
<button class="plain" id="insert-smile" align="left" label="&smiley1Cmd.label;"/>
</menuitem>
<menuitem oncommand="doStatefulCommand('cmd_smiley', ':-(' )">
<button class="plain" id="insert-frown" align="left" value="&smiley2Cmd.label;"/>
<button class="plain" id="insert-frown" align="left" label="&smiley2Cmd.label;"/>
</menuitem>
<menuitem oncommand="doStatefulCommand('cmd_smiley', ';-)' )">
<button class="plain" id="insert-wink" align="left" value="&smiley3Cmd.label;"/>
<button class="plain" id="insert-wink" align="left" label="&smiley3Cmd.label;"/>
</menuitem>
<menuitem oncommand="doStatefulCommand('cmd_smiley', ':-P' )">
<button class="plain" id="insert-sick" align="left" value="&smiley4Cmd.label;"/>
<button class="plain" id="insert-sick" align="left" label="&smiley4Cmd.label;"/>
</menuitem>
<menuitem oncommand="doStatefulCommand('cmd_smiley', ':)' )">
<button class="plain" id="insert-smile5" align="left" value="&smiley5Cmd.label;"/>
<button class="plain" id="insert-smile5" align="left" label="&smiley5Cmd.label;"/>
</menuitem>
<menuitem oncommand="doStatefulCommand('cmd_smiley', ':(' )">
<button class="plain" id="insert-smile6" align="left" value="&smiley6Cmd.label;"/>
<button class="plain" id="insert-smile6" align="left" label="&smiley6Cmd.label;"/>
</menuitem>
<menuitem oncommand="doStatefulCommand('cmd_smiley', ';)' )">
<button class="plain" id="insert-smile7" align="left" value="&smiley7Cmd.label;"/>
<button class="plain" id="insert-smile7" align="left" label="&smiley7Cmd.label;"/>
</menuitem>
<spring flex="100%" />
</menupopup>
@ -601,13 +601,13 @@
<menubutton id="AlignPopupButton" class="button-toolbar" observes="cmd_align"
tooltip="aTooltip" tooltiptext="&AlignPopupButton.tooltip;">
<menupopup id="AlignPopup">
<menuitem id="AlignLeftItem" class="menuitem-iconic" value="&alignLeft.label;"
<menuitem id="AlignLeftItem" class="menuitem-iconic" label="&alignLeft.label;"
oncommand="doStatefulCommand('cmd_align', 'left')"/>
<menuitem id="AlignCenterItem" class="menuitem-iconic" value="&alignCenter.label;"
<menuitem id="AlignCenterItem" class="menuitem-iconic" label="&alignCenter.label;"
oncommand="doStatefulCommand('cmd_align', 'center')"/>
<menuitem id="AlignRightItem" class="menuitem-iconic" value="&alignRight.label;"
<menuitem id="AlignRightItem" class="menuitem-iconic" label="&alignRight.label;"
oncommand="doStatefulCommand('cmd_align', 'right')"/>
<menuitem id="AlignJustifyItem" class="menuitem-iconic" value="&alignJustify.label;"
<menuitem id="AlignJustifyItem" class="menuitem-iconic" label="&alignJustify.label;"
oncommand="doStatefulCommand('cmd_align', 'justify')"/>
</menupopup>
</menubutton>
@ -616,107 +616,107 @@
<menubutton id="InsertPopupButton" class="button-toolbar" observes="cmd_insert">
<menupopup id="InsertPopup">
<menuitem id="InsertLinkItem" class="menuitem-iconic" observes="cmd_link"
oncommand="goDoCommand('cmd_link')" value="&linkToolbarCmd.label;"/>
oncommand="goDoCommand('cmd_link')" label="&linkToolbarCmd.label;"/>
<menuitem id="InsertAnchorItem" class="menuitem-iconic" observes="cmd_anchor"
oncommand="goDoCommand('cmd_anchor')" value="&anchorToolbarCmd.label;"/>
oncommand="goDoCommand('cmd_anchor')" label="&anchorToolbarCmd.label;"/>
<menuitem id="InsertImageItem" class="menuitem-iconic" observes="cmd_image"
oncommand="goDoCommand('cmd_image')" value="&imageToolbarCmd.label;"/>
oncommand="goDoCommand('cmd_image')" label="&imageToolbarCmd.label;"/>
<menuitem id="InsertHRuleItem" class="menuitem-iconic" observes="cmd_hline"
oncommand="goDoCommand('cmd_hline')" value="&hruleToolbarCmd.label;"/>
oncommand="goDoCommand('cmd_hline')" label="&hruleToolbarCmd.label;"/>
<menuitem id="InsertTableItem" class="menuitem-iconic" observes="cmd_table"
oncommand="goDoCommand('cmd_table')" value="&tableToolbarCmd.label;"/>
oncommand="goDoCommand('cmd_table')" label="&tableToolbarCmd.label;"/>
</menupopup>
</menubutton>
<!-- Editor toolbar items -->
<!-- note that we override the submenu item label "Blank Window" with "New" used for the menu -->
<button class="button-toolbar-2 top" id="newButton"
value="&newMenu.label;" observes="cmd_newEditor"
label="&newMenu.label;" observes="cmd_newEditor"
tooltip="aTooltip" tooltiptext="&newToolbarCmd.tooltip;"/>
<button class="button-toolbar-2 top" id="openButton"
value="&openToolbarCmd.label;" observes="cmd_open"
label="&openToolbarCmd.label;" observes="cmd_open"
tooltip="aTooltip" tooltiptext="&openToolbarCmd.tooltip;"/>
<button class="button-toolbar-2 top" id="saveButton"
observes="cmd_save"
tooltip="aTooltip" tooltiptext="&saveToolbarCmd.tooltip;"/>
<button class="button-toolbar-2 top" id="previewButton"
value="&previewToolbarCmd.label;" observes="cmd_preview"
label="&previewToolbarCmd.label;" observes="cmd_preview"
tooltip="aTooltip" tooltiptext="&previewToolbarCmd.tooltip;"/>
<menubutton class="menubutton-dual toolbar top" id="printButton" value="&printToolbarCmd.label;"
<menubutton class="menubutton-dual toolbar top" id="printButton" label="&printToolbarCmd.label;"
observes="cmd_print" tooltip="aTooltip" tooltiptext="&printToolbarCmd.tooltip;"
crop="right">
<menupopup id="printMenu">
<menuitem accesskey="&fileprint.accesskey;" key="printkb" value="&printCmd.label;" default="true"/>
<menupopup id="printMenu">
<menuitem accesskey="&fileprint.accesskey;" key="printkb" label="&printCmd.label;" default="true"/>
<menuitem accesskey="&fileprintsetup.accesskey;" observes="cmd_printSetup" />
</menupopup>
</menubutton>
<button class="button-toolbar-2 top" id="findButton"
value="&findToolbarCmd.label;" observes="cmd_find"
label="&findToolbarCmd.label;" observes="cmd_find"
tooltip="aTooltip" tooltiptext="&findToolbarCmd.tooltip;"/>
<button class="button-toolbar-2 top" id="spellingButton"
value="&spellToolbarCmd.label;" observes="cmd_spelling"
label="&spellToolbarCmd.label;" observes="cmd_spelling"
tooltip="aTooltip" tooltiptext="&spellToolbarCmd.tooltip;"/>
<button class="button-toolbar-2 top" id="imageButton"
value="&imageToolbarCmd.label;" observes="cmd_image"
label="&imageToolbarCmd.label;" observes="cmd_image"
tooltip="aTooltip" tooltiptext="&imageToolbarCmd.tooltip;"/>
<button class="button-toolbar-2 top" id="hlineButton"
value="&hruleToolbarCmd.label;" observes="cmd_hline"
label="&hruleToolbarCmd.label;" observes="cmd_hline"
tooltip="aTooltip" tooltiptext="&hruleToolbarCmd.tooltip;"/>
<button class="button-toolbar-2 top" id="tableButton"
value="&tableToolbarCmd.label;" observes="cmd_table"
label="&tableToolbarCmd.label;" observes="cmd_table"
tooltip="aTooltip" tooltiptext="&tableToolbarCmd.tooltip;"/>
<button class="button-toolbar-2 top" id="linkButton"
value="&linkToolbarCmd.label;" observes="cmd_link"
label="&linkToolbarCmd.label;" observes="cmd_link"
tooltip="aTooltip" tooltiptext="&linkToolbarCmd.tooltip;"/>
<button class="button-toolbar-2 top" id="namedAnchorButton"
value="&anchorToolbarCmd.label;" observes="cmd_anchor"
label="&anchorToolbarCmd.label;" observes="cmd_anchor"
tooltip="aTooltip" tooltiptext="&anchorToolbarCmd.tooltip;"/>
<!-- Formatting toolbar items. "data" are HTML tagnames, don't translate -->
<!-- Formatting toolbar items. "value" are HTML tagnames, don't translate -->
<menulist class="toolbar-focustarget" id="ParagraphSelect" tooltip="aTooltip" tooltiptext="&ParagraphSelect.tooltip;" crop="right">
<observes element="cmd_paragraphState" attribute="state" onbroadcast="onParagraphFormatChange(this.parentNode, 'cmd_paragraphState')"/>
<menupopup id="ParagraphPopup" oncommand="doStatefulCommand('cmd_paragraphState', event.target.data)">
<menuitem value="&bodyTextCmd.label;" data=""/>
<menuitem value="&paragraphParagraphCmd.label;" data="p"/>
<menuitem value="&heading1Cmd.label;" data="h1"/>
<menuitem value="&heading2Cmd.label;" data="h2"/>
<menuitem value="&heading3Cmd.label;" data="h3"/>
<menuitem value="&heading4Cmd.label;" data="h4"/>
<menuitem value="&heading5Cmd.label;" data="h5"/>
<menuitem value="&heading6Cmd.label;" data="h6"/>
<menuitem value="&paragraphAddressCmd.label;" data="address"/>
<menuitem value="&paragraphPreformatCmd.label;" data="pre"/>
<menupopup id="ParagraphPopup" oncommand="doStatefulCommand('cmd_paragraphState', event.target.value)">
<menuitem label="&bodyTextCmd.label;" value=""/>
<menuitem label="&paragraphParagraphCmd.label;" value="p"/>
<menuitem label="&heading1Cmd.label;" value="h1"/>
<menuitem label="&heading2Cmd.label;" value="h2"/>
<menuitem label="&heading3Cmd.label;" value="h3"/>
<menuitem label="&heading4Cmd.label;" value="h4"/>
<menuitem label="&heading5Cmd.label;" value="h5"/>
<menuitem label="&heading6Cmd.label;" value="h6"/>
<menuitem label="&paragraphAddressCmd.label;" value="address"/>
<menuitem label="&paragraphPreformatCmd.label;" value="pre"/>
<menuseparator/>
<menuitem value="&paragraphBlockquoteCmd.label;" data="blockquote"/>
<menuitem label="&paragraphBlockquoteCmd.label;" value="blockquote"/>
</menupopup>
</menulist>
<!-- "data" are HTML tagnames, don't translate -->
<!-- "value" are HTML tagnames, don't translate -->
<menulist class="toolbar-focustarget" id="FontFaceSelect" tooltip="aTooltip" tooltiptext="&FontFaceSelect.tooltip;" crop="right">
<observes element="cmd_fontFace" attribute="state" onbroadcast="onFontFaceChange(this.parentNode, 'cmd_fontFace')"/>
<menupopup id="FontFacePopup" oncommand="doStatefulCommand('cmd_fontFace', event.target.data)">
<menuitem value="&fontVarWidth.label;" data=""/>
<menuitem value="&fontFixedWidth.label;" data="tt"/>
<menupopup id="FontFacePopup" oncommand="doStatefulCommand('cmd_fontFace', event.target.value)">
<menuitem label="&fontVarWidth.label;" value=""/>
<menuitem label="&fontFixedWidth.label;" value="tt"/>
<menuseparator/>
<menuitem value="&fontHelveticaFont.label;" data="Helvetica, foo, sans-serif"/>
<menuitem value="&fontTimes.label;" data="Times New Roman, Times, serif"/>
<menuitem value="&fontCourier.label;" data="Courier New, Courier, mono"/>
<menuitem label="&fontHelveticaFont.label;" value="Helvetica, foo, sans-serif"/>
<menuitem label="&fontTimes.label;" value="Times New Roman, Times, serif"/>
<menuitem label="&fontCourier.label;" value="Courier New, Courier, mono"/>
</menupopup>
</menulist>
<menulist class="toolbar-focustarget" id="FontSizeSelect" oncommand="EditorSelectFontSize()" tooltip="aTooltip" tooltiptext="&FontSizeSelect.tooltip;" crop="right">
<observes element="cmd_fontSize" attribute="state" onbroadcast="onFontSizeChange(this.parentNode, 'cmd_fontSize')"/>
<menupopup>
<menuitem value="&size-xx-smallCmd.label;"/>
<menuitem value="&size-x-smallCmd.label;"/>
<menuitem value="&size-smallCmd.label;"/>
<menuitem value="&size-mediumCmd.label;"/>
<menuitem value="&size-largeCmd.label;"/>
<menuitem value="&size-x-largeCmd.label;"/>
<menuitem value="&size-xx-largeCmd.label;"/>
<menuitem label="&size-xx-smallCmd.label;"/>
<menuitem label="&size-x-smallCmd.label;"/>
<menuitem label="&size-smallCmd.label;"/>
<menuitem label="&size-mediumCmd.label;"/>
<menuitem label="&size-largeCmd.label;"/>
<menuitem label="&size-x-largeCmd.label;"/>
<menuitem label="&size-xx-largeCmd.label;"/>
</menupopup>
</menulist>
@ -784,13 +784,13 @@
</button>
<!-- Edit Mode toolbar -->
<tab id="NormalModeButton" class="tab-bottom edit-mode _plain" type="text" selected="1" value="&NormalModeTab.label;" oncommand="SetEditMode(1);"
<tab id="NormalModeButton" class="tab-bottom edit-mode _plain" type="text" selected="1" label="&NormalModeTab.label;" oncommand="SetEditMode(1);"
tooltip="aTooltip" tooltiptext="&NormalMode.tooltip;"/>
<tab id="TagModeButton" class="tab-bottom edit-mode _plain" type="text" selected="0" value="&AllTagsMode.label;" oncommand="SetEditMode(2);"
<tab id="TagModeButton" class="tab-bottom edit-mode _plain" type="text" selected="0" label="&AllTagsMode.label;" oncommand="SetEditMode(2);"
tooltip="aTooltip" tooltiptext="&AllTagsMode.tooltip;"/>
<tab id="SourceModeButton" class="tab-bottom edit-mode _plain" type="text" selected="0" value="&SourceMode.label;" oncommand="SetEditMode(3);"
<tab id="SourceModeButton" class="tab-bottom edit-mode _plain" type="text" selected="0" label="&SourceMode.label;" oncommand="SetEditMode(3);"
tooltip="aTooltip" tooltiptext="&HTMLSourceMode.tooltip;"/>
<tab id="PreviewModeButton" class="tab-bottom edit-mode _plain" type="text" selected="0" value="&PreviewMode.label;" oncommand="SetEditMode(0);"
<tab id="PreviewModeButton" class="tab-bottom edit-mode _plain" type="text" selected="0" label="&PreviewMode.label;" oncommand="SetEditMode(0);"
tooltip="aTooltip" tooltiptext="&PreviewMode.tooltip;"/>
<!-- Paste as quotation is used by mail compose,
@ -799,55 +799,55 @@
<menuitem id="menu_pasteQuote" accesskey="&editpastequotation.accesskey;" observes="cmd_pasteQuote"/>
<!-- DEBUG only -->
<menu id="debugMenu" value="&debugMenu.label;">
<menu id="debugMenu" label="&debugMenu.label;">
<menupopup>
<menuitem value="&newEditorTestPage.label;" oncommand="window.openDialog('chrome://editor/content','_blank','chrome,all,dialog=no','chrome://editor/content/EditorInitPage.html')"/>
<menuitem value="&textEditorCmd.label;" oncommand="EditorNewPlaintext();" />
<menuitem value="&outputTextCmd.label;"
<menuitem label="&newEditorTestPage.label;" oncommand="window.openDialog('chrome://editor/content','_blank','chrome,all,dialog=no','chrome://editor/content/EditorInitPage.html')"/>
<menuitem label="&textEditorCmd.label;" oncommand="EditorNewPlaintext();" />
<menuitem label="&outputTextCmd.label;"
oncommand="EditorGetText()"/>
<menuitem value="&outputHTMLCmd.label;"
<menuitem label="&outputHTMLCmd.label;"
oncommand="EditorGetHTML()"/>
<menuitem value="Dom Serializer"
<menuitem label="Dom Serializer"
oncommand="EditorSerialize()"/>
<menuseparator />
<menuitem value="&pasteAsQuotationCmd.label;"
<menuitem label="&pasteAsQuotationCmd.label;"
accesskey="&editpastequotation.accesskey;"
oncommand="goDoCommand('cmd_pasteQuote')"/>
<menuitem value="&editRewrapCmd.label;"
<menuitem label="&editRewrapCmd.label;"
oncommand="editorShell.Rewrap(false)"/>
<menuitem value="&editStripQuotesCmd.label;"
<menuitem label="&editStripQuotesCmd.label;"
oncommand="editorShell.StripCites()"/>
<menuitem value="&insertTextCmd.label;"
<menuitem label="&insertTextCmd.label;"
oncommand="EditorInsertText('All good things come to those who wait. ')"/>
<menuitem value="Tableize"
<menuitem label="Tableize"
oncommand="EditorTableize()"/>
<menuseparator />
<menuitem value="&testSelectionCmd.label;"
<menuitem label="&testSelectionCmd.label;"
oncommand="EditorTestSelection()"/>
<menuitem value="&testTableLayoutCmd.label;"
<menuitem label="&testTableLayoutCmd.label;"
oncommand="EditorTestTableLayout()"/>
<menuitem value="&showEmbeddedCmd.label;"
<menuitem label="&showEmbeddedCmd.label;"
oncommand="EditorShowEmbeddedObjects()"/>
<menuitem value="&dumpContentCmd.label;"
<menuitem label="&dumpContentCmd.label;"
oncommand="EditorDumpContent()"/>
<menuitem value="&testDocumentCmd.label;"
<menuitem label="&testDocumentCmd.label;"
oncommand="EditorTestDocument()"/>
<menuitem value="&runUnitTestsCmd.label;"
<menuitem label="&runUnitTestsCmd.label;"
oncommand="EditorUnitTests()"/>
<menuseparator />
<menuitem value="&dumpUndoStack.label;"
<menuitem label="&dumpUndoStack.label;"
oncommand="DumpUndoStack()"/>
<menuitem value="&dumpRedoStack.label;"
<menuitem label="&dumpRedoStack.label;"
oncommand="DumpRedoStack()"/>
<menuseparator />
<menuitem value="&startLogCmd.label;"
<menuitem label="&startLogCmd.label;"
oncommand="EditorStartLog()"/>
<menuitem value="&stopLogCmd.label;"
<menuitem label="&stopLogCmd.label;"
oncommand="EditorStopLog()"/>
<menuitem value="&runLogCmd.label;"
<menuitem label="&runLogCmd.label;"
oncommand="EditorRunLog()"/>
<menuseparator />
<menuitem value="&setFocusCmd.label;"
<menuitem label="&setFocusCmd.label;"
accesskey="&toolsetfocus.accesskey;"
oncommand="window.focus()"/>
</menupopup>

14
editor/ui/composer/content/editorPrefsOverlay.xul
Просмотреть файл

@ -27,7 +27,7 @@
<!-- editor startup toggle -->
<titledbox id="generalStartupPreferences">
<checkbox id="generalStartupEditor" wsm_persist="true" position="3"
value="&editorCheck.label;" accesskey="&editorCheck.accesskey;"
label="&editorCheck.label;" accesskey="&editorCheck.accesskey;"
pref="true" preftype="bool" prefstring="general.startup.editor"
prefattribute="checked"/>
</titledbox>
@ -36,20 +36,20 @@
<treechildren id="panelChildren">
<treeitem container="true" open="true" id="editor" position="3">
<treerow>
<treecell class="treecell-indent" url="chrome://editor/content/pref-composer.xul" value="&compose.label;" />
<treecell class="treecell-indent" url="chrome://editor/content/pref-composer.xul" label="&compose.label;" />
</treerow>
<treechildren>
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://editor/content/pref-editing.xul" value="&editing.label;"/>
<treecell class="treecell-indent" url="chrome://editor/content/pref-editing.xul" label="&editing.label;"/>
</treerow>
</treeitem>
<!--
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://editor/content/pref-publish.xul" value="&publish.label;"/>
</treerow>
</treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://editor/content/pref-publish.xul" label="&publish.label;"/>
</treerow>
</treeitem>
-->
</treechildren>
</treeitem>

56
editor/ui/composer/content/pref-composer.xul
Просмотреть файл

@ -29,10 +29,10 @@
<!DOCTYPE window SYSTEM "chrome://editor/locale/pref-composer.dtd" >
<window xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
class="color-dialog"
orient="vertical"
onload="parent.initPanel('chrome://editor/content/pref-composer.xul');">
onload="parent.initPanel('chrome://editor/content/pref-composer.xul');">
<!-- We need these for separator "thin" class -->
<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
@ -50,8 +50,8 @@
<box class="box-smallheader" title="&lHeader;"/>
<!-- Recent files menu -->
<titledbox orient="vertical">
<title value="&recentFiles.title;"/>
<titledbox orient="vertical">
<label value="&recentFiles.title;"/>
<box align="horizontal" valign="middle">
<text value="&documentsInMenu;"/>
<textbox
@ -66,41 +66,41 @@
prefattribute="value"
/>
</box>
</titledbox>
</titledbox>
<!-- HTML formatting on output -->
<titledbox orient="vertical">
<title value="&savingFiles.title;"/>
<titledbox orient="vertical">
<label value="&savingFiles.title;"/>
<spring class="spacer"/>
<radiogroup orient="vertical" autostretch="never"
id = "preserveFormatting"
pref = "true"
preftype = "bool"
prefstring = "editor.prettyprint"
prefattribute = "data">
prefattribute = "value">
<radio
group = "preserveFormatting"
data = "false"
value = "&preserveExistingFormatting;"
value = "false"
label = "&preserveExistingFormatting;"
accesskey = "&preserveExistingFormatting.accesskey;"
tooltip = "aTooltip"
tooltiptext= "&preserveExistingFormatting.tooltip;"
/>
<radio
group = "preserveFormatting"
data = "true"
value = "&reformat.label;"
value = "true"
label = "&reformat.label;"
accesskey = "&reformat.accesskey;"
tooltip = "aTooltip"
tooltiptext= "&reformat.tooltip;"
/>
</radiogroup>
</titledbox>
</titledbox>
<titledbox orient="vertical" autostretch="never">
<title value="&tableEditing.label;"/>
<label value="&tableEditing.label;"/>
<checkbox
value = "&maintainTableStructure.label;"
label = "&maintainTableStructure.label;"
id = "maintainTableStructure"
accesskey = "&maintainStructure.accesskey;"
tooltip = "aTooltip" tooltiptext="&maintainTableStructure.tooltip;"
@ -121,19 +121,19 @@
pref = "true"
preftype = "int"
prefstring="editor.table.delete_key"
prefattribute="data">
<radio group="tableDeleteKey" data="0" value="&deleteCell.label;" accesskey="&deleteCell.accesskey;"/>
<radio group="tableDeleteKey" data="1" value="&deleteContent.label;" accesskey="&deleteContent.accesskey;" />
prefattribute="value">
<radio group="tableDeleteKey" value="0" label="&deleteCell.label;" accesskey="&deleteCell.accesskey;"/>
<radio group="tableDeleteKey" value="1" label="&deleteContent.label;" accesskey="&deleteContent.accesskey;" />
</radiogroup>
</box>
</titledbox>
<!-- Take out Auto-Save; not supported at this time
<titledbox orient="vertical">
<title value="&saving;"/>
<titledbox orient="vertical">
<label value="&saving;"/>
<box align="horizontal" valign="middle">
<checkbox
value = "&AutoSaveCheck;"
label = "&AutoSaveCheck;"
id = "shouldAutoSave"
pref = "true"
preftype = "bool"
@ -154,16 +154,16 @@
/>
<text value="&minText;" />
</box>
</titledbox>
</titledbox>
-->
<!-- External Editors are not supported at this time
<titledbox orient="vertical">
<title value="&exterLegend.label;"/>
<titledbox orient="vertical">
<label value="&exterLegend.label;"/>
<box>
<checkbox
name = "htmlSourceEditorCheckbox"
value = "&htmlSource;"
label = "&htmlSource;"
pref = "true"
preftype = "int"
prefindex = "0"
@ -178,14 +178,14 @@
<button
class = "dialog"
name = ""
value = "&chooseButton.label;"
label = "&chooseButton.label;"
/>
</box>
<box>
<checkbox
name = "htmlImageEditorCheckbox"
value = "&imageeditor;"
label = "&imageeditor;"
pref = "true"
preftype = "int"
prefindex = "0"
@ -198,7 +198,7 @@
preftype = "string"
prefstring = "editor.image_editor"
/>
<button class="dialog" value="&chooseButton.label;" />
<button class="dialog" label="&chooseButton.label;" />
</box>
</titledbox>

36
editor/ui/composer/content/pref-editing.xul
Просмотреть файл

@ -47,27 +47,27 @@
<box class="box-smallheader" title="&lHeader;"/>
<titledbox orient="vertical">
<title value="&authorName.label;"/>
<label value="&authorName.label;"/>
<textbox id="editorAuthor" flex="1"
pref="true" preftype="string" prefstring="editor.author"
prefattribute="value"/>
</titledbox>
<titledbox orient="vertical">
<title value="&pageColorHeader;"/>
<label value="&pageColorHeader;"/>
<box orient="horizontal">
<box orient="vertical">
<radiogroup id="useCustomColors" orient="vertical" autostretch="never"
pref="true" preftype="bool" prefstring="editor.use_custom_colors"
prefattribute="data">
prefattribute="value">
<radio group="useCustomColors" id="DefaultColorsRadio"
data="false"
value="&defaultColorsRadio.label;"
value="false"
label="&defaultColorsRadio.label;"
accesskey="&defaultColors.accesskey;"
oncommand="UseDefaultColors();"/>
<text class="label" value="&defaultColorsMsg.label;" style="margin-left: 26px"/>
<radio group="useCustomColors" id="CustomColorsRadio"
data="true" value="&customColorsRadio.label;"
value="true" label="&customColorsRadio.label;"
accesskey="&customColors.accesskey;"
oncommand="UseCustomColors()"/>
</radiogroup>
@ -79,8 +79,8 @@
<row valign="middle" autostretch="never">
<text class="label" id="Text" value="&normalText.label;&colon.character;" />
<stack>
<button id="TextButton" class="dialog color-button" onclick="GetColorAndUpdate('textCW');"/>
<box autostretch="never" valign="middle" mousethrough="always">
<button id="TextButton" class="dialog color-button" oncommand="GetColorAndUpdate('textCW');"/>
<box autostretch="never" valign="middle" mousethrough="always">
<spring flex="1"/>
<spring id="textCW" class="color-well"/>
<spring flex="1"/>
@ -91,8 +91,8 @@
<row valign="middle" autostretch="never">
<text class="label" id="Link" value="&linkText.label;&colon.character;" />
<stack>
<button id="LinkButton" class="dialog color-button" onclick="GetColorAndUpdate('linkCW');"/>
<box autostretch="never" valign="middle" mousethrough="always">
<button id="LinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('linkCW');"/>
<box autostretch="never" valign="middle" mousethrough="always">
<spring flex="1"/>
<spring id="linkCW" class="color-well"/>
<spring flex="1"/>
@ -103,8 +103,8 @@
<row valign="middle" autostretch="never">
<text class="label" id="Active" value="&activeLinkText.label;&colon.character;" />
<stack>
<button id="ActiveLinkButton" class="dialog color-button" onclick="GetColorAndUpdate('activeCW');"/>
<box autostretch="never" valign="middle" mousethrough="always">
<button id="ActiveLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('activeCW');"/>
<box autostretch="never" valign="middle" mousethrough="always">
<spring flex="1"/>
<spring id="activeCW" class="color-well"/>
<spring flex="1"/>
@ -115,8 +115,8 @@
<row valign="middle" autostretch="never">
<text class="label" id="Visited" value ="&visitedLinkText.label;&colon.character;" />
<stack>
<button id="VisitedLinkButton" class="dialog color-button" onclick="GetColorAndUpdate('visitedCW');"/>
<box autostretch="never" valign="middle" mousethrough="always">
<button id="VisitedLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('visitedCW');"/>
<box autostretch="never" valign="middle" mousethrough="always">
<spring flex="1"/>
<spring id="visitedCW" class="color-well"/>
<spring flex="1"/>
@ -127,8 +127,8 @@
<row valign="middle" autostretch="never">
<text class="label" id="Background" value="&background.label;" />
<stack>
<button id="BackgroundButton" class="dialog color-button" onclick="GetColorAndUpdate('backgroundCW');"/>
<box autostretch="never" valign="middle" mousethrough="always">
<button id="BackgroundButton" class="dialog color-button" oncommand="GetColorAndUpdate('backgroundCW');"/>
<box autostretch="never" valign="middle" mousethrough="always">
<spring flex="1"/>
<spring id="backgroundCW" class="color-well"/>
<spring flex="1"/>
@ -159,10 +159,10 @@
<text class="label" value="&backgroundImage.label;" accesskey="&backgroundImage.accesskey;"/>
<box valign="middle" autostretch="never">
<textbox id="BackgroundImageInput" oninput="ChangeBackgroundImage();" style="min-width : 16em"/>
<button class="dialog" value="&chooseFile.label;" accesskey="&chooseFile.accesskey;"
<button class="dialog" label="&chooseFile.label;" accesskey="&chooseFile.accesskey;"
oncommand="ChooseImageFile()"/>
<data id="backgroundImageData" pref="true" preftype="string" prefstring="editor.default_background_image" prefattribute="value"/>
</box>
</titledbox>
</titledbox>
</window>

4
editor/ui/composer/content/sb-bookmarks-panel.xul
Просмотреть файл

@ -34,7 +34,7 @@
<script src="chrome://editor/content/sb-bookmarks.js"/>
<popup id="contextual" oncreate="return fillContextMenu('contextual');" >
<menu />
<menu />
</popup>
<tree id="bookmarksTree" context="contextual" ref="NC:BookmarksRoot"
@ -62,7 +62,7 @@
<treerow>
<treecell>
<treeindentation />
<button value="rdf:http://home.netscape.com/NC-rdf#Name"
<button label="rdf:http://home.netscape.com/NC-rdf#Name"
align="left" />
</treecell>
</treerow>

196
editor/ui/composer/content/sb-bookmarks.js
Просмотреть файл

@ -33,14 +33,14 @@ function BookmarkProperties()
if (select_list.length >= 1) {
// don't bother showing properties on bookmark separators
var type = select_list[0].getAttribute('type');
// don't bother showing properties on bookmark separators
var type = select_list[0].getAttribute('type');
if (type != "http://home.netscape.com/NC-rdf#BookmarkSeparator")
{
var props = window.open("chrome://communicator/content/bookmarks/bm-props.xul",
var props = window.open("chrome://communicator/content/bookmarks/bm-props.xul",
"BookmarkProperties", "chrome,menubar,resizable");
props.BookmarkURL = select_list[0].getAttribute("id");
}
props.BookmarkURL = select_list[0].getAttribute("id");
}
} else {
dump("nothing selected!\n");
}
@ -48,7 +48,7 @@ function BookmarkProperties()
function OpenSearch(tabName)
{
window.openDialog("resource:/res/samples/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName);
window.openDialog("resource:/res/samples/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName);
}
function OpenURL(event, node)
@ -74,32 +74,32 @@ function OpenURL(event, node)
return(false);
}
try
{
// add support for IE favorites under Win32, and NetPositive URLs under BeOS
if (url.indexOf("file://") == 0)
{
var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService();
if (rdf) rdf = rdf.QueryInterface(Components.interfaces.nsIRDFService);
if (rdf)
{
var fileSys = rdf.GetDataSource("rdf:files");
if (fileSys)
{
var src = rdf.GetResource(url, true);
var prop = rdf.GetResource("http://home.netscape.com/NC-rdf#URL", true);
var target = fileSys.GetTarget(src, prop, true);
if (target) target = target.QueryInterface(Components.interfaces.nsIRDFLiteral);
if (target) target = target.Value;
if (target) url = target;
try
{
// add support for IE favorites under Win32, and NetPositive URLs under BeOS
if (url.indexOf("file://") == 0)
{
var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService();
if (rdf) rdf = rdf.QueryInterface(Components.interfaces.nsIRDFService);
if (rdf)
{
var fileSys = rdf.GetDataSource("rdf:files");
if (fileSys)
{
var src = rdf.GetResource(url, true);
var prop = rdf.GetResource("http://home.netscape.com/NC-rdf#URL", true);
var target = fileSys.GetTarget(src, prop, true);
if (target) target = target.QueryInterface(Components.interfaces.nsIRDFLiteral);
if (target) target = target.Value;
if (target) url = target;
}
}
}
}
catch(ex)
{
}
}
}
}
}
catch(ex)
{
}
if(top.isEditor != undefined) {
dump("yay, top.isEditor is defined\n");
@ -457,7 +457,7 @@ function fillContextMenu(name)
dump("Command #" + cmdIndex + ": id='" + cmdResource.Value + "' name='" + cmdName + "'\n\n");
var menuItem = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menuitem");
menuItem.setAttribute("value", cmdName);
menuItem.setAttribute("label", cmdName);
menuItem.setAttribute("onaction", "return doContextCmd('" + cmdResource.Value + "');");
menuNode.appendChild(menuItem);
@ -470,90 +470,90 @@ function fillContextMenu(name)
function doContextCmd(cmdName)
{
dump("doContextCmd start: cmd='" + cmdName + "'\n");
dump("doContextCmd start: cmd='" + cmdName + "'\n");
var treeNode = document.getElementById("bookmarksTree");
if (!treeNode) return(false);
var db = treeNode.database;
if (!db) return(false);
var treeNode = document.getElementById("bookmarksTree");
if (!treeNode) return(false);
var db = treeNode.database;
if (!db) return(false);
var compositeDB = db.QueryInterface(Components.interfaces.nsIRDFDataSource);
if (!compositeDB) return(false);
var compositeDB = db.QueryInterface(Components.interfaces.nsIRDFDataSource);
if (!compositeDB) return(false);
var isupports = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService();
if (!isupports) return(false);
var rdf = isupports.QueryInterface(Components.interfaces.nsIRDFService);
if (!rdf) return(false);
var isupports = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService();
if (!isupports) return(false);
var rdf = isupports.QueryInterface(Components.interfaces.nsIRDFService);
if (!rdf) return(false);
// need a resource for the command
var cmdResource = rdf.GetResource(cmdName);
if (!cmdResource) return(false);
cmdResource = cmdResource.QueryInterface(Components.interfaces.nsIRDFResource);
if (!cmdResource) return(false);
// need a resource for the command
var cmdResource = rdf.GetResource(cmdName);
if (!cmdResource) return(false);
cmdResource = cmdResource.QueryInterface(Components.interfaces.nsIRDFResource);
if (!cmdResource) return(false);
var select_list = treeNode.getElementsByAttribute("selected", "true");
if (select_list.length < 1) return(false);
var select_list = treeNode.getElementsByAttribute("selected", "true");
if (select_list.length < 1) return(false);
dump("# of Nodes selected: " + select_list.length + "\n\n");
dump("# of Nodes selected: " + select_list.length + "\n\n");
// set up selection nsISupportsArray
var selectionInstance = Components.classes["@mozilla.org/supports-array;1"].createInstance();
var selectionArray = selectionInstance.QueryInterface(Components.interfaces.nsISupportsArray);
// set up selection nsISupportsArray
var selectionInstance = Components.classes["@mozilla.org/supports-array;1"].createInstance();
var selectionArray = selectionInstance.QueryInterface(Components.interfaces.nsISupportsArray);
// set up arguments nsISupportsArray
var argumentsInstance = Components.classes["@mozilla.org/supports-array;1"].createInstance();
var argumentsArray = argumentsInstance.QueryInterface(Components.interfaces.nsISupportsArray);
// set up arguments nsISupportsArray
var argumentsInstance = Components.classes["@mozilla.org/supports-array;1"].createInstance();
var argumentsArray = argumentsInstance.QueryInterface(Components.interfaces.nsISupportsArray);
// get argument (parent)
var parentArc = rdf.GetResource("http://home.netscape.com/NC-rdf#parent");
if (!parentArc) return(false);
// get argument (parent)
var parentArc = rdf.GetResource("http://home.netscape.com/NC-rdf#parent");
if (!parentArc) return(false);
for (var nodeIndex=0; nodeIndex<select_list.length; nodeIndex++)
{
var node = select_list[nodeIndex];
if (!node) break;
var uri = node.getAttribute("ref");
if ((uri) || (uri == ""))
{
uri = node.getAttribute("id");
}
if (!uri) return(false);
for (var nodeIndex=0; nodeIndex<select_list.length; nodeIndex++)
{
var node = select_list[nodeIndex];
if (!node) break;
var uri = node.getAttribute("ref");
if ((uri) || (uri == ""))
{
uri = node.getAttribute("id");
}
if (!uri) return(false);
var rdfNode = rdf.GetResource(uri);
if (!rdfNode) break;
var rdfNode = rdf.GetResource(uri);
if (!rdfNode) break;
// add node into selection array
selectionArray.AppendElement(rdfNode);
// add node into selection array
selectionArray.AppendElement(rdfNode);
// get the parent's URI
var parentURI="";
var theParent = node;
while (theParent)
{
theParent = theParent.parentNode;
// get the parent's URI
var parentURI="";
var theParent = node;
while (theParent)
{
theParent = theParent.parentNode;
parentURI = theParent.getAttribute("ref");
if ((!parentURI) || (parentURI == ""))
{
parentURI = theParent.getAttribute("id");
}
if (parentURI != "") break;
}
if (parentURI == "") return(false);
parentURI = theParent.getAttribute("ref");
if ((!parentURI) || (parentURI == ""))
{
parentURI = theParent.getAttribute("id");
}
if (parentURI != "") break;
}
if (parentURI == "") return(false);
var parentNode = rdf.GetResource(parentURI, true);
if (!parentNode) return(false);
var parentNode = rdf.GetResource(parentURI, true);
if (!parentNode) return(false);
// add parent arc and node into arguments array
argumentsArray.AppendElement(parentArc);
argumentsArray.AppendElement(parentNode);
}
// add parent arc and node into arguments array
argumentsArray.AppendElement(parentArc);
argumentsArray.AppendElement(parentNode);
}
// do the command
compositeDB.DoCommand( selectionArray, cmdResource, argumentsArray );
// do the command
compositeDB.DoCommand( selectionArray, cmdResource, argumentsArray );
dump("doContextCmd ends.\n\n");
return(true);
dump("doContextCmd ends.\n\n");
return(true);
}
// ripped from tasksOverlay.js.. ideally we should

52
editor/ui/composer/content/sb-file-contextMenu.js
Просмотреть файл

@ -67,32 +67,32 @@ function GetFileURL(node)
return(false);
}
try
{
// add support for IE favorites under Win32, and NetPositive URLs under BeOS
if (url.indexOf("file://") == 0)
{
var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService();
if (rdf) rdf = rdf.QueryInterface(Components.interfaces.nsIRDFService);
if (rdf)
{
var fileSys = rdf.GetDataSource("rdf:files");
if (fileSys)
{
var src = rdf.GetResource(url, true);
var prop = rdf.GetResource("http://home.netscape.com/NC-rdf#URL", true);
var target = fileSys.GetTarget(src, prop, true);
if (target) target = target.QueryInterface(Components.interfaces.nsIRDFLiteral);
if (target) target = target.Value;
if (target) url = target;
try
{
// add support for IE favorites under Win32, and NetPositive URLs under BeOS
if (url.indexOf("file://") == 0)
{
var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService();
if (rdf) rdf = rdf.QueryInterface(Components.interfaces.nsIRDFService);
if (rdf)
{
var fileSys = rdf.GetDataSource("rdf:files");
if (fileSys)
{
var src = rdf.GetResource(url, true);
var prop = rdf.GetResource("http://home.netscape.com/NC-rdf#URL", true);
var target = fileSys.GetTarget(src, prop, true);
if (target) target = target.QueryInterface(Components.interfaces.nsIRDFLiteral);
if (target) target = target.Value;
if (target) url = target;
}
}
}
}
catch(ex)
{
}
}
}
}
}
catch(ex)
{
}
return url;
}
@ -100,7 +100,7 @@ function isImageFile(parent,url)
{
// note: deleted all the doContextCmd stuff from bookmarks.
var menuItem = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menuitem");
menuItem.setAttribute("value","Insert Image");
menuItem.setAttribute("label","Insert Image");
// menuItem.setAttribute("onaction","AutoInsertImage(\'" + url + "\')");
parent.appendChild(menuItem);
}

246
editor/ui/composer/content/sb-file-panel.js
Просмотреть файл

@ -30,13 +30,13 @@ function FileProperties()
var tree = document.getElementById('fileTree');
if (tree.selectedItems.length >= 1) {
// don't bother showing properties on bookmark separators
var type = tree.selectedItems[0].getAttribute('type');
// don't bother showing properties on bookmark separators
var type = tree.selectedItems[0].getAttribute('type');
if (type != "http://home.netscape.com/NC-rdf#BookmarkSeparator") {
var props = window.open("chrome://communicator/content/bookmarks/bm-props.xul",
var props = window.open("chrome://communicator/content/bookmarks/bm-props.xul",
"BookmarkProperties", "chrome,menubar,resizable");
props.BookmarkURL = tree.selectedItems[0].getAttribute("id");
}
props.BookmarkURL = tree.selectedItems[0].getAttribute("id");
}
} else {
dump("nothing selected!\n");
}
@ -44,7 +44,7 @@ function FileProperties()
function OpenSearch(tabName)
{
window.openDialog("resource:/res/samples/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName);
window.openDialog("resource:/res/samples/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName);
}
function OpenURL(event, node)
@ -70,32 +70,32 @@ function OpenURL(event, node)
return(false);
}
try
{
// add support for IE favorites under Win32, and NetPositive URLs under BeOS
if (url.indexOf("file://") == 0)
{
var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService();
if (rdf) rdf = rdf.QueryInterface(Components.interfaces.nsIRDFService);
if (rdf)
{
var fileSys = rdf.GetDataSource("rdf:files");
if (fileSys)
{
var src = rdf.GetResource(url, true);
var prop = rdf.GetResource("http://home.netscape.com/NC-rdf#URL", true);
var target = fileSys.GetTarget(src, prop, true);
if (target) target = target.QueryInterface(Components.interfaces.nsIRDFLiteral);
if (target) target = target.Value;
if (target) url = target;
try
{
// add support for IE favorites under Win32, and NetPositive URLs under BeOS
if (url.indexOf("file://") == 0)
{
var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService();
if (rdf) rdf = rdf.QueryInterface(Components.interfaces.nsIRDFService);
if (rdf)
{
var fileSys = rdf.GetDataSource("rdf:files");
if (fileSys)
{
var src = rdf.GetResource(url, true);
var prop = rdf.GetResource("http://home.netscape.com/NC-rdf#URL", true);
var target = fileSys.GetTarget(src, prop, true);
if (target) target = target.QueryInterface(Components.interfaces.nsIRDFLiteral);
if (target) target = target.Value;
if (target) url = target;
}
}
}
}
catch(ex)
{
}
}
}
}
}
catch(ex)
{
}
if(top.isEditor != undefined) {
if(top.editorShell) {
@ -402,7 +402,7 @@ function fillContextMenu(name,node)
{
// note: deleted all the doContextCmd stuff from bookmarks.
menuItem = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menuitem");
menuItem.setAttribute("value","Insert Image");
menuItem.setAttribute("label","Insert Image");
// menuItem.setAttribute("onaction","AutoInsertImage(\'" + url + "\')");
parent.appendChild(menuItem);
}
@ -424,32 +424,32 @@ function GetFileURL(node)
return(false);
}
try
{
// add support for IE favorites under Win32, and NetPositive URLs under BeOS
if (url.indexOf("file://") == 0)
{
var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService();
if (rdf) rdf = rdf.QueryInterface(Components.interfaces.nsIRDFService);
if (rdf)
{
var fileSys = rdf.GetDataSource("rdf:files");
if (fileSys)
{
var src = rdf.GetResource(url, true);
var prop = rdf.GetResource("http://home.netscape.com/NC-rdf#URL", true);
var target = fileSys.GetTarget(src, prop, true);
if (target) target = target.QueryInterface(Components.interfaces.nsIRDFLiteral);
if (target) target = target.Value;
if (target) url = target;
try
{
// add support for IE favorites under Win32, and NetPositive URLs under BeOS
if (url.indexOf("file://") == 0)
{
var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService();
if (rdf) rdf = rdf.QueryInterface(Components.interfaces.nsIRDFService);
if (rdf)
{
var fileSys = rdf.GetDataSource("rdf:files");
if (fileSys)
{
var src = rdf.GetResource(url, true);
var prop = rdf.GetResource("http://home.netscape.com/NC-rdf#URL", true);
var target = fileSys.GetTarget(src, prop, true);
if (target) target = target.QueryInterface(Components.interfaces.nsIRDFLiteral);
if (target) target = target.Value;
if (target) url = target;
}
}
}
}
catch(ex)
{
}
}
}
}
}
catch(ex)
{
}
return url;
}
@ -457,88 +457,88 @@ function GetFileURL(node)
function doContextCmd(cmdName)
{
dump("doContextCmd start: cmd='" + cmdName + "'\n");
dump("doContextCmd start: cmd='" + cmdName + "'\n");
var treeNode = document.getElementById("bookmarksTree");
if (!treeNode) return(false);
var db = treeNode.database;
if (!db) return(false);
var treeNode = document.getElementById("bookmarksTree");
if (!treeNode) return(false);
var db = treeNode.database;
if (!db) return(false);
var compositeDB = db.QueryInterface(Components.interfaces.nsIRDFDataSource);
if (!compositeDB) return(false);
var compositeDB = db.QueryInterface(Components.interfaces.nsIRDFDataSource);
if (!compositeDB) return(false);
var isupports = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService();
if (!isupports) return(false);
var rdf = isupports.QueryInterface(Components.interfaces.nsIRDFService);
if (!rdf) return(false);
var isupports = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService();
if (!isupports) return(false);
var rdf = isupports.QueryInterface(Components.interfaces.nsIRDFService);
if (!rdf) return(false);
// need a resource for the command
var cmdResource = rdf.GetResource(cmdName);
if (!cmdResource) return(false);
cmdResource = cmdResource.QueryInterface(Components.interfaces.nsIRDFResource);
if (!cmdResource) return(false);
// need a resource for the command
var cmdResource = rdf.GetResource(cmdName);
if (!cmdResource) return(false);
cmdResource = cmdResource.QueryInterface(Components.interfaces.nsIRDFResource);
if (!cmdResource) return(false);
var select_list = treeNode.getElementsByAttribute("selected", "true");
if (select_list.length < 1) return(false);
var select_list = treeNode.getElementsByAttribute("selected", "true");
if (select_list.length < 1) return(false);
dump("# of Nodes selected: " + select_list.length + "\n\n");
dump("# of Nodes selected: " + select_list.length + "\n\n");
// set up selection nsISupportsArray
var selectionInstance = Components.classes["@mozilla.org/supports-array;1"].createInstance();
var selectionArray = selectionInstance.QueryInterface(Components.interfaces.nsISupportsArray);
// set up selection nsISupportsArray
var selectionInstance = Components.classes["@mozilla.org/supports-array;1"].createInstance();
var selectionArray = selectionInstance.QueryInterface(Components.interfaces.nsISupportsArray);
// set up arguments nsISupportsArray
var argumentsInstance = Components.classes["@mozilla.org/supports-array;1"].createInstance();
var argumentsArray = argumentsInstance.QueryInterface(Components.interfaces.nsISupportsArray);
// set up arguments nsISupportsArray
var argumentsInstance = Components.classes["@mozilla.org/supports-array;1"].createInstance();
var argumentsArray = argumentsInstance.QueryInterface(Components.interfaces.nsISupportsArray);
// get argument (parent)
var parentArc = rdf.GetResource("http://home.netscape.com/NC-rdf#parent");
if (!parentArc) return(false);
// get argument (parent)
var parentArc = rdf.GetResource("http://home.netscape.com/NC-rdf#parent");
if (!parentArc) return(false);
for (var nodeIndex=0; nodeIndex<select_list.length; nodeIndex++)
{
var node = select_list[nodeIndex];
if (!node) break;
var uri = node.getAttribute("ref");
if ((uri) || (uri == ""))
{
uri = node.getAttribute("id");
}
if (!uri) return(false);
for (var nodeIndex=0; nodeIndex<select_list.length; nodeIndex++)
{
var node = select_list[nodeIndex];
if (!node) break;
var uri = node.getAttribute("ref");
if ((uri) || (uri == ""))
{
uri = node.getAttribute("id");
}
if (!uri) return(false);
var rdfNode = rdf.GetResource(uri);
if (!rdfNode) break;
var rdfNode = rdf.GetResource(uri);
if (!rdfNode) break;
// add node into selection array
selectionArray.AppendElement(rdfNode);
// add node into selection array
selectionArray.AppendElement(rdfNode);
// get the parent's URI
var parentURI="";
var theParent = node;
while (theParent)
{
theParent = theParent.parentNode;
// get the parent's URI
var parentURI="";
var theParent = node;
while (theParent)
{
theParent = theParent.parentNode;
parentURI = theParent.getAttribute("ref");
if ((!parentURI) || (parentURI == ""))
{
parentURI = theParent.getAttribute("id");
}
if (parentURI != "") break;
}
if (parentURI == "") return(false);
parentURI = theParent.getAttribute("ref");
if ((!parentURI) || (parentURI == ""))
{
parentURI = theParent.getAttribute("id");
}
if (parentURI != "") break;
}
if (parentURI == "") return(false);
var parentNode = rdf.GetResource(parentURI, true);
if (!parentNode) return(false);
var parentNode = rdf.GetResource(parentURI, true);
if (!parentNode) return(false);
// add parent arc and node into arguments array
argumentsArray.AppendElement(parentArc);
argumentsArray.AppendElement(parentNode);
}
// add parent arc and node into arguments array
argumentsArray.AppendElement(parentArc);
argumentsArray.AppendElement(parentNode);
}
// do the command
compositeDB.DoCommand( selectionArray, cmdResource, argumentsArray );
// do the command
compositeDB.DoCommand( selectionArray, cmdResource, argumentsArray );
dump("doContextCmd ends.\n\n");
return(true);
dump("doContextCmd ends.\n\n");
return(true);
}

4
editor/ui/composer/content/sb-file-panel.xul
Просмотреть файл

@ -36,7 +36,7 @@
<script src="chrome://editor/content/sb-FileWidgetFileHandler.js"/>
<popup id="contextual" oncreate="return fillContextMenu('contextual',event.target.parentNode.parentNode);" >
<menu />
<menu />
</popup>
<tree id="fileTree" context="contextual" ref="NC:FilesRoot"
@ -52,7 +52,7 @@
<treerow>
<treecell>
<treeindentation />
<button value="rdf:http://home.netscape.com/NC-rdf#Name"
<button label="rdf:http://home.netscape.com/NC-rdf#Name"
align="left" />
</treecell>
</treerow>

6
editor/ui/composer/content/sidebar-editor.xul
Просмотреть файл

@ -40,11 +40,11 @@
<box class="sidebartitle">
<spring flex="1"/>
<button class="dialog borderless paneltitle"
value="&sidebar.reload.label;"
label="&sidebar.reload.label;"
oncommand="window.location.reload()" />
<button class="borderless paneltitle"
value="&sidebar.customize.label;"
oncommand="var dialogWindow=customize();" />
label="&sidebar.customize.label;"
oncommand="var dialogWindow=customize();" />
</box>
</box>
</window>

2
editor/ui/dialogs/content/EdAECSSAttributes.js
Просмотреть файл

@ -70,7 +70,7 @@ function UpdateCSSAttributes()
for(var i = 0; i < CSSAList.childNodes.length; i++)
{
var item = CSSAList.childNodes[i];
var name = TrimString(item.firstChild.firstChild.getAttribute("value"));
var name = TrimString(item.firstChild.firstChild.getAttribute("label"));
var value = TrimString(item.firstChild.lastChild.firstChild.value);
// this code allows users to be sloppy in typing in values, and enter
// things like "foo: " and "bar;". This will trim off everything after the

2
editor/ui/dialogs/content/EdAEHTMLAttributes.js
Просмотреть файл

@ -75,7 +75,7 @@ function UpdateHTMLAttributes()
for( i = 0; i < HTMLAList.childNodes.length; i++)
{
var item = HTMLAList.childNodes[i];
name = TrimString(item.firstChild.firstChild.getAttribute("value"));
name = TrimString(item.firstChild.firstChild.getAttribute("label"));
var value = TrimString(item.firstChild.lastChild.firstChild.value);
// set the attribute
element.setAttribute(name,value);

2
editor/ui/dialogs/content/EdAEJSEAttributes.js
Просмотреть файл

@ -83,7 +83,7 @@ function UpdateJSEAttributes()
for( i = 0; i < JSEAList.childNodes.length; i++)
{
var item = JSEAList.childNodes[i];
name = TrimString(item.firstChild.firstChild.getAttribute("value"));
name = TrimString(item.firstChild.firstChild.getAttribute("label"));
value = TrimString(item.firstChild.lastChild.firstChild.value);
// set the event handler

2
editor/ui/dialogs/content/EdAdvancedEdit.js
Просмотреть файл

@ -262,7 +262,7 @@ function AddTreeItem ( name, value, treekidsId, attArray, valueCaseFunc )
var treerow = document.createElementNS ( XUL_NS, "treerow" );
var attrcell = document.createElementNS ( XUL_NS, "treecell" );
attrcell.setAttribute( "class", "propertylist" );
attrcell.setAttribute( "value", name );
attrcell.setAttribute( "label", name );
// Modify treerow selection to better show focus in textbox
treeitem.setAttribute( "class", "ae-selection");

38
editor/ui/dialogs/content/EdAdvancedEdit.xul
Просмотреть файл

@ -65,10 +65,10 @@
<separator class="thin"/>
<tabcontrol align="vertical" orient="vertical" flex="1">
<tabbox>
<tab value="&tabHTML.label;"/>
<tab value="&tabCSS.label;"/>
<tab value="&tabJSE.label;"/>
<tabbox>
<tab label="&tabHTML.label;"/>
<tab label="&tabCSS.label;"/>
<tab label="&tabJSE.label;"/>
</tabbox>
<tabpanel flex="1">
<!-- ============================================================== -->
@ -87,9 +87,9 @@
</treecols>
<treehead>
<treerow>
<treecell class="treecell-header treecell-inset-header" value="&tree.attributeHeader.label;"
<treecell class="treecell-header treecell-inset-header" label="&tree.attributeHeader.label;"
tooltip="aTooltip" tooltiptext="Click on item to edit value"/>
<treecell class="treecell-header treecell-inset-header" value="&tree.valueHeader.label;"
<treecell class="treecell-header treecell-inset-header" label="&tree.valueHeader.label;"
tooltip="aTooltip" tooltiptext="Click on item to edit value"/>
</treerow>
</treehead>
@ -98,18 +98,18 @@
<box valign="middle" autostretch="never" flex="1">
<text class="label" value="&editAttribute.label;"/>
<spring flex="1"/>
<button class="dialog" value="&removeAttribute.label;" oncommand="RemoveAttribute('HTMLATree')"/>
<button class="dialog" label="&removeAttribute.label;" oncommand="RemoveAttribute('HTMLATree')"/>
</box>
<box orient="vertical">
<spring class="spacer"/>
<titledbox orient="vertical">
<title value="&AddHTMLAttributeLabel.label;"/>
<label value="&AddHTMLAttributeLabel.label;"/>
<box autostretch="never">
<text class="label" for="AddHTMLAttributeNameInput" value="&AttName.label;"/>
<textbox flex="1" id="AddHTMLAttributeNameInput" oninput="doHTMLEnabling()" onkeyup="if (event.keyCode == 13) onAddHTMLAttribute();"/>
<text class="label" for="AddHTMLAttributeValueInput" value="&AttValue.label;"/>
<textbox flex="1" id="AddHTMLAttributeValueInput" oninput="doHTMLEnabling()" onkeyup="if (event.keyCode == 13) onAddHTMLAttribute();"/>
<button class="dialog" id="AddHTMLAttribute" oncommand="onAddHTMLAttribute()" value="&AddAttributeButton.label;" disabled="true"/>
<button class="dialog" id="AddHTMLAttribute" oncommand="onAddHTMLAttribute()" label="&AddAttributeButton.label;" disabled="true"/>
</box>
</titledbox>
</box>
@ -127,8 +127,8 @@
</treecolgroup>
<treehead>
<treerow>
<treecell class="treecell-header treecell-inset-header" value="&tree.attributeHeader.label;"/>
<treecell class="treecell-header treecell-inset-header" value="&tree.valueHeader.label;"/>
<treecell class="treecell-header treecell-inset-header" label="&tree.attributeHeader.label;"/>
<treecell class="treecell-header treecell-inset-header" label="&tree.valueHeader.label;"/>
</treerow>
</treehead>
<treechildren id="CSSAList" flex="1"/>
@ -136,18 +136,18 @@
<box valign="middle" autostretch="never" flex="1">
<text class="label" value="&editAttribute.label;"/>
<spring flex="1"/>
<button class="dialog" value="&removeAttribute.label;" oncommand="RemoveAttribute('CSSATree')"/>
<button class="dialog" label="&removeAttribute.label;" oncommand="RemoveAttribute('CSSATree')"/>
</box>
<box orient="vertical">
<spring class="spacer"/>
<titledbox orient="vertical">
<title value="&AddCSSAttributeLabel.label;"/>
<label value="&AddCSSAttributeLabel.label;"/>
<box autostretch="never">
<text class="label" for="AddCSSAttributeNameInput" value="&AttName.label;"/>
<textbox flex="1" id="AddCSSAttributeNameInput" oninput="doCSSEnabling()" onkeyup="if (event.keyCode == 13) onAddCSSAttribute();"/>
<text class="label" for="AddCSSAttributeValueInput" value="&AttValue.label;"/>
<textbox flex="1" id="AddCSSAttributeValueInput" oninput="doCSSEnabling()" onkeyup="if (event.keyCode == 13) onAddCSSAttribute();"/>
<button class="dialog" id="AddCSSAttribute" oncommand="onAddCSSAttribute()" value="&AddAttributeButton.label;" disabled="true"/>
<button class="dialog" id="AddCSSAttribute" oncommand="onAddCSSAttribute()" label="&AddAttributeButton.label;" disabled="true"/>
</box>
</titledbox>
</box>
@ -165,8 +165,8 @@
</treecolgroup>
<treehead>
<treerow>
<treecell class="treecell-header treecell-inset-header" value="&tree.attributeHeader.label;"/>
<treecell class="treecell-header treecell-inset-header" value="&tree.valueHeader.label;"/>
<treecell class="treecell-header treecell-inset-header" label="&tree.attributeHeader.label;"/>
<treecell class="treecell-header treecell-inset-header" label="&tree.valueHeader.label;"/>
</treerow>
</treehead>
<treechildren id="JSEAList" flex="1"/>
@ -174,18 +174,18 @@
<box valign="middle" autostretch="never" flex="1">
<text class="label" value="&editAttribute.label;"/>
<spring flex="1"/>
<button class="dialog" value="&removeAttribute.label;" oncommand="RemoveAttribute('JSEATree')"/>
<button class="dialog" label="&removeAttribute.label;" oncommand="RemoveAttribute('JSEATree')"/>
</box>
<box orient="vertical">
<spring class="spacer"/>
<titledbox orient="vertical">
<title value="&AddJSEAttributeLabel.label;"/>
<label value="&AddJSEAttributeLabel.label;"/>
<box autostretch="never">
<text class="label" for="AddJSEAttributeNameInput" value="&AttName.label;"/>
<textbox flex="1" id="AddJSEAttributeNameInput" oninput="doJSEEnabling()" onkeyup="if (event.keyCode == 13) onAddJSAttribute();"/>
<text class="label" for="AddJSEAttributeValueInput" value="&AttValue.label;"/>
<textbox flex="1" id="AddJSEAttributeValueInput" oninput="doJSEEnabling()" onkeyup="if (event.keyCode == 13) onAddJSAttribute();"/>
<button class="dialog" id="AddJSEAttribute" oncommand="onAddJSEAttribute()" value="&AddAttributeButton.label;" disabled="true"/>
<button class="dialog" id="AddJSEAttribute" oncommand="onAddJSEAttribute()" label="&AddAttributeButton.label;" disabled="true"/>
</box>
</titledbox>
</box>

14
editor/ui/dialogs/content/EdColorPicker.xul
Просмотреть файл

@ -47,8 +47,8 @@
<box id="TableOrCellGroup" valign="middle" autostretch="never" collapsed="true">
<text value="&background.label;"/>
<radiogroup id="1" orient="horizontal">
<radio group="1" id="TableRadio" value="&table.label;"/>
<radio group="1" id="CellRadio" value="&cell.label;"/>
<radio group="1" id="TableRadio" label="&table.label;"/>
<radio group="1" id="CellRadio" label="&cell.label;"/>
</radiogroup>
</box>
<colorpicker id="ColorPicker" palettename="standard"
@ -57,14 +57,14 @@
<!-- Web palette is not implemented???
<box valign="middle" autostretch="never">
<text class="label" value="&palette.label;"/>
<radio id="StandardPalette" value="&standardPalette.label;" oncommand="ChangePalette('standard')"/>
<radio id="WebPalette" value="&webPalette.label;" oncommand="ChangePalette('web')"/>
<radio id="StandardPalette" label="&standardPalette.label;" oncommand="ChangePalette('standard')"/>
<radio id="WebPalette" label="&webPalette.label;" oncommand="ChangePalette('web')"/>
</box>
-->
<spring class="spacer"/>
<box orient="vertical" flex="1">
<stack valign="middle" autostretch="never">
<button id="LastPickedButton" class="dialog" value="&lastPickedColor.label;"
<button id="LastPickedButton" class="dialog" label="&lastPickedColor.label;"
style="margin-left:0px; margin-right: 0px;"
onclick="SelectLastPickedColor();"/>
<box style="margin-left: 5px" mousethrough="always">
@ -86,11 +86,11 @@
<spring flex="1"/>
<spring id="ColorPickerSwatch"/>
<spring flex="1"/>
<button id="DefaultColorButton" class="dialog" value="&default.label;"
<button id="DefaultColorButton" class="dialog" label="&default.label;"
style="margin-right:0px;" oncommand="RemoveColor()"/>
</box>
</box>
<separator class="groove"/>
<!-- from global dialogOverlay -->
<box id="okCancelButtons"/>
<box id="okCancelButtons"/>
</window>

16
editor/ui/dialogs/content/EdColorProps.xul
Просмотреть файл

@ -46,14 +46,14 @@
<broadcaster id="args" value=""/>
<popupset id="aTooltipSet" />
<titledbox orient="vertical"><title value="&pageColors.label;"/>
<titledbox orient="vertical"><label value="&pageColors.label;"/>
<box orient="horizontal">
<box orient="vertical">
<radiogroup id="pageColorGroup" orient="vertical" autostretch="never">
<radio group="pageColorGroup" id="DefaultColorsRadio" value="&defaultColorsRadio.label;" oncommand="UseDefaultColors()"
<radio group="pageColorGroup" id="DefaultColorsRadio" label="&defaultColorsRadio.label;" oncommand="UseDefaultColors()"
tooltip="aTooltip" tooltiptext="&defaultColorsRadio.tooltip;" />
<text class="label" value="&defaultColorsMsg.label;" style="margin-left: 20px"/>
<radio group="pageColorGroup" id="CustomColorsRadio" value="&customColorsRadio.label;" oncommand="UseCustomColors()"
<radio group="pageColorGroup" id="CustomColorsRadio" label="&customColorsRadio.label;" oncommand="UseCustomColors()"
tooltip="aTooltip" tooltiptext="&customColorsRadio.tooltip;" />
</radiogroup>
<spring class="spacer"/>
@ -65,7 +65,7 @@
<text class="label" id="Text" value="&normalText.label;&colon.character;" />
<stack>
<button id="TextButton" class="dialog color-button" oncommand="GetColorAndUpdate('textCW');"/>
<box autostretch="never" valign="middle" mousethrough="always">
<box autostretch="never" valign="middle" mousethrough="always">
<spring flex="1"/>
<spring id="textCW" class="color-well"/>
<spring flex="1"/>
@ -76,7 +76,7 @@
<text class="label" id="Link" value="&linkText.label;&colon.character;" />
<stack>
<button id="LinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('linkCW');"/>
<box autostretch="never" valign="middle" mousethrough="always">
<box autostretch="never" valign="middle" mousethrough="always">
<spring flex="1"/>
<spring id="linkCW" class="color-well"/>
<spring flex="1"/>
@ -87,7 +87,7 @@
<text class="label" id="Active" value="&activeLinkText.label;&colon.character;" />
<stack>
<button id="ActiveLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('activeCW');"/>
<box autostretch="never" valign="middle" mousethrough="always">
<box autostretch="never" valign="middle" mousethrough="always">
<spring flex="1"/>
<spring id="activeCW" class="color-well"/>
<spring flex="1"/>
@ -98,7 +98,7 @@
<text class="label" id="Visited" value ="&visitedLinkText.label;&colon.character;" />
<stack>
<button id="VisitedLinkButton" class="dialog color-button" oncommand="GetColorAndUpdate('visitedCW');"/>
<box autostretch="never" valign="middle" mousethrough="always">
<box autostretch="never" valign="middle" mousethrough="always">
<spring flex="1"/>
<spring id="visitedCW" class="color-well"/>
<spring flex="1"/>
@ -109,7 +109,7 @@
<text class="label" id="Background" value="&background.label;" />
<stack>
<button id="BackgroundButton" class="dialog color-button" oncommand="GetColorAndUpdate('backgroundCW');"/>
<box autostretch="never" valign="middle" mousethrough="always">
<box autostretch="never" valign="middle" mousethrough="always">
<spring flex="1"/>
<spring id="backgroundCW" class="color-well"/>
<spring flex="1"/>

22
editor/ui/dialogs/content/EdDialogCommon.js
Просмотреть файл

@ -359,7 +359,7 @@ function AppendStringToMenulist(menulist, string)
var menuItem = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menuitem");
if (menuItem)
{
menuItem.setAttribute("value", string);
menuItem.setAttribute("label", string);
menupopup.appendChild(menuItem);
return menuItem;
}
@ -367,7 +367,7 @@ function AppendStringToMenulist(menulist, string)
return null;
}
function AppendValueAndDataToMenulist(menulist, valueStr, dataStr)
function AppendLabelAndValueToMenulist(menulist, labelStr, valueStr)
{
if (menulist)
{
@ -387,8 +387,8 @@ function AppendValueAndDataToMenulist(menulist, valueStr, dataStr)
var menuItem = document.createElementNS("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul", "menuitem");
if (menuItem)
{
menuItem.setAttribute("label", labelStr);
menuItem.setAttribute("value", valueStr);
menuItem.setAttribute("data", dataStr);
menupopup.appendChild(menuItem);
return menuItem;
}
@ -415,7 +415,7 @@ function ClearMenulist(menulist)
<treechildren>
<treeitem>
<treerow>
<treecell value="the text the user sees"/>
<treecell label="the text the user sees"/>
*/
function AppendStringToTreelistById(tree, stringID)
@ -455,7 +455,7 @@ function AppendStringToTreelist(tree, string)
treerow.appendChild(treecell);
treeitem.appendChild(treerow);
treechildren.appendChild(treeitem)
treecell.setAttribute("value", string);
treecell.setAttribute("label", string);
//var len = Number(tree.getAttribute("length"));
//if (!len) len = -1;
tree.setAttribute("length", treechildren.childNodes.length);
@ -487,7 +487,7 @@ function ReplaceStringInTreeList(tree, index, string)
var row = childNodes.item(index).firstChild;
if (row && row.firstChild)
{
row.firstChild.setAttribute("value", string);
row.firstChild.setAttribute("label", string);
}
}
}
@ -531,7 +531,7 @@ function GetSelectedTreelistAttribute(tree, attr)
function GetSelectedTreelistValue(tree)
{
return GetSelectedTreelistAttribute(tree,"value")
return GetSelectedTreelistAttribute(tree,"label")
}
function RemoveSelectedTreelistItem(tree)
@ -563,7 +563,7 @@ function GetTreelistValueAt(tree, index)
{
var item = tree.getItemAtIndex(index);
if (item && item.firstChild && item.firstChild.firstChild)
return item.firstChild.firstChild.getAttribute("value");
return item.firstChild.firstChild.getAttribute("label");
}
return "";
}
@ -743,7 +743,7 @@ function onMoreFewer()
dialog.MoreSection.setAttribute("collapsed","true");
window.sizeToContent();
dialog.MoreFewerButton.setAttribute("more","0");
dialog.MoreFewerButton.setAttribute("value",GetString("MoreProperties"));
dialog.MoreFewerButton.setAttribute("label",GetString("MoreProperties"));
SeeMore = false;
}
else
@ -751,7 +751,7 @@ function onMoreFewer()
dialog.MoreSection.removeAttribute("collapsed");
window.sizeToContent();
dialog.MoreFewerButton.setAttribute("more","1");
dialog.MoreFewerButton.setAttribute("value",GetString("FewerProperties"));
dialog.MoreFewerButton.setAttribute("label",GetString("FewerProperties"));
SeeMore = true;
}
}
@ -771,7 +771,7 @@ function GetPrefs()
}
catch(ex)
{
dump("failed to get prefs service!\n");
dump("failed to get prefs service!\n");
}
return null;
}

6
editor/ui/dialogs/content/EdDialogOverlay.xul
Просмотреть файл

@ -25,14 +25,14 @@
-->
<overlay id="EdDialogOverlay"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<box id="AdvancedEdit" orient="vertical" flex="1">
<box flex="1" style="margin-top: 0.2em" autostretch="never">
<!-- This will right-align the button -->
<spring flex="1"/>
<button class="dialog" id="AdvancedEditButton1" oncommand="onAdvancedEdit()" value="&AdvancedEditButton.label;"
<button class="dialog" id="AdvancedEditButton1" oncommand="onAdvancedEdit()" label="&AdvancedEditButton.label;"
tooltip="aTooltip" tooltiptext="&AdvancedEditButton.tooltip;"/>
</box>
<separator class="groove"/>

8
editor/ui/dialogs/content/EdDictionary.xul
Просмотреть файл

@ -51,7 +51,7 @@
</row>
<row>
<textbox id="WordInput" flex="1"/>
<button class="dialog" flex="1" id="AddWord" oncommand="AddWord()" value="&AddButton.label;"/>
<button class="dialog" flex="1" id="AddWord" oncommand="AddWord()" label="&AddButton.label;"/>
</row>
<row>
<text class="label" value="&DictionaryList.label;"/>
@ -62,12 +62,12 @@
<treecolgroup><treecol flex="1"/></treecolgroup>
</tree>
<box orient="vertical" flex="1">
<button class="dialog" id="ReplaceWord" oncommand="ReplaceWord()" value="&ReplaceButton.label;"/>
<button class="dialog" id="ReplaceWord" oncommand="ReplaceWord()" label="&ReplaceButton.label;"/>
<spring class="spacer"/>
<button class="dialog" id="RemoveWord" oncommand="RemoveWord()" value="&RemoveButton.label;"/>
<button class="dialog" id="RemoveWord" oncommand="RemoveWord()" label="&RemoveButton.label;"/>
<spring class="spacer"/>
<spring flex="1"/>
<button class="exit-dialog" id="close" value="&CloseButton.label;" default="true" oncommand="Close();"/>
<button class="exit-dialog" id="close" label="&CloseButton.label;" default="true" oncommand="Close();"/>
</box>
</row>
</rows>

18
editor/ui/dialogs/content/EdHLineProps.xul
Просмотреть файл

@ -33,8 +33,8 @@
<!DOCTYPE window SYSTEM "chrome://editor/locale/EditorHLineProperties.dtd">
<window class="dialog" title="&windowTitle.label;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
onload = "Startup()"
orient="vertical">
@ -48,7 +48,7 @@
<keyset id="keyset"/>
<popupset id="aTooltipSet" />
<titledbox orient="vertical"><title value="&dimensionsBox.label;"/>
<titledbox orient="vertical"><label value="&dimensionsBox.label;"/>
<grid>
<columns><column/><column/><column /></columns>
<rows>
@ -65,19 +65,19 @@
</row>
</rows>
</grid>
<checkbox id="3dShading" value="&threeDShading.label;" />
<checkbox id="3dShading" label="&threeDShading.label;" />
</titledbox>
<titledbox><title align="left" value="&alignmentBox.label;"/>
<titledbox><label align="left" value="&alignmentBox.label;"/>
<radiogroup id="alignmentGroup" orient="horizontal">
<spring class="spacer"/>
<radio group="alignmentGroup" id="leftAlign" value="&leftRadio.value;" />
<radio group="alignmentGroup" id="centerAlign" value="&centerRadio.value;" />
<radio group="alignmentGroup" id="rightAlign" value="&rightRadio.value;" />
<radio group="alignmentGroup" id="leftAlign" label="&leftRadio.value;" />
<radio group="alignmentGroup" id="centerAlign" label="&centerRadio.value;" />
<radio group="alignmentGroup" id="rightAlign" label="&rightRadio.value;" />
</radiogroup>
</titledbox>
<spring class="spacer"/>
<box>
<button class="dialog" id="SaveDefault" value="&saveSettings.label;"
<button class="dialog" id="SaveDefault" label="&saveSettings.label;"
oncommand="onSaveDefault()"
tooltip="aTooltip" tooltiptext="&saveSettings.tooltip;" />
<spring flex="1"/>

4
editor/ui/dialogs/content/EdImageMap.js
Просмотреть файл

@ -141,14 +141,14 @@ function hideToolbar(){
// If it is show it
document.getElementById("toolbar").setAttribute("collapsed", "false");
// Set the menu items text back to "Hide Toolbar"
document.getElementById("view_hidetoolbar").setAttribute("value", GetString("HideToolbar"));
document.getElementById("view_hidetoolbar").setAttribute("label", GetString("HideToolbar"));
tHide = false
}
else{
// If not hide it
document.getElementById("toolbar").setAttribute("collapsed", "true");
//Set the menu items text to "Show Toolbar"
document.getElementById("view_hidetoolbar").setAttribute("value", GetString("ShowToolbar"));
document.getElementById("view_hidetoolbar").setAttribute("label", GetString("ShowToolbar"));
tHide = true;
}
}

52
editor/ui/dialogs/content/EdImageMap.xul
Просмотреть файл

@ -19,8 +19,8 @@
- Rights Reserved.
-
- Contributor(s):
- Brian King
- Dan Haddix
- Brian King
- Dan Haddix
-->
<?xml-stylesheet href="chrome://editor/skin/EdImageMap.css" type="text/css"?>
@ -45,8 +45,8 @@
width="640" height="480"
>
<!--
screenX="10" screenY="10"
persist="screenX screenY width height"
screenX="10" screenY="10"
persist="screenX screenY width height"
-->
<!-- Methods common to all editor dialogs -->
@ -77,21 +77,21 @@
</keyset>
<broadcaster id="Map:Clear" value="&clearCmd.label;" oncommand=""/>
<broadcaster id="Map:Close" value="&closeCmd.label;" oncommand="exitImageMap()"/>
<broadcaster id="Map:Copy" value="&copyCmd.label;" disabled="true" oncommand="cutCopy()"/>
<broadcaster id="Map:Cut" value="&cutCmd.label;" disabled="true" oncommand="cutCopy(true)"/>
<broadcaster id="Map:Paste" value="&pasteCmd.label;" disabled="true" oncommand="paste()"/>
<broadcaster id="Map:Props" value="&propsCmd.label;" oncommand="hotSpotProps(currentElement[0])"/>
<broadcaster id="Map:ViewToolbar" value="&showhideTbarCmd.label;" oncommand="hideToolbar()"/>
<broadcaster id="Map:Apercent" value="&apercentCmd.label;" checked="true" oncommand="zoom('', 1)"/>
<broadcaster id="Map:Bpercent" value="&bpercentCmd.label;" oncommand="zoom('', 2)"/>
<broadcaster id="Map:Cpercent" value="&cpercentCmd.label;" oncommand="zoom('', 4)"/>
<broadcaster id="Map:Contrast" value="&contrastCmd.label;" oncommand="highContrast()" toggled="0" checked="false"/>
<broadcaster id="Map:About" value="&aboutCmd.label;" onaction=""/>
<broadcaster id="Map:ZoomIn" value="&zoominCmd.label;" oncommand="zoom('in')"/>
<broadcaster id="Map:ZoomOut" value="&zoomoutCmd.label;" disabled="true" oncommand="zoom('out')"/>
<broadcaster id="Map:SelectAll" value="&selectallCmd.label;" oncommand="selectAll()"/>
<broadcaster id="Map:Clear" label="&clearCmd.label;" oncommand=""/>
<broadcaster id="Map:Close" label="&closeCmd.label;" oncommand="exitImageMap()"/>
<broadcaster id="Map:Copy" label="&copyCmd.label;" disabled="true" oncommand="cutCopy()"/>
<broadcaster id="Map:Cut" label="&cutCmd.label;" disabled="true" oncommand="cutCopy(true)"/>
<broadcaster id="Map:Paste" label="&pasteCmd.label;" disabled="true" oncommand="paste()"/>
<broadcaster id="Map:Props" label="&propsCmd.label;" oncommand="hotSpotProps(currentElement[0])"/>
<broadcaster id="Map:ViewToolbar" label="&showhideTbarCmd.label;" oncommand="hideToolbar()"/>
<broadcaster id="Map:Apercent" label="&apercentCmd.label;" checked="true" oncommand="zoom('', 1)"/>
<broadcaster id="Map:Bpercent" label="&bpercentCmd.label;" oncommand="zoom('', 2)"/>
<broadcaster id="Map:Cpercent" label="&cpercentCmd.label;" oncommand="zoom('', 4)"/>
<broadcaster id="Map:Contrast" label="&contrastCmd.label;" oncommand="highContrast()" toggled="0" checked="false"/>
<broadcaster id="Map:About" label="&aboutCmd.label;" onaction=""/>
<broadcaster id="Map:ZoomIn" label="&zoominCmd.label;" oncommand="zoom('in')"/>
<broadcaster id="Map:ZoomOut" label="&zoomoutCmd.label;" disabled="true" oncommand="zoom('out')"/>
<broadcaster id="Map:SelectAll" label="&selectallCmd.label;" oncommand="selectAll()"/>
<!-- Interim hack to transition from nsIXULWindowCallbacks/ShowWindowWithArgs -->
<broadcaster id="dialog.start" ready="false"/>
@ -100,7 +100,7 @@
<toolbox>
<menubar>
<!-- File menu -->
<menu id="mapfileMenu" value="&mapfileMenu.label;" accesskey="&mapfilemenu.accesskey;">
<menu id="mapfileMenu" label="&mapfileMenu.label;" accesskey="&mapfilemenu.accesskey;">
<menupopup>
<menuitem accesskey="&mapfileclear.accesskey;" key="mapclearkb" observes="Map:Clear"/>
<menuitem accesskey="&mapfileclose.accesskey;" key="mapclosekb" observes="Map:Close"/>
@ -108,7 +108,7 @@
</menu>
<!-- Edit menu -->
<menu id="mapeditMenu" value="&mapeditMenu.label;" accesskey="&mapeditmenu.accesskey;">
<menu id="mapeditMenu" label="&mapeditMenu.label;" accesskey="&mapeditmenu.accesskey;">
<menupopup>
<menuitem accesskey="&mapselectall.accesskey;" key="mapselectkb" observes="Map:SelectAll"/>
<menuitem accesskey="&mapeditcut.accesskey;" key="mapcutkb" observes="Map:Cut"/>
@ -120,10 +120,10 @@
</menu>
<!-- View menu -->
<menu id="mapviewMenu" value="&mapviewMenu.label;" accesskey="&mapviewmenu.accesskey;">
<menu id="mapviewMenu" label="&mapviewMenu.label;" accesskey="&mapviewmenu.accesskey;">
<menupopup>
<menuitem id="view_hidetoolbar" accesskey="&mapviewtbar.accesskey;" key="maptbarkb" observes="Map:ViewToolbar"/>
<menu id="mapscalingMenu" value="&mapviewScale.label;" accesskey="&mapviewscale.accesskey;">
<menu id="mapscalingMenu" label="&mapviewScale.label;" accesskey="&mapviewscale.accesskey;">
<menupopup>
<menuitem accesskey="&zoomone.accesskey;" key="" observes="Map:Apercent"/>
<menuitem accesskey="&zoomtwo.accesskey;" key="" observes="Map:Bpercent"/>
@ -135,7 +135,7 @@
</menupopup>
</menu>
<menu id="maphelpMenu" value="&maphelpMenu.label;" accesskey="&maphelpmenu.accesskey;">
<menu id="maphelpMenu" label="&maphelpMenu.label;" accesskey="&maphelpmenu.accesskey;">
<menupopup>
<menuitem accesskey="&about.accesskey;" observes="Map:About"/>
</menupopup>
@ -184,8 +184,8 @@
<!-- Cheap hack until I get key events hooked up
<button
class = "push dialog"
id = "DelButton"
value="&delSpotCmd.label;"
id = "DelButton"
label="&delSpotCmd.label;"
oncommand="deleteElement(currentElement);"/> -->
<spring flex="1"/>

2
editor/ui/dialogs/content/EdImageMapHotSpot.js
Просмотреть файл

@ -74,7 +74,7 @@ function onOK()
}
function changeTarget() {
dialog.targetInput.value=dialog.commonInput.data;
dialog.targetInput.value=dialog.commonInput.value;
}
function chooseFile()

22
editor/ui/dialogs/content/EdImageMapHotSpot.xul
Просмотреть файл

@ -19,8 +19,8 @@
- Rights Reserved.
-
- Contributor(s):
- Brian King
- Dan Haddix
- Brian King
- Dan Haddix
-->
<?xml-stylesheet href="chrome://editor/skin/" type="text/css"?>
@ -34,7 +34,7 @@
xmlns:html="http://www.w3.org/1999/xhtml"
onload = "Startup()"
orient="vertical"
>
>
<!-- Methods common to all editor dialogs -->
<script type="application/x-javascript" src="chrome://editor/content/EdDialogCommon.js"/>
@ -46,7 +46,7 @@
<broadcaster id="args" value=""/>
<titledbox orient="vertical" flex="1">
<title id="titleInput" value="&link.label;"/>
<label id="titleInput" value="&link.label;"/>
<grid>
<columns><column/><column/><column/></columns>
@ -56,7 +56,7 @@
<textbox id="urlInput" class="MinWidth20em" value="http://"/>
<button class="dialog" id="Browse" oncommand="chooseFile()" value="&browseButton.label;"/>
<button class="dialog" id="Browse" oncommand="chooseFile()" label="&browseButton.label;"/>
</row>
<row>
@ -69,7 +69,7 @@
</titledbox>
<titledbox orient="vertical" flex="1">
<title id="targetLabel" value="&targetFieldset.label;"/>
<label id="targetLabel" value="&targetFieldset.label;"/>
<grid>
<columns><column/><column/><column/></columns>
<rows>
@ -83,11 +83,11 @@
<menulist id="commonInput" oncommand="changeTarget()">
<menupopup valign="middle">
<menuitem class="middle" data="" value="&none.value;"/>
<menuitem class="middle" data="_self" value="&same.value;"/>
<menuitem class="middle" data="_top" value="&whole.value;"/>
<menuitem class="middle" data="_blank" value="&new.value;"/>
<menuitem class="middle" data="_parent" value="&parent.value;"/>
<menuitem class="middle" value="" label="&none.value;"/>
<menuitem class="middle" value="_self" label="&same.value;"/>
<menuitem class="middle" value="_top" label="&whole.value;"/>
<menuitem class="middle" value="_blank" label="&new.value;"/>
<menuitem class="middle" value="_parent" label="&parent.value;"/>
</menupopup>
</menulist>

99
editor/ui/dialogs/content/EdImageProps.js
Просмотреть файл

@ -225,20 +225,20 @@ function InitDialog()
// Get alignment setting
var align = globalElement.getAttribute("align");
if (align) {
align = align.toLowerCase();
align = align.toLowerCase();
}
var imgClass;
var textID;
switch ( align )
{
case "top":
case "center":
case "right":
case "left":
dialog.alignTypeSelect.data = align;
case "top":
case "center":
case "right":
case "left":
dialog.alignTypeSelect.value = align;
break;
default: // Default or "bottom"
dialog.alignTypeSelect.data = "bottom";
default: // Default or "bottom"
dialog.alignTypeSelect.value = "bottom";
}
// we want to force an update so initialize "wasEnableAll" to be the opposite of what the actual state is
@ -397,7 +397,7 @@ function onMoreFewerImage()
if (SeeMore)
{
dialog.MoreSection.setAttribute("collapsed","true");
dialog.MoreFewerButton.setAttribute("value", GetString("MoreProperties"));
dialog.MoreFewerButton.setAttribute("label", GetString("MoreProperties"));
dialog.MoreFewerButton.setAttribute("more","0");
SeeMore = false;
// Show the "Advanced Edit" button on same line as "More Properties"
@ -409,8 +409,7 @@ function onMoreFewerImage()
else
{
dialog.MoreSection.setAttribute("collapsed","false");
dialog.MoreFewerButton.setAttribute("value", "");
dialog.MoreFewerButton.setAttribute("value", GetString("FewerProperties"));
dialog.MoreFewerButton.setAttribute("label", GetString("FewerProperties"));
dialog.MoreFewerButton.setAttribute("more","1");
SeeMore = true;
@ -591,10 +590,10 @@ function ValidateData()
}
else
{
isPercentWidth = (dialog.widthUnitsMenulist.selectedIndex == 1);
isPercentHeight = (dialog.heightUnitsMenulist.selectedIndex == 1);
isPercentWidth = (dialog.widthUnitsMenulist.selectedIndex == 1);
isPercentHeight = (dialog.heightUnitsMenulist.selectedIndex == 1);
maxLimitWidth = isPercentWidth ? 100 : maxPixels; // Defined in EdDialogCommon.js
maxLimitWidth = isPercentWidth ? 100 : maxPixels; // Defined in EdDialogCommon.js
width = ValidateNumberString(dialog.widthInput.value, 1, maxLimitWidth);
if (width == "")
{
@ -606,7 +605,7 @@ function ValidateData()
if (isPercentWidth)
width = width + "%";
maxLimitHeight = isPercentHeight ? 100 : maxPixels; // Defined in EdDialogCommon.js
maxLimitHeight = isPercentHeight ? 100 : maxPixels; // Defined in EdDialogCommon.js
height = ValidateNumberString(dialog.heightInput.value, 1, maxLimitHeight);
if (height == "")
{
@ -633,52 +632,52 @@ function ValidateData()
// spacing attributes
var amount;
if ( dialog.imagelrInput.value )
{
amount = ValidateNumberString(dialog.imagelrInput.value, 0, maxPixels);
if (amount == "")
return false;
if ( dialog.imagelrInput.value )
{
amount = ValidateNumberString(dialog.imagelrInput.value, 0, maxPixels);
if (amount == "")
return false;
globalElement.setAttribute( "hspace", amount );
}
else
globalElement.removeAttribute( "hspace" );
if ( dialog.imagetbInput.value )
{
var vspace = ValidateNumberString(dialog.imagetbInput.value, 0, maxPixels);
if (vspace == "")
return false;
globalElement.setAttribute( "vspace", vspace );
}
else
globalElement.removeAttribute( "vspace" );
if ( dialog.imagetbInput.value )
{
var vspace = ValidateNumberString(dialog.imagetbInput.value, 0, maxPixels);
if (vspace == "")
return false;
globalElement.setAttribute( "vspace", vspace );
}
else
globalElement.removeAttribute( "vspace" );
// note this is deprecated and should be converted to stylesheets
if ( dialog.border.value )
{
var border = ValidateNumberString(dialog.border.value, 0, maxPixels);
if (border == "")
return false;
globalElement.setAttribute( "border", border );
}
else
globalElement.removeAttribute( "border" );
if ( dialog.border.value )
{
var border = ValidateNumberString(dialog.border.value, 0, maxPixels);
if (border == "")
return false;
globalElement.setAttribute( "border", border );
}
else
globalElement.removeAttribute( "border" );
// Default or setting "bottom" means don't set the attribute
// Default or setting "bottom" means don't set the attribute
// Note that the attributes "left" and "right" are opposite
// of what we use in the UI, which describes where the TEXT wraps,
// not the image location (which is what the HTML describes)
switch ( dialog.alignTypeSelect.data )
{
case "top":
case "center":
case "right":
case "left":
globalElement.setAttribute( "align", dialog.alignTypeSelect.data );
switch ( dialog.alignTypeSelect.value )
{
case "top":
case "center":
case "right":
case "left":
globalElement.setAttribute( "align", dialog.alignTypeSelect.value );
break;
default:
globalElement.removeAttribute( "align" );
}
}
return true;
}
@ -688,9 +687,9 @@ function onOK()
// handle insertion of new image
if (ValidateData())
{
// Assign to map if there is one
if ( globalMap )
{
// Assign to map if there is one
if ( globalMap )
{
var mapName = globalMap.getAttribute("name");
dump("mapName = "+mapName+"\n");
if (mapName != "")

28
editor/ui/dialogs/content/EdImageProps.xul
Просмотреть файл

@ -54,7 +54,7 @@
<popupset id="aTooltipSet" />
<titledbox orient="vertical">
<title value="&locationBox.label;"/>
<label value="&locationBox.label;"/>
<!--/////// Src URL and ALT Text //////-->
<grid>
<columns><column/><column/><column/></columns>
@ -132,19 +132,19 @@
<box orient="vertical">
<!-- //////// Image Dimensions //////// -->
<titledbox orient="vertical" flex="1">
<title id="dimensionsLabel" value="&dimensionsBox.label;"/>
<label id="dimensionsLabel" value="&dimensionsBox.label;"/>
<box>
<radiogroup id="imgSizeGroup" orient="vertical">
<radio
group = "imgSizeGroup"
id = "actualSizeRadio"
value = "&actualSizeRadio.label;"
label = "&actualSizeRadio.label;"
tooltip = "aTooltip" tooltiptext="&actualSizeRadio.tooltip;"
oncommand = "SetActualSize()"/>
<radio
group = "imgSizeGroup"
id = "customSizeRadio"
value = "&customSizeRadio.label;"
label = "&customSizeRadio.label;"
tooltip = "aTooltip" tooltiptext="&customSizeRadio.tooltip;"
oncommand = "doDimensionEnabling();" />
</radiogroup>
@ -198,20 +198,20 @@
</titledbox>
<!--////// IMAGE MAP BUTTONS //////-->
<titledbox orient="vertical" flex="1">
<title id="imagemapLabel" value="&imagemapBox.label;"/>
<label id="imagemapLabel" value="&imagemapBox.label;"/>
<box flex="1">
<button
class = "dialog"
id = "editImageMap"
oncommand = "editImageMap()"
tooltip = "aTooltip" tooltiptext="&editImageMapButton.tooltip;"
value = "&editImageMapButton.label;"
label = "&editImageMapButton.label;"
flex = "1"/>
<button
class = "dialog"
id = "removeImageMap"
oncommand = "removeImageMap()"
value = "&removeImageMapButton.label;"
label = "&removeImageMapButton.label;"
flex = "1"/>
</box>
<spring class="spacer"/>
@ -222,22 +222,22 @@
<box orient="vertical" flex="1">
<!--//////// Alignment ////////-->
<titledbox flex="1" orient="vertical">
<title id="alignLabel" value="&alignment.label;"/>
<label id="alignLabel" value="&alignment.label;"/>
<spring class="spacer"/>
<menulist id="alignTypeSelect" class="align-menu">
<menupopup valign="middle">
<menuitem class="align-menu" data="top" value="&topPopup.value;"/>
<menuitem class="align-menu" data="center" value="&centerPopup.value;"/>
<menuitem class="align-menu" data="bottom" value="&bottomPopup.value;"/>
<menuitem class="align-menu" data="left" value="&wrapLeftPopup.value;"/>
<menuitem class="align-menu" data="right" value="&wrapRightPopup.value;"/>
<menuitem class="align-menu" value="top" label="&topPopup.value;"/>
<menuitem class="align-menu" value="center" label="&centerPopup.value;"/>
<menuitem class="align-menu" value="bottom" label="&bottomPopup.value;"/>
<menuitem class="align-menu" value="left" label="&wrapLeftPopup.value;"/>
<menuitem class="align-menu" value="right" label="&wrapRightPopup.value;"/>
</menupopup>
</menulist>
</titledbox>
<!--//////// Borders and Spacing ////////-->
<titledbox flex="1">
<title id="spacingLabel" value="&spacingBox.label;"/>
<label id="spacingLabel" value="&spacingBox.label;"/>
<grid>
<columns><column/><column/><column/></columns>
<rows>

2
editor/ui/dialogs/content/EdInsSrc.js
Просмотреть файл

@ -33,7 +33,7 @@ function Startup()
if (okButton)
{
okButton.removeAttribute("default");
okButton.setAttribute("value",GetString("Insert"));
okButton.setAttribute("label",GetString("Insert"));
}
// Create dialog object to store controls for easy access
srcInput = document.getElementById("srcInput");

4
editor/ui/dialogs/content/EdInsertChars.js
Просмотреть файл

@ -48,11 +48,11 @@ function Startup()
// Change "Ok" to "Insert, change "Cancel" to "Close"
var okButton = document.getElementById("ok");
if (okButton)
okButton.setAttribute("value", GetString("Insert"));
okButton.setAttribute("label", GetString("Insert"));
var cancelButton = document.getElementById("cancel");
if (cancelButton)
cancelButton.setAttribute("value", GetString("Close"));
cancelButton.setAttribute("label", GetString("Close"));
// Set a variable on the opener window so we
// can track ownership of close this window with it

12
editor/ui/dialogs/content/EdInsertChars.xul
Просмотреть файл

@ -44,13 +44,13 @@
<keyset id="keyset"/>
<broadcaster id="args" value=""/>
<titledbox orient="vertical"><title value="&category.label;"/>
<titledbox orient="vertical"><label value="&category.label;"/>
<radiogroup id="CatGrp" orient="vertical" persist="category letter_index char_index">
<radio group="CatGrp" id="AccentUpper" value="&accentUpper.label;" oncommand="ChangeCategory(this.id)"/>
<radio group="CatGrp" id="AccentLower" value="&accentLower.label;" oncommand="ChangeCategory(this.id)"/>
<radio group="CatGrp" id="Upper" value="&otherUpper.label;" oncommand="ChangeCategory(this.id)"/>
<radio group="CatGrp" id="Lower" value="&otherLower.label;" oncommand="ChangeCategory(this.id)"/>
<radio group="CatGrp" id="Symbol" value="&commonSymbols.label;" oncommand="ChangeCategory(this.id)"/>
<radio group="CatGrp" id="AccentUpper" label="&accentUpper.label;" oncommand="ChangeCategory(this.id)"/>
<radio group="CatGrp" id="AccentLower" label="&accentLower.label;" oncommand="ChangeCategory(this.id)"/>
<radio group="CatGrp" id="Upper" label="&otherUpper.label;" oncommand="ChangeCategory(this.id)"/>
<radio group="CatGrp" id="Lower" label="&otherLower.label;" oncommand="ChangeCategory(this.id)"/>
<radio group="CatGrp" id="Symbol" label="&commonSymbols.label;" oncommand="ChangeCategory(this.id)"/>
</radiogroup>
<spring class="spacer"/>
</titledbox>

4
editor/ui/dialogs/content/EdInsertTable.xul
Просмотреть файл

@ -48,7 +48,7 @@
<broadcaster id="args" value=""/>
<keyset id="keyset"/>
<popupset id="aTooltipSet" />
<titledbox orient="vertical"><title value="&size.label;"/>
<titledbox orient="vertical"><label value="&size.label;"/>
<grid>
<columns><column/><column/><column/></columns>
<rows>
@ -82,5 +82,5 @@
<!-- from EdDialogOverlay -->
<box id="AdvancedEdit"/>
<!-- from global dialogOverlay -->
<box id="okCancelButtons"/>
<box id="okCancelButtons"/>
</window>

10
editor/ui/dialogs/content/EdLinkProps.xul
Просмотреть файл

@ -32,8 +32,8 @@
<window title="&windowTitle.label;"
class="dialog"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
onload = "Startup()"
orient="vertical" >
@ -46,12 +46,12 @@
<keyset id="keyset"/>
<box orient="vertical" style="min-width: 20em">
<titledbox orient="vertical"><title id="linkTextCaption" align="left"/>
<titledbox orient="vertical"><label id="linkTextCaption" align="left"/>
<text class="label" id="linkTextMessage"/>
<textbox id="linkTextInput" flex="1" oninput="ChangeText()"/>
</titledbox>
<titledbox orient="vertical"><title value="&LinkURLBox.label;"/>
<titledbox orient="vertical"><label value="&LinkURLBox.label;"/>
<text class="label" value="&LinkURLEditField.label;"/>
<box autostretch="never" valign="middle">
<textbox id="hrefInput" flex="1" style="min-width: 18em" oninput="ChangeLocation()"/>
@ -80,5 +80,5 @@
<!-- from EdDialogOverlay -->
<box id="AdvancedEdit"/>
<!-- from global dialogOverlay -->
<box id="okCancelButtons"/>
<box id="okCancelButtons"/>
</window>

18
editor/ui/dialogs/content/EdListProps.xul
Просмотреть файл

@ -43,18 +43,18 @@
<broadcaster id="args" value=""/>
<spring id="location" offsetY="50" persist="offsetX offsetY"/>
<titledbox orient="vertical" flex="1"><title value="&ListType.label;"/>
<titledbox orient="vertical" flex="1"><label value="&ListType.label;"/>
<menulist id="ListType" oncommand="SelectListType()">
<menupopup>
<menuitem value="&none.value;"/>
<menuitem value="&bulletList.value;"/>
<menuitem value="&numberList.value;"/>
<menuitem value="&definitionList.value;"/>
<menuitem label="&none.value;"/>
<menuitem label="&bulletList.value;"/>
<menuitem label="&numberList.value;"/>
<menuitem label="&definitionList.value;"/>
</menupopup>
</menulist>
<radiogroup id="RadioGroup" orient="vertical" index="0" persist="index">
<radio group="RadioGroup" id="ChangeAll" value="&changeEntireListRadio.label;"/>
<radio group="RadioGroup" id="ChangeSelected" value="&changeSelectedRadio.label;"/>
<radio group="RadioGroup" id="ChangeAll" label="&changeEntireListRadio.label;"/>
<radio group="RadioGroup" id="ChangeSelected" label="&changeSelectedRadio.label;"/>
</radiogroup>
</titledbox>
<spring class="spacer"/>
@ -62,7 +62,7 @@
<!-- message text and list items are set in JS
text value should be identical to string with id=BulletStyle in editor.properties
-->
<titledbox orient="vertical" flex="1"><title id="BulletStyleLabel" value="&bulletStyle.label;"/>
<titledbox orient="vertical" flex="1"><label id="BulletStyleLabel" value="&bulletStyle.label;"/>
<menulist class="MinWidth10em" id="BulletStyle" oncommand="SelectBulletStyle()"/>
<spring class="spacer"/>
<box>
@ -75,6 +75,6 @@
<!-- from EdDialogOverlay -->
<box id="AdvancedEdit"/>
<!-- from global dialogOverlay -->
<box id="okCancelButtons"/>
<box id="okCancelButtons"/>
</window>

2
editor/ui/dialogs/content/EdSpellCheck.js
Просмотреть файл

@ -180,7 +180,7 @@ function InitLanguageMenu(curLang)
if (curLang && dictList[i] == curLang)
defaultIndex = i;
AppendValueAndDataToMenulist(dialog.LanguageMenulist, menuStr, dictList[i]);
AppendLabelAndValueToMenulist(dialog.LanguageMenulist, menuStr, dictList[i]);
}
// Now make sure the correct item in the menu list is selected.

18
editor/ui/dialogs/content/EdSpellCheck.xul
Просмотреть файл

@ -58,7 +58,7 @@
<text class="label" id="ReplaceWordLabel" value="&wordEditField.label;"/>
<box valign="middle" autostretch="never">
<textbox id="ReplaceWord" oninput="ChangeReplaceWord()" style="width: 14em"/>
<button id="CheckWord" oncommand="CheckWord()" value="&checkwordButton.label;"/>
<button id="CheckWord" oncommand="CheckWord()" label="&checkwordButton.label;"/>
</box>
</row>
</rows>
@ -76,18 +76,18 @@
<columns><column style="min-width: 8em"/><column style="min-width: 8em"/></columns>
<rows>
<row>
<button class="dialog" id="Ignore" oncommand="Ignore()" value="&ignoreButton.label;"/>
<button class="dialog" id="IgnoreAll" oncommand="IgnoreAll()" value="&ignoreAllButton.label;"/>
<button class="dialog" id="Ignore" oncommand="Ignore()" label="&ignoreButton.label;"/>
<button class="dialog" id="IgnoreAll" oncommand="IgnoreAll()" label="&ignoreAllButton.label;"/>
</row>
<row>
<button class="dialog" id="Replace" oncommand="Replace()" value="&changeButton.label;"/>
<button class="dialog" id="ReplaceAll" oncommand="ReplaceAll()" value="&changeAllButton.label;"/>
<button class="dialog" id="Replace" oncommand="Replace()" label="&changeButton.label;"/>
<button class="dialog" id="ReplaceAll" oncommand="ReplaceAll()" label="&changeAllButton.label;"/>
</row>
<spring class="bigspacer"/>
<text class="label" value="&userDictionary.label;"/>
<row>
<button class="dialog" id="AddToDictionary" oncommand="AddToDictionary()" value="&addToUserDictionaryButton.label;"/>
<button class="dialog" id="EditDictionary" oncommand="EditDictionary()" value="&editUserDictionaryButton.label;"/>
<button class="dialog" id="AddToDictionary" oncommand="AddToDictionary()" label="&addToUserDictionaryButton.label;"/>
<button class="dialog" id="EditDictionary" oncommand="EditDictionary()" label="&editUserDictionaryButton.label;"/>
</row>
</rows>
</grid>
@ -100,8 +100,8 @@
<menulist id="LanguageMenulist" oncommand="SelectLanguage()"/>
<!-- contents are appended by JS -->
<box flex="1">
<button class="dialog" id="Recheck" flex="1" value="&recheckButton.label;" oncommand="Recheck()"/>
<button class="dialog" id="Close" flex="1" value="&closeButton.label;" oncommand="onClose()"/>
<button class="dialog" id="Recheck" flex="1" label="&recheckButton.label;" oncommand="Recheck()"/>
<button class="dialog" id="Close" flex="1" label="&closeButton.label;" oncommand="onClose()"/>
</box>
</row>
</rows>

8
editor/ui/dialogs/content/EdTableProps.js
Просмотреть файл

@ -832,7 +832,7 @@ function ValidateNumber(inputWidgetID, listWidget, minVal, maxVal, element, attN
function SetAlign(listID, defaultValue, element, attName)
{
var value = document.getElementById(listID).selectedItem.data;
var value = document.getElementById(listID).selectedItem.value;
if (value == defaultValue)
element.removeAttribute(attName);
else
@ -904,7 +904,7 @@ function ValidateCellData()
if (dialog.CellHAlignCheckbox.checked)
{
var hAlign = dialog.CellHAlignList.selectedItem.data;
var hAlign = dialog.CellHAlignList.selectedItem.value;
// Horizontal alignment is complicated by "char" type
// We don't change current values if user didn't edit alignment
@ -1023,7 +1023,7 @@ function ConfirmDeleteCells()
function ApplyTableAttributes()
{
var newAlign = dialog.TableCaptionList.selectedItem.data;
var newAlign = dialog.TableCaptionList.selectedItem.value;
if (!newAlign) newAlign = "";
if (TableCaptionElement)
@ -1301,7 +1301,7 @@ function SetCloseButton()
// Change text on "Cancel" button after Apply is used
if (!ApplyUsed)
{
document.getElementById("cancel").setAttribute("value",GetString("Close"));
document.getElementById("cancel").setAttribute("label",GetString("Close"));
ApplyUsed = true;
}
}

78
editor/ui/dialogs/content/EdTableProps.xul
Просмотреть файл

@ -47,15 +47,15 @@
<keyset id="keyset"/>
<tabcontrol align="vertical" orient="vertical">
<tabbox flex="1">
<tab id="TableTab" oncommand="SelectTableTab()" value="&tableTab.label;"/>
<tab id="CellTab" oncommand="SelectCellTab()" value="&cellTab.label;"/>
</tabbox>
<tabbox flex="1">
<tab id="TableTab" oncommand="SelectTableTab()" label="&tableTab.label;"/>
<tab id="CellTab" oncommand="SelectCellTab()" label="&cellTab.label;"/>
</tabbox>
<tabpanel orient="vertical" id="TabPanel">
<!-- TABLE PANEL -->
<box id="TablePanel" orient="vertical">
<titledbox><title value="&size.label;"/>
<titledbox><label value="&size.label;"/>
<grid>
<columns><column/><column/></columns>
<rows>
@ -81,7 +81,7 @@
</rows>
</grid>
</titledbox>
<titledbox orient="vertical"><title align="left" value="&tableBorderSpacing.label;"/>
<titledbox orient="vertical"><label align="left" value="&tableBorderSpacing.label;"/>
<grid>
<columns><column/><column/><column/></columns>
<rows>
@ -108,18 +108,18 @@
<text class="label" value="&tableAlignment.label;"/>
<menulist id="TableAlignList">
<menupopup>
<menuitem value="&AlignLeft.label;" data="left"/>
<menuitem value="&AlignCenter.label;" data="center"/>
<menuitem value="&AlignRight.label;" data="right"/>
<menuitem label="&AlignLeft.label;" value="left"/>
<menuitem label="&AlignCenter.label;" value="center"/>
<menuitem label="&AlignRight.label;" value="right"/>
</menupopup>
</menulist>
<spring class="spacer"/>
<text class="label" value="&tableCaption.label;"/>
<menulist id="TableCaptionList">
<menupopup>
<menuitem value="&tableCaptionNone.label;" data=""/>
<menuitem value="&tableCaptionAbove.label;" data="top"/>
<menuitem value="&tableCaptionBelow.label;" data="bottom"/>
<menuitem label="&tableCaptionNone.label;" value=""/>
<menuitem label="&tableCaptionAbove.label;" value="top"/>
<menuitem label="&tableCaptionBelow.label;" value="bottom"/>
</menupopup>
</menulist>
</box>
@ -128,7 +128,7 @@
<text class="label" value="&backgroundColor.label;"/>
<stack>
<button class="dialog color-button" oncommand="GetColorAndUpdate('tableBackgroundCW');"/>
<box autostretch="never" valign="middle" mousethrough="always">
<box autostretch="never" valign="middle" mousethrough="always">
<spring flex="1"/>
<spring id="tableBackgroundCW" class="color-well"/>
<spring flex="1"/>
@ -147,21 +147,21 @@
</box><!-- Table Panel -->
<!-- CELL PANEL -->
<box id="CellPanel" orient="vertical">
<box id="CellPanel" orient="vertical">
<titledbox autostretch="never" valign="middle">
<title value="&cellSelection.label;"/>
<label value="&cellSelection.label;"/>
<box orient="vertical">
<menulist id="SelectionList" oncommand="ChangeSelection(event.target.data)" flex="1">
<menulist id="SelectionList" oncommand="ChangeSelection(event.target.value)" flex="1">
<menupopup>
<!-- JS code assumes order is Cell, Row, Column -->
<menuitem value="&cellSelectCell.label;" data="1"/>
<menuitem value="&cellSelectRow.label;" data="2"/>
<menuitem value="&cellSelectColumn.label;" data="3"/>
<menuitem label="&cellSelectCell.label;" value="1"/>
<menuitem label="&cellSelectRow.label;" value="2"/>
<menuitem label="&cellSelectColumn.label;" value="3"/>
</menupopup>
</menulist>
<box flex="1">
<button id="PreviousButton" class="dialog" value="&cellSelectPrevious.label;" oncommand="MoveSelection(0)" flex="1"/>
<button id="NextButton" class="dialog right" value="&cellSelectNext.label;" oncommand="MoveSelection(1)" flex="1"/>
<button id="PreviousButton" class="dialog" label="&cellSelectPrevious.label;" oncommand="MoveSelection(0)" flex="1"/>
<button id="NextButton" class="dialog right" label="&cellSelectNext.label;" oncommand="MoveSelection(1)" flex="1"/>
</box>
</box>
<spring class="bigspacer"/>
@ -172,7 +172,7 @@
</titledbox>
<!-- cell size titledbox -->
<titledbox><title align="left" value="&size.label;"/>
<titledbox><label align="left" value="&size.label;"/>
<grid>
<columns><column/><column/><column/></columns>
<rows>
@ -195,12 +195,12 @@
<columns><column/><column/></columns>
<rows>
<row valign="middle" autostretch="never">
<checkbox id="RowSpanCheckbox" value="&cellRowSpan.label;"/>
<checkbox id="RowSpanCheckbox" label="&cellRowSpan.label;"/>
<textbox class="narrow" id="RowSpanInput"
oninput="ChangeIntTextbox(this.id,'RowSpanCheckbox');"/>
</row>
<row valign="middle" autostretch="never">
<checkbox id="ColSpanCheckbox" value="&cellColSpan.label;"/>
<checkbox id="ColSpanCheckbox" label="&cellColSpan.label;"/>
<textbox class="narrow" id="ColSpanInput"
oninput="ChangeIntTextbox(this.id,'ColSpanCheckbox');"/>
</row>
@ -210,23 +210,23 @@
<!-- Alignment -->
<titledbox valign="middle" autostretch="never">
<title value="&cellContentAlignment.label;"/>
<label value="&cellContentAlignment.label;"/>
<checkbox id="CellHAlignCheckbox" value="&cellHorizontal.label;"/>
<menulist id="CellHAlignList" oncommand="SelectCellHAlign()">
<menupopup>
<menuitem value="&AlignLeft.label;" data="left"/>
<menuitem value="&AlignCenter.label;" data="center"/>
<menuitem value="&AlignRight.label;" data="right"/>
<menuitem value="&cellAlignJustify.label;" data="justify"/>
<menuitem label="&AlignLeft.label;" value="left"/>
<menuitem label="&AlignCenter.label;" value="center"/>
<menuitem label="&AlignRight.label;" value="right"/>
<menuitem label="&cellAlignJustify.label;" value="justify"/>
</menupopup>
</menulist>
<spring class="spacer"/>
<checkbox id="CellVAlignCheckbox" value="&cellVertical.label;"/>
<menulist id="CellVAlignList" oncommand="SetCheckbox('CellVAlignCheckbox');">
<menupopup>
<menuitem value="&cellAlignTop.label;" data="top"/>
<menuitem value="&cellAlignMiddle.label;" data="middle"/>
<menuitem value="&cellAlignBottom.label;" data="bottom"/>
<menuitem label="&cellAlignTop.label;" value="top"/>
<menuitem label="&cellAlignMiddle.label;" value="middle"/>
<menuitem label="&cellAlignBottom.label;" value="bottom"/>
</menupopup>
</menulist>
</titledbox>
@ -235,25 +235,25 @@
<checkbox id="CellStyleCheckbox" value="&cellStyle.label;"/>
<menulist id="CellStyleList" oncommand="SetCheckbox('CellStyleCheckbox');">
<menupopup>
<menuitem value="&cellNormal.label;" data="td"/>
<menuitem value="&cellHeader.label;" data="th"/>
<menuitem label="&cellNormal.label;" value="td"/>
<menuitem label="&cellHeader.label;" value="th"/>
</menupopup>
</menulist>
<spring class="bigspacer"/>
<checkbox id="TextWrapCheckbox" value="&cellTextWrap.label;"/>
<menulist id="TextWrapList" oncommand="SetCheckbox('TextWrapCheckbox');">
<menupopup>
<menuitem value="&cellWrap.label;" data="wrap"/>
<menuitem value="&cellNoWrap.label;" data="nowrap"/>
<menuitem label="&cellWrap.label;" value="wrap"/>
<menuitem label="&cellNoWrap.label;" value="nowrap"/>
</menupopup>
</menulist>
</box>
<separator class="groove"/>
<box valign="middle" autostretch="never">
<checkbox id="CellColorCheckbox" value="&backgroundColor.label;"/>
<checkbox id="CellColorCheckbox" label="&backgroundColor.label;"/>
<stack>
<button class="dialog color-button" oncommand="GetColorAndUpdate('cellBackgroundCW');" flex="1"/>
<box autostretch="never" valign="middle" mousethrough="always">
<box autostretch="never" valign="middle" mousethrough="always">
<spring flex="1"/>
<spring id="cellBackgroundCW" class="color-well"/>
<spring flex="1"/>
@ -276,7 +276,7 @@
<!-- from EdDialogOverlay -->
<box>
<spring flex="1"/>
<button class="dialog" value="&applyButton.label;" oncommand="Apply();"/>
<button class="dialog" label="&applyButton.label;" oncommand="Apply();"/>
<box id="okCancelButtons"/>
</box>
</tabcontrol>

8
editor/ui/dialogs/content/EditConflict.xul
Просмотреть файл

@ -31,8 +31,8 @@
<!DOCTYPE window SYSTEM "chrome://editor/locale/EditConflict.dtd">
<window class="dialog" title="&windowTitle.label;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
onload = "Startup()"
orient="vertical">
@ -51,13 +51,13 @@
<spring class="bigspacer"/>
<box flex="1">
<spring class="bigspacer"/>
<button class="dialog" value="&keepCurrentPageButton.label;"
<button class="dialog" label="&keepCurrentPageButton.label;"
flex="1" oncommand="KeepCurrentPage()"/>
<spring class="bigspacer"/>
</box>
<box flex="1">
<spring class="bigspacer"/>
<button class="dialog" value="&useOtherPageButton.label;"
<button class="dialog" label="&useOtherPageButton.label;"
flex="1" oncommand="UseOtherPage()"/>
<spring class="bigspacer"/>
</box>

6
editor/ui/dialogs/content/EditorSaveAsCharset.xul
Просмотреть файл

@ -48,14 +48,14 @@
<keyset id="keyset"/>
<box orient="vertical">
<titledbox orient="vertical"><title align="left" value="&documentTitleTitle.label;"/>
<titledbox orient="vertical"><label align="left" value="&documentTitleTitle.label;"/>
<!-- Text labels filled in from editor.properties -->
<text id="EnterTitleLabel" class="label"/>
<textbox id="TitleInput" flex="1" oninput="TitleChanged();"/>
<html id="TitleHelp" class="label wrap" style="width:1em" flex="1"/>
</titledbox>
<titledbox orient="vertical"><title value="&documentCharsetTitle.label;"/>
<titledbox orient="vertical"><label value="&documentCharsetTitle.label;"/>
<text class="label" value="&documentCharsetDesc.label;"/>
<box flex="1">
<tree class="list" id="CharsetTree" rows="10" flex="1" onselect="SelectCharset();">
@ -65,5 +65,5 @@
</titledbox>
</box>
<!-- from global dialogOverlay -->
<box id="okCancelButtons"/>
<box id="okCancelButtons"/>
</window>

20
embedding/browser/chrome/content/mini-nav.xul
Просмотреть файл

@ -44,21 +44,21 @@ Contributor(s): ______________________________________. -->
<!-- Context menu -->
<popupset>
<popup id="context" oncreate="InitContextMenu(this)">
<menuitem id="context-back" value="&backCmd.label;"
<menuitem id="context-back" label="&backCmd.label;"
accesskey="" oncommand="BrowserBack()"/>
<menuitem id="context-forward" value="&forwardCmd.label;"
<menuitem id="context-forward" label="&forwardCmd.label;"
accesskey="" oncommand="BrowserForward()"/>
<menuitem id="context-stop" value="&stopCmd.label;"
<menuitem id="context-stop" label="&stopCmd.label;"
accesskey="" oncommand="BrowserStop()"/>
<menuitem id="context-reload" value="&reloadCmd.label;"
<menuitem id="context-reload" label="&reloadCmd.label;"
accesskey="" oncommand="BrowserReload()"/>
<!-- The following DEBUG MENU ITEMS can be removed -->
<menuseparator/>
<menu value="Debug">
<menupopup>
<menuitem id="command-handler" value="CommandHandler::Exec" oncommand="CHExecTest()"/>
<menuitem id="command-handler" value="CommandHandler::Query" oncommand="CHQueryTest()"/>
<menuitem id="command-handler" label="CommandHandler::Exec" oncommand="CHExecTest()"/>
<menuitem id="command-handler" label="CommandHandler::Query" oncommand="CHQueryTest()"/>
</menupopup>
</menu>
<!-- End DEBUG MENU ITEMS -->
@ -71,10 +71,10 @@ Contributor(s): ______________________________________. -->
<toolbox>
<toolbar id="nav-bar">
<box id="nav-bar-inner" autostretch="never" flex="1" style="min-width: 0px;">
<button id="back-button" crop="right" onclick="BrowserBack()" value="&backButton.label;"/>
<button id="forward-button" crop="right" onclick="BrowserForward()" value="&forwardButton.label;"/>
<button id="reload-button" crop="right" onclick="BrowserReload()" value="&reloadButton.label;"/>
<button id="stop-button" crop="right" onclick="BrowserStop()" value="&stopButton.label;"/>
<button id="back-button" crop="right" onclick="BrowserBack()" label="&backButton.label;"/>
<button id="forward-button" crop="right" onclick="BrowserForward()" label="&forwardButton.label;"/>
<button id="reload-button" crop="right" onclick="BrowserReload()" label="&reloadButton.label;"/>
<button id="stop-button" crop="right" onclick="BrowserStop()" label="&stopButton.label;"/>
<box class="box-toolbar-group" flex="1">
<box autostretch="never" valign="middle" flex="1">
<textbox autocomplete="true" timeout="300"

2
extensions/cookie/resources/content/cookieContextOverlay.xul
Просмотреть файл

@ -111,7 +111,7 @@
<!-- context menu -->
<popup id="contentAreaContextMenu">
<menuitem id="context-blockimage"
value="&blockImageCmd.label;"
label="&blockImageCmd.label;"
accesskey=""
oncommand="cookieContextMenu.blockImage();"
style="display:none;"

4
extensions/cookie/resources/content/cookiePrefsOverlay.xul
Просмотреть файл

@ -31,7 +31,7 @@
<treerow>
<treecell class="treecell-indent"
url="chrome://cookie/content/pref-cookies.xul"
value="&cookies.label;"
label="&cookies.label;"
id="cookiesCell"/>
</treerow>
</treeitem>
@ -39,7 +39,7 @@
<treerow>
<treecell class="treecell-indent"
url="chrome://cookie/content/pref-images.xul"
value="&images.label;"/>
label="&images.label;"/>
</treerow>
</treeitem>
</treechildren>

20
extensions/cookie/resources/content/cookieTasksOverlay.xul
Просмотреть файл

@ -49,7 +49,7 @@
HideImage();
}
} catch(e) {
HideImage();
HideImage();
dump("imageblocker.enabled pref is missing from all.js\n");
}
}
@ -94,42 +94,42 @@
<!-- tasksOverlay menu items -->
<menupopup id="personalManagers">
<menu value="&cookieCookieManager.label;"
<menu label="&cookieCookieManager.label;"
accesskey="&cookieCookieManager.accesskey;"
position="1">
<menupopup>
<menuitem value="&cookieDisplayCookiesCmd.label;"
<menuitem label="&cookieDisplayCookiesCmd.label;"
accesskey="&cookieDisplayCookiesCmd.accesskey;"
oncommand="viewCookies();"/>
<menuitem id="AllowCookies" value="&cookieAllowCookiesCmd.label;"
<menuitem id="AllowCookies" label="&cookieAllowCookiesCmd.label;"
accesskey="&cookieAllowCookiesCmd.accesskey;"
msg="&cookieAllowCookiesMsg.label;"
oncommand="CookieImageAction('cookieAllow');"/>
<menuitem id="BlockCookies" value="&cookieBlockCookiesCmd.label;"
<menuitem id="BlockCookies" label="&cookieBlockCookiesCmd.label;"
accesskey="&cookieBlockCookiesCmd.accesskey;"
msg="&cookieBlockCookiesMsg.label;"
oncommand="CookieImageAction('cookieBlock');"/>
</menupopup>
</menu>
<menu value="&cookieImageManager.label;"
<menu label="&cookieImageManager.label;"
accesskey="&cookieImageManager.accesskey;" id="image"
position="2">
<menupopup oncreate="CheckForImage()">
<menuitem value="&cookieDisplayImagesCmd.label;"
<menuitem label="&cookieDisplayImagesCmd.label;"
accesskey="&cookieDisplayImagesCmd.accesskey;"
oncommand="viewImages();"/>
<menuitem id="AllowImages" value="&cookieAllowImagesCmd.label;"
<menuitem id="AllowImages" label="&cookieAllowImagesCmd.label;"
accesskey="&cookieAllowImagesCmd.accesskey;"
msg="&cookieAllowImagesMsg.label;"
oncommand="CookieImageAction('imageAllow');"/>
<menuitem id="BlockImages" value="&cookieBlockImagesCmd.label;"
<menuitem id="BlockImages" label="&cookieBlockImagesCmd.label;"
accesskey="&cookieBlockImagesCmd.accesskey;"
msg="&cookieBlockImagesMsg.label;"
oncommand="CookieImageAction('imageBlock');"/>
</menupopup>
</menu>
<menuseparator insertbefore="lastInPersonalManagers"/>
<menuitem value="&cookieTutorialCmd.label;"
<menuitem label="&cookieTutorialCmd.label;"
accesskey="&cookieTutorialCmd.accesskey;"
oncommand="viewTutorial();"
insertbefore="lastInPersonalManagers"/>

16
extensions/cookie/resources/content/pref-cookies.xul
Просмотреть файл

@ -48,25 +48,25 @@
<box class="box-smallheader" id="cookieHeader" title="&lHeader;"/>
<titledbox orient="vertical">
<title><text value="&cookiePolicy.label;"/></title>
<label value="&cookiePolicy.label;"/>
<html>&cookieDetails;</html>
<radiogroup id="networkCookieBehaviour" orient="vertical" autostretch="never"
pref="true" preftype="int" prefstring="network.cookie.cookieBehavior"
prefattribute="data">
<radio group="networkCookieBehaviour" data="0" value="&accAllCookiesRadio.label;" accesskey="&accAllCookiesRadio.accesskey;"/>
<radio group="networkCookieBehaviour" data="1" value="&accOrgCookiesRadio.label;" accesskey="&accOrgCookiesRadio.accesskey;"/>
<radio group="networkCookieBehaviour" data="2" value="&disableCookies.label;" accesskey="&disableCookies.accesskey;"/>
prefattribute="value">
<radio group="networkCookieBehaviour" value="0" label="&accAllCookiesRadio.label;" accesskey="&accAllCookiesRadio.accesskey;"/>
<radio group="networkCookieBehaviour" value="1" label="&accOrgCookiesRadio.label;" accesskey="&accOrgCookiesRadio.accesskey;"/>
<radio group="networkCookieBehaviour" value="2" label="&disableCookies.label;" accesskey="&disableCookies.accesskey;"/>
</radiogroup>
<box autostretch="never">
<checkbox class="indent" id="networkWarnAboutCookies" value="&warnAboutCookies.label;" accesskey="&warnAboutCookies.accesskey;"
<checkbox class="indent" id="networkWarnAboutCookies" label="&warnAboutCookies.label;" accesskey="&warnAboutCookies.accesskey;"
pref="true" preftype="bool" prefstring="network.cookie.warnAboutCookies"
prefattribute="checked"/>
</box>
<box autostretch="never" halign="right">
<button class="dialog" value="&viewCookies.label;" accesskey="&viewCookies.accesskey;" oncommand="viewCookies();"/>
<button class="dialog" value="&viewTutorial.label;" accesskey="&viewTutorial.accesskey;" oncommand="viewTutorial();"/>
<button class="dialog" label="&viewCookies.label;" accesskey="&viewCookies.accesskey;" oncommand="viewCookies();"/>
<button class="dialog" label="&viewTutorial.label;" accesskey="&viewTutorial.accesskey;" oncommand="viewTutorial();"/>
</box>
</titledbox>

14
extensions/cookie/resources/content/pref-images.xul
Просмотреть файл

@ -93,26 +93,26 @@
<box class="box-smallheader" id="imagesHeader" title="&lHeader;"/>
<titledbox orient="vertical" id="imagesArea">
<title><text value="&imageBlocking.label;"/></title>
<label value="&imageBlocking.label;"/>
<html>&imageDetails;</html>
<radiogroup id="networkImageBehaviour" orient="vertical" autostretch="never"
pref="true" preftype="int" prefstring="network.image.imageBehavior"
prefattribute="data">
<radio group="networkImageBehaviour" data="0" value="&accAllImagesRadio.label;" accesskey="&accAllImagesRadio.accesskey;"/>
<radio id="accOrgImages" group="networkImageBehaviour" data="1" value="&accOrgImagesRadio.label;" accesskey="&accOrgImagesRadio.accesskey;"/>
<radio group="networkImageBehaviour" data="2" value="&disableImages.label;" accesskey="&disableImages.accesskey;"/>
prefattribute="value">
<radio group="networkImageBehaviour" value="0" label="&accAllImagesRadio.label;" accesskey="&accAllImagesRadio.accesskey;"/>
<radio id="accOrgImages" group="networkImageBehaviour" value="1" label="&accOrgImagesRadio.label;" accesskey="&accOrgImagesRadio.accesskey;"/>
<radio group="networkImageBehaviour" value="2" label="&disableImages.label;" accesskey="&disableImages.accesskey;"/>
</radiogroup>
<box autostretch="never">
<checkbox class="indent" id="networkImageWarnAboutImages" value="&warnAboutImages.label;" accesskey="&warnAboutImages.accesskey;"
<checkbox class="indent" id="networkImageWarnAboutImages" label="&warnAboutImages.label;" accesskey="&warnAboutImages.accesskey;"
pref="true" preftype="bool" prefstring="network.image.warnAboutImages"
prefattribute="checked"/>
</box>
<box autostretch="never" halign="right">
<button class="dialog" id="viewImages" value="&viewImages.label;" accesskey="&viewImages.accesskey;" oncommand="viewImages();"/>
<button class="dialog" id="viewImages" label="&viewImages.label;" accesskey="&viewImages.accesskey;" oncommand="viewImages();"/>
</box>
</titledbox>

32
extensions/cview/resources/content/cview.xul
Просмотреть файл

@ -73,43 +73,43 @@
-->
<popupset>
<popup id="interfacePopup">
<menuitem value="LXR filename lookup"
<menuitem label="LXR filename lookup"
oncommand="onLXRIFCLookup(event,'find?string=');"/>
<menuitem value="LXR text lookup"
<menuitem label="LXR text lookup"
oncommand="onLXRIFCLookup(event, 'search?string=');"/>
</popup>
</popupset>
<toolbox>
<menubar id="main-menubar">
<menu id="view-menu" value="View">
<menu id="view-menu" label="View">
<menupopup>
<menu value="Components">
<menu label="Components">
<menupopup>
<menuitem id="menu-cmp-show-all" value="All" checked="true"
<menuitem id="menu-cmp-show-all" label="All" checked="true"
type="checkbox"
oncommand="onChangeDisplayMode(event);"/>
<menuitem id="menu-cmp-show-contains"
value="Containing..." type="checkbox"
label="Containing..." type="checkbox"
oncommand="onChangeDisplayMode(event);"/>
<menuitem id="menu-cmp-show-starts-with"
value="Starting with..." type="checkbox"
label="Starting with..." type="checkbox"
oncommand="onChangeDisplayMode(event);"/>
</menupopup>
</menu>
<menu value="Interfaces">
<menu label="Interfaces">
<menupopup>
<menuitem id="menu-ifc-show-all" value="All" checked="true"
<menuitem id="menu-ifc-show-all" label="All" checked="true"
type="checkbox"
oncommand="onChangeDisplayMode(event);"/>
<menuitem id="menu-ifc-show-contains"
value="Containing..." type="checkbox"
label="Containing..." type="checkbox"
oncommand="onChangeDisplayMode(event);"/>
<menuitem id="menu-ifc-show-starts-with"
value="Starting with..." type="checkbox"
label="Starting with..." type="checkbox"
oncommand="onChangeDisplayMode(event);"/>
<menuitem id="menu-ifc-show-implemented-by"
value="Implemented by selected component"
label="Implemented by selected component"
type="checkbox"
oncommand="onChangeDisplayMode(event);"/>
</menupopup>
@ -181,11 +181,11 @@
<treerow>
<treecell id="componentcol-contractid" flex="1"
resource="http://www.mozilla.org/NC-xpcom#contractid"
class="treecell-header sortDirectionIndicator" value="ContractID"
class="treecell-header sortDirectionIndicator" label="ContractID"
onclick="return onSortCol('componentcol-contractid');"/>
<treecell id="componentcol-clsid" flex="1"
resource="http://www.mozilla.org/NC-xpcom#clsid"
class="treecell-header sortDirectionIndicator" value="CLSID"
class="treecell-header sortDirectionIndicator" label="CLSID"
onclick="return onSortCol('componentcol-clsid');"/>
</treerow>
</treehead>
@ -236,11 +236,11 @@
<treerow>
<treecell id="interfacecol-iname"
resource="http://www.mozilla.org/NC-xpcom#iname"
class="treecell-header sortDirectionIndicator" value="Interface"
class="treecell-header sortDirectionIndicator" label="Interface"
onclick="return onSortCol('interfacecol-iname');"/>
<treecell id="interfacecol-iid"
resource="http://www.mozilla.org/NC-xpcom#iid"
class="treecell-header sortDirectionIndicator" value="IID"
class="treecell-header sortDirectionIndicator" label="IID"
onclick="return onSortCol('interfacecol-iid');"/>
</treerow>
</treehead>

2
extensions/cview/resources/content/cviewOverlay.xul
Просмотреть файл

@ -43,7 +43,7 @@
This is the id that the menuitem will be appended to. see tasksOverlay.xul
-->
<menupopup id="toolsPopup">
<menuitem position="5" value="&cviewCmd.label;" oncommand="toCView()"/>
<menuitem position="5" label="&cviewCmd.label;" oncommand="toCView()"/>
</menupopup>
</overlay>

12
extensions/help/resources/content/help.xul
Просмотреть файл

@ -31,19 +31,19 @@
<button id="helpBackButton"
class="button-toolbar-1 top"
value="&backBtn.label;"
label="&backBtn.label;"
tooltiptext="&backBtn.tooltip;"
tooltip="aTooltip"
oncommand="goBack();"/>
<button id="helpForwardButton"
class="button-toolbar-1 top"
value="&fwdBtn.label;"
label="&fwdBtn.label;"
tooltiptext="&fwdBtn.tooltip;"
tooltip="aTooltip"
oncommand="goForward();"/>
<button id="helpHomeButton"
class="button-toolbar-1 top"
value="&homeBtn.label;"
label="&homeBtn.label;"
tooltiptext="&homeBtn.tooltip;"
tooltip="aTooltip"
oncommand="goHome();"/>
@ -71,8 +71,8 @@
<tabcontrol orient="vertical" flex="1">
<tabbox orient="horizontal">
<tab value="Contents"/>
<tab value="Index"/>
<tab label="Contents"/>
<tab label="Index"/>
</tabbox>
<tabpanel flex="1">
<box id="help-toc">
@ -103,7 +103,7 @@
<treeitem uri="?subheading">
<treerow>
<treecell class="treecell-indent"
value="?name"
label="?name"
helplink="?link"
onclick="loadURI(this.getAttribute('helplink'));"/>
</treerow>

14
extensions/help/resources/content/helpMenuOverlay.xul
Просмотреть файл

@ -5,15 +5,15 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<menupopup id="helpPopup">
<menuitem value="Mozilla Help System"
oncommand="toOpenWindowByType('mozilla:help', 'chrome://help/content/help.xul');" />
<menuitem label="Mozilla Help System"
oncommand="toOpenWindowByType('mozilla:help', 'chrome://help/content/help.xul');" />
<!-- example: context-passing menuitem
"key" object at top of help.js has key->document pairs
note the cgi-like suffix of the url. help window's init() grabs it as
window.location.search -->
<!--menuitem value="Gimme Mail!"
oncommand="toOpenWindowByType('mozilla:help', 'chrome://help/content/help.xul?mail');" /-->
"key" object at top of help.js has key->document pairs
note the cgi-like suffix of the url. help window's init() grabs it as
window.location.search -->
<!--menuitem label="Gimme Mail!"
oncommand="toOpenWindowByType('mozilla:help', 'chrome://help/content/help.xul?mail');" /-->
</menupopup>
</overlay>

2
extensions/inspector/resources/content/ViewerPane.js
Просмотреть файл

@ -145,7 +145,7 @@ ViewerPane.prototype =
for (var i = 0; i < aEntries.length; i++) {
var entry = aEntries[i];
var menuitem = document.createElement("menuitem");
menuitem.setAttribute("value", this.mViewerReg.getEntryProperty(entry, "description"));
menuitem.setAttribute("label", this.mViewerReg.getEntryProperty(entry, "description"));
menuitem.entry = entry;
mpp.appendChild(menuitem);
}

4
extensions/inspector/resources/content/extensions/treeEditable.xml
Просмотреть файл

@ -54,7 +54,7 @@
item = item.parentNode;
var editor = this.getEditorElement(aTreecell);
editor.setAttribute("value", aTreecell.getAttribute("value"));
editor.setAttribute("value", aTreecell.getAttribute("label"));
aTreecell.parentNode.replaceChild(editor, aTreecell);
this.mEditing = true;
@ -76,7 +76,7 @@
var ed = this.mEditingEditor;
var ev = ed.value;
var cancel = this.onAfterEdit({ newValue: ev, editingNode: cell, editingItem: this.mEditingItem });
if (!aCancel && !cancel) cell.setAttribute("value", ev);
if (!aCancel && !cancel) cell.setAttribute("label", ev);
ed.parentNode.replaceChild(cell, ed);
this.mEditing = false;
this.focus();

8
extensions/inspector/resources/content/jsutil/xul/inFormManager.js
Просмотреть файл

@ -61,7 +61,7 @@ var inFormManager =
read_menulist: function(aEl)
{
return aEl.getAttribute("data");
return aEl.getAttribute("value");
},
read_checkbox: function(aEl)
@ -71,7 +71,7 @@ var inFormManager =
read_radiogroup: function(aEl)
{
return aEl.getAttribute("data");
return aEl.getAttribute("value");
},
read_colorpicker: function(aEl)
@ -86,7 +86,7 @@ var inFormManager =
write_menulist: function(aEl, aValue)
{
aEl.setAttribute("data", aValue);
aEl.setAttribute("value", aValue);
},
write_checkbox: function(aEl, aValue)
@ -96,7 +96,7 @@ var inFormManager =
write_radiogroup: function(aEl, aValue)
{
aEl.setAttribute("data", aValue);
aEl.setAttribute("value", aValue);
},
write_colorpicker: function(aEl, aValue)

6
extensions/inspector/resources/content/jsutil/xul/inTreeTableBuilder.js
Просмотреть файл

@ -369,7 +369,7 @@ inTreeTableBuilder.prototype =
{
var target = aEvent.target;
if (target.parentNode == this.mTreeHeadRow) {
var column = target.getAttribute("value");
var column = target.getAttribute("label");
var idx = this.getColumnIndexFromHeader(target);
if (idx == -1) return;
@ -559,7 +559,7 @@ inTreeTableBuilder.prototype =
cell.setAttribute("class", "treecell-header");
val = cols[i].title;
if (val)
cell.setAttribute("value", val);
cell.setAttribute("label", val);
row.appendChild(cell);
}
},
@ -597,7 +597,7 @@ inTreeTableBuilder.prototype =
// build the default value data field
binding = this.createBinding(val);
bindings.appendChild(binding);
cell.setAttribute("value", "?" + val);
cell.setAttribute("label", "?" + val);
cell.setAttribute("class", className);
row.appendChild(cell);

46
extensions/inspector/resources/content/popupOverlay.xul
Просмотреть файл

@ -11,57 +11,57 @@
<popupset id="ppsGlobalPopupset">
<popup id="ppSearchResults">
<!--
<menuitem id="ppSearchResults-view" value="&cmdViewSearchItem.label;" observes="cmdViewSearchItem"/>
<menuitem id="ppSearchResults-edit" value="&cmdEditSearchItem.label;" observes="cmdEditSearchItem"/>
<menuitem id="ppSearchResults-view" label="&cmdViewSearchItem.label;" observes="cmdViewSearchItem"/>
<menuitem id="ppSearchResults-edit" label="&cmdEditSearchItem.label;" observes="cmdEditSearchItem"/>
-->
<menuseparator id="ppSearchResults-insertion"/>
<menuitem id="ppSearchResults-copyLine" value="&cmdCopySearchItemLine.label;" observes="cmdCopySearchItemLine"/>
<menuitem id="ppSearchResults-copyAll" value="&cmdCopySearchItemAll.label;" observes="cmdCopySearchItemAll"/>
<menuitem id="ppSearchResults-save" value="&cmdSaveSearchItemText.label;" observes="cmdSaveSearchItemText"/>
<menuitem id="ppSearchResults-copyLine" label="&cmdCopySearchItemLine.label;" observes="cmdCopySearchItemLine"/>
<menuitem id="ppSearchResults-copyAll" label="&cmdCopySearchItemAll.label;" observes="cmdCopySearchItemAll"/>
<menuitem id="ppSearchResults-save" label="&cmdSaveSearchItemText.label;" observes="cmdSaveSearchItemText"/>
<menuseparator/>
<menuitem id="ppSearchResults-clear" value="&cmdClearSearch.label;" observes="cmdClearSearch"/>
<menuitem id="ppSearchResults-hide" value="&cmdHideSearchItems.label;" observes="cmdToggleSearch"/>
<menuitem id="ppSearchResults-clear" label="&cmdClearSearch.label;" observes="cmdClearSearch"/>
<menuitem id="ppSearchResults-hide" label="&cmdHideSearchItems.label;" observes="cmdToggleSearch"/>
</popup>
</popupset>
<menupopup id="mppFile">
<menuitem value="&cmdShowOpenURLDialog.label;..." accesskey="&cmdShowOpenURLDialog.accesskey;" observes="cmdShowOpenURLDialog"/>
<menuitem label="&cmdShowOpenURLDialog.label;..." accesskey="&cmdShowOpenURLDialog.accesskey;" observes="cmdShowOpenURLDialog"/>
<menuseparator/>
<menuitem value="&cmdExit.label;" accesskey="&cmdExit.accesskey;" observes="cmdExit"/>
<menuitem label="&cmdExit.label;" accesskey="&cmdExit.accesskey;" observes="cmdExit"/>
</menupopup>
<menupopup id="mppEdit">
<menuitem value="&cmdUndo.label;" accesskey="&cmdUndo.accesskey;" observes="cmdUndo"/>
<menuitem value="&cmdRedo.label;" accesskey="&cmdRedo.accesskey;" observes="cmdRedo"/>
<menuitem label="&cmdUndo.label;" accesskey="&cmdUndo.accesskey;" observes="cmdUndo"/>
<menuitem label="&cmdRedo.label;" accesskey="&cmdRedo.accesskey;" observes="cmdRedo"/>
<menuseparator/>
<menuitem value="&cmdCut.label;" accesskey="&cmdCut.accesskey;" observes="cmdCut"/>
<menuitem value="&cmdCopy.label;" accesskey="&cmdCopy.accesskey;" observes="cmdCopy"/>
<menuitem value="&cmdPaste.label;" accesskey="&cmdPaste.accesskey;" observes="cmdPaste"/>
<menuitem value="&cmdDelete.label;" accesskey="&cmdDelete.accesskey;" observes="cmdDelete"/>
<menuitem label="&cmdCut.label;" accesskey="&cmdCut.accesskey;" observes="cmdCut"/>
<menuitem label="&cmdCopy.label;" accesskey="&cmdCopy.accesskey;" observes="cmdCopy"/>
<menuitem label="&cmdPaste.label;" accesskey="&cmdPaste.accesskey;" observes="cmdPaste"/>
<menuitem label="&cmdDelete.label;" accesskey="&cmdDelete.accesskey;" observes="cmdDelete"/>
<menuseparator/>
<menuitem value="&cmdPrefs.label;..." accesskey="&cmdPrefs.accesskey;" observes="cmdShowPrefsDialog"/>
<menuitem label="&cmdPrefs.label;..." accesskey="&cmdPrefs.accesskey;" observes="cmdShowPrefsDialog"/>
</menupopup>
<menupopup id="mppSearch" oncreate="inspector.initPopup(this)">
<menuseparator/>
<menu value="&mnSearchPlugins.label;" accesskey="&mnSearchPlugins.accesskey;">
<menu label="&mnSearchPlugins.label;" accesskey="&mnSearchPlugins.accesskey;">
<menupopup id="mppSearchPlugins">
<menuitem value="&cmdRunSearch.label;" accesskey="&cmdRunSearch.accesskey;" observes="cmdRunSearch"/>
<menuitem label="&cmdRunSearch.label;" accesskey="&cmdRunSearch.accesskey;" observes="cmdRunSearch"/>
</menupopup>
</menu>
</menupopup>
<menupopup id="mppView" >
<menuitem class="menuitem-iconic" type="checkbox" value="&cmdToggleBrowser.label;" observes="cmdToggleBrowser"/>
<menuitem class="menuitem-iconic" type="checkbox" value="&cmdToggleSearch.label;" observes="cmdToggleSearch"/>
<menuitem class="menuitem-iconic" type="checkbox" label="&cmdToggleBrowser.label;" observes="cmdToggleBrowser"/>
<menuitem class="menuitem-iconic" type="checkbox" label="&cmdToggleSearch.label;" observes="cmdToggleSearch"/>
<menuseparator/>
<menuitem class="menuitem-iconic" type="checkbox" value="&cmdFlashSelected.label;" observes="cmdFlashSelected"/>
<menuitem class="menuitem-iconic" type="checkbox" label="&cmdFlashSelected.label;" observes="cmdFlashSelected"/>
</menupopup>
<menupopup id="mppHelp">
<menuitem value="&cmdNotes.label;" accesskey="&cmdNotes.accesskey;" observes="cmdShowNotes"/>
<menuitem label="&cmdNotes.label;" accesskey="&cmdNotes.accesskey;" observes="cmdShowNotes"/>
<menuseparator/>
<menuitem value="&cmdAbout.label;" accesskey="&cmdAbout.accesskey;" observes="cmdShowAbout"/>
<menuitem label="&cmdAbout.label;" accesskey="&cmdAbout.accesskey;" observes="cmdShowAbout"/>
</menupopup>
</overlay>

4
extensions/inspector/resources/content/prefs/pref-inspector.xul
Просмотреть файл

@ -32,7 +32,7 @@
<box id="bxGeneralPrefs">
<titledbox>
<title><text value="Element Blinking"/></title>
<label value="Element Blinking"/>
<box orient="vertical">
<grid>
<columns>
@ -74,7 +74,7 @@
</rows>
</grid>
<box autostretch="never">
<checkbox id="cbElOn" value="Blink Selected Element"
<checkbox id="cbElOn" label="Blink Selected Element"
pref="true" preftype="bool" prefstring="inspector.blink.on" prefattribute="checked"/>
</box>
</box>

2
extensions/inspector/resources/content/prefs/pref-sidebar.xul
Просмотреть файл

@ -20,7 +20,7 @@
</box>
<box id="bxSidebarNotInstalled" collapsed="true" flex="1" orient="vertical">
<text value="The sidebar panel is not currently installed. Click the 'Install' button to add it to your sidebar."/>
<button value="Install" onclick="gSidebarPrefs.installSidebar()"/>
<button label="Install" onclick="gSidebarPrefs.installSidebar()"/>
</box>
</box>
</window>

4
extensions/inspector/resources/content/prefs/prefsOverlay.xul
Просмотреть файл

@ -8,12 +8,12 @@
<treechildren id="panelChildren">
<treeitem id="inspector" container="true" open="true">
<treerow>
<treecell class="treecell-indent" url="chrome://inspector/content/prefs/pref-inspector.xul" value="&Inspector.label;"/>
<treecell class="treecell-indent" url="chrome://inspector/content/prefs/pref-inspector.xul" label="&Inspector.label;"/>
</treerow>
<treechildren id="inspectorChildren">
<treeitem>
<treerow>
<treecell class="treecell-indent" url="chrome://inspector/content/prefs/pref-sidebar.xul" value="&Sidebar.label;"/>
<treecell class="treecell-indent" url="chrome://inspector/content/prefs/pref-sidebar.xul" label="&Sidebar.label;"/>
</treerow>
</treeitem>
</treechildren>

4
extensions/inspector/resources/content/search/modules/findFiles/dialog.xul
Просмотреть файл

@ -25,10 +25,10 @@
<box autostretch="never">
<text id="txSearchPath" value="&txSearchPath.label;"/>
<textbox id="txfSearchPath" style="width: 25em;" persist="true"/>
<button id="btnSearchPathBrowser" value="Browse" onclick="dialog.browse()" persist="true"/>
<button id="btnSearchPathBrowser" label="Browse" onclick="dialog.browse()" persist="true"/>
</box>
<box autostretch="never">
<checkbox id="cbRecurse" value="&cbRecurse.label;"/>
<checkbox id="cbRecurse" label="&cbRecurse.label;"/>
</box>
</box>

2
extensions/inspector/resources/content/search/modules/junkImgs/dialog.xul
Просмотреть файл

@ -30,7 +30,7 @@
<textbox id="txfRemotePath" flex="1" persist="true"/>
</box>
<box autostretch="never">
<checkbox id="cbIsSkin" value="Target is a Skin" checked="true" persist="true"/>
<checkbox id="cbIsSkin" label="Target is a Skin" checked="true" persist="true"/>
</box>
-->
</box>

4
extensions/inspector/resources/content/search/modules/junkImgs/junkImgs.xml
Просмотреть файл

@ -14,8 +14,8 @@
</columns>
<contextmenu>
<xul:menuitem value="View..." oncommand="this.search.cmdViewItem()" isEnabled="return true"/>
<xul:menuitem value="Delete File" oncommand="this.search.cmdDeleteItems()" isEnabled="return true"/>
<xul:menuitem label="View..." oncommand="this.search.cmdViewItem()" isEnabled="return true"/>
<xul:menuitem label="Delete File" oncommand="this.search.cmdDeleteItems()" isEnabled="return true"/>
</contextmenu>
<implementation>

4
extensions/inspector/resources/content/search/modules/popupOverlay.xul
Просмотреть файл

@ -11,11 +11,11 @@
<menupopup id="mppSearchPlugins">
<menuitem id="item:startFindFiles" position="1"
value="&findFiles.title;..."
label="&findFiles.title;..."
observes="cmd:startFindFiles"/>
<menuitem id="item:startJunkImgs" position="2"
value="&junkImgs.title;..."
label="&junkImgs.title;..."
isDisabled="return !inspector.isViewingContent"
observes="cmd:startJunkImgs"/>

4
extensions/inspector/resources/content/sidebar/sidebar.xul
Просмотреть файл

@ -39,8 +39,8 @@
<tabcontrol id="tbcInspectorSidebar" flex="1">
<tabbox>
<tab value="Document"/>
<tab value="Node"/>
<tab label="Document"/>
<tab label="Node"/>
</tabbox>
<tabpanel flex="1">
<box id="bxDocPane" flex="1" orient="vertical">

4
extensions/inspector/resources/content/tasksOverlay.xul
Просмотреть файл

@ -9,13 +9,13 @@
function launchInspector()
{
toOpenWindowByType("inspector", "chrome://inspector/content");
toOpenWindowByType("inspector", "chrome://inspector/content");
}
</script>
<broadcasterset id="broadcasterset">
<broadcaster id="Tasks:Inspector" value="&inspectorTaskCmd.label;" oncommand="launchInspector();"/>
<broadcaster id="Tasks:Inspector" label="&inspectorTaskCmd.label;" oncommand="launchInspector();"/>
</broadcasterset>
<!--

18
extensions/inspector/resources/content/toolboxOverlay.xul
Просмотреть файл

@ -15,15 +15,15 @@
<menubar id="mbrInspectorMain">
<menu id="mnFile" value="&mnFile.label;" accesskey="&mnFile.accesskey;">
<menu id="mnFile" label="&mnFile.label;" accesskey="&mnFile.accesskey;">
<menupopup id="mppFile">
<menu
id="mnWindowsFile" value="&mnWindows.label;" accesskey="&mnWindows.accesskey;"
id="mnWindowsFile" label="&mnWindows.label;" accesskey="&mnWindows.accesskey;"
datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot">
<template>
<rule>
<menupopup>
<menuitem uri="rdf:*" value="&NC-rdf;Name" oncommand="inspector.goToWindow(this)"/>
<menuitem uri="rdf:*" label="&NC-rdf;Name" oncommand="inspector.goToWindow(this)"/>
</menupopup>
</rule>
</template>
@ -31,19 +31,19 @@
</menupopup>
</menu>
<menu id="mnEdit" value="&mnEdit.label;" accesskey="&mnEdit.accesskey;">
<menu id="mnEdit" label="&mnEdit.label;" accesskey="&mnEdit.accesskey;">
<menupopup id="mppEdit"/>
</menu>
<menu id="mnSearch" value="&mnSearch.label;" accesskey="&mnSearch.accesskey;">
<menu id="mnSearch" label="&mnSearch.label;" accesskey="&mnSearch.accesskey;">
<menupopup id="mppSearch"/>
</menu>
<menu id="mnView" value="&mnView.label;" accesskey="&mnView.accesskey;">
<menu id="mnView" label="&mnView.label;" accesskey="&mnView.accesskey;">
<menupopup id="mppView"/>
</menu>
<menu id="mnHelp" value="&mnHelp.label;" accesskey="&mnHelp.accesskey;">
<menu id="mnHelp" label="&mnHelp.label;" accesskey="&mnHelp.accesskey;">
<menupopup id="mppHelp"/>
</menu>
@ -79,7 +79,7 @@
</conditions>
<action>
<menuitem uri="?item" value="?url" oncommand="inspector.goToHistoryItem(this)"/>
<menuitem uri="?item" label="?url" oncommand="inspector.goToHistoryItem(this)"/>
</action>
</rule>
</template>
@ -89,7 +89,7 @@
</menubutton>
</box>
<button class="button-toolbar-3" value="&btnInspect.label;" observes="cmdGotoURL"/>
<button class="button-toolbar-3" label="&btnInspect.label;" observes="cmdGotoURL"/>
</box>
</toolbar>

4
extensions/inspector/resources/content/viewers/dom/dom.xul
Просмотреть файл

@ -37,8 +37,8 @@
<popupset id="psPopups">
<popup id="ppDOMContext" oncreate="viewer.onContextCreate(this)">
<menuitem value="&cmdDeleteNode.label;" observes="cmdDeleteNode"/>
<menuitem value="&cmdInspectBrowser.label;" observes="cmdInspectBrowser"/>
<menuitem label="&cmdDeleteNode.label;" observes="cmdDeleteNode"/>
<menuitem label="&cmdInspectBrowser.label;" observes="cmdInspectBrowser"/>
</popup>
</popupset>

18
extensions/inspector/resources/content/viewers/dom/findDialog.xul
Просмотреть файл

@ -43,25 +43,25 @@
</grid>
<box orient="horizontal" autostretch="never" style="vertical-align: top">
<titledbox id="tbxType">
<title value="Search By"/>
<label value="Search By"/>
<radiogroup id="rgType" orient="vertical">
<radio id="rdType_id" value="ID" oncommand="dialog.toggleType('id')"/>
<radio id="rdType_tag" value="Tag" oncommand="dialog.toggleType('tag')"/>
<radio id="rdType_attr" value="Attribute" oncommand="dialog.toggleType('attr')"/>
<radio id="rdType_id" label="ID" oncommand="dialog.toggleType('id')"/>
<radio id="rdType_tag" label="Tag" oncommand="dialog.toggleType('tag')"/>
<radio id="rdType_attr" label="Attribute" oncommand="dialog.toggleType('attr')"/>
</radiogroup>
</titledbox>
<titledbox id="tbxDirection" hide="true">
<title value="Direction"/>
<label value="Direction"/>
<radiogroup id="rgDirection" orient="horizontal">
<radio id="rdDir_up" value="Up"/>
<radio id="rdDir_down" value="Down"/>
<radio id="rdDir_up" label="Up"/>
<radio id="rdDir_down" label="Down"/>
</radiogroup>
</titledbox>
</box>
</box>
<box orient="vertical">
<button value="Find" observes="cmdFind" default="true"/>
<button value="Close" observes="cmdClose"/>
<button label="Find" observes="cmdFind" default="true"/>
<button label="Close" observes="cmdClose"/>
</box>
</window>

16
extensions/inspector/resources/content/viewers/dom/popupOverlay.xul
Просмотреть файл

@ -8,13 +8,13 @@
<popupset id="ppsGlobalPopupset">
<menupopup id="ppViewerContext-dom">
<menuitem id="item:find"
value="&cmdShowFindDialog.label;"
label="&cmdShowFindDialog.label;"
accesskey="&cmdShowFindDialog.accesskey;"
key="key:find"
observes="cmd:find"/>
<menuitem id="item:findNext"
value="&cmdFindNext.label;"
label="&cmdFindNext.label;"
key="key:findNext"
observes="cmd:findNext"/>
@ -23,14 +23,14 @@
<menuitem id="item:toggleAnon"
class="menuitem-iconic"
type="checkbox"
value="&cmdToggleAnonContent.label;"
label="&cmdToggleAnonContent.label;"
accesskey="&cmdToggleAnonContent.accesskey;"
observes="cmd:toggleAnon"/>
<menuseparator/>
<menuitem id="item:showColumns"
value="&cmdShowColumnsDialog.label;"
label="&cmdShowColumnsDialog.label;"
accesskey="&cmdShowColumnsDialog.accesskey;"
observes="cmd:showColumns"/>
@ -40,20 +40,20 @@
<menupopup id="mppSearch">
<menuitem id="item:find" position="1"
value="&cmdShowFindDialog.label;"
label="&cmdShowFindDialog.label;"
accesskey="&cmdShowFindDialog.accesskey;"
key="key:find"
observes="cmd:find"/>
<menuitem id="item:findNext" position="2"
value="&cmdFindNext.label;"
label="&cmdFindNext.label;"
key="key:findNext"
observes="cmd:findNext"/>
<menuseparator position="3"/>
<menuitem id="item:selectByClick" position="4"
value="&cmdSelectByClick.label;"
label="&cmdSelectByClick.label;"
accesskey="&cmdSelectByClick.accesskey;"
observes="cmd:selectByClick"/>
</menupopup>
@ -62,7 +62,7 @@
<menuitem id="item:toggleAnon"
class="menuitem-iconic"
type="checkbox"
value="&cmdToggleAnonContent.label;"
label="&cmdToggleAnonContent.label;"
accesskey="&cmdToggleAnonContent.accesskey;"
observes="cmd:toggleAnon"/>
</menupopup>

14
extensions/inspector/resources/content/viewers/nodeElement/nodeElement.xul
Просмотреть файл

@ -25,9 +25,9 @@
<popupset id="psPopups">
<popup id="ppAttrContext">
<menuitem value="New Attribute" oncommand="viewer.cmdNewAttribute()"/>
<menuitem value="Edit" oncommand="viewer.cmdEditSelectedAttribute()"/>
<menuitem value="Delete" oncommand="viewer.cmdDeleteSelectedAttribute()"/>
<menuitem label="New Attribute" oncommand="viewer.cmdNewAttribute()"/>
<menuitem label="Edit" oncommand="viewer.cmdEditSelectedAttribute()"/>
<menuitem label="Delete" oncommand="viewer.cmdDeleteSelectedAttribute()"/>
</popup>
</popupset>
@ -71,8 +71,8 @@
<treehead>
<treerow>
<treecell class="treecell-header" value="Name"/>
<treecell class="treecell-header" value="Value"/>
<treecell class="treecell-header" label="Name"/>
<treecell class="treecell-header" label="Value"/>
</treerow>
</treehead>
@ -94,8 +94,8 @@
<treechildren>
<treeitem uri="?node">
<treerow>
<treecell value="?nodeName" ins-type="name"/>
<treecell value="?nodeValue" class="treecell-editable" ins-type="value"/>
<treecell label="?nodeName" ins-type="name"/>
<treecell label="?nodeValue" class="treecell-editable" ins-type="value"/>
</treerow>
</treeitem>
</treechildren>

42
extensions/inspector/resources/content/viewers/styleRules/styleRules.xul
Просмотреть файл

@ -25,19 +25,19 @@
<popupset id="psPopups">
<popup id="ppStyleRuleContext" oncreate="return viewer.onCreateRulePopup()">
<menuitem value="New" oncommand="viewer.cmdNewRule()"/>
<menuitem value="Delete" oncommand="viewer.cmdDeleteSelectedRule()"/>
<menuitem value="Disable" oncommand="viewer.cmdToggleSelectedRule()"/>
<menuitem label="New" oncommand="viewer.cmdNewRule()"/>
<menuitem label="Delete" oncommand="viewer.cmdDeleteSelectedRule()"/>
<menuitem label="Disable" oncommand="viewer.cmdToggleSelectedRule()"/>
<menuseparator/>
<menuitem value="Open File in Editor" oncommand="viewer.cmdOpenSelectedFileInEditor()"/>
<menuitem label="Open File in Editor" oncommand="viewer.cmdOpenSelectedFileInEditor()"/>
</popup>
<popup id="ppStyleDecContext">
<menuitem value="New Property" oncommand="viewer.cmdNewProperty()"/>
<menuitem value="Edit" oncommand="viewer.cmdEditSelectedProperty()"/>
<menuitem value="Delete" oncommand="viewer.cmdDeleteSelectedProperty()"/>
<menuitem label="New Property" oncommand="viewer.cmdNewProperty()"/>
<menuitem label="Edit" oncommand="viewer.cmdEditSelectedProperty()"/>
<menuitem label="Delete" oncommand="viewer.cmdDeleteSelectedProperty()"/>
<menuseparator/>
<menuitem value="Toggle !important" oncommand="viewer.cmdToggleSelectedImportant()"/>
<menuitem label="Toggle !important" oncommand="viewer.cmdToggleSelectedImportant()"/>
</popup>
</popupset>
@ -67,10 +67,10 @@
<treechildren>
<treeitem uri="?rule">
<treerow>
<treecell value="?selector"/>
<treecell value="?fileURL"/>
<treecell value="?weight"/>
<treecell value="?lineNum"/>
<treecell label="?selector"/>
<treecell label="?fileURL"/>
<treecell label="?weight"/>
<treecell label="?lineNum"/>
</treerow>
</treeitem>
</treechildren>
@ -90,10 +90,10 @@
<treehead>
<treerow>
<treecell class="treecell-header" value="Selector"/>
<treecell class="treecell-header" value="File"/>
<treecell class="treecell-header" value="Weight"/>
<treecell class="treecell-header" value="Line"/>
<treecell class="treecell-header" label="Selector"/>
<treecell class="treecell-header" label="File"/>
<treecell class="treecell-header" label="Weight"/>
<treecell class="treecell-header" label="Line"/>
</treerow>
</treehead>
@ -128,8 +128,8 @@
<treeitem uri="?prop">
<treerow>
<treecell class="treecell-priority treecell-iconic" ins-type="priority" ins:priority="?priority"/>
<treecell value="?name" ins-type="name"/>
<treecell class="treecell-editable" value="?value" ins-type="value"/>
<treecell label="?name" ins-type="name"/>
<treecell class="treecell-editable" label="?value" ins-type="value"/>
</treerow>
</treeitem>
</treechildren>
@ -146,9 +146,9 @@
<treehead>
<treerow>
<treecell class="treecell-header" value="!"/>
<treecell class="treecell-header" value="Name"/>
<treecell class="treecell-header" value="Value"/>
<treecell class="treecell-header" label="!"/>
<treecell class="treecell-header" label="Name"/>
<treecell class="treecell-header" label="Value"/>
</treerow>
</treehead>

44
extensions/irc/xul/content/chatzilla.xul
Просмотреть файл

@ -63,20 +63,20 @@
<popupset>
<popup id="userlistPopup" oncommand="onUserListPopupClick(event)">
<menuitem value="&op.value;" accesskey="&op.accesskey;" code="/op" />
<menuitem value="&deop.value;" accesskey="&deop.accesskey;"
<menuitem label="&op.value;" accesskey="&op.accesskey;" code="/op" />
<menuitem label="&deop.value;" accesskey="&deop.accesskey;"
code="/deop" />
<menuitem value="&voice.value;" accesskey="&voice.accesskey;"
<menuitem label="&voice.value;" accesskey="&voice.accesskey;"
code="/voice" />
<menuitem value="&devoice.value;" accesskey="&devoice.accesskey;"
<menuitem label="&devoice.value;" accesskey="&devoice.accesskey;"
code="/devoice" />
<menuitem value="&kick.value;" accesskey="&kick.accesskey;"
<menuitem label="&kick.value;" accesskey="&kick.accesskey;"
code="/kick" />
<!--
<menuitem value="&kick2.value;" accesskey="&kick2.accesskey;"
<menuitem label="&kick2.value;" accesskey="&kick2.accesskey;"
code="/kick" />
-->
<menuitem value="&whois.value;" accesskey="&whois.accesskey;" code="/whois" />
<menuitem label="&whois.value;" accesskey="&whois.accesskey;" code="/whois" />
</popup>
</popupset>
@ -84,31 +84,31 @@
<menubar id="main-menubar" persist="collapsed">
<menu id="menu_File">
<menupopup id="menu_FilePopup">
<menu value="Options">
<menu label="Options">
<menupopup>
<menuitem id="menu-view-toolbar" value="Show Toolbar"
<menuitem id="menu-view-toolbar" label="Show Toolbar"
type="checkbox" oncommand="onToggleVisibility('toolbar');"/>
<menuitem id="menu-view-info" value="Show Userlist"
<menuitem id="menu-view-info" label="Show Userlist"
type="checkbox" oncommand="onToggleVisibility('info');"/>
<menuitem id="menu-view-status" value="Show Statusbar"
<menuitem id="menu-view-status" label="Show Statusbar"
type="checkbox" oncommand="onToggleVisibility('status');"/>
<menuseparator/>
<menuitem id="menu-munger" value="Enable Smileys"
<menuitem id="menu-munger" label="Enable Smileys"
oncommand="onToggleMunger()" type="checkbox"/>
<menuseparator/>
<menuitem id="menu-dmessages" value="Debug Messages"
<menuitem id="menu-dmessages" label="Debug Messages"
oncommand="onToggleTraceHook()" type="checkbox"/>
<menuseparator/>
<menuitem id="menu-settings-save-now" value="Save Settings Now"
<menuitem id="menu-settings-save-now" label="Save Settings Now"
oncommand="writeIRCPrefs()"/>
<menuitem id="menu-settings-autosave" value="Save Settings On Exit"
<menuitem id="menu-settings-autosave" label="Save Settings On Exit"
oncommand="onToggleSaveOnExit()" type="checkbox"/>
</menupopup>
@ -118,14 +118,14 @@
<menuitem id="menu_close"/>
</menupopup>
</menu>
<menu value="View">
<menu label="View">
<menupopup>
<!-- hide vs delete nuances are too vague
<menuitem value="Hide" oncommand="onHideCurrentView();"/>
<menuitem label="Hide" oncommand="onHideCurrentView();"/>
-->
<menuitem value="Clear this view" oncommand="onClearCurrentView();"/>
<menuitem value="Delete this view" oncommand="onDeleteCurrentView();"/>
<menuitem label="Clear this view" oncommand="onClearCurrentView();"/>
<menuitem label="Delete this view" oncommand="onDeleteCurrentView();"/>
</menupopup>
</menu>
@ -179,15 +179,15 @@
<treerow crop="right">
<treecell id="usercol-op"
resource="http://home.netscape.com/NC-irc#op"
class="treecell-header sortDirectionIndicator" value="O"
class="treecell-header sortDirectionIndicator" label="O"
onclick="return onSortCol('usercol-op');"/>
<treecell id="usercol-voice"
resource="http://home.netscape.com/NC-irc#voice"
class="treecell-header sortDirectionIndicator" value="V"
class="treecell-header sortDirectionIndicator" label="V"
onclick="return onSortCol('usercol-voice');"/>
<treecell id="usercol-nick"
resource="http://home.netscape.com/NC-irc#nick"
class="treecell-header sortDirectionIndicator" value="Nick"
class="treecell-header sortDirectionIndicator" label="Nick"
onclick="return onSortCol('usercol-nick');"/>
</treerow>
</treehead>

4
extensions/irc/xul/content/chatzillaOverlay.xul
Просмотреть файл

@ -15,11 +15,11 @@
</keyset>
<broadcasterset id="broadcasterset">
<broadcaster id="Tasks:IRC" value="&ircCmd.label;" oncommand="toIRC();"/>
<broadcaster id="Tasks:IRC" label="&ircCmd.label;" oncommand="toIRC();"/>
</broadcasterset>
<menupopup id="taskPopup">
<menuitem
<menuitem
position="7"
accesskey="&ircCmd.accesskey;"
key="key_irc"

14
extensions/irc/xul/content/pref-irc.xul
Просмотреть файл

@ -24,16 +24,16 @@
<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-irc.dtd" >
<window xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
class="dialog"
align="vertical" title="&window.title;"
onload="if( parent.handle ) parent.handle.onpageload( 'pref-irc' ); else parent.queuedTag = 'pref-irc';">
onload="if( parent.handle ) parent.handle.onpageload( 'pref-irc' ); else parent.queuedTag = 'pref-irc';">
<box class="header" align="horizontal">
<button class="left-header-text" value="&lHeader;"/>
<spring class="header-spring" flex="1"/>
<button class="right-header-text" value="&rHeader;"/>
</box>
<box class="header" align="horizontal">
<button class="left-header-text" label="&lHeader;"/>
<spring class="header-spring" flex="1"/>
<button class="right-header-text" label="&rHeader;"/>
</box>
<html:fieldset style="width: 100%;">

30
extensions/irc/xul/tests/test3.xul
Просмотреть файл

@ -53,40 +53,40 @@ resource:///irc/tests/test3.xul
<toolbox>
<menubar>
<menu value="Options">
<menu label="Options">
<menupopup>
<menuitem id="menu-dmessages" value="Debug Messages"
<menuitem id="menu-dmessages" label="Debug Messages"
oncommand="onToggleTraceHook()"/>
<menuitem id="menu-munger" value="Munger" oncommand="onToggleMunger()"
<menuitem id="menu-munger" label="Munger" oncommand="onToggleMunger()"
checked="true"/>
<menuitem id="menu-viewicons" value="Icons in View Buttons"
<menuitem id="menu-viewicons" label="Icons in View Buttons"
checked="true" oncommand="onNotImplemented();"/>
<menuseparator/>
<menu value="Style">
<menu label="Style">
<menupopup>
<menuitem value="Default"
<menuitem label="Default"
oncommand="onDoStyleChange('default')"/>
<menuitem value="Marble"
<menuitem label="Marble"
oncommand="onDoStyleChange('marble')"/>
<menuitem value="Loud"
<menuitem label="Loud"
oncommand="onDoStyleChange('loud')"/>
<menuseparator/>
<menuitem value="Other..."
<menuitem label="Other..."
oncommand="onDoStyleChange('other')"/>
</menupopup>
</menu>
</menupopup>
</menu>
<menu value="Views">
<menu label="Views">
<menupopup>
<menu value="Current View">
<menu label="Current View">
<menupopup>
<menuitem value="Hide" oncommand="onHideCurrentView();"/>
<menuitem value="Clear" oncommand="onClearCurrentView();"/>
<menuitem value="Delete" oncommand="onDeleteCurrentView();"/>
<menuitem label="Hide" oncommand="onHideCurrentView();"/>
<menuitem label="Clear" oncommand="onClearCurrentView();"/>
<menuitem label="Delete" oncommand="onDeleteCurrentView();"/>
</menupopup>
</menu>
<menuitem value="Logging..." enabled="false"
<menuitem label="Logging..." enabled="false"
oncommand="onNotImplemented();"/>
</menupopup>
</menu>

36
extensions/transformiix/resources/buster/buster.xul
Просмотреть файл

@ -33,33 +33,33 @@
<script type="text/javascript" src="xulTxTools.js" />
<script type="text/javascript" src="DumpDOM.js" />
<box align="horizontal">
<button value="load tests" oncommand="refresh_xalan()" />
<button value="check all" oncommand="check(true)" />
<button value="uncheck all" oncommand="check(false)" />
<button value="invert checks" oncommand="invert_check()" />
<button value="hide checked" oncommand="hide_checked(true)" />
<button value="hide unchecked" oncommand="hide_checked(false)" />
<button value="run checked tests" oncommand="dump_checked()" />
<button label="load tests" oncommand="refresh_xalan()" />
<button label="check all" oncommand="check(true)" />
<button label="uncheck all" oncommand="check(false)" />
<button label="invert checks" oncommand="invert_check()" />
<button label="hide checked" oncommand="hide_checked(true)" />
<button label="hide unchecked" oncommand="hide_checked(false)" />
<button label="run checked tests" oncommand="dump_checked()" />
</box>
<box align="horizontal">
<text value="Xalan base directory: " class="head" />
<textbox id="xalan_base" persist="value"/>
<button value="browse..." oncommand="browse_base_dir()" />
<button label="browse..." oncommand="browse_base_dir()" />
</box>
<box align="horizontal">
<titledbox align="horizontal"><title value="search" />
<button value="Search for " oncommand="select()"/>
<titledbox align="horizontal"><label value="search" />
<button label="Search for " oncommand="select()"/>
<textbox style="width: 10em;" id="search-name" persist="value" /><text value=" in " />
<menulist id="search-field" persist="data">
<menupopup>
<menuitem data="1" value="Name" />
<menuitem data="2" value="Purpose" />
<menuitem data="3" value="Comment" />
<menuitem value="1" label="Name" />
<menuitem value="2" label="Purpose" />
<menuitem value="3" label="Comment" />
</menupopup>
</menulist>
</titledbox>
<spring flex="1" /></box>
<box align="horizontal"><titledbox align="horizontal"><title value="stats" />
<box align="horizontal"><titledbox align="horizontal"><label value="stats" />
<text value="tests run: "/><text id="tests_run" value="0" />
<text value=" tests passed: "/><text id="tests_passed" value="0"/>
<text value=" tests failed: "/><text id="tests_failed" value="0"/>
@ -77,10 +77,10 @@
<rows id="xalan_grid">
<row flex="1">
<text value=" " class="head"/>
<text value="Name" class="head"/>
<text value="Purpose" class="head"/>
<text value="Comment" class="head"/>
<text value=" " class="head"/>
<text value="Name" class="head"/>
<text value="Purpose" class="head"/>
<text value="Comment" class="head"/>
</row>
</rows>
</grid>

10
extensions/transformiix/resources/buster/xulTxTools.js
Просмотреть файл

@ -67,7 +67,7 @@ function refresh_xalan() {
function populate_xalan() {
var upper=pop_last+pop_chunk;
var current,test,i,j, lName, re=/\/err\//;
var searchField = matchFieldTag.getAttribute("data");
var searchField = matchFieldTag.getAttribute("value");
var matchValue = matchNameTag.value;
if (matchValue.length==0) matchValue='.';
var matchRE = new RegExp(matchValue);
@ -76,8 +76,8 @@ function populate_xalan() {
test = xalan_elems.childNodes.item(2*i+1);
if (!test.getAttribute("file").match(re)){
current.setAttribute("id", test.getAttribute("file"));
current.childNodes.item(1).setAttribute("value",
test.getAttribute("file"));
current.childNodes.item(1).setAttribute("label",
test.getAttribute("file"));
for (j=1;j<test.childNodes.length;j+=2){
lName = test.childNodes.item(j).localName;
if (lName=="purpose")
@ -85,7 +85,7 @@ function populate_xalan() {
test.childNodes.item(j).firstChild.nodeValue);
if (lName=="comment")
current.childNodes.item(3).setAttribute("value",
test.childNodes.item(j).firstChild.nodeValue);
test.childNodes.item(j).firstChild.nodeValue);
}
if (matchRE.test(current.childNodes.item(searchField)
.getAttribute("value"))) target.appendChild(current);
@ -138,7 +138,7 @@ function hide_checked(yes){
}
function select(){
var searchField = matchFieldTag.getAttribute("data");
var searchField = matchFieldTag.getAttribute("value");
var matchRE = new RegExp(matchNameTag.value);
var nds = target.childNodes;
for (i=1;i<nds.length;i++){

4
extensions/vixen/resources/content/history/history.xul
Просмотреть файл

@ -65,10 +65,10 @@
state="?transaction-state"
position="?transaction-position">
<treecell state="?transaction-state"
class="treecell-history-grabber" allowevents="true" value="+"/>
class="treecell-history-grabber" allowevents="true" label="+"/>
<treecell class="treecell-history-cell"
state="?transaction-state"
value="?description" crop="right" flex="1"/>
label="?description" crop="right" flex="1"/>
</treerow>
</treeitem>
</treechildren>

6
extensions/vixen/resources/content/palette/vxPalette.xul
Просмотреть файл

@ -20,11 +20,11 @@
<script src="chrome://vixen/content/vfd/vxCreateElementTxn.js"></script>
<button value="Button"
<button label="Button"
oncommand="vxPalette.insertButtonElement();"/>
<button value="TextBox"
<button label="TextBox"
oncommand="vxPalette.insertTextboxElement();"/>
<button value="RadioGroup"
<button label="RadioGroup"
oncommand="vxPalette.insertRadioGroup();"/>

20
extensions/vixen/resources/content/vfdScratch.xul
Просмотреть файл

@ -42,8 +42,8 @@
<tree id="domTree" style="height: 0px; width: 0px;" flex="1">
<treehead>
<treerow>
<treecell value="Node/Attribute Name" class="treecell-header treecell-inset-header"/>
<treecell value="Attribute Value" class="treecell-header treecell-inset-header"/>
<treecell label="Node/Attribute Name" class="treecell-header treecell-inset-header"/>
<treecell label="Attribute Value" class="treecell-header treecell-inset-header"/>
</treerow>
</treehead>
<treecolgroup>
@ -53,26 +53,26 @@
<treechildren>
<treeitem>
<treerow>
<treecell value="foopy"/>
<treecell label="foopy"/>
<splitter class="tree-splitter"/>
<treecell value="noopy"/>
<treecell label="noopy"/>
</treerow>
</treeitem>
</treechildren>
</tree>
<box>
<button class="button-toolbar" value="Insert Node"/>
<button class="button-toolbar" value="Remove Node"/>
<button class="button-toolbar" label="Insert Node"/>
<button class="button-toolbar" label="Remove Node"/>
<toolbarseparator/>
<button class="button-toolbar" value="Add Attribute"/>
<button class="button-toolbar" value="Remove Attribute"/>
<button class="button-toolbar" label="Add Attribute"/>
<button class="button-toolbar" label="Remove Attribute"/>
<spring flex="1"/>
</box>
</box>
</tabpanel>
<tabbox>
<tab value="Designer"/>
<tab value="DOM Tree"/>
<tab label="Designer"/>
<tab label="DOM Tree"/>
</tabbox>
</tabcontrol>
</window>

24
extensions/vixen/resources/content/vixen.xul
Просмотреть файл

@ -50,33 +50,33 @@
<toolbox id="xuledit-toolbox" flex="1">
<menubar id="xuledit-menubar">
<menu id="menu_File" value="File" accesskey="f">
<menu id="menu_File" label="File" accesskey="f">
<menupopup>
<menuitem value="New..." accesskey="n" oncommand="vxShell.newDocument();"/>
<menuitem label="New..." accesskey="n" oncommand="vxShell.newDocument();"/>
<menuseparator/>
<menuitem value="Open..." accesskey="o" oncommand="vxShell.loadFormDesignerWithUI();"/>
<menuitem label="Open..." accesskey="o" oncommand="vxShell.loadFormDesignerWithUI();"/>
<menuseparator/>
<menuitem value="Save As..." accesskey="a" oncommand="vxShell.saveDocument();"/>
<menuitem label="Save As..." accesskey="a" oncommand="vxShell.saveDocument();"/>
<menuseparator/>
<menuitem value="Exit" accesskey="x" key="quitKey"/>
<menuitem label="Exit" accesskey="x" key="quitKey"/>
</menupopup>
</menu>
<menu id="menu_Edit" value="Edit" accesskey="e">
<menu id="menu_Edit" label="Edit" accesskey="e">
<menupopup>
<menuitem value="Undo" accesskey="u" oncommand="vxShell.undo();" key="undo"/>
<menuitem value="Redo" accesskey="r" oncommand="vxShell.redo();" key="redo"/>
<menuitem label="Undo" accesskey="u" oncommand="vxShell.undo();" key="undo"/>
<menuitem label="Redo" accesskey="r" oncommand="vxShell.redo();" key="redo"/>
<menuseparator/>
<menuitem value=" "/>
<menuitem label=" "/>
</menupopup>
</menu>
<menu id="menu_Help" value="Help" accesskey="h">
<menu id="menu_Help" label="Help" accesskey="h">
<menupopup>
<menuitem value="About" oncommand="vxShell.appAbout();"/>
<menuitem label="About" oncommand="vxShell.appAbout();"/>
</menupopup>
</menu>
</menubar>
<toolbar id="xuledit-toolbar" flex="1">
<button class="button-toolbar" value="Dump DOM" oncommand="XXX_dumpDOM();"/>
<button class="button-toolbar" label="Dump DOM" oncommand="XXX_dumpDOM();"/>
</toolbar>
</toolbox>
</window>

4
extensions/vixen/resources/content/xe_NavOverlay.xul
Просмотреть файл

@ -37,9 +37,9 @@ function loadXULEdit()
</script>
<menupopup id="taskPopup">
<menuitem
<menuitem
position="7"
value="ViXEn"
label="ViXEn"
oncommand="loadXULEdit();"/>
</menupopup>

8
extensions/wallet/cookieviewer/CookieViewer.js
Просмотреть файл

@ -213,7 +213,7 @@ function ViewCookieSelected( e )
{
if(i == 3) {
var dtypecell = document.getElementById("ifl_domaintype");
dtypecell.setAttribute("value", cookies[idx].domaintype+":");
dtypecell.setAttribute("label", cookies[idx].domaintype+":");
continue;
}
var field = document.getElementById(rows[i]);
@ -236,7 +236,7 @@ function DeleteCookieSelected() {
for(k = 0; k < rows.length; k++)
{
var row = document.getElementById(rows[k]);
row.setAttribute("value","");
row.setAttribute("label","");
}
if( !document.getElementById("cookietree").selectedItems.length ) {
if( !document.getElementById("removeCookies").disabled ) {
@ -258,7 +258,7 @@ function DeleteAllCookies() {
for(var k = 0; k < rows.length; k++)
{
var row = document.getElementById(rows[k]);
row.setAttribute("value","");
row.setAttribute("label","");
}
if( !document.getElementById("removeCookies").disabled ) {
document.getElementById("removeCookies").setAttribute("disabled", "true")
@ -477,7 +477,7 @@ function AddItem(children,cells,prefix,idfier)
{
var cell = document.createElement("treecell");
cell.setAttribute("class", "propertylist");
cell.setAttribute("value", cells[i])
cell.setAttribute("label", cells[i])
row.appendChild(cell);
}
item.appendChild(row);

36
extensions/wallet/cookieviewer/CookieViewer.xul
Просмотреть файл

@ -46,9 +46,9 @@
<tabcontrol id="tabcontrol" flex="1" orient="vertical">
<tabbox>
<tab id="cookiesTab" value="&tab.cookiesonsystem.label;"/>
<tab value="&tab.bannedservers.label;"/>
<tab id="imagesTab" style="display:none" value="&tab.bannedimages.label;"/>
<tab id="cookiesTab" label="&tab.cookiesonsystem.label;"/>
<tab label="&tab.bannedservers.label;"/>
<tab id="imagesTab" style="display:none" label="&tab.bannedimages.label;"/>
</tabbox>
<tabpanel id="panel" flex="1">
<box class="tabpanel" id="system" flex="1" orient="vertical">
@ -66,18 +66,18 @@
<treehead>
<treerow>
<treecell class="treecell-header sortDirectionIndicator"
value="&treehead.cookiedomain.label;"
label="&treehead.cookiedomain.label;"
onclick="return Wallet_ColumnSort('0', 'cookielist');"/>
<treecell class="treecell-header
sortDirectionIndicator"
value="&treehead.cookiename.label;"
label="&treehead.cookiename.label;"
onclick="return Wallet_ColumnSort('1', 'cookielist');"/>
</treerow>
</treehead>
<treechildren id="cookielist" flex="1"/>
</tree>
<titledbox>
<title value="&treehead.infoselected.label;"/>
<label value="&treehead.infoselected.label;"/>
<!-- labels -->
<grid flex="1">
<columns>
@ -114,16 +114,16 @@
</titledbox>
<box>
<button id="removeCookies" class="dialog push" disabled="true"
value="&button.removecookie.label;"
label="&button.removecookie.label;"
oncommand="DeleteCookieSelected();"/>
<button id="removeAllCookies" class="dialog push"
value="&button.removeallcookies.label;"
label="&button.removeallcookies.label;"
oncommand="DeleteAllCookies();"/>
<!-- todo: <button id="restoreCookies" class="dialog push" disabled="true" value="&button.restorecookie.label;" oncommand="RestoreCookies();"/> -->
<!-- todo: <button id="restoreCookies" class="dialog push" disabled="true" label="&button.restorecookie.label;" oncommand="RestoreCookies();"/> -->
</box>
<separator class="thin"/>
<box autostretch="never">
<checkbox id="checkbox" value="&checkbox.label;" />
<checkbox id="checkbox" label="&checkbox.label;" />
</box>
</box>
@ -141,10 +141,10 @@
<treehead>
<treerow>
<treecell class="treecell-header sortDirectionIndicator"
value="&treehead.sitename.label;"
label="&treehead.sitename.label;"
onclick="return Wallet_ColumnSort('0', 'permissionslist');"/>
<treecell class="treecell-header sortDirectionIndicator"
value="&treehead.status.label;"
label="&treehead.status.label;"
onclick="return Wallet_ColumnSort('1', 'permissionslist');"/>
</treerow>
</treehead>
@ -152,10 +152,10 @@
</tree>
<box>
<button id="removePermissions" class="dialog push" disabled="true"
value="&removepermission.label;"
label="&removepermission.label;"
oncommand="DeletePermissionSelected();"/>
<button id="removeAllPermissions" class="dialog push"
value="&removeallpermissions.label;"
label="&removeallpermissions.label;"
oncommand="DeleteAllPermissions();"/>
</box>
</box>
@ -174,10 +174,10 @@
<treehead>
<treerow>
<treecell class="treecell-header sortDirectionIndicator"
value="&treehead.sitename.label;"
label="&treehead.sitename.label;"
onclick="return Wallet_ColumnSort('0', 'imageslist');"/>
<treecell class="treecell-header sortDirectionIndicator"
value="&treehead.status.label;"
label="&treehead.status.label;"
onclick="return Wallet_ColumnSort('1', 'imageslist');"/>
</treerow>
</treehead>
@ -185,10 +185,10 @@
</tree>
<box>
<button id="removeImages" class="dialog push" disabled="true"
value="&removeimage.label;"
label="&removeimage.label;"
oncommand="DeleteImageSelected();"/>
<button id="removeAllImages" class="dialog push"
value="&removeallimages.label;"
label="&removeallimages.label;"
oncommand="DeleteAllImages();"/>
</box>
</box>

22
extensions/wallet/editor/WalletAddress.xul
Просмотреть файл

@ -48,7 +48,7 @@
src="chrome://communicator/content/wallet/WalletViewer.js"/>
<titledbox class="tabpanel" autostretch="never">
<title><text value="&address.title;"/></title>
<label value="&address.title;"/>
<grid class="indent" flex="1">
<columns>
@ -63,7 +63,7 @@
<menulist id="street.line1" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -73,7 +73,7 @@
<menulist id="street.line2" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -83,7 +83,7 @@
<menulist id="street.line3" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -93,7 +93,7 @@
<menulist id="city" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -103,7 +103,7 @@
<menulist id="state" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -114,14 +114,14 @@
<menulist id="postalcode.prefix" editable="true" flex="55%" width="0"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
<text value="__"/>
<menulist id="postalcode.suffix" editable="true" flex="45%" width="0"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</box>
@ -132,7 +132,7 @@
<menulist id="country" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -142,7 +142,7 @@
<menulist id="email" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -153,7 +153,7 @@
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>

88
extensions/wallet/editor/WalletConcatenated.xul
Просмотреть файл

@ -64,7 +64,7 @@
<titledbox class="tabpanel" autostretch="never" hidden="true">
<title><text value="&concatPrimary.title;"/></title>
<label value="&concatPrimary.title;"/>
<grid class="indent" flex="1">
<columns>
<column/>
@ -77,7 +77,7 @@
<menulist id="name" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -87,7 +87,7 @@
<menulist id="home.postalcode" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -97,7 +97,7 @@
<menulist id="home.phone" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -107,7 +107,7 @@
<menulist id="home.phone.number" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -117,7 +117,7 @@
<menulist id="home.altphone" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -127,7 +127,7 @@
<menulist id="home.altphone.number" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -137,7 +137,7 @@
<menulist id="home.fax" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -147,7 +147,7 @@
<menulist id="home.fax.number" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -157,7 +157,7 @@
<menulist id="home.mobile" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -167,7 +167,7 @@
<menulist id="home.mobile.number" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -177,7 +177,7 @@
<menulist id="home.pager" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -187,7 +187,7 @@
<menulist id="home.pager.number" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -197,7 +197,7 @@
</titledbox>
<titledbox class="tabpanel" autostretch="never" hidden="true">
<title><text value="&concatShipping.title;"/></title>
<label value="&concatShipping.title;"/>
<grid class="indent">
<columns>
<column/>
@ -210,7 +210,7 @@
<menulist id="shipto.name" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -220,7 +220,7 @@
<menulist id="shipto.postalcode" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -230,7 +230,7 @@
<menulist id="shipto.phone" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -240,7 +240,7 @@
<menulist id="shipto.phone.number" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -250,7 +250,7 @@
<menulist id="shipto.altphone" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -260,7 +260,7 @@
<menulist id="shipto.altphone.number" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -270,7 +270,7 @@
<menulist id="shipto.fax" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -280,7 +280,7 @@
<menulist id="shipto.fax.number" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -290,7 +290,7 @@
<menulist id="shipto.mobile" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -300,7 +300,7 @@
<menulist id="shipto.mobile.number" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -310,7 +310,7 @@
<menulist id="shipto.pager" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -320,7 +320,7 @@
<menulist id="shipto.pager.number" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -330,7 +330,7 @@
</titledbox>
<titledbox class="tabpanel" autostretch="never" hidden="true">
<title><text value="&concatBilling.title;"/></title>
<label value="&concatBilling.title;"/>
<grid class="indent">
<columns>
<column/>
@ -343,7 +343,7 @@
<menulist id="billto.name" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -353,7 +353,7 @@
<menulist id="billto.postalcode" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -363,7 +363,7 @@
<menulist id="billto.phone" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -373,7 +373,7 @@
<menulist id="billto.phone.number" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -383,7 +383,7 @@
<menulist id="billto.altphone" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -393,7 +393,7 @@
<menulist id="billto.altphone.number" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -403,7 +403,7 @@
<menulist id="billto.fax" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -413,7 +413,7 @@
<menulist id="billto.fax.number" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -423,7 +423,7 @@
<menulist id="billto.mobile" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -433,7 +433,7 @@
<menulist id="billto.mobile.number" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -443,7 +443,7 @@
<menulist id="billto.pager" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -453,7 +453,7 @@
<menulist id="billto.pager.number" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -463,7 +463,7 @@
</titledbox>
<titledbox class="tabpanel" autostretch="never" hidden="true">
<title><text value="&concatOther.title;"/></title>
<label value="&concatOther.title;"/>label
<grid class="indent">
<columns>
<column/>
@ -476,7 +476,7 @@
<menulist id="card.expdate" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -486,7 +486,7 @@
<menulist id="socsec" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -496,7 +496,7 @@
<menulist id="bdate" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -506,7 +506,7 @@
<menulist id="anniv" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>

12
extensions/wallet/editor/WalletCredit.xul
Просмотреть файл

@ -47,7 +47,7 @@
src="chrome://communicator/content/wallet/WalletViewer.js"/>
<titledbox class="tabpanel" autostretch="never">
<title><text value="&credit.title;"/></title>
<label value="&credit.title;"/>
<grid class="indent" flex="1">
<columns>
@ -62,7 +62,7 @@
<menulist id="card.type" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -72,7 +72,7 @@
<menulist id="card.number" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -84,14 +84,14 @@
<menulist id="card.expdate.month" editable="true" flex="40%" width="0"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
<html>&creditExpiresYear.label;</html>
<menulist id="card.expdate.year" editable="true" flex="60%" width="0"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</box>
@ -102,7 +102,7 @@
<menulist id="card.name" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>

2
extensions/wallet/editor/WalletEditor.js
Просмотреть файл

@ -869,7 +869,7 @@ function AddItem(children,cells,prefix,idfier)
{
var cell = document.createElement("treecell");
cell.setAttribute("class", "propertylist");
cell.setAttribute("value", cells[i])
cell.setAttribute("label", cells[i])
row.appendChild(cell);
}
item.appendChild(row);

12
extensions/wallet/editor/WalletEditor.xul
Просмотреть файл

@ -57,8 +57,8 @@
<treechildren id="schemalist" flex="1"/>
</tree>
<box orient="horizontal">
<button id="removeSchema" class="dialog push" disabled="true" value="&button.remove.label;" oncommand="DeleteSchema();"/>
<button id="addSchema" class="dialog push" disabled="false" value="&button.addschema.label;" oncommand="AddSchema();"/>
<button id="removeSchema" class="dialog push" disabled="true" label="&button.remove.label;" oncommand="DeleteSchema();"/>
<button id="addSchema" class="dialog push" disabled="false" label="&button.addschema.label;" oncommand="AddSchema();"/>
</box>
</box>
<spring style="width: 7px;"/>
@ -84,11 +84,11 @@
<spring style="width: 7px;"/>
<box orient="vertical">
<spring style="height: 15px;"/>
<button id="removeEntry" class="dialog push" disabled="true" value="&button.remove.label;" oncommand="DeleteEntry();"/>
<button id="addEntry" class="dialog push" disabled="false" value="&button.addentry.label;" oncommand="AddEntry();"/>
<button id="removeEntry" class="dialog push" disabled="true" label="&button.remove.label;" oncommand="DeleteEntry();"/>
<button id="addEntry" class="dialog push" disabled="false" label="&button.addentry.label;" oncommand="AddEntry();"/>
<spring style="height: 93px;"/>
<button id="removeSynonym" class="dialog push" disabled="true" value="&button.remove.label;" oncommand="DeleteSynonym();"/>
<button id="addSynonym" class="dialog push" disabled="false" value="&button.addsynonym.label;" oncommand="AddSynonym();"/>
<button id="removeSynonym" class="dialog push" disabled="true" label="&button.remove.label;" oncommand="DeleteSynonym();"/>
<button id="addSynonym" class="dialog push" disabled="false" label="&button.addsynonym.label;" oncommand="AddSynonym();"/>
</box>
<spring style="width: 7px;"/>
</box>

8
extensions/wallet/editor/WalletEmploy.xul
Просмотреть файл

@ -46,7 +46,7 @@
src="chrome://communicator/content/wallet/WalletViewer.js"/>
<titledbox class="tabpanel" autostretch="never">
<title><text value="&employ.title;"/></title>
<label value="&employ.title;"/>
<grid class="indent" flex="1">
<columns>
@ -61,7 +61,7 @@
<menulist id="business.companyname" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -71,7 +71,7 @@
<menulist id="business.jobtitle" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -81,7 +81,7 @@
<menulist id="business.department" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>

26
extensions/wallet/editor/WalletMisc.xul
Просмотреть файл

@ -49,7 +49,7 @@
src="chrome://communicator/content/wallet/WalletViewer.js"/>
<titledbox class="tabpanel" autostretch="never">
<title><text value="&misc.title;"/></title>
<label value="&misc.title;"/>
<grid class="indent" flex="1">
<columns>
@ -65,21 +65,21 @@
<menulist id="socsec.prefix" editable="true" flex="33%" width="0"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
<text value="__"/>
<menulist id="socsec.middle" editable="true" flex="24%" width="0"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
<text value="__"/>
<menulist id="socsec.suffix" editable="true" flex="43%" width="0"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</box>
@ -91,7 +91,7 @@
<menulist id="license.number" editable="true" flex="70" width="0"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
<spring style="width: 5px;"/>
@ -99,7 +99,7 @@
<menulist id="license.state" editable="true" flex="30" width="0"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</box>
@ -110,7 +110,7 @@
<menulist id="mothersmaidenname" editable="true"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</row>
@ -122,21 +122,21 @@
<menulist id="bdate.month" editable="true" flex="40%" width="0"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
<html>&miscBirthdayDay.label;</html>
<menulist id="bdate.day" editable="true" flex="20%" width="0"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
<html>&miscBirthdayYear.label;</html>
<menulist id="bdate.year" editable="true" flex="40%" width="0"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</box>
@ -149,21 +149,21 @@
<menulist id="anniv.month" editable="true" flex="40%" width="0"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
<html>&miscAnnivDay.label;</html>
<menulist id="anniv.day" editable="true" flex="20%" width="0"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
<html>&miscAnnivYear.label;</html>
<menulist id="anniv.year" editable="true" flex="40%" width="0"
onchange="Append(this)" onmousedown="Append(this)">
<menupopup>
<menuitem value="" len="0"/>
<menuitem label="" len="0"/>
</menupopup>
</menulist>
</box>

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше