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

bug 275695 

initial cut at reworking Sunbird's menus
This commit is contained in:
mattwillis%gmail.com 2004-12-22 17:42:14 +00:00
Родитель 4b4631fbc0
Коммит 1d5850d261
3 изменённых файлов: 201 добавлений и 108 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

156
calendar/sunbird/base/content/calendar-menubar.inc
Просмотреть файл

@ -59,14 +59,10 @@
label="&event.new.todo;" label="&event.new.todo;"
accesskey="&event.new.todo.accesskey;" accesskey="&event.new.todo.accesskey;"
observes="new_todo_command"/> observes="new_todo_command"/>
<menuitem id="unifinder-modify-menu" <!-- XXX lilmatt: Finish/localize this! -->
key="modify_event_key" <menuitem key="new_journal_key"
label="&event.edit.event;" label="New Journal Item..."
accesskey="&event.edit.event.accesskey;" disabled="true"/>
observes="modify_command"/>
<menuseparator/>
<!-- files -->
<menuitem id="calendar-new-calendar-menu" <menuitem id="calendar-new-calendar-menu"
key="new_calendar_key" key="new_calendar_key"
label="&calendar.new.server.label;" label="&calendar.new.server.label;"
@ -77,6 +73,19 @@
label="&calendar.open.file.label;" label="&calendar.open.file.label;"
accesskey="&calendar.open.file.accesskey;" accesskey="&calendar.open.file.accesskey;"
observes="open_local_calendar_command"/> observes="open_local_calendar_command"/>
<!-- XXX lilmatt: Localize this! label="&event.edit.event;" -->
<menuitem id="unifinder-modify-menu"
key="modify_event_key"
label="Edit Selection..."
accesskey="&event.edit.event.accesskey;"
observes="modify_command"/>
<menuitem id="calendar-close"
key="key_close"
label="&calendar.menu.options.close;"
accesskey="&calendar.menu.options.close.accesskey;"
observes="close_calendar_command"/>
<menuseparator/>
<menuitem id="calendar-addserver-menu" <menuitem id="calendar-addserver-menu"
label="&calendar.subscribe.label;" label="&calendar.subscribe.label;"
accesskey="&calendar.subscribe.accesskey;" accesskey="&calendar.subscribe.accesskey;"
@ -94,35 +103,35 @@
label="&calendar.import.label;" label="&calendar.import.label;"
accesskey="&calendar.import.accesskey;" accesskey="&calendar.import.accesskey;"
observes="import_command"/> observes="import_command"/>
<menuseparator/>
<!-- export: getting data out of existing files --> <!-- export: getting data out of existing files -->
<!-- XXX lilmatt: Localize this! label="&calendar.export.label;" -->
<menuitem id="calendar-export-menu" <menuitem id="calendar-export-menu"
label="&calendar.export.label;" label="Export Selection..."
accesskey="&calendar.export.accesskey;" accesskey="&calendar.export.accesskey;"
observes="export_command"/> observes="export_command"/>
<!-- XXX lilmatt: Localize this! label="&event.mail.event;" -->
<menuitem id="calendar-mail-event" <menuitem id="calendar-mail-event"
key="send_event_key" key="send_event_key"
label="&event.mail.event;" label="Mail Selection..."
accesskey="&event.mail.event.accesskey;" accesskey="&event.mail.event.accesskey;"
observes="send_event_command"/> observes="send_event_command"/>
<!-- XXX lilmatt: Localize this! label="&calendar.publish.label;" -->
<menuitem id="calendar-publish-menu" <menuitem id="calendar-publish-menu"
label="&calendar.publish.label;" label="Publish..."
accesskey="&calendar.publish.accesskey;" accesskey="&calendar.publish.accesskey;"
observes="publish_events_command"/> observes="publish_events_command"/>
<menuseparator/>
<!-- XXX lilmatt: Finish/localize this! -->
<menuitem label="Page Setup..." disabled="true"/>
<!-- XXX lilmatt: Localize this! label="&calendar.print.label;" -->
<menuitem id="calendar-print-menu" <menuitem id="calendar-print-menu"
key="print_key" key="print_key"
label="&calendar.print.label;" label="Print..."
accesskey="&calendar.print.accesskey;" accesskey="&calendar.print.accesskey;"
observes="print_command"/> observes="print_command"/>
#ifndef XP_MACOSX
<menuseparator id="calendar-print-sep"/> <menuseparator id="calendar-print-sep"/>
#endif
<!-- window/Application -->
<menuitem id="calendar-close"
key="key_close"
label="&calendar.menu.options.close;"
accesskey="&calendar.menu.options.close.accesskey;"
observes="close_calendar_command"/>
</menupopup> </menupopup>
</menu> </menu>
@ -130,6 +139,15 @@
label="&editMenu.label;" label="&editMenu.label;"
accesskey="&editMenu.accesskey;"> accesskey="&editMenu.accesskey;">
<menupopup id="mppEdit"> <menupopup id="mppEdit">
<!-- XXX lilmatt: Finish/localize this! -->
<menuitem key="undo_key"
label="Undo"
disabled="true"/>
<!-- XXX lilmatt: Finish/localize this! -->
<menuitem key="redo_key"
label="Redo"
disabled="true"/>
<menuseparator/>
<menuitem id="calendar-cut-menu" <menuitem id="calendar-cut-menu"
key="key_cut" key="key_cut"
label="&calendar.cut.label;" label="&calendar.cut.label;"
@ -154,7 +172,6 @@
label="&event.delete.tasks;" label="&event.delete.tasks;"
accesskey="&event.delete.tasks.accesskey;" accesskey="&event.delete.tasks.accesskey;"
observes="delete_todo_command" /> observes="delete_todo_command" />
<menuseparator/>
<menuitem id="calendar-selectall-menu" <menuitem id="calendar-selectall-menu"
key="key_selectAll" key="key_selectAll"
label="&calendar.selectall.label;" label="&calendar.selectall.label;"
@ -167,77 +184,124 @@
label="&viewMenu.label;" label="&viewMenu.label;"
accesskey="&viewMenu.accesskey;"> accesskey="&viewMenu.accesskey;">
<menupopup id="mppView"> <menupopup id="mppView">
<!-- XXX lilmatt: Finish/localize this! -->
<menu label="Toolbars">
<menupopup>
<!-- XXX This eventually needs to be RDF-driven so toolbars created
by the user are selectable. Also there's no good way to delete
a user-created toolbar without resetting all your other toolbars
to the defaults. Should that be fixed here? -->
<!-- XXX lilmatt: Localize this! -->
<menuitem id="menu_showCalendarToolbar"
type="checkbox"
label="Calendar Toolbar"
command="cmd_showCalendarToolbar"
checked="true"/>
<menuseparator/>
<!-- XXX lilmatt: Localize this! label="&calendar.menu.customize.label;" -->
<menuitem id="calendar-view-menu-customize"
command="cmd_CustomizeToolbars"
label="Customize..."
accesskey="&calendar.menu.customize.accesskey;"/>
</menupopup>
</menu>
<!-- XXX lilmatt: Localize this! label="&showSearchToolbarCmd.label;" accesskey="&showSearchToolbarCmd.accesskey;" -->
<menuitem id="menu_showSearchToolbar"
type="checkbox"
label="Search Bar"
command="cmd_showSearchToolbar"
checked="true"/>
<!-- XXX lilmatt: Localize this! -->
<menuitem id="menu_showStatusBar"
type="checkbox"
label="Status Bar"
command="cmd_showStatusBar"
checked="true"/>
<!-- XXX lilmatt: Localize this! -->
<menuitem id="menu_showTaskBox"
type="checkbox"
label="Task List"
command="cmd_showTaskBox"
checked="true"/>
<menuseparator/>
<menuitem id="calendar-view-menu-day" <menuitem id="calendar-view-menu-day"
type="radio"
name="viewGroup"
key="view_day_key" key="view_day_key"
label="&calendar.flat.topbar.dayview;" label="&calendar.flat.topbar.dayview;"
accesskey="&calendar.dayview.accesskey;" accesskey="&calendar.dayview.accesskey;"
observes="day_view_command"/> observes="day_view_command"/>
<menuitem id="calendar-view-menu-week" <menuitem id="calendar-view-menu-week"
type="radio"
name="viewGroup"
key="view_week_key" key="view_week_key"
label="&calendar.flat.topbar.weekview;" label="&calendar.flat.topbar.weekview;"
accesskey="&calendar.weekview.accesskey;" accesskey="&calendar.weekview.accesskey;"
observes="week_view_command"/> observes="week_view_command"/>
<menuitem id="calendar-view-menu-multiweek" <menuitem id="calendar-view-menu-multiweek"
type="radio"
name="viewGroup"
key="view_multiweek_key" key="view_multiweek_key"
label="&calendar.flat.topbar.multiweekview;" label="&calendar.flat.topbar.multiweekview;"
accesskey="&calendar.multiweekview.accesskey;" accesskey="&calendar.multiweekview.accesskey;"
observes="multiweek_view_command"/> observes="multiweek_view_command"/>
<menuitem id="calendar-view-menu-month" <menuitem id="calendar-view-menu-month"
type="radio"
name="viewGroup"
key="view_month_key" key="view_month_key"
label="&calendar.flat.topbar.monthview;" label="&calendar.flat.topbar.monthview;"
accesskey="&calendar.monthview.accesskey;" accesskey="&calendar.monthview.accesskey;"
observes="month_view_command"/> observes="month_view_command"/>
<menuseparator/> <menuseparator/>
<!-- XXX lilmatt: Localize this! label="&calendar.onlyworkday.checkbox.label;" -->
<menuitem id="only-workday-checkbox-1" <menuitem id="only-workday-checkbox-1"
type="checkbox" type="checkbox"
label="&calendar.onlyworkday.checkbox.label;" label="Only Show Work Days"
accesskey="&calendar.onlyworkday.checkbox.accesskey;" accesskey="&calendar.onlyworkday.checkbox.accesskey;"
oncommand="changeOnlyWorkdayCheckbox(1);" oncommand="changeOnlyWorkdayCheckbox(1);"
persist="checked" persist="checked"
disabled="true"/> disabled="true"/>
<!-- XXX lilmatt: Localize this! label="&calendar.displaytodos.checkbox.label;" -->
<menuitem id="display-todo-inview-checkbox-1" <menuitem id="display-todo-inview-checkbox-1"
type="checkbox" type="checkbox"
label="&calendar.displaytodos.checkbox.label;" label="Show Tasks in Calendar"
accesskey="&calendar.displaytodos.checkbox.accesskey;" accesskey="&calendar.displaytodos.checkbox.accesskey;"
oncommand="changeDisplayToDoInViewCheckbox(1);" oncommand="changeDisplayToDoInViewCheckbox(1);"
persist="checked" persist="checked"
disabled="true"/> disabled="true"/>
<menu label="&calendar.menu.numberofweeks.label;" <!-- XXX lilmatt: Localize this! label="&calendar.menu.numberofweeks.label;" -->
<menu id="menu-numberofweeks-inview"
label="Multiweek View Size"
oncommand="gCalendarWindow.currentView.changeNumberOfWeeks(event.target)" oncommand="gCalendarWindow.currentView.changeNumberOfWeeks(event.target)"
id="menu-numberofweeks-inview"
disabled="true"> disabled="true">
<menupopup> <menupopup>
<menuitem type="radio" <!-- XXX lilmatt: Localize this! label="&calendar.menu.numberofweeks.2;" -->
value="1"
name="menunbofweeks"
label="&calendar.menu.numberofweeks.1;"/>
<menuitem type="radio" <menuitem type="radio"
value="2" value="2"
name="menunbofweeks" name="menunbofweeks"
label="&calendar.menu.numberofweeks.2;"/> label="Two Weeks"/>
<menuitem type="radio" <menuitem type="radio"
value="3" value="3"
name="menunbofweeks" name="menunbofweeks"
label="&calendar.menu.numberofweeks.3;"/> label="Three Weeks"/>
<menuitem type="radio" <menuitem type="radio"
value="4" value="4"
name="menunbofweeks" name="menunbofweeks"
label="&calendar.menu.numberofweeks.4;"/> label="Four Weeks"/>
<menuitem type="radio" <menuitem type="radio"
value="5" value="5"
name="menunbofweeks" name="menunbofweeks"
label="&calendar.menu.numberofweeks.5;"/> label="Five Weeks"/>
<menuitem type="radio" <menuitem type="radio"
value="6" value="6"
name="menunbofweeks" name="menunbofweeks"
label="&calendar.menu.numberofweeks.6;"/> label="Six Weeks"/>
</menupopup> </menupopup>
</menu> </menu>
<menuseparator/> <menuseparator/>
<menuitem id="calendar-view-menu-customize" <!-- XXX lilmatt: Finish/localize this! -->
command="cmd_CustomizeToolbars" <menuitem label="Full Screen" disabled="true"/>
label="&calendar.menu.customize.label;"
accesskey="&calendar.menu.customize.accesskey;"/>
</menupopup> </menupopup>
</menu> </menu>
@ -277,6 +341,17 @@
# accesskey="&calendar.wizard.accesskey;" # accesskey="&calendar.wizard.accesskey;"
# observes="wizard_command"/> # observes="wizard_command"/>
# <menuseparator/> # <menuseparator/>
<!-- XXX lilmatt: Finish/localize this! label="&extensions.label;" accesskey="&extensions.accesskey;" -->
<menuitem id="extensionsManager"
label="Extensions"
oncommand="openExtensions('extensions');"/>
# disabled="true"/>
<!-- XXX lilmatt: Finish/localize this! label="&themes.label;" accesskey="&themes.accesskey;"-->
<menuitem id="themesManager"
label="Themes"
oncommand="openExtensions('themes');"/>
# disabled="true"/>
<menuseparator/>
<menuitem id="javascriptConsole" <menuitem id="javascriptConsole"
label="&javaScriptConsoleCmd.label;" label="&javaScriptConsoleCmd.label;"
accesskey="&javaScriptConsoleCmd.accesskey;" accesskey="&javaScriptConsoleCmd.accesskey;"
@ -332,6 +407,9 @@
label="&helpMenu.label;" label="&helpMenu.label;"
accesskey="&helpMenu.accesskey;"> accesskey="&helpMenu.accesskey;">
<menupopup id="menu_HelpPopup"> <menupopup id="menu_HelpPopup">
<!-- XXX lilmatt: Finish/localize this! oncommand="openTopWin('&helpURL;');" -->
<menuitem label="Help Contents"
disabled="true"/>
<menuitem accesskey="&releaseCmd.accesskey;" <menuitem accesskey="&releaseCmd.accesskey;"
label="&releaseCmd.label;" label="&releaseCmd.label;"
oncommand="openTopWin('&releaseURL;');" oncommand="openTopWin('&releaseURL;');"

