Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 57653: search cleanup, skinability, random fixes, optimization, and more. r=jag a=ben

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@84746 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
blakeross%telocity.com 2001-01-10 23:02:57 +00:00
parent aa91fe5d8e
commit b6f4549d3e
7 changed files with 577 additions and 795 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/themes/blue/communicator/search/search.css
View File

@ -104,5 +104,10 @@ titledbutton.panelbtn {
margin-left : 0px;
margin-right : 0px;
}
#stopButton
{
list-style-image : url("resource:/res/rdf/loading.gif");
}

5
mozilla/themes/classic/communicator/search/mac/search.css
View File

@ -105,5 +105,10 @@ titledbutton.panelbtn {
margin-left : 0px;
margin-right : 0px;
}
#stopButton
{
list-style-image : url("resource:/res/rdf/loading.gif");
}

7
mozilla/themes/classic/communicator/search/win/search.css
View File

@ -53,4 +53,9 @@
{
border-right : 1px solid threedshadow;
border-left : 1px solid threedhighlight;
}
}
#stopButton
{
list-style-image : url("resource:/res/rdf/loading.gif");
}

5
mozilla/themes/modern/communicator/search/search.css
View File

@ -109,3 +109,8 @@ titledbutton.panelbtn {
{
font-weight : normal;
}
#stopButton
{
list-style-image : url("resource:/res/rdf/loading.gif");
}

35
mozilla/xpfe/components/search/resources/internetresults.xul
View File

@ -6,22 +6,21 @@
<!DOCTYPE window SYSTEM "chrome://communicator/locale/search/internetresults.dtd">
<window class="color-dialog" orient="vertical" onload="onLoadInternetResults()"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
<window class="color-dialog" orient="vertical" onload="onLoadInternetResults();"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&internetresults.title;"
context="disallowcontext">
context="disallowcontext">
<popupset>
<popup id="disallowcontext" oncreate="return(false);" />
<popup id="disallowcontext" oncreate="return false;" />
</popupset>
<script src="chrome://global/content/strres.js"></script>
<script src="chrome://global/content/nsUserSettings.js"></script>
<script src="chrome://global/content/nsJSComponentManager.js"></script>
<script src="chrome://communicator/content/search/internetresults.js"></script>
<script src="chrome://communicator/content/search/shared.js"></script>
<script type="text/javascript" src="chrome://global/content/nsUserSettings.js"/>
<script type="text/javascript" src="chrome://global/content/nsJSComponentManager.js"/>
<script type="text/javascript" src="chrome://communicator/content/search/internetresults.js"/>
<script type="text/javascript" src="chrome://communicator/content/search/shared.js"/>
<box id="multi-results-header">
<text value="&results.header.label;"/>
@ -32,13 +31,13 @@
style="overflow: none; min-width: 1px;">
<template>
<button class="engineTabs button-toolbar-3 button-slimline" uri="..."
oncommand="doEngineClick(event, this)" crop="right"
oncommand="doEngineClick(event, this);" crop="right"
src="rdf:http://home.netscape.com/NC-rdf#StatusIcon"
value="rdf:http://home.netscape.com/NC-rdf#Name"
loading="rdf:http://home.netscape.com/NC-rdf#loading" />
</template>
<button class="engineTabs button-toolbar-3 button-slimline" id="allEngines"
oncommand="doEngineClick(event, this)" value="&allresults.title.label;"
oncommand="doEngineClick(event, this);" value="&allresults.title.label;"
toggled="true"/>
<separator orient="vertical"/>
<text value="&viewbyprovider.label;"/>
@ -47,7 +46,7 @@
<popupset>
<popup id="contextual" oncreate="return fillContextMenu('contextual', 'internetresultstree');" >
<menu />
<menu/>
</popup>
</popupset>
<tree id="internetresultstree" ref="" flex="1" datasources="rdf:internetsearch" context="contextual"
@ -61,19 +60,19 @@
<splitter class="tree-splitter"/>
<treecol id="RelevanceColumn" resource="http://home.netscape.com/NC-rdf#Relevance"
resource2="http://home.netscape.com/NC-rdf#Name"
style="width: 0; visibility: collapse;" flex="1"/>
hidden="true" flex="1"/>
<splitter class="tree-splitter"/>
<treecol id="PriceColumn" resource="http://home.netscape.com/NC-rdf#Price"
resource2="http://home.netscape.com/NC-rdf#Availability"
style="width: 0; visibility: collapse;" flex="1"/>
hidden="true" flex="1"/>
<splitter class="tree-splitter"/>
<treecol id="AvailabilityColumn" resource="http://home.netscape.com/NC-rdf#Availability"
resource2="http://home.netscape.com/NC-rdf#Price"
style="width: 0; visibility: collapse;" flex="1"/>
hidden="true" flex="1"/>
<splitter class="tree-splitter"/>
<treecol id="DateColumn" resource="http://home.netscape.com/NC-rdf#Date"
resource2="http://home.netscape.com/NC-rdf#Name"
style="width: 0; visibility: collapse;" flex="1"/>
hidden="true" flex="1"/>
<splitter class="tree-splitter"/>
<treecol id="SiteColumn" resource="http://home.netscape.com/NC-rdf#Site"
resource2="http://home.netscape.com/NC-rdf#Name" flex="1"/>

1276
mozilla/xpfe/components/search/resources/search-panel.js
View File

File diff suppressed because it is too large Load Diff

39
mozilla/xpfe/components/search/resources/search-panel.xul
View File

@ -19,7 +19,7 @@
Rights Reserved.
Contributor(s):
Blake Ross <BlakeR1234@aol.com>
Blake Ross <blakeross@telocity.com>
-->
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
@ -33,11 +33,12 @@
orient="vertical" onload="SearchPanelStartup();"
onunload="SearchPanelShutdown();">
<script language="Javascript" src="chrome://global/content/strres.js"></script>
<script language="Javascript" src="chrome://global/content/nsJSComponentManager.js"></script>
<script language="Javascript" src="chrome://global/content/nsUserSettings.js"></script>
<script language="Javascript" src="chrome://communicator/content/search/search-panel.js"></script>
<script language="Javascript" src="chrome://communicator/content/search/shared.js"></script>
<script type="text/javascript" src="chrome://global/content/nsUserSettings.js"/>
<script type="text/javascript" src="chrome://global/content/nsJSComponentManager.js"/>
<script type="text/javascript" src="chrome://communicator/content/search/search-panel.js"/>
<script type="text/javascript" src="chrome://communicator/content/search/shared.js"/>
<stringbundle id="searchBundle" src="chrome://communicator/locale/search/search-panel.properties"/>
<popupset>
<popup id="contextual" oncreate="return fillContextMenu('contextual', 'Tree');" >
@ -49,14 +50,13 @@
<box class="color-window groove-bottom box-padded outset-right" orient="vertical">
<box autostretch="never">
<textfield id="sidebar-search-text" flex="1"
onkeypress="if (event.keyCode == 13) return doSearch();"
oninput="return doEnabling();" />
onkeypress="if (event.keyCode == 13) doSearch();"
oninput="doEnabling();" />
<box autostretch="never">
<button class="button-toolbar-3" id="searchbutton" value="&search.button.label;"
disabled="true" oncommand="return doSearch();"/>
<button class="button-toolbar-3" id="stopbutton" align="left"
src="resource:/res/rdf/loading.gif" value="&stop.button.label;"
oncommand="return doStop();" style="display:none;"/>
<button class="button-toolbar-3" id="searchButton" value="&search.button.label;"
disabled="true" oncommand="doSearch();"/>
<button class="button-toolbar-3" id="stopButton" align="left"
value="&stop.button.label;" oncommand="doStop();" hidden="true"/>
</box>
</box>
<box autostretch="never" orient="vertical">
@ -64,10 +64,10 @@
<box orient="horizontal">
<text class="label" value="&within.label;" />
<menulist id="categoryList" ref="NC:SearchCategoryRoot"
datasources="rdf:null" oncommand="return switchTab(1);" >
datasources="rdf:null" oncommand="switchTab(1);" >
<template>
<menupopup>
<menuitem id="chooseCat" uri="rdf:*" oncommand="return chooseCategory(this);"
<menuitem id="chooseCat" uri="rdf:*" oncommand="chooseCategory(this);"
data="rdf:http://home.netscape.com/NC-rdf#category"
value="rdf:http://home.netscape.com/NC-rdf#title"/>
</menupopup>
@ -75,10 +75,10 @@
<menupopup id="categoryPopup">
<menuitem data="NC:SearchEngineRoot" value="&allengines.label;"
oncommand="return chooseCategory(this);"/>
oncommand="chooseCategory(this);"/>
<menuseparator />
<menuitem value="&customize.menuitem.label;" data="NC:SearchEngineRoot"
oncommand="chooseCategory(this); return doCustomize();"/>
oncommand="chooseCategory(this); doCustomize();"/>
<menuseparator />
</menupopup>
</menulist>
@ -96,7 +96,8 @@
resource2="http://home.netscape.com/NC-rdf#Name"
sortDirection="ascending" sortActive="true"
flex="1" datasources="rdf:internetsearch"
onclick="sidebarOpenURL(event, event.target.parentNode.parentNode, 'Tree');">
onclick="if (event.button == 1 &amp;&amp; event.target.localName == 'treecell')
sidebarOpenURL(event.target.parentNode.parentNode);">
<template>
@ -167,7 +168,7 @@
<treeitem uri="...">
<treerow>
<treecell autostretch="never" flex="1">
<checkbox oncommand="doCheck(this);" allowevents="true"
<checkbox oncommand="saveEngines();" allowevents="true"
loading="rdf:http://home.netscape.com/NC-rdf#loading"
src="rdf:http://home.netscape.com/NC-rdf#Icon"
value="rdf:http://home.netscape.com/NC-rdf#Name" flex="1"/>