зеркало из https://github.com/mozilla/gecko-dev.git
80834 - [outliner scrollbar] if inbox has less than one page of messages, it will come up with a box where the scroll bar is
80548 - outliner scroll bar "disappears" in 3 stages 111101 - No scrollbox / slider / thumb in thread pane scrollbar 116269 - white scrollbars briefly show up in folder pane 116432 - Sometimes the twisty won't update after a click 116855 - Modify outliner builder syntax to match outliner content model r=waterson, sspitzer, blake sr=hyatt 99715 - convert category tree to use outliner r=hixie sr=blake
This commit is contained in:
Родитель
12f2f8e8cb
Коммит
d20016bd43
|
@ -500,6 +500,9 @@ inDOMView::ToggleOpenState(PRInt32 index)
|
|||
else
|
||||
ExpandNode(index);
|
||||
|
||||
// Update the twisty.
|
||||
mOutliner->InvalidateRow(index);
|
||||
|
||||
mOutliner->RowCountChanged(index+1, GetRowCount() - oldCount);
|
||||
|
||||
return NS_OK;
|
||||
|
|
|
@ -261,7 +261,7 @@ nsPrefWindow.prototype =
|
|||
function ()
|
||||
{
|
||||
var prefPanelTree = document.getElementById( "prefsTree" );
|
||||
var selectedItem = prefPanelTree.selectedItems[0];
|
||||
var selectedItem = prefPanelTree.contentView.getItemAtIndex(prefPanelTree.currentIndex);
|
||||
|
||||
var oldURL = document.getElementById( this.contentFrame ).getAttribute("tag");
|
||||
if( !oldURL )
|
||||
|
@ -364,7 +364,8 @@ nsPrefWindow.prototype =
|
|||
currentItem.removeAttribute( "open" );
|
||||
}
|
||||
var openItem = document.getElementById( aSelectItem );
|
||||
panelTree.selectItem( openItem );
|
||||
var index = panelTree.contentView.getIndexOfItem( openItem );
|
||||
panelTree.outlinerBoxObject.selection.select( index );
|
||||
}
|
||||
|
||||
};
|
||||
|
|
|
@ -26,22 +26,20 @@
|
|||
<overlay id="cookiePrefsOverlay"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
|
||||
|
||||
<treechildren id="securityChildren">
|
||||
<treeitem position="1">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent"
|
||||
url="chrome://cookie/content/pref-cookies.xul"
|
||||
label="&cookies.label;"
|
||||
id="cookiesCell"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem position="2">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent"
|
||||
url="chrome://cookie/content/pref-images.xul"
|
||||
label="&images.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
<outlinerchildren id="securityChildren">
|
||||
<outlineritem position="1">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://cookie/content/pref-cookies.xul"
|
||||
label="&cookies.label;"
|
||||
id="cookiesCell"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem position="2">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://cookie/content/pref-images.xul"
|
||||
label="&images.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
</outlinerchildren>
|
||||
|
||||
</overlay>
|
||||
|
|
|
@ -53,11 +53,8 @@
|
|||
<script type="application/x-javascript" src="chrome://help/content/help.js"/>
|
||||
|
||||
<hbox flex="1">
|
||||
<vbox>
|
||||
<label value="&categoryHeader;"/>
|
||||
<!-- tree sidebar -->
|
||||
<tree id="prefsTree" style="width: 13em;" flex="1"/>
|
||||
</vbox>
|
||||
<!-- tree sidebar -->
|
||||
<outliner id="prefsTree" style="width: 13em;"/>
|
||||
<vbox flex="1">
|
||||
<dialogheader id="header"/>
|
||||
<iframe id="panelFrame" name="panelFrame" style="width: 0px" flex="1"/>
|
||||
|
|
|
@ -37,156 +37,145 @@
|
|||
]]>
|
||||
</script>
|
||||
|
||||
<tree id="prefsTree" onselect="if( hPrefWindow ) hPrefWindow.switchPage();">
|
||||
|
||||
<treecolgroup>
|
||||
<treecol flex="1"/>
|
||||
</treecolgroup>
|
||||
<outliner id="prefsTree" seltype="single">
|
||||
<outlinercols>
|
||||
<outlinercol id="categoryCol" label="&category.label;" flex="1" primary="true"/>
|
||||
</outlinercols>
|
||||
<outlinerbody flex="1" onselect="if( hPrefWindow ) hPrefWindow.switchPage();">
|
||||
<outlinerchildren id="panelChildren">
|
||||
<outlineritem container="true" open="true" id="appearance">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-appearance.xul" label="&appear.label;"/>
|
||||
</outlinerrow>
|
||||
<outlinerchildren id="appearanceChildren">
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-fonts.xul" label="&fonts.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-colors.xul" label="&colors.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem id="themes-panel">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-themes.xul" label="&themes.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
</outlinerchildren>
|
||||
</outlineritem>
|
||||
|
||||
<!-- XXX remove this when overlays.rdf works for navigator -->
|
||||
<outlineritem container="true" open="true" id="navigator">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-navigator.xul" label="&navigator.label;"/>
|
||||
</outlinerrow>
|
||||
<outlinerchildren>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-history.xul" label="&history.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-languages.xul" label="&languages.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-applications.xul" label="&applications.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-smart_browsing.xul" label="&smartBrowse.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-search.xul" label="&search.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-tabs.xul" label="&tabWindows.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-policies.xul" label="&policies.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem> -->
|
||||
</outlinerchildren>
|
||||
</outlineritem>
|
||||
|
||||
<treechildren id="panelChildren" flex="1">
|
||||
<treeitem container="true" open="true" id="appearance">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-appearance.xul" label="&appear.label;"/>
|
||||
</treerow>
|
||||
<treechildren id="appearanceChildren">
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-fonts.xul" label="&fonts.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-colors.xul" label="&colors.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="themes-panel">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-themes.xul" label="&themes.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</treeitem>
|
||||
<!-- Security and Privacy items -->
|
||||
<outlineritem container="true" open="true" id="securityItem">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-security.xul" label="&security.label;" />
|
||||
</outlinerrow>
|
||||
<outlinerchildren id="securityChildren"/>
|
||||
</outlineritem>
|
||||
|
||||
<!-- XXX remove this when overlays.rdf works for navigator -->
|
||||
<treeitem container="true" open="true" id="navigator">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-navigator.xul" label="&navigator.label;"/>
|
||||
</treerow>
|
||||
<treechildren>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-history.xul" label="&history.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-languages.xul" label="&languages.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-applications.xul" label="&applications.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-smart_browsing.xul" label="&smartBrowse.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-search.xul" label="&search.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<outlineritem container="true" open="true" id="advancedItem">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-advanced.xul" label="&advance.label;"/>
|
||||
</outlinerrow>
|
||||
<outlinerchildren id="advancedChildren">
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-scripts.xul" label="&scriptsAndWindows.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-cache.xul" label="&cache.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-proxies.xul" label="&proxies.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-smartupdate.xul" label="&smart.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem id="mousewheelItem">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-mousewheel.xul" label="&mousewheel.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
</outlinerchildren>
|
||||
</outlineritem>
|
||||
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-tabs.xul" label="&tabWindows.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<outlineritem container="true" open="true" id="debugItem">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-debug.xul" label="&debug.label;"/>
|
||||
</outlinerrow>
|
||||
<outlinerchildren id="debugChildren">
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-debug1.xul" label="&debug1.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
<outlineritem>
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-debug2.xul" label="&debug2.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
</outlinerchildren>
|
||||
</outlineritem>
|
||||
|
||||
<!-- Taking out Policies panel b/c bug 44121
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-policies.xul" label="&policies.label;"/>
|
||||
</treerow>
|
||||
</treeitem> -->
|
||||
</treechildren>
|
||||
</treeitem>
|
||||
<!-- XXX -->
|
||||
|
||||
<!-- Security and Privacy items -->
|
||||
<treeitem container="true" open="true" id="securityItem">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-security.xul"
|
||||
label="&security.label;" />
|
||||
</treerow>
|
||||
<treechildren id="securityChildren"/>
|
||||
</treeitem>
|
||||
|
||||
<treeitem container="true" open="true" id="advancedItem">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-advanced.xul" label="&advance.label;"/>
|
||||
</treerow>
|
||||
<treechildren id="advancedChildren">
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-scripts.xul" label="&scriptsAndWindows.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-cache.xul" label="&cache.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-proxies.xul" label="&proxies.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-smartupdate.xul" label="&smart.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
<treeitem id="mousewheelItem">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-mousewheel.xul" label="&mousewheel.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
</treeitem>
|
||||
|
||||
<treeitem container="true" open="true" id="debugItem">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-debug.xul" label="&debug.label;"/>
|
||||
</treerow>
|
||||
<treechildren id="debugChildren">
|
||||
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-debug1.xul" label="&debug1.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
<treeitem>
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-debug2.xul" label="&debug2.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
</treechildren>
|
||||
</treeitem>
|
||||
|
||||
<treeitem container="false" id="offlineItem">
|
||||
<treerow>
|
||||
<treecell class="treecell-indent" url="chrome://communicator/content/pref/pref-offline.xul" label="&offline.label;"/>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
|
||||
</treechildren>
|
||||
|
||||
</tree>
|
||||
<outlineritem id="offlineItem">
|
||||
<outlinerrow>
|
||||
<outlinercell url="chrome://communicator/content/pref/pref-offline.xul" label="&offline.label;"/>
|
||||
</outlinerrow>
|
||||
</outlineritem>
|
||||
</outlinerchildren>
|
||||
</outlinerbody>
|
||||
</outliner>
|
||||
|
||||
</overlay>
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
<!-- LOCALIZATION NOTE : FILE UI for the outer parts of the Prefs dialog -->
|
||||
<!ENTITY prefWindow.title "Preferences">
|
||||
<!ENTITY categoryHeader "Category">
|
||||
|
||||
<!-- LOCALIZATION NOTE : this is part of an inline-style attribute on the
|
||||
preference dialog's <window> node, which specifies the width and height
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
<!-- extracted from content/preftree.xul -->
|
||||
|
||||
<!ENTITY category.label "Category">
|
||||
|
||||
<!--LOCALIZATION NOTE : FILE Lists preferences categories that appear on the left of the preferences dialog -->
|
||||
<!ENTITY appear.label "Appearance">
|
||||
<!ENTITY fonts.label "Fonts">
|
||||
|
|
Загрузка…
Ссылка в новой задаче