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

Fix for 80392, poor fit for pref panels. r=blake, sr=hewitt

This commit is contained in:
ben%netscape.com 2006-05-17 02:29:54 +00:00
Родитель f9b97793ae
Коммит 3fb58b147b
7 изменённых файлов: 97 добавлений и 112 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
suite/common/pref/pref-applications.xul
Просмотреть файл

@ -41,12 +41,12 @@
<box class="box-smallheader" title="&lHeader;"/> <box class="box-smallheader" title="&lHeader;"/>
<titledbox> <titledbox flex="1">
<label value="&descript;"/> <label value="&descript;"/>
<box orient="vertical" flex="1"> <box orient="vertical" flex="1">
<text class="label" value="&fileTypes.label;"/> <text class="label" value="&fileTypes.label;"/>
<tree id="appTree" class="inset" flex="1" <tree id="appTree" class="inset" flex="1" style="width: 0px; height: 0px;"
datasources="rdf:null" ref="urn:mimetypes" datasources="rdf:null" ref="urn:mimetypes"
onselect="selectApplication();"> onselect="selectApplication();">
<treecolgroup> <treecolgroup>

115
suite/common/pref/pref-fonts.xul
Просмотреть файл

@ -41,8 +41,8 @@
<label value="&displayFonts;"/> <label value="&displayFonts;"/>
<box autostretch="never" valign="middle"> <box autostretch="never" valign="middle">
<text class="label" value="&language.label;" accesskey="&language.accesskey;" for="selectLangs"/> <text class="label small-margin" value="&language.label;" accesskey="&language.accesskey;" for="selectLangs"/>
<menulist id="selectLangs" oncommand="selectLanguage();"> <menulist id="selectLangs" class="small-margin" oncommand="selectLanguage();">
<menupopup> <menupopup>
<menuitem value="x-western" label="&font.langGroup.latin1;"/> <menuitem value="x-western" label="&font.langGroup.latin1;"/>
<menuitem value="x-central-euro" label="&font.langGroup.latin2;"/> <menuitem value="x-central-euro" label="&font.langGroup.latin2;"/>
@ -66,7 +66,7 @@
<text class="label" value="&variableFonts.label;"/> <text class="label" value="&variableFonts.label;"/>
<grid class="indent"> <grid>
<columns> <columns>
<column/> <column/>
<column flex="1"/> <column flex="1"/>
@ -77,12 +77,12 @@
<rows> <rows>
<row autostretch="never" valign="middle"> <row autostretch="never" valign="middle">
<text class="label" value="&serif.label;" accesskey="&serif.accesskey;" for="serif"/> <text class="label small-margin" value="&serif.label;" accesskey="&serif.accesskey;" for="serif"/>
<menulist id="serif"> <menulist id="serif" class="small-margin" flex="1" style="width: 0px;">
<menupopup/> <menupopup/>
</menulist> </menulist>
<text class="label" value="&size.label;" accesskey="&sizeVar.accesskey;" for="sizeVar"/> <text class="label small-margin" value="&size.label;" accesskey="&sizeVar.accesskey;" for="sizeVar"/>
<menulist id="sizeVar"> <menulist id="sizeVar" class="small-margin">
<menupopup> <menupopup>
<menuitem value="8" label="8"/> <menuitem value="8" label="8"/>
<menuitem value="9" label="9"/> <menuitem value="9" label="9"/>
@ -110,8 +110,8 @@
<text class="label" value="&units.label;"/> <text class="label" value="&units.label;"/>
</row> </row>
<row autostretch="never" valign="middle"> <row autostretch="never" valign="middle">
<text class="label" value="&sans-serif.label;" accesskey="&sans-serif.accesskey;" for="sans-serif"/> <text class="label small-margin" value="&sans-serif.label;" accesskey="&sans-serif.accesskey;" for="sans-serif"/>
<menulist id="sans-serif"> <menulist id="sans-serif" class="small-margin" flex="1" style="width: 0px;">
<menupopup/> <menupopup/>
</menulist> </menulist>
<spring/> <spring/>
@ -120,8 +120,8 @@
</row> </row>
<!-- <!--
<row autostretch="never" valign="middle"> <row autostretch="never" valign="middle">
<text class="label" value="&cursive.label;" accesskey="&cursive.accesskey;" for="cursive"/> <text class="label small-margin" value="&cursive.label;" accesskey="&cursive.accesskey;" for="cursive"/>
<menulist id="cursive"> <menulist id="cursive" class="small-margin">
<menupopup/> <menupopup/>
</menulist> </menulist>
<spring/> <spring/>
@ -129,8 +129,8 @@
<spring/> <spring/>
</row> </row>
<row autostretch="never" valign="middle"> <row autostretch="never" valign="middle">
<text class="label" value="&fantasy.label;" accesskey="&fantasy.accesskey;" for="fantasy"/> <text class="label small-margin" value="&fantasy.label;" accesskey="&fantasy.accesskey;" for="fantasy"/>
<menulist id="fantasy"> <menulist id="fantasy" class="small-margin">
<menupopup/> <menupopup/>
</menulist> </menulist>
<spring/> <spring/>
@ -153,59 +153,44 @@
<text class="label" value="&fixedFonts.label;"/> <text class="label" value="&fixedFonts.label;"/>
<grid class="indent"> <hbox autostretch="never" valign="middle">
<columns> <text class="label small-margin" value="&monospace.label;" accesskey="&monospace.accesskey;" for="monospace"/>
<column/> <menulist id="monospace" class="small-margin" flex="1" style="width: 0px;" crop="right">
<column flex="1"/> <menupopup/>
<column/> </menulist>
<column/> <text class="label small-margin" value="&size.label;" accesskey="&sizeMono.accesskey;" for="sizeMono"/>
<column/> <menulist id="sizeMono" class="small-margin">
</columns> <menupopup>
<rows> <menuitem value="8" label="8"/>
<row autostretch="never" valign="middle"> <menuitem value="9" label="9"/>
<text class="label" value="&monospace.label;" accesskey="&monospace.accesskey;" for="monospace"/> <menuitem value="10" label="10"/>
<menulist id="monospace"> <menuitem value="11" label="11"/>
<menupopup/> <menuitem value="12" label="12"/>
</menulist> <menuitem value="13" label="13"/>
<text class="label" value="&size.label;" accesskey="&sizeMono.accesskey;" for="sizeMono"/> <menuitem value="14" label="14"/>
<menulist id="sizeMono"> <menuitem value="15" label="15"/>
<menupopup> <menuitem value="16" label="16"/>
<menuitem value="8" label="8"/> <menuitem value="18" label="18"/>
<menuitem value="9" label="9"/> <menuitem value="20" label="20"/>
<menuitem value="10" label="10"/> <menuitem value="24" label="24"/>
<menuitem value="11" label="11"/> <menuitem value="26" label="26"/>
<menuitem value="12" label="12"/> <menuitem value="28" label="28"/>
<menuitem value="13" label="13"/> <menuitem value="32" label="32"/>
<menuitem value="14" label="14"/> <menuitem value="36" label="36"/>
<menuitem value="15" label="15"/> <menuitem value="40" label="40"/>
<menuitem value="16" label="16"/> <menuitem value="48" label="48"/>
<menuitem value="18" label="18"/> <menuitem value="56" label="56"/>
<menuitem value="20" label="20"/> <menuitem value="64" label="64"/>
<menuitem value="24" label="24"/> <menuitem value="72" label="72"/>
<menuitem value="26" label="26"/> </menupopup>
<menuitem value="28" label="28"/> </menulist>
<menuitem value="32" label="32"/> <text class="label" value="&units.label;"/>
<menuitem value="36" label="36"/> </hbox>
<menuitem value="40" label="40"/>
<menuitem value="48" label="48"/>
<menuitem value="56" label="56"/>
<menuitem value="64" label="64"/>
<menuitem value="72" label="72"/>
</menupopup>
</menulist>
<text class="label" value="&units.label;"/>
</row>
</rows>
</grid>
<separator class="thin"/>
<box autostretch="never"> <!-- note that this removes the ability to select dynamic fonts -->
<!-- note that this removes the ability to select dynamic fonts --> <checkbox id="browserUseDocumentFonts" class="small-margin"
<checkbox id="browserUseDocumentFonts" label="&useDocumentFonts.label;" accesskey="&useDocumentFonts.accesskey;"
label="&useDocumentFonts.label;" accesskey="&useDocumentFonts.accesskey;" preftype="int" prefstring="browser.display.use_document_fonts"/>
preftype="int" prefstring="browser.display.use_document_fonts"/>
</box>
</titledbox> </titledbox>