12
calendar/sunbird/base/content/calendar-sets.inc
Просмотреть файл

@ -93,6 +93,11 @@
<command id="wizard_command" oncommand="launchWizard()" collapsed="true"/> <command id="wizard_command" oncommand="launchWizard()" collapsed="true"/>
<command id="cmd_CustomizeToolbars" oncommand="CalendarCustomizeToolbar()"/> <command id="cmd_CustomizeToolbars" oncommand="CalendarCustomizeToolbar()"/>
<command id="cmd_showCalendarToolbar" oncommand="goToggleToolbar('calendar-bar', 'menu_showCalendarToolbar');"/>
<command id="cmd_showSearchToolbar" oncommand="goToggleToolbar('searchBox', 'menu_showSearchToolbar');"/>
<command id="cmd_showStatusBar" oncommand="goToggleToolbar('status-bar', 'menu_showStatusBar');"/>
<command id="cmd_showTaskBox" oncommand="goToggleToolbar('taskBox', 'menu_showTaskBox');"/>
#ifdef XP_MACOSX #ifdef XP_MACOSX
<command id="minimizeWindowCmd" oncommand="window.minimize();"/> <command id="minimizeWindowCmd" oncommand="window.minimize();"/>
<command id="zoomWindowCmd" oncommand="zoomWindow();"/> <command id="zoomWindowCmd" oncommand="zoomWindow();"/>
@ -102,6 +107,9 @@
<keyset> <keyset>
<key id="new_event_key" key="&event.new.event.key;" observes="new_command" modifiers="accel"/> <key id="new_event_key" key="&event.new.event.key;" observes="new_command" modifiers="accel"/>
<key id="new_todo_key" key="&event.new.todo.key;" observes="new_todo_command" modifiers="accel"/> <key id="new_todo_key" key="&event.new.todo.key;" observes="new_todo_command" modifiers="accel"/>
#XXX lilmatt: Finish/localize this!
<key id="new_journal_key" key="J" modifiers="accel"/>
<key id="modify_event_key" key="&event.edit.event.key;" observes="modify_command" modifiers="accel"/> <key id="modify_event_key" key="&event.edit.event.key;" observes="modify_command" modifiers="accel"/>
<key id="new_calendar_key" key="&calendar.new.server.key;" observes="new_local_calendar_command" modifiers="accel"/> <key id="new_calendar_key" key="&calendar.new.server.key;" observes="new_local_calendar_command" modifiers="accel"/>
<key id="open_calendar_key" key="&calendar.open.file.key;" observes="open_local_calendar_command" modifiers="accel"/> <key id="open_calendar_key" key="&calendar.open.file.key;" observes="open_local_calendar_command" modifiers="accel"/>
@ -113,6 +121,10 @@
#endif #endif
<key id="print_key" key="&calendar.print.key;" observes="print_command" modifiers="accel"/> <key id="print_key" key="&calendar.print.key;" observes="print_command" modifiers="accel"/>
#XXX lilmatt: Finish/localize this!
<key id="undo_key" key="Z" modifiers="accel"/>
<key id="redo_key" key="Z" modifiers="shift,accel"/>
<key id="key_cut" key="&calendar.cut.key;" observes="cut_command" modifiers="accel"/> <key id="key_cut" key="&calendar.cut.key;" observes="cut_command" modifiers="accel"/>
<key id="key_copy" key="&calendar.copy.key;" observes="copy_command" modifiers="accel"/> <key id="key_copy" key="&calendar.copy.key;" observes="copy_command" modifiers="accel"/>
<key id="key_paste" key="&calendar.paste.key;" observes="paste_command" modifiers="accel"/> <key id="key_paste" key="&calendar.paste.key;" observes="paste_command" modifiers="accel"/>

