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

Checked in attachment 164223 for bug 226209:Cleanup calendar code

This commit is contained in:
mostafah%oeone.com 2004-11-02 20:39:21 +00:00
Родитель 393e907d66
Коммит dd723f8f99
4 изменённых файлов: 95 добавлений и 72 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
calendar/resources/content/pref/nsPrefWindow.js
Просмотреть файл

@ -154,7 +154,7 @@ nsPrefWindow.prototype =
} }
} }
return "!/!ERROR_UNDEFINED_PREF!/!"; return "!/!ERROR_UNDEFINED_PREF!/!";
} , },
setPref: setPref:
function ( aPrefType, aPrefString, aValue ) function ( aPrefType, aPrefString, aValue )
@ -272,10 +272,10 @@ nsPrefWindow.prototype =
dump(e + "\n"); dump(e + "\n");
} }
} }
}, },
switchPage: switchPage:
function (aNewURL, aNewTag) function ( aNewURL, aNewTag )
{ {
var oldURL = document.getElementById( this.contentFrame ).getAttribute("tag"); var oldURL = document.getElementById( this.contentFrame ).getAttribute("tag");
if( !oldURL ) if( !oldURL )

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

@ -67,7 +67,7 @@
var newTag = aEvent.target.getAttribute("tag"); var newTag = aEvent.target.getAttribute("tag");
if (hPrefWindow) if (hPrefWindow)
hPrefWindow.switchPage(newURL, newTag); hPrefWindow.switchPage(newURL, newTag);
} }
function visitLink(aEvent) function visitLink(aEvent)
{ {

61
calendar/resources/content/pref/prefBirdOverlay.xul
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!-- ***** BEGIN LICENSE BLOCK ***** <!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1 - Version: MPL 1.1/GPL 2.0/LGPL 2.1
- -
@ -19,7 +19,7 @@
- the Initial Developer. All Rights Reserved. - the Initial Developer. All Rights Reserved.
- -
- Contributor(s): - Contributor(s):
- Mike Potter <mikep@oeone.com> - Mike Potter <mikep@oeone.com>
- Eric Belhaire <belhaire@ief.u-psud.fr> - Eric Belhaire <belhaire@ief.u-psud.fr>
- -
- Alternatively, the contents of this file may be used under the terms of - Alternatively, the contents of this file may be used under the terms of
@ -37,41 +37,52 @@
- ***** END LICENSE BLOCK ***** --> - ***** END LICENSE BLOCK ***** -->
<!DOCTYPE overlay [ <!DOCTYPE overlay [
<!ENTITY % calendarPrefsOverlayDTD SYSTEM "chrome://calendar/locale/prefs.dtd" > <!ENTITY % calendarPrefsOverlayDTD SYSTEM "chrome://calendar/locale/prefs.dtd" >
%calendarPrefsOverlayDTD; %calendarPrefsOverlayDTD;
]> ]>
<overlay id="calendarPrefOverlay" <overlay id="calendarPrefOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<treechildren id="panelChildren">
<treechildren id="panelChildren">
<treeitem id="calendarPanel" container="false"> <treeitem id="calendarPanel" container="false">
<treerow> <treerow>
<treecell class="treecell-indent" url="chrome://calendar/content/pref/calendarPref.xul" label="&calendar.general.label;" id="calendar"/> <treecell class="treecell-indent"
</treerow> url="chrome://calendar/content/pref/calendarPref.xul"
label="&calendar.general.label;"
id="calendar"/>
</treerow>
</treeitem> </treeitem>
<treeitem id="calendarPublishPanel" container="false"> <treeitem id="calendarPublishPanel" container="false">
<treerow> <treerow>
<treecell class="treecell-indent" url="chrome://calendar/content/pref/alarmPrefs.xul" label="&calendar.alarms.label;" id="calendarAlarm"/> <treecell class="treecell-indent"
</treerow> url="chrome://calendar/content/pref/alarmPrefs.xul"
label="&calendar.alarms.label;"
id="calendarAlarm"/>
</treerow>
</treeitem> </treeitem>
<treeitem id="calendarPublishPanel" container="false"> <treeitem id="calendarPublishPanel" container="false">
<treerow> <treerow>
<treecell class="treecell-indent" url="chrome://calendar/content/pref/publishPrefs.xul" label="&calendar.publish.label;" id="calendarPublish"/> <treecell class="treecell-indent"
</treerow> url="chrome://calendar/content/pref/publishPrefs.xul"
label="&calendar.publish.label;"
id="calendarPublish"/>
</treerow>
</treeitem> </treeitem>
<treeitem id="calendarPublishPanel" container="false"> <treeitem id="calendarViewPanel" container="false">
<treerow> <treerow>
<treecell class="treecell-indent" url="chrome://calendar/content/pref/viewPrefs.xul" label="&calendar.views.label;" id="calendarView"/> <treecell class="treecell-indent"
</treerow> url="chrome://calendar/content/pref/viewPrefs.xul"
label="&calendar.views.label;"
id="calendarView"/>
</treerow>
</treeitem> </treeitem>
<treeitem id="calendarTimezonePanel" container="false"> <treeitem id="calendarTimezonePanel" container="false">
<treerow> <treerow>
<treecell class="treecell-indent" <treecell class="treecell-indent"
url="chrome://calendar/content/pref/timezonePrefs.xul" url="chrome://calendar/content/pref/timezonePrefs.xul"
label="&calendar.timezone.label;" id="timezone"/> label="&calendar.timezone.label;"
</treerow> id="timezone"/>
</treerow>
</treeitem> </treeitem>
</treechildren> </treechildren>
</overlay> </overlay>

98
calendar/resources/content/pref/prefOverlay.xul
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!-- ***** BEGIN LICENSE BLOCK ***** <!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1 - Version: MPL 1.1/GPL 2.0/LGPL 2.1
- -
@ -19,7 +19,7 @@
- the Initial Developer. All Rights Reserved. - the Initial Developer. All Rights Reserved.
- -
- Contributor(s): - Contributor(s):
- Mike Potter <mikep@oeone.com> - Mike Potter <mikep@oeone.com>
- -
- Alternatively, the contents of this file may be used under the terms of - Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or - either the GNU General Public License Version 2 or later (the "GPL"), or
@ -36,61 +36,73 @@
- ***** END LICENSE BLOCK ***** --> - ***** END LICENSE BLOCK ***** -->
<!DOCTYPE overlay [ <!DOCTYPE overlay [
<!ENTITY % calendarPrefsOverlayDTD SYSTEM "chrome://calendar/locale/prefs.dtd" > <!ENTITY % calendarPrefsOverlayDTD SYSTEM "chrome://calendar/locale/prefs.dtd" >
%calendarPrefsOverlayDTD; %calendarPrefsOverlayDTD;
]> ]>
<overlay id="calendarPrefOverlay" <overlay id="calendarPrefOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="application/x-javascript"> <script type="application/x-javascript">
<![CDATA[ <![CDATA[
var panel; var panel;
if ((panel != undefined)&&(panel == "chrome://communicator/content/pref/pref-appearance.xul")) if ((panel != undefined)&&(panel == "chrome://communicator/content/pref/pref-appearance.xul"))
{ {
_elementIDs.push("generalStartupCalendar"); _elementIDs.push("generalStartupCalendar");
} }
]]> ]]>
</script> </script>
<!-- calendar startup toggle --> <!-- calendar startup toggle -->
<groupbox id="generalStartupPreferences"> <groupbox id="generalStartupPreferences">
<checkbox id="generalStartupCalendar" wsm_persist="true" position="4" <checkbox id="generalStartupCalendar" wsm_persist="true" position="4"
label="&calendar.label;" accesskey="&calendar.accesskey;" label="&calendar.label;" accesskey="&calendar.accesskey;"
pref="true" preftype="bool" prefstring="general.startup.calendar" pref="true" preftype="bool" prefstring="general.startup.calendar"
prefattribute="checked"/> prefattribute="checked"/>
</groupbox> </groupbox>
<treechildren id="panelChildren"> <treechildren id="panelChildren">
<treeitem id="calendarPanel" container="true"> <treeitem id="calendarPanel" container="true">
<treerow> <treerow>
<treecell class="treecell-indent" url="chrome://calendar/content/pref/calendarPref.xul" label="&calendar.label;" id="calendar"/> <treecell class="treecell-indent"
</treerow> url="chrome://calendar/content/pref/calendarPref.xul"
<treechildren id="calendarPrefChildren"> label="&calendar.label;"
<treeitem id="calendarPublishPanel" container="false"> id="calendar"/>
<treerow> </treerow>
<treecell class="treecell-indent" url="chrome://calendar/content/pref/alarmPrefs.xul" label="&calendar.alarms.label;" id="calendarAlarm"/> <treechildren id="calendarPrefChildren">
</treerow>
</treeitem>
<treeitem id="calendarPublishPanel" container="false">
<treerow>
<treecell class="treecell-indent" url="chrome://calendar/content/pref/publishPrefs.xul" label="&calendar.publish.label;" id="calendarPublish"/>
</treerow>
</treeitem>
<treeitem id="calendarPublishPanel" container="false"> <treeitem id="calendarPublishPanel" container="false">
<treerow> <treerow>
<treecell class="treecell-indent" url="chrome://calendar/content/pref/viewPrefs.xul" label="&calendar.views.label;" id="calendarView"/> <treecell class="treecell-indent"
</treerow> url="chrome://calendar/content/pref/alarmPrefs.xul"
</treeitem> label="&calendar.alarms.label;"
id="calendarAlarm"/>
</treerow>
</treeitem>
<treeitem id="calendarPublishPanel" container="false">
<treerow>
<treecell class="treecell-indent"
url="chrome://calendar/content/pref/publishPrefs.xul"
label="&calendar.publish.label;"
id="calendarPublish"/>
</treerow>
</treeitem>
<treeitem id="calendarViewPanel" container="false">
<treerow>
<treecell class="treecell-indent"
url="chrome://calendar/content/pref/viewPrefs.xul"
label="&calendar.views.label;"
id="calendarView"/>
</treerow>
</treeitem>
<treeitem id="calendarTimezonePanel" container="false"> <treeitem id="calendarTimezonePanel" container="false">
<treerow> <treerow>
<treecell class="treecell-indent" <treecell class="treecell-indent"
url="chrome://calendar/content/pref/timezonePrefs.xul" url="chrome://calendar/content/pref/timezonePrefs.xul"
label="&calendar.timezone.label;" id="timezone"/> label="&calendar.timezone.label;"
</treerow> id="timezone"/>
</treeitem> </treerow>
</treechildren> </treeitem>
</treechildren>
</treeitem> </treeitem>
</treechildren> </treechildren>
</overlay> </overlay>