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

fix pref xul and window size to look nicer. now the pref window is bigger and now the size is set in pref.xul. fixes #20244 among other bugs

This commit is contained in:
sspitzer%netscape.com 1999-12-02 22:34:19 +00:00
Родитель 011b2d4700
Коммит c9d61e76cb
4 изменённых файлов: 12 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
mailnews/compose/prefs/resources/content/pref-formatting.xul
Просмотреть файл

@ -25,26 +25,26 @@
<html:div>
<html:input id="pref:0:int:mail.default_html_action" class="indent" name="recipients" type="radio" checked="true"/>
<html:label for="pref:0:int:mail.default_html_action">&askMe.label;</html:label>
<html:label for="pref:0:int:mail.default_html_action" class="indent-second-label">&askMe2.label;</html:label>
</html:div>
<html:label for="pref:0:int:mail.default_html_action" class="indent-second-label">&askMe2.label;</html:label>
<html:div>
<html:input id="pref:1:int:mail.default_html_action" class="indent" name="recipients" type="radio"/>
<html:label for="pref:1:int:mail.default_html_action">&convertPlain.label;</html:label>
<html:label for="pref:1:int:mail.default_html_action" class="indent-second-label">&convertPlain2.label;</html:label>
</html:div>
<html:label for="pref:1:int:mail.default_html_action" class="indent-second-label">&convertPlain2.label;</html:label>
<html:div>
<html:input id="pref:2:int:mail.default_html_action" class="indent" name="recipients" type="radio"/>
<html:label for="pref:2:int:mail.default_html_action">&sendHTML.label;</html:label>
<html:label for="pref:2:int:mail.default_html_action" class="indent-second-label">&sendHTML2.label;</html:label>
</html:div>
<html:label for="pref:2:int:mail.default_html_action" class="indent-second-label">&sendHTML2.label;</html:label>
<html:div>
<html:input id="pref:3:int:mail.default_html_action" class="indent" name="recipients" type="radio"/>
<html:label for="pref:3:int:mail.default_html_action">&sendBoth.label;</html:label>
<html:label for="pref:3:int:mail.default_html_action" class="indent-second-label">&sendBoth2.label;</html:label>
</html:div>
<html:label for="pref:3:int:mail.default_html_action" class="indent-second-label">&sendBoth2.label;</html:label>
<html:div class="vertical-gap">&override.label;</html:div>
<!--/html:fieldset-->

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

@ -32,6 +32,8 @@
class="dialog"
onload="StartUp('Top'); OnLoadPref();"
title="&window.title;"
height="436"
width="600"
align="vertical">
<html:script language="javascript" src="PrefsWindow.js"/>

2
xpfe/components/prefwindow/resources/content/pref.xul
Просмотреть файл

@ -32,6 +32,8 @@
class="dialog"
onload="StartUp('Top'); OnLoadPref();"
title="&window.title;"
height="436"
width="600"
align="vertical">
<html:script language="javascript" src="PrefsWindow.js"/>

6
xpfe/components/prefwindow/src/nsPrefWindow.cpp
Просмотреть файл

@ -217,13 +217,15 @@ NS_IMETHODIMP nsPrefWindow::ShowWindow(
#if defined(MODELESS_PREF_DIALOG)||defined(DEBUG_mcafee)||defined(DEBUG_akkana)||defined(DEBUG_pavlov)
// testing modeless pref window. -mcafee
nsIWebShellWindow *foo = nsnull;
// pass 0 for the height and width because we want to leave the size up to the xul (see prefs.xul for the window size)
rv = appShell->CreateTopLevelWindow(parent, urlObj, PR_TRUE, PR_TRUE,
NS_CHROME_ALL_CHROME | NS_CHROME_OPEN_AS_DIALOG,
cb, 504, 436, &foo);
cb, 0, 0, &foo);
#else
// pass 0 for the height and width because we want to leave the size up to the xul (see prefs.xul for the window size)
rv = appShell->RunModalDialog(nsnull, parent, urlObj,
NS_CHROME_ALL_CHROME | NS_CHROME_OPEN_AS_DIALOG,
cb, 504, 436);
cb, 0, 0);
#endif
return rv;
} // nsPrefWindow::ShowWindow()