Fixing bug 189903, moving views section of calendar prefs to its own node. Patch by Tim Davenport.

This commit is contained in:
mikep%oeone.com 2003-01-24 15:39:40 +00:00
Родитель 006361f2af
Коммит b3fb20bc0e
4 изменённых файлов: 190 добавлений и 32 удалений

Просмотреть файл

@ -82,8 +82,7 @@
*/
var _elementIDs = [
"dateformat", "weekstarts", "defaultlength", "defaultsnoozelength",
"reloadonlaunch", "categories", "daystarthour", "dayendhour"
"dateformat", "defaultlength", "defaultsnoozelength", "reloadonlaunch", "categories"
];
</script>
@ -98,39 +97,15 @@
</menupopup>
</menulist>
</hbox>
<hbox>
<description>&pref.weekstarts.label;</description>
<menulist id="weekstarts" prefstring="calendar.week.start">
<menupopup id="weekstarts">
<menuitem label="&pref.weekstarts.sunday;" value="0"/>
<menuitem label="&pref.weekstarts.monday;" value="1"/>
<menuitem label="&pref.weekstarts.tuesday;" value="2"/>
<menuitem label="&pref.weekstarts.wednesday;" value="3"/>
<menuitem label="&pref.weekstarts.thursday;" value="4"/>
<menuitem label="&pref.weekstarts.friday;" value="5"/>
<menuitem label="&pref.weekstarts.saturday;" value="6" selected="true"/>
</menupopup>
</menulist>
</hbox>
<hbox align="center">
<description>Unless there are events, restrict day view to </description>
<textbox id="daystarthour" preftype="int" prefstring="calendar.event.defaultstarthour" maxlength="2" size="2" value="8"/>
<description>:00 and </description>
<textbox id="dayendhour" preftype="int" prefstring="calendar.event.defaultendhour" maxlength="2" size="2" value="17"/>
<description>:00 ( 0 - 24 ) </description>
</hbox>
<hbox align="center">
<hbox align="center">
<description>&pref.defaultlength.label;</description>
<textbox id="defaultlength" preftype="int" prefstring="calendar.event.defaultlength" maxlength="3" size="3"/>
<textbox flex="1" id="defaultlength" preftype="int" prefstring="calendar.event.defaultlength" maxlength="3" size="3"/>
<label value="Minutes"/>
</hbox>
<hbox align="center">
<description>&pref.defaultsnoozelength.label;</description>
<textbox id="defaultsnoozelength" preftype="int" prefstring="calendar.alarms.defaultsnoozelength" maxlength="3" size="3"/>
<textbox flex="1" id="defaultsnoozelength" preftype="int" prefstring="calendar.alarms.defaultsnoozelength" maxlength="3" size="3"/>
<label value="Minutes"/>
</hbox>
@ -139,8 +114,8 @@
<groupbox>
<caption label="&pref.categories.label;"/>
<vbox>
<textbox id="categories" prefstring="calendar.categories.names"/>
<description flex="1">&pref.categories.help.description;</description>
<textbox id="categories" prefstring="calendar.categories.names"/>
<description>&pref.categories.help.description;</description>
</vbox>
</groupbox>
</page>

Просмотреть файл

@ -76,7 +76,12 @@
<treerow>
<treecell class="treecell-indent" url="chrome://calendar/content/pref/publishPrefs.xul" label="&calendar.publish.label;" id="calendarPublish"/>
</treerow>
</treeitem>
</treeitem>
<treeitem id="calendarPublishPanel" container="false">
<treerow>
<treecell class="treecell-indent" url="chrome://calendar/content/pref/viewPrefs.xul" label="&calendar.views.label;" id="calendarView"/>
</treerow>
</treeitem>
</treechildren>
</treeitem>

Просмотреть файл