5
calendar/sunbird/base/content/calendar.xul
Просмотреть файл

@ -483,6 +483,8 @@
</tabpanel> </tabpanel>
</tabpanels> </tabpanels>
</tabbox> </tabbox>
<vbox id="taskBox" persist="collapsed" flex="1">
<splitter id="calendar-todo-splitter" collapse="before" persist="state" <splitter id="calendar-todo-splitter" collapse="before" persist="state"
orient="vertical"/> orient="vertical"/>
<vbox id="left-hand-below-splitter" flex="1" persist="height"> <vbox id="left-hand-below-splitter" flex="1" persist="height">
@ -548,6 +550,7 @@
</tree> </tree>
</vbox> </vbox>
</vbox> </vbox>
</vbox>
<splitter id="calendar-splitter" collapse="before" persist="state" <splitter id="calendar-splitter" collapse="before" persist="state"
class="chromeclass-extrachrome sidebar-splitter" orient="horizontal" class="chromeclass-extrachrome sidebar-splitter" orient="horizontal"
@ -555,7 +558,7 @@
<vbox flex="1"> <vbox flex="1">
<vbox id="bottom-events-box" persist="height"> <vbox id="bottom-events-box" persist="height">
<hbox> <hbox id="searchBox" persist="collapsed">
<box align="center"> <box align="center">
<menulist id="event-filter-menulist" persist="value"> <menulist id="event-filter-menulist" persist="value">
<menupopup id="event-filter-menupopup" oncommand="changeEventFilter( event );"> <menupopup id="event-filter-menupopup" oncommand="changeEventFilter( event );">