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

Update for using commands as broadcasters, and adding in keybindings to most things now.

This commit is contained in:
mikep%oeone.com 2002-06-05 19:24:28 +00:00
Родитель 5175193e79
Коммит 6705eb76b1
14 изменённых файлов: 189 добавлений и 83 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -78,7 +78,7 @@ h1 {
<td id="mozver">
<h1>
<a id="mozlink" href="http://www.mozilla.org/projects/calendar/">Mozilla Calendar 2002060416-cal</a>
<a id="mozlink" href="http://www.mozilla.org/projects/calendar/">Mozilla Calendar 2002060511-cal</a>
</h1>
<script type="application/x-javascript">
// using try..catch to handle empty useragents and other cases where the regex fails to apply

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

@ -62,7 +62,6 @@
[
<!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
<!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd2;
<!ENTITY % dtd4 SYSTEM "chrome://calendar/locale/calendarMenu.dtd" > %dtd4;
<!ENTITY % calendarMenuOverlayDTD SYSTEM "chrome://calendar/locale/calendarMenuOverlay.dtd" > %calendarMenuOverlayDTD;
]>
@ -81,19 +80,47 @@
width="830px"
persist="screenX screenY width height sizemode">
<broadcasterset>
<broadcaster id="delete_command" disabled="true"/>
<broadcaster id="modify_command" disabled="true"/>
<broadcaster id="send_event_command" disabled="true"/>
<broadcaster id="copy_command" disabled="true"/>
<broadcaster id="cut_command" disabled="true"/>
</broadcasterset>
<commandset>
<command id="new_command" oncommand="newEventCommand()"/>
<command id="delete_command" oncommand="unifinderDeleteCommand( true )" disabled="true"/>
<command id="modify_command" oncommand="unifinderEditCommand()" disabled="true"/>
<command id="send_event_command" oncommand="sendEvent()" disabled="true"/>
<command id="cut_command" oncommand="cutToClipboard()" disabled="true"/>
<command id="copy_command" oncommand="copyToClipboard()" disabled="true"/>
<command id="paste_command" oncommand="pasteFromClipboard()"/>
<command id="select_all_command" oncommand="selectAllEvents()"/>
<command id="next_command" oncommand="gCalendarWindow.currentView.goToNext()"/>
<command id="previous_command" oncommand="gCalendarWindow.currentView.goToPrevious()"/>
<command id="go_today_command" oncommand="gCalendarWindow.goToToday()"/>
<command id="day_view_command" oncommand="gCalendarWindow.switchToDayView()" disabled="true"/>
<command id="week_view_command" oncommand="gCalendarWindow.switchToWeekView()" disabled="true"/>
<command id="month_view_command" oncommand="gCalendarWindow.switchToMonthView()" disabled="true"/>
<command id="import_command" oncommand="loadEventsFromFile()"/>
<command id="export_command" oncommand="saveEventsToFile()"/>
</commandset>
<keyset>
<key id="delete_key" keycode="VK_DELETE" observes="delete_command" oncommand="unifinderDeleteCommand( true )"/>
<key id="page_up_key" keycode="VK_PAGE_UP" oncommand="gCalendarWindow.currentView.goToPrevious( )"/>
<key id="page_down_key" keycode="VK_PAGE_DOWN" oncommand="gCalendarWindow.currentView.goToNext( )"/>
<key id="delete_key" keycode="VK_DELETE" observes="delete_command"/>
<key id="new_event_key" key="N" modifiers="control" observes="new_command"/>
<key id="modify_event_key" key="E" modifiers="control" observes="modify_command"/>
<key id="import_key" key="I" modifiers="control" observes="import_command"/>
<key id="export_key" key="O" modifiers="control" observes="export_command"/>
<key id="key_selectAll" key="A" modifiers="control" observes="select_all_command"/>
<key id="key_cut" key="X" modifiers="control" observes="cut_command"/>
<key id="key_copy" key="C" modifiers="control" observes="copyt_command"/>
<key id="key_paste" key="V" modifiers="control" observes="paste_command"/>
<key id="view_day_key" keycode="VK_F1" observes="day_view_command"/>
<key id="view_week_key" keycode="VK_F2" observes="week_view_command"/>
<key id="view_month_key" keycode="VK_F3" observes="month_view_command"/>
<key id="go_forward_key" keycode="VK_PAGE_UP" observes="previous_command"/>
<key id="go_backward_key" keycode="VK_PAGE_DOWN" observes="next_command"/>
<key id="go_to_today_key" key="T" modifiers="control" observes="go_today_command"/>
</keyset>
<keyset id="tasksKeys"/>
@ -130,25 +157,25 @@
<tooltip id="savetip"/>
<popup id="context-menu">
<menuitem label="&calendar.context.newevent.label;" accesskey="&calendar.context.newevent.accesskey;" oncommand="newEventCommand()"/>
<menuitem label="&calendar.context.modifyevent.label;" accesskey="&calendar.context.modifyevent.accesskey;" observes="modify_command" oncommand="unifinderEditCommand()"/>
<menuitem label="&calendar.context.deleteevent.label;" accesskey="&calendar.context.deleteevent.accesskey;" observes="delete_command" oncommand="unifinderDeleteCommand()"/>
<menuitem label="&calendar.context.newevent.label;" accesskey="&calendar.context.newevent.accesskey;" observes="new_command"/>
<menuitem label="&calendar.context.modifyevent.label;" accesskey="&calendar.context.modifyevent.accesskey;" observes="modify_command" />
<menuitem label="&calendar.context.deleteevent.label;" accesskey="&calendar.context.deleteevent.accesskey;" observes="delete_command"/>
<menuseparator/>
<menuitem label="&calendar.context.cutevent.label;" accesskey="&calendar.context.cutevent.accesskey;" observes="cut_command" oncommand="cutToClipboard()"/>
<menuitem label="&calendar.context.copyevent.label;" accesskey="&calendar.context.copyevent.accesskey;" observes="copy_command" oncommand="copyToClipboard()"/>
<menuitem label="&calendar.context.pasteevent.label;" accesskey="&calendar.context.pasteevent.accesskey;" oncommand="pasteFromClipboard()"/>
<menuitem label="&calendar.context.cutevent.label;" accesskey="&calendar.context.cutevent.accesskey;" observes="copy_command"/>
<menuitem label="&calendar.context.copyevent.label;" accesskey="&calendar.context.copyevent.accesskey;" observes="copy_command"/>
<menuitem label="&calendar.context.pasteevent.label;" accesskey="&calendar.context.pasteevent.accesskey;" observes="paste_command"/>
<menuseparator/>
<menuitem label="&calendar.context.selectall.label;" accesskey="&calendar.context.selectall.accesskey;" oncommand="selectAllEvents()"/>
<menuitem label="&calendar.context.selectall.label;" accesskey="&calendar.context.selectall.accesskey;" observes="select_all_command"/>
<menuseparator/>
<menuitem label="&calendar.context.gototoday.label;" accesskey="&calendar.context.gototoday.accesskey;" oncommand="gCalendarWindow.goToToday()"/>
<menuitem label="&calendar.context.gototoday.label;" accesskey="&calendar.context.gototoday.accesskey;" observes="go_today_command"/>
<menuseparator/>
<menuitem label="&calendar.context.dayview.label;" accesskey="&calendar.context.dayview.accesskey;" oncommand="gCalendarWindow.switchToDayView()"/>
<menuitem label="&calendar.context.weekview.label;" accesskey="&calendar.context.weekview.accesskey;" oncommand="gCalendarWindow.switchToWeekView()"/>
<menuitem label="&calendar.context.monthview.label;" accesskey="&calendar.context.monthview.accesskey;" oncommand="gCalendarWindow.switchToMonthView()"/>
<menuitem label="&calendar.context.dayview.label;" accesskey="&calendar.context.dayview.accesskey;" observes="day_view_command"/>
<menuitem label="&calendar.context.weekview.label;" accesskey="&calendar.context.weekview.accesskey;" observes="week_view_command"/>
<menuitem label="&calendar.context.monthview.label;" accesskey="&calendar.context.monthview.accesskey;" observes="month_view_command"/>
<menuseparator/>
<menuitem label="&calendar.context.emailevent.label;" accesskey="&calendar.context.emailevent.accesskey;" observes="send_event_command" oncommand="sendEvent();"/>
<menuitem label="&calendar.context.emailevent.label;" accesskey="&calendar.context.emailevent.accesskey;" observes="send_event_command"/>
<menuseparator/>
<menuitem label="&calendar.context.toggleBackground.label;" accesskey="&calendar.context.toggleBackground.accesskey;" oncommand="MonthView.toggleBackground()"/>
@ -168,16 +195,16 @@
grippytooltip="aTooltip" grippytooltiptext="&navigationToolbar.tooltip;"
tbalign="stretch">
<toolbarbutton class="toolbarbutton-1" id="calendar-new-event-button" label="&calendar.newevent.button.label;" tooltiptext="&calendar.newevent.button.tooltip;" oncommand="newEventCommand()"/>
<toolbarbutton class="toolbarbutton-1" id="calendar-edit-event-button" label="&calendar.edit.button.label;" tooltiptext="&calendar.edit.button.tooltip;" oncommand="unifinderEditCommand()" observes="modify_command"/>
<toolbarbutton class="toolbarbutton-1" id="calendar-delete-event-button" label="&calendar.delete.button.label;" tooltiptext="&calendar.delete.button.tooltip;" oncommand="unifinderDeleteCommand()" observes="delete_command"/>
<toolbarbutton class="toolbarbutton-1" id="calendar-new-event-button" label="&calendar.newevent.button.label;" tooltiptext="&calendar.newevent.button.tooltip;" observes="new_command"/>
<toolbarbutton class="toolbarbutton-1" id="calendar-edit-event-button" label="&calendar.edit.button.label;" tooltiptext="&calendar.edit.button.tooltip;" observes="modify_command"/>
<toolbarbutton class="toolbarbutton-1" id="calendar-delete-event-button" label="&calendar.delete.button.label;" tooltiptext="&calendar.delete.button.tooltip;" observes="delete_command"/>
<toolbarseparator class="toolbarseparator-primary"/>
<toolbarbutton class="toolbarbutton-1" id="calendar-choose-date-button" label="&calendar.choosedate.button.label;" tooltiptext="&calendar.choosedate.button.tooltip;" onmousedown="prepareChooseDate()" popup="oe-date-picker-popup"/>
<toolbarbutton class="toolbarbutton-1" id="calendar-go-to-today-button" label="&calendar.gototoday.button.label;" tooltiptext="&calendar.gototoday.button.tooltip;" oncommand="gCalendarWindow.goToToday()"/>
<toolbarbutton class="toolbarbutton-1" id="calendar-go-to-today-button" label="&calendar.gototoday.button.label;" tooltiptext="&calendar.gototoday.button.tooltip;" observes="go_today_command"/>
<toolbarseparator class="toolbarseparator-primary"/>
<toolbarbutton class="toolbarbutton-1" id="calendar-day-view-button" label="&calendar.dayview.button.label;" tooltiptext="&calendar.dayview.button.tooltip;" oncommand="gCalendarWindow.switchToDayView()"/>
<toolbarbutton class="toolbarbutton-1" id="calendar-week-view-button" label="&calendar.weekview.button.label;" tooltiptext="&calendar.weekview.button.tooltip;" oncommand="gCalendarWindow.switchToWeekView()"/>
<toolbarbutton class="toolbarbutton-1" id="calendar-month-view-button" label="&calendar.monthview.button.label;" tooltiptext="&calendar.monthview.button.tooltip;" oncommand="gCalendarWindow.switchToMonthView()"/>
<toolbarbutton class="toolbarbutton-1" id="calendar-day-view-button" label="&calendar.dayview.button.label;" tooltiptext="&calendar.dayview.button.tooltip;" observes="day_view_command"/>
<toolbarbutton class="toolbarbutton-1" id="calendar-week-view-button" label="&calendar.weekview.button.label;" tooltiptext="&calendar.weekview.button.tooltip;" observes="week_view_command"/>
<toolbarbutton class="toolbarbutton-1" id="calendar-month-view-button" label="&calendar.monthview.button.label;" tooltiptext="&calendar.monthview.button.tooltip;" observes="month_view_command"/>
<spacer flex="1"/>
<hbox id="throbber-box" align="center">
<button id="navigator-throbber" oncommand="goClickThrobber('browser.throbber.url')"

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

@ -392,9 +392,9 @@ DayView.prototype.switchTo = function( )
{
// disable/enable view switching buttons
var weekViewButton = document.getElementById( "calendar-week-view-button" );
var monthViewButton = document.getElementById( "calendar-month-view-button" );
var dayViewButton = document.getElementById( "calendar-day-view-button" );
var weekViewButton = document.getElementById( "week_view_command" );
var monthViewButton = document.getElementById( "month_view_command" );
var dayViewButton = document.getElementById( "day_view_command" );
monthViewButton.removeAttribute( "disabled" );
weekViewButton.removeAttribute( "disabled" );

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

@ -45,6 +45,7 @@
<!DOCTYPE window
[
<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" > %navigatorDTD;
<!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd" > %calendarDTD;
<!ENTITY % calendarMenuOverlayDTD SYSTEM "chrome://calendar/locale/calendarMenuOverlay.dtd" > %calendarMenuOverlayDTD;
]>
@ -98,31 +99,42 @@
<menubar id="main-menubar" class="chromeclass-menubar">
<menu id="menu_File">
<menupopup id="menu_FilePopup">
<menuitem id="calendar-import-menu" label="&calendar.import.label;" oncommand="loadEventsFromFile()"/>
<menuitem id="calendar-export-menu" label="&calendar.export.label;" oncommand="saveEventsToFile()"/>
<menuitem id="calendar-new-event-menu" key="new_event_key" label="&event.new.event;" observes="new_command"/>
<menuitem id="unifinder-modify-menu" key="modify_event_key" label="&event.edit.event;" observes="modify_command"/>
<menuseparator/>
<menuitem id="calendar-about-menu-item" label="&calendar.about.label;" oncommand="alertCalendarVersion()"/>
<menuitem id="calendar-import-menu" key="import_key" label="&calendar.import.label;" accesskey="&calendar.import.accesskey;" observes="import_command"/>
<menuitem id="calendar-export-menu" key="export_key" label="&calendar.export.label;" accesskey="&calendar.export.accesskey;" observes="export_command"/>
<menuseparator/>
<menuitem id="calendar-mail-event" observes="send_event_command" label="&event.mail.event;"/>
</menupopup>
</menu>
<menu id="menu_Edit">
<menupopup id="mppEdit">
<menuitem id="calendar-copy-menu" observes="copy_command" label="&calendar.copy.label;" accesskey="c" oncommand="copyToClipboard()"/>
<menuitem id="calendar-paste-menu" label="&calendar.paste.label;" accesskey="p" oncommand="pasteFromClipboard()"/>
<menuitem id="calendar-cut-menu" key="key_cut" label="&calendar.cut.label;" accesskey="&calendar.cut.accesskey;" observes="cut_command" />
<menuitem id="calendar-copy-menu" key="key_copy" label="&calendar.copy.label;" accesskey="&calendar.copy.accesskey;" observes="copy_command" />
<menuitem id="calendar-paste-menu" key="key_paste" label="&calendar.paste.label;" accesskey="&calendar.paste.accesskey;" observes="paste_command"/>
<menuitem id="unifinder-remove-menu" key="delete_key" label="&event.delete.event;" observes="delete_command" />
<menuseparator/>
<menuitem id="calendar-selectall-menu" label="&calendar.selectall.label;" accesskey="a" oncommand="selectAllEvents()"/>
<menuitem id="calendar-selectall-menu" key="key_selectAll" label="&calendar.selectall.label;" accesskey="&calendar.selectall.accesskey;" observes="select_all_command"/>
<menuseparator/>
<menuitem id="calendar-edit-preferences" label="&calendar.preferences.label;" oncommand="launchPreferences()"/>
<menuitem id="calendar-edit-preferences" label="&calendar.preferences.label;" accesskey="&calendar.preferences.accesskey;" oncommand="launchPreferences()"/>
</menupopup>
</menu>
<menu id="menu_Event" label="&event.menu.title;" accesskey="&eventMenuCmd.accesskey;">
<menupopup id="mppEvent">
<menuitem id="calendar-new-event-menu" label="&event.new.event;" oncommand="newEventCommand()"/>
<menuitem id="unifinder-modify-menu" observes="modify_command" label="&event.edit.event;" oncommand="unifinderEditCommand()" />
<menuitem id="unifinder-remove-menu" observes="delete_command" label="&event.delete.event;" oncommand="unifinderDeleteCommand()" key="delete_key" />
<menuseparator/>
<menuitem id="calendar-mail-event" observes="send_event_command" label="&event.mail.event;" oncommand="sendEvent();"/>
<menu id="menu_View">
<menupopup id="mppView">
<menuitem id="calendar-view-menu-day" key="view_day_key" label="&calendar.flat.topbar.dayview;" accesskey="d" observes="day_view_command"/>
<menuitem id="calendar-view-menu-week" key="view_week_key" label="&calendar.flat.topbar.weekview;" accesskey="w" observes="week_view_command"/>
<menuitem id="calendar-view-menu-month" key="view_month_key" label="&calendar.flat.topbar.monthview;" accesskey="m" observes="month_view_command"/>
</menupopup>
</menu>
<menu id="menu_Go" label="Go" accesskey="g">
<menupopup id="mppView">
<menuitem id="calendar-view-menu-today" key="go_to_today_key" label="Go To Today" accesskey="t" observes="go_today_command"/>
<menuitem id="calendar-view-menu-previous" key="go_backward_key" label="Previous" accesskey="p" observes="previous_command"/>
<menuitem id="calendar-view-menu-next" key="go_forward_key" label="Next" accesskey="n" observes="next_command"/>
</menupopup>
</menu>
@ -130,7 +142,11 @@
<menu id="windowMenu"/>
<menu accesskey="&helpMenuCmd.accesskey;" id="menu_Help"/>
<menu accesskey="&helpMenuCmd.accesskey;" id="menu_Help">
<menupopup>
<menuitem id="calendar-about-menu-item" label="&calendar.about.label;" accesskey="&calendar.about.accesskey;" oncommand="alertCalendarVersion()"/>
</menupopup>
</menu>
</menubar>
</overlay>

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

@ -377,9 +377,9 @@ MonthView.prototype.switchTo = function( )
// disable/enable view switching buttons
var weekViewButton = document.getElementById( "calendar-week-view-button" );
var monthViewButton = document.getElementById( "calendar-month-view-button" );
var dayViewButton = document.getElementById( "calendar-day-view-button" );
var weekViewButton = document.getElementById( "week_view_command" );
var monthViewButton = document.getElementById( "month_view_command" );
var dayViewButton = document.getElementById( "day_view_command" );
monthViewButton.setAttribute( "disabled", "true" );
weekViewButton.removeAttribute( "disabled" );

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

@ -430,9 +430,9 @@ WeekView.prototype.switchTo = function( )
{
// disable/enable view switching buttons
var weekViewButton = document.getElementById( "calendar-week-view-button" );
var monthViewButton = document.getElementById( "calendar-month-view-button" );
var dayViewButton = document.getElementById( "calendar-day-view-button" );
var weekViewButton = document.getElementById( "week_view_command" );
var monthViewButton = document.getElementById( "month_view_command" );
var dayViewButton = document.getElementById( "day_view_command" );
monthViewButton.removeAttribute( "disabled" );
weekViewButton.setAttribute( "disabled", "true" );

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

@ -392,9 +392,9 @@ DayView.prototype.switchTo = function( )
{
// disable/enable view switching buttons
var weekViewButton = document.getElementById( "calendar-week-view-button" );
var monthViewButton = document.getElementById( "calendar-month-view-button" );
var dayViewButton = document.getElementById( "calendar-day-view-button" );
var weekViewButton = document.getElementById( "week_view_command" );
var monthViewButton = document.getElementById( "month_view_command" );
var dayViewButton = document.getElementById( "day_view_command" );
monthViewButton.removeAttribute( "disabled" );
weekViewButton.removeAttribute( "disabled" );

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

@ -45,6 +45,7 @@
<!DOCTYPE window
[
<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" > %navigatorDTD;
<!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd" > %calendarDTD;
<!ENTITY % calendarMenuOverlayDTD SYSTEM "chrome://calendar/locale/calendarMenuOverlay.dtd" > %calendarMenuOverlayDTD;
]>
@ -98,31 +99,42 @@
<menubar id="main-menubar" class="chromeclass-menubar">
<menu id="menu_File">
<menupopup id="menu_FilePopup">
<menuitem id="calendar-import-menu" label="&calendar.import.label;" oncommand="loadEventsFromFile()"/>
<menuitem id="calendar-export-menu" label="&calendar.export.label;" oncommand="saveEventsToFile()"/>
<menuitem id="calendar-new-event-menu" key="new_event_key" label="&event.new.event;" observes="new_command"/>
<menuitem id="unifinder-modify-menu" key="modify_event_key" label="&event.edit.event;" observes="modify_command"/>
<menuseparator/>
<menuitem id="calendar-about-menu-item" label="&calendar.about.label;" oncommand="alertCalendarVersion()"/>
<menuitem id="calendar-import-menu" key="import_key" label="&calendar.import.label;" accesskey="&calendar.import.accesskey;" observes="import_command"/>
<menuitem id="calendar-export-menu" key="export_key" label="&calendar.export.label;" accesskey="&calendar.export.accesskey;" observes="export_command"/>
<menuseparator/>
<menuitem id="calendar-mail-event" observes="send_event_command" label="&event.mail.event;"/>
</menupopup>
</menu>
<menu id="menu_Edit">
<menupopup id="mppEdit">
<menuitem id="calendar-copy-menu" observes="copy_command" label="&calendar.copy.label;" accesskey="c" oncommand="copyToClipboard()"/>
<menuitem id="calendar-paste-menu" label="&calendar.paste.label;" accesskey="p" oncommand="pasteFromClipboard()"/>
<menuitem id="calendar-cut-menu" key="key_cut" label="&calendar.cut.label;" accesskey="&calendar.cut.accesskey;" observes="cut_command" />
<menuitem id="calendar-copy-menu" key="key_copy" label="&calendar.copy.label;" accesskey="&calendar.copy.accesskey;" observes="copy_command" />
<menuitem id="calendar-paste-menu" key="key_paste" label="&calendar.paste.label;" accesskey="&calendar.paste.accesskey;" observes="paste_command"/>
<menuitem id="unifinder-remove-menu" key="delete_key" label="&event.delete.event;" observes="delete_command" />
<menuseparator/>
<menuitem id="calendar-selectall-menu" label="&calendar.selectall.label;" accesskey="a" oncommand="selectAllEvents()"/>
<menuitem id="calendar-selectall-menu" key="key_selectAll" label="&calendar.selectall.label;" accesskey="&calendar.selectall.accesskey;" observes="select_all_command"/>
<menuseparator/>
<menuitem id="calendar-edit-preferences" label="&calendar.preferences.label;" oncommand="launchPreferences()"/>
<menuitem id="calendar-edit-preferences" label="&calendar.preferences.label;" accesskey="&calendar.preferences.accesskey;" oncommand="launchPreferences()"/>
</menupopup>
</menu>
<menu id="menu_Event" label="&event.menu.title;" accesskey="&eventMenuCmd.accesskey;">
<menupopup id="mppEvent">
<menuitem id="calendar-new-event-menu" label="&event.new.event;" oncommand="newEventCommand()"/>
<menuitem id="unifinder-modify-menu" observes="modify_command" label="&event.edit.event;" oncommand="unifinderEditCommand()" />
<menuitem id="unifinder-remove-menu" observes="delete_command" label="&event.delete.event;" oncommand="unifinderDeleteCommand()" key="delete_key" />
<menuseparator/>
<menuitem id="calendar-mail-event" observes="send_event_command" label="&event.mail.event;" oncommand="sendEvent();"/>
<menu id="menu_View">
<menupopup id="mppView">
<menuitem id="calendar-view-menu-day" key="view_day_key" label="&calendar.flat.topbar.dayview;" accesskey="d" observes="day_view_command"/>
<menuitem id="calendar-view-menu-week" key="view_week_key" label="&calendar.flat.topbar.weekview;" accesskey="w" observes="week_view_command"/>
<menuitem id="calendar-view-menu-month" key="view_month_key" label="&calendar.flat.topbar.monthview;" accesskey="m" observes="month_view_command"/>
</menupopup>
</menu>
<menu id="menu_Go" label="Go" accesskey="g">
<menupopup id="mppView">
<menuitem id="calendar-view-menu-today" key="go_to_today_key" label="Go To Today" accesskey="t" observes="go_today_command"/>
<menuitem id="calendar-view-menu-previous" key="go_backward_key" label="Previous" accesskey="p" observes="previous_command"/>
<menuitem id="calendar-view-menu-next" key="go_forward_key" label="Next" accesskey="n" observes="next_command"/>
</menupopup>
</menu>
@ -130,7 +142,11 @@
<menu id="windowMenu"/>
<menu accesskey="&helpMenuCmd.accesskey;" id="menu_Help"/>
<menu accesskey="&helpMenuCmd.accesskey;" id="menu_Help">
<menupopup>
<menuitem id="calendar-about-menu-item" label="&calendar.about.label;" accesskey="&calendar.about.accesskey;" oncommand="alertCalendarVersion()"/>
</menupopup>
</menu>
</menubar>
</overlay>

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

@ -377,9 +377,9 @@ MonthView.prototype.switchTo = function( )
// disable/enable view switching buttons
var weekViewButton = document.getElementById( "calendar-week-view-button" );
var monthViewButton = document.getElementById( "calendar-month-view-button" );
var dayViewButton = document.getElementById( "calendar-day-view-button" );
var weekViewButton = document.getElementById( "week_view_command" );
var monthViewButton = document.getElementById( "month_view_command" );
var dayViewButton = document.getElementById( "day_view_command" );
monthViewButton.setAttribute( "disabled", "true" );
weekViewButton.removeAttribute( "disabled" );

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

@ -430,9 +430,9 @@ WeekView.prototype.switchTo = function( )
{
// disable/enable view switching buttons
var weekViewButton = document.getElementById( "calendar-week-view-button" );
var monthViewButton = document.getElementById( "calendar-month-view-button" );
var dayViewButton = document.getElementById( "calendar-day-view-button" );
var weekViewButton = document.getElementById( "week_view_command" );
var monthViewButton = document.getElementById( "month_view_command" );
var dayViewButton = document.getElementById( "day_view_command" );
monthViewButton.removeAttribute( "disabled" );
weekViewButton.setAttribute( "disabled", "true" );

1
calendar/resources/jar.mn
Просмотреть файл

@ -31,7 +31,6 @@ calendar.jar:
content/calendar/pref/calendarPref.js (content/pref/calendarPref.js)
content/calendar/pref/calendarPref.xul (content/pref/calendarPref.xul)
locale/en-US/calendar/calendar.dtd (locale/en-US/calendar.dtd)
locale/en-US/calendar/calendarMenu.dtd (locale/en-US/calendarMenu.dtd)
locale/en-US/calendar/calendarMenuOverlay.dtd (locale/en-US/calendarMenuOverlay.dtd)
locale/en-US/calendar/calendarOverlay.dtd (locale/en-US/calendarOverlay.dtd)
locale/en-US/calendar/calendarPrefs.dtd (locale/en-US/calendarPrefs.dtd)

4
calendar/resources/locale/en-US/calendar.dtd
Просмотреть файл

@ -198,3 +198,7 @@
<!ENTITY calendar.about.title "About Mozilla Calendar">
<!ENTITY calendar.about.tab "About">
<!ENTITY throbber.tooltip "Home page">
<!ENTITY menuBar.tooltip "Menu bar">
<!ENTITY navigationToolbar.tooltip "Navigation Toolbar">

24
calendar/resources/locale/en-US/calendarMenuOverlay.dtd
Просмотреть файл

@ -41,15 +41,37 @@
<!ENTITY eventMenuCmd.accesskey "v">
<!ENTITY event.new.event "New Event">
<!ENTITY event.new.event.accesskey "n">
<!ENTITY event.edit.event "Edit Event">
<!ENTITY event.delete.event "Delete Event">
<!ENTITY event.edit.event.accesskey "e">
<!ENTITY event.delete.event "Delete">
<!ENTITY event.delete.event.accesskey "d">
<!ENTITY event.mail.event "Mail Calendar Event">
<!ENTITY event.mail.event.accesskey "m">
<!ENTITY calendar.import.label "Import...">
<!ENTITY calendar.import.accesskey "i">
<!ENTITY calendar.export.label "Export...">
<!ENTITY calendar.export.accesskey "e">
<!ENTITY calendar.about.label "About Calendar">
<!ENTITY calendar.about.accesskey "a">
<!ENTITY calendar.cut.label "Cut">
<!ENTITY calendar.cut.accesskey "t">
<!ENTITY calendar.copy.label "Copy">
<!ENTITY calendar.copy.accesskey "c">
<!ENTITY calendar.paste.label "Paste">
<!ENTITY calendar.paste.accesskey "p">
<!ENTITY calendar.selectall.label "Select All">
<!ENTITY calendar.selectall.accesskey "a">
<!ENTITY calendar.preferences.label "Preferences...">
<!ENTITY calendar.preferences.accesskey "p">

24
calendar/resources/locale/en-US/menuOverlay.dtd
Просмотреть файл

@ -41,15 +41,37 @@
<!ENTITY eventMenuCmd.accesskey "v">
<!ENTITY event.new.event "New Event">
<!ENTITY event.new.event.accesskey "n">
<!ENTITY event.edit.event "Edit Event">
<!ENTITY event.delete.event "Delete Event">
<!ENTITY event.edit.event.accesskey "e">
<!ENTITY event.delete.event "Delete">
<!ENTITY event.delete.event.accesskey "d">
<!ENTITY event.mail.event "Mail Calendar Event">
<!ENTITY event.mail.event.accesskey "m">
<!ENTITY calendar.import.label "Import...">
<!ENTITY calendar.import.accesskey "i">
<!ENTITY calendar.export.label "Export...">
<!ENTITY calendar.export.accesskey "e">
<!ENTITY calendar.about.label "About Calendar">
<!ENTITY calendar.about.accesskey "a">
<!ENTITY calendar.cut.label "Cut">
<!ENTITY calendar.cut.accesskey "t">
<!ENTITY calendar.copy.label "Copy">
<!ENTITY calendar.copy.accesskey "c">
<!ENTITY calendar.paste.label "Paste">
<!ENTITY calendar.paste.accesskey "p">
<!ENTITY calendar.selectall.label "Select All">
<!ENTITY calendar.selectall.accesskey "a">
<!ENTITY calendar.preferences.label "Preferences...">
<!ENTITY calendar.preferences.accesskey "p">