From f1af5d1dda608080d4db6cfc037871f1a0f24255 Mon Sep 17 00:00:00 2001
From: "seawood%netscape.com" <seawood%netscape.com>
Date: Sat, 17 Nov 2001 03:49:05 +0000
Subject: [PATCH] Add overlays to add calendar to the Tasks menu Bug #110354
r=colinp
---
calendar/resources/content/calendarOverlay.js | 7 +++++
.../resources/content/calendarOverlay.xul | 29 +++++++++++++++++++
calendar/resources/content/contents.rdf | 10 +++++++
calendar/resources/jar.mn | 3 ++
.../locale/en-US/calendarOverlay.dtd | 3 ++
calendar/resources/locale/en-US/overlay.dtd | 3 ++
6 files changed, 55 insertions(+)
create mode 100644 calendar/resources/content/calendarOverlay.js
create mode 100644 calendar/resources/content/calendarOverlay.xul
create mode 100644 calendar/resources/locale/en-US/calendarOverlay.dtd
create mode 100644 calendar/resources/locale/en-US/overlay.dtd
diff --git a/calendar/resources/content/calendarOverlay.js b/calendar/resources/content/calendarOverlay.js
new file mode 100644
index 0000000000000..7f97f688ccaa7
--- /dev/null
+++ b/calendar/resources/content/calendarOverlay.js
@@ -0,0 +1,7 @@
+function openCalendar()
+{
+
+ toOpenWindowByType("calendar", "chrome://calendar/content/calendar.xul");
+
+}
+
diff --git a/calendar/resources/content/calendarOverlay.xul b/calendar/resources/content/calendarOverlay.xul
new file mode 100644
index 0000000000000..c26ab4ddaa7ca
--- /dev/null
+++ b/calendar/resources/content/calendarOverlay.xul
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE window SYSTEM "chrome://calendar/locale/calendarOverlay.dtd" >
+
+<!-- This is the overlay that addes "Calendar" to the (global) task menu. -->
+
+<overlay id="CalendarTaskMenuID"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<script type="application/x-javascript" src="chrome://calendar/content/calendarOverlay.js"/>
+
+<keyset id="tasksKeys">
+ <key id="key_calendar" key="&calendarCmd.commandkey;" command="Tasks:Calendar" modifiers="accel"/>
+</keyset>
+
+<commandset id="tasksCommands">
+ <command id="Tasks:Calendar" oncommand="openCalendar();"/>
+</commandset>
+
+<menupopup id="taskPopup">
+ <menuitem
+ position="3"
+ label="&calendarCmd.label;"
+ accesskey="&calendarCmd.accesskey;"
+ key="key_calendar"
+ command="Tasks:Calendar"/>
+</menupopup>
+
+</overlay>
diff --git a/calendar/resources/content/contents.rdf b/calendar/resources/content/contents.rdf
index 7d14840ea1231..322834c14ab20 100644
--- a/calendar/resources/content/contents.rdf
+++ b/calendar/resources/content/contents.rdf
@@ -47,4 +47,14 @@
chrome:author="OEOne Corp."
chrome:name="calendar">
</RDF:Description>
+
+ <!-- overlay information -->
+ <RDF:Seq about="urn:mozilla:overlays">
+ <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
+ </RDF:Seq>
+
+ <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul">
+ <RDF:li>chrome://calendar/content/calendarOverlay.xul</RDF:li>
+ </RDF:Seq>
+
</RDF:RDF>
diff --git a/calendar/resources/jar.mn b/calendar/resources/jar.mn
index bc095ea7bdbf9..6eadd3aeb60d5 100644
--- a/calendar/resources/jar.mn
+++ b/calendar/resources/jar.mn
@@ -137,6 +137,8 @@ calendar.jar:
content/calendar/calendarFolderDialog.xul (content/calendarFolderDialog.xul)
content/calendar/calendarMonthView.js (content/calendarMonthView.js)
content/calendar/calendarMonthView.xul (content/calendarMonthView.xul)
+ content/calendar/calendarOverlay.xul (content/calendarOverlay.xul)
+ content/calendar/calendarOverlay.js (content/calendarOverlay.js)
content/calendar/calendarWeekView.js (content/calendarWeekView.js)
content/calendar/calendarWeekView.xul (content/calendarWeekView.xul)
content/calendar/categories.js (content/categories.js)
@@ -149,6 +151,7 @@ calendar.jar:
content/calendar/test/testCalendarEvent.js (content/test/testCalendarEvent.js)
content/calendar/test/testCalendarEvent.xul (content/test/testCalendarEvent.xul)
locale/en-US/calendar/calendar.dtd (locale/en-US/calendar.dtd)
+ locale/en-US/calendar/calendarOverlay.dtd (locale/en-US/calendarOverlay.dtd)
locale/en-US/calendar/contents.rdf (locale/en-US/contents.rdf)
skin/modern/calendar/ca-event-dialog/background_with_border.png (skin/modern/ca-event-dialog/background_with_border.png)
skin/modern/calendar/ca-event-dialog/calendar_disabled.png (skin/modern/ca-event-dialog/calendar_disabled.png)
diff --git a/calendar/resources/locale/en-US/calendarOverlay.dtd b/calendar/resources/locale/en-US/calendarOverlay.dtd
new file mode 100644
index 0000000000000..d6a612456d980
--- /dev/null
+++ b/calendar/resources/locale/en-US/calendarOverlay.dtd
@@ -0,0 +1,3 @@
+<!ENTITY calendarCmd.label "Calendar">
+<!ENTITY calendarCmd.accesskey "r">
+<!ENTITY calendarCmd.commandkey "6">
diff --git a/calendar/resources/locale/en-US/overlay.dtd b/calendar/resources/locale/en-US/overlay.dtd
new file mode 100644
index 0000000000000..d6a612456d980
--- /dev/null
+++ b/calendar/resources/locale/en-US/overlay.dtd
@@ -0,0 +1,3 @@
+<!ENTITY calendarCmd.label "Calendar">
+<!ENTITY calendarCmd.accesskey "r">
+<!ENTITY calendarCmd.commandkey "6">
--
GitLab