@ -0,0 +1,151 @@
<?xml version="1.0"?>
<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Mozilla Calendar Code.
-
- The Initial Developer of the Original Code is Mike Potter.
- Portions created by the Initial Developer are Copyright (C) 2002
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
- Mike Potter <mikep@oeone.com>
- ArentJan Banck <ajbanck@planet.nl>
-
- 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
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the LGPL or the GPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<!-- DTD File with all strings specific to the file -->
<!DOCTYPE page
[
<!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/prefs.dtd" > %dtd1;
]>
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="parent.initPanel('chrome://calendar/content/pref/viewPrefs.xul')"
headertitle="&calendarPanel.label;">
<script type="application/x-javascript" src="chrome://calendar/content/dateUtils.js"/>
<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
<script type="application/x-javascript">
/*
** NOTE:
** When you add a pref to this page, you have to add its ID to the following list.
*/
var _elementIDs = [
"weekstarts", "daystarthour", "dayendhour"
];
</script>>
<groupbox>
<caption label="Day View"/>
<hbox flex="1" align="center">
<description flex="1" >&pref.hour.help.description;</description>
</hbox>
<hbox flex="1" align="center">
<description flex="1" >Restrict Views to </description>
<description>Start time:</description>
<menulist id="daystarthour" preftype="int" prefstring="calendar.event.defaultstarthour" value="8">
<menupopup id="daystarthour">
<menuitem label="&pref.hour.00;" value="0"/>
<menuitem label="&pref.hour.01;" value="1"/>
<menuitem label="&pref.hour.02;" value="2"/>
<menuitem label="&pref.hour.03;" value="3"/>
<menuitem label="&pref.hour.04;" value="4"/>
<menuitem label="&pref.hour.05;" value="5"/>
<menuitem label="&pref.hour.06;" value="6"/>
<menuitem label="&pref.hour.07;" value="7"/>
<menuitem label="&pref.hour.08;" value="8"/>
<menuitem label="&pref.hour.09;" value="9"/>
<menuitem label="&pref.hour.10;" value="10"/>
<menuitem label="&pref.hour.11;" value="11"/>
<menuitem label="&pref.hour.12;" value="12"/>
<menuitem label="&pref.hour.13;" value="13"/>
<menuitem label="&pref.hour.14;" value="14"/>
<menuitem label="&pref.hour.15;" value="15"/>
<menuitem label="&pref.hour.16;" value="16"/>
<menuitem label="&pref.hour.17;" value="17"/>
<menuitem label="&pref.hour.18;" value="18"/>
<menuitem label="&pref.hour.19;" value="19"/>
<menuitem label="&pref.hour.20;" value="20"/>
<menuitem label="&pref.hour.21;" value="21"/>
<menuitem label="&pref.hour.22;" value="22"/>
<menuitem label="&pref.hour.23;" value="23"/>
</menupopup>
</menulist>
<description>End time:</description>
<menulist id="dayendhour" preftype="int" prefstring="calendar.event.defaultendhour" value="17">
<menupopup id="dayendhour">
<menuitem label="&pref.hour.00;" value="0"/>
<menuitem label="&pref.hour.01;" value="1"/>
<menuitem label="&pref.hour.02;" value="2"/>
<menuitem label="&pref.hour.03;" value="3"/>
<menuitem label="&pref.hour.04;" value="4"/>
<menuitem label="&pref.hour.05;" value="5"/>
<menuitem label="&pref.hour.06;" value="6"/>
<menuitem label="&pref.hour.07;" value="7"/>
<menuitem label="&pref.hour.08;" value="8"/>
<menuitem label="&pref.hour.09;" value="9"/>
<menuitem label="&pref.hour.10;" value="10"/>
<menuitem label="&pref.hour.11;" value="11"/>
<menuitem label="&pref.hour.12;" value="12"/>
<menuitem label="&pref.hour.13;" value="13"/>
<menuitem label="&pref.hour.14;" value="14"/>
<menuitem label="&pref.hour.15;" value="15"/>
<menuitem label="&pref.hour.16;" value="16"/>
<menuitem label="&pref.hour.17;" value="17"/>
<menuitem label="&pref.hour.18;" value="18"/>
<menuitem label="&pref.hour.19;" value="19"/>
<menuitem label="&pref.hour.20;" value="20"/>
<menuitem label="&pref.hour.21;" value="21"/>
<menuitem label="&pref.hour.22;" value="22"/>
<menuitem label="&pref.hour.23;" value="23"/>
</menupopup>
</menulist>
</hbox>
</groupbox>
<groupbox>
<caption label="Week View"/>
<hbox align="center">
<description>&pref.weekstarts.label;</description>
<menulist id="weekstarts" prefstring="calendar.week.start">
<menupopup id="weekstarts">
<menuitem label="&pref.weekstarts.sunday;" value="0"/>
<menuitem label="&pref.weekstarts.monday;" value="1"/>
<menuitem label="&pref.weekstarts.tuesday;" value="2"/>
<menuitem label="&pref.weekstarts.wednesday;" value="3"/>
<menuitem label="&pref.weekstarts.thursday;" value="4"/>
<menuitem label="&pref.weekstarts.friday;" value="5"/>
<menuitem label="&pref.weekstarts.saturday;" value="6" selected="true"/>
</menupopup>
</menulist>
</hbox>
</groupbox>
</page>

Просмотреть файл

@ -41,6 +41,7 @@
<!ENTITY calendar.accesskey "c" >
<!ENTITY calendar.publish.label "Publishing">
<!ENTITY calendar.alarms.label "Alarms">
<!ENTITY calendar.views.label "Views">
<!ENTITY pref.mainbox.label "General Settings" >
<!ENTITY pref.alarmgoesoff.label "When an alarm goes off:">
@ -61,6 +62,32 @@
<!ENTITY pref.weekstarts.friday "Friday" >
<!ENTITY pref.weekstarts.saturday "Saturday" >
<!ENTITY pref.hour.help.description "Overwritten if events are outside these times" >
<!ENTITY pref.hour.00 "00:00" >
<!ENTITY pref.hour.01 "01:00" >
<!ENTITY pref.hour.02 "02:00" >
<!ENTITY pref.hour.03 "03:00" >
<!ENTITY pref.hour.04 "04:00" >
<!ENTITY pref.hour.05 "05:00" >
<!ENTITY pref.hour.06 "06:00" >
<!ENTITY pref.hour.07 "07:00" >
<!ENTITY pref.hour.08 "08:00" >
<!ENTITY pref.hour.09 "09:00" >
<!ENTITY pref.hour.10 "10:00" >
<!ENTITY pref.hour.11 "11:00" >
<!ENTITY pref.hour.12 "12:00" >
<!ENTITY pref.hour.13 "13:00" >
<!ENTITY pref.hour.14 "14:00" >
<!ENTITY pref.hour.15 "15:00" >
<!ENTITY pref.hour.16 "16:00" >
<!ENTITY pref.hour.17 "17:00" >
<!ENTITY pref.hour.18 "18:00" >
<!ENTITY pref.hour.19 "19:00" >
<!ENTITY pref.hour.20 "20:00" >
<!ENTITY pref.hour.21 "21:00" >
<!ENTITY pref.hour.22 "22:00" >
<!ENTITY pref.hour.23 "23:00" >
<!ENTITY pref.categories.label "Categories" >
<!ENTITY pref.categories.help.description "Use a comma between each category you want to add.">