24
suite/common/pref/pref-languages.xul
Просмотреть файл

@ -56,7 +56,7 @@
<html>&languages.customize.active.label;</html> <html>&languages.customize.active.label;</html>
<box flex="1"> <box flex="1">
<tree class="inset" id="active_languages" flex="1" <tree class="inset" id="active_languages" flex="1" style="width: 0px; height: 0px;"
datasources="rdf:null" multiple="true" onselect="SelectLanguage();"> datasources="rdf:null" multiple="true" onselect="SelectLanguage();">
<treecolgroup> <treecolgroup>
<treecol flex="1"/> <treecol flex="1"/>
@ -90,17 +90,15 @@
</titledbox> </titledbox>
<titledbox orient="vertical" autostretch="never"> <titledbox orient="vertical" autostretch="never">
<label value="&languages.customize.Charset.grouplabel;"/> <label value="&languages.customize.Charset.grouplabel;"/>
<box autostretch="never"> <text class="label" value="&languages.customize.DefaultCharset.label;" for="DefaultCharsetList"/>
<text class="label" value="&languages.customize.DefaultCharset.label;" for="DefaultCharsetList"/> <menulist id="DefaultCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu"
<menulist id="DefaultCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu" pref="true" preftype="string" prefstring="intl.charset.default"
pref="true" preftype="string" prefstring="intl.charset.default" prefattribute="value" wsm_attributes="value">
prefattribute="value" wsm_attributes="value"> <template>
<template> <menupopup>
<menupopup> <menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/>
<menuitem label="rdf:http://home.netscape.com/NC-rdf#Name" value="..." uri="..."/> </menupopup>
</menupopup> </template>
</template> </menulist>
</menulist>
</box>
</titledbox> </titledbox>
</window> </window>

22
suite/common/pref/pref-offline.xul
Просмотреть файл

@ -41,7 +41,7 @@
<box class="box-smallheader" id="OfflineHeader" title="&boxHeader;"/> <box class="box-smallheader" id="OfflineHeader" title="&boxHeader;"/>
<titledbox orient="vertical"> <titledbox orient="vertical" class="small-margin">
<label value="&rHeader;"/> <label value="&rHeader;"/>
<html> &descipt1;</html> <html> &descipt1;</html>
@ -49,31 +49,31 @@
<radiogroup id="offlineStartupstate" orient="vertical" autostretch="never" <radiogroup id="offlineStartupstate" orient="vertical" autostretch="never"
pref="true" preftype="int" prefstring="offline.startup_state" pref="true" preftype="int" prefstring="offline.startup_state"
prefattribute="value"> prefattribute="value">
<radio group="offlineStartupstate" value="0" label="&prevRadio;"/> <radio class="small-margin" group="offlineStartupstate" value="0" label="&prevRadio;"/>
<radio group="offlineStartupstate" value="1" label="&askOfflineRadio;"/> <radio class="small-margin" group="offlineStartupstate" value="1" label="&askOfflineRadio;"/>
</radiogroup> </radiogroup>
</titledbox> </titledbox>
<titledbox orient="vertical"> <titledbox orient="vertical" class="small-margin">
<label value="&header2;"/> <label value="&header2;"/>
<radiogroup id="whengoingOnlinestate" orient="vertical" autostretch="never" <radiogroup id="whengoingOnlinestate" orient="vertical" autostretch="never"
pref="true" preftype="int" prefstring="offline.send.unsent_messages" pref="true" preftype="int" prefstring="offline.send.unsent_messages"
prefattribute="value"> prefattribute="value">
<radio group="whengoingOnlinestate" value="0" label="&unsentAskRadio;"/> <radio class="small-margin" group="whengoingOnlinestate" value="0" label="&unsentAskRadio;"/>
<radio group="whengoingOnlinestate" value="1" label="&unsentAutoRadio;"/> <radio class="small-margin" group="whengoingOnlinestate" value="1" label="&unsentAutoRadio;"/>
<radio group="whengoingOnlinestate" value="2" label="&unsentDoNotRadio;"/> <radio class="small-margin" group="whengoingOnlinestate" value="2" label="&unsentDoNotRadio;"/>
</radiogroup> </radiogroup>
</titledbox> </titledbox>
<titledbox orient="vertical"> <titledbox orient="vertical" class="small-margin">
<label value="&header3;"/> <label value="&header3;"/>
<radiogroup id="whengoingOfflinestate" orient="vertical" autostretch="never" <radiogroup id="whengoingOfflinestate" orient="vertical" autostretch="never"
pref="true" preftype="int" prefstring="offline.download.download_messages" pref="true" preftype="int" prefstring="offline.download.download_messages"
prefattribute="value"> prefattribute="value">
<radio group="whengoingOfflinestate" value="0" label="&unsentAskDownloadRadio;"/> <radio class="small-margin" group="whengoingOfflinestate" value="0" label="&unsentAskDownloadRadio;"/>
<radio group="whengoingOfflinestate" value="1" label="&unsentAutoDownloadRadio;"/> <radio class="small-margin" group="whengoingOfflinestate" value="1" label="&unsentAutoDownloadRadio;"/>
<radio group="whengoingOfflinestate" value="2" label="&unsentDoNotDownloadRadio;"/> <radio class="small-margin" group="whengoingOfflinestate" value="2" label="&unsentDoNotDownloadRadio;"/>
</radiogroup> </radiogroup>
</titledbox> </titledbox>

12
suite/common/pref/pref-search.xul
Просмотреть файл

@ -58,11 +58,13 @@
<titledbox orient="vertical"> <titledbox orient="vertical">
<label value="&searchResults.label;"/> <label value="&searchResults.label;"/>
<box autostretch="never"> <!-- XXX - unfortunately we can't have an autostretch never box here
<checkbox id="openSidebarPanel" label="&openSidebarSearchPanel.label;" accesskey="&openSidebarSearchPanel.accesskey;" because it causes the text not to wrap and the panel content
pref="true" preftype="bool" prefstring="browser.search.opensidebarsearchpanel" to go offscreen. We need to come up with a better solution
prefattribute="checked"/> to allow wrapping and even focusrings - ben@netscape.com -->
</box> <checkbox id="openSidebarPanel" label="&openSidebarSearchPanel.label;" accesskey="&openSidebarSearchPanel.accesskey;"
pref="true" preftype="bool" prefstring="browser.search.opensidebarsearchpanel"
prefattribute="checked"/>
</titledbox> </titledbox>
</window> </window>

30
suite/common/pref/pref-smart_browsing.xul
Просмотреть файл

@ -184,34 +184,34 @@
<box class="box-smallheader" title="&lHeader;"/> <box class="box-smallheader" title="&lHeader;"/>
<titledbox orient="vertical"> <titledbox orient="vertical" flex="1">
<label value="&whatsRelated.label;"/> <label value="&whatsRelated.label;"/>
<html id="doNotAcceptText">&doNotDecp.label;</html> <html class="small-margin" id="doNotAcceptText">&doNotDecp.label;</html>
<grid flex="1"> <grid flex="1">
<columns> <columns>
<column flex="1"/> <column flex="4"/>
<column/> <column flex="3"/>
</columns> </columns>
<rows> <rows>
<row> <row flex="1">
<tree class="inset" id="disabledDomains" multiple="true" onkeyup="treeHandleEvent(event)" style="height: 65px;" flex="1"> <tree class="inset" id="disabledDomains" multiple="true" onkeyup="treeHandleEvent(event)" style="height: 0px; width: 0px;" flex="1">
<treecolgroup> <treecolgroup>
<treecol flex="1"/> <treecol flex="1"/>
</treecolgroup> </treecolgroup>
<treechildren id="disabledKids" flex="1"/> <treechildren id="disabledKids" flex="1"/>
</tree> </tree>
<box autostretch="never" valign="top"> <vbox>
<button class="dialog" id="removeDomain" label="&removeDomain.label;" accesskey="&removeDomain.accesskey;" <button class="dialog" id="removeDomain" label="&removeDomain.label;" accesskey="&removeDomain.accesskey;"
oncommand="removeDomain();" pref="true" preftype="bool" oncommand="removeDomain();" pref="true" preftype="bool"
prefstring="pref.browser.smartbrowsing.disable_button.remove" prefattribute="disabled"/> prefstring="pref.browser.smartbrowsing.disable_button.remove" prefattribute="disabled"/>
</box> </vbox>
</row> </row>
<row> <row>
<box autostretch="never"> <box autostretch="never">
<text class="label" id="domainText" value="&domain.label;" accesskey="&domain.accesskey;" for="addDomain"/> <text class="label small-margin" id="domainText" value="&domain.label;" accesskey="&domain.accesskey;" for="addDomain"/>
<textbox id="addDomain" flex="1" oninput="doButtonEnabling();" <textbox class="small-margin" id="addDomain" flex="1" oninput="doButtonEnabling();"
prefstring="pref.browser.smartbrowsing.disable_textbox.add" prefattribute="disabled"/> prefstring="pref.browser.smartbrowsing.disable_textbox.add" prefattribute="disabled"/>
</box> </box>
<button disabled="true" class="dialog" id="addDomainButton" label="&addDomain.label;" accesskey="&addDomain.accesskey;" <button disabled="true" class="dialog" id="addDomainButton" label="&addDomain.label;" accesskey="&addDomain.accesskey;"
@ -229,14 +229,14 @@
<titledbox orient="vertical"> <titledbox orient="vertical">
<label value="&internetKeywordsHeader.label;"/> <label value="&internetKeywordsHeader.label;"/>
<html>&internetKeywordsDescription.label;</html> <html class="small-margin">&internetKeywordsDescription.label;</html>
<box autostretch="never"> <box autostretch="never">
<checkbox id="browserGoBrowsingEnabled" label="&keywordsEnabled.label;" accesskey="&keywordsEnabled.accesskey;" <checkbox class="small-margin" id="browserGoBrowsingEnabled" label="&keywordsEnabled.label;" accesskey="&keywordsEnabled.accesskey;"
pref="true" preftype="bool" prefstring="keyword.enabled" pref="true" preftype="bool" prefstring="keyword.enabled"
prefattribute="checked"/> prefattribute="checked"/>
<spring flex="1"/> <spring flex="1"/>
<button class="dialog" label="&moreInformation.label;" accesskey="&moreInformation.accesskey;" oncommand="moreInfo();" <button class="small-margin" label="&moreInformation.label;" accesskey="&moreInformation.accesskey;" oncommand="moreInfo();"
id="moreInformationButton" pref="true" preftype="bool" id="moreInformationButton" pref="true" preftype="bool"
prefstring="pref.browser.smartbrowsing.disable_button.more_info" prefattribute="disabled"/> prefstring="pref.browser.smartbrowsing.disable_button.more_info" prefattribute="disabled"/>
</box> </box>
@ -245,9 +245,9 @@
<titledbox orient="vertical"> <titledbox orient="vertical">
<label value="&autoCompleteHeader.label;"/> <label value="&autoCompleteHeader.label;"/>
<html>&autoCompleteDescription.label;</html> <html class="small-margin">&autoCompleteDescription.label;</html>
<box autostretch="never"> <box autostretch="never">
<checkbox id="browserAutoCompleteEnabled" label="&autoCompleteEnabled.label;" accesskey="&autoCompleteEnabled.accesskey;" <checkbox class="small-margin" id="browserAutoCompleteEnabled" label="&autoCompleteEnabled.label;" accesskey="&autoCompleteEnabled.accesskey;"
pref="true" preftype="bool" prefstring="browser.urlbar.autocomplete.enabled" pref="true" preftype="bool" prefstring="browser.urlbar.autocomplete.enabled"
prefattribute="checked"/> prefattribute="checked"/>
<spring flex="1"/> <spring flex="1"/>

2
suite/common/pref/pref.xul
Просмотреть файл

@ -16,7 +16,7 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&prefWindow.title;" title="&prefWindow.title;"
orient="vertical" class="dialog" orient="vertical" class="dialog"
style="width: 51em; height: 40em;" style="width: 52em; height: 41em;"
onload="Startup();" onload="Startup();"
persist="screenX screenY"> persist="screenX screenY">