Need button and periodic interval for refreshing/publishing a calendar

bug 207381, patch by Matthew Willis, image by Mark Carson, r=mvl

calendar/resources/content/calendar.xul

@@ -121,7 +121,7 @@
   <command id="import_command" oncommand="startImport()"/>
   <command id="export_command" oncommand="saveEventsToFile()" disabled="true" disabledwhennoeventsselected="true"/>
 
-  <command id="refresh_remote_calendars" oncommand="gCalendarWindow.calendarManager.refreshAllRemoteCalendars()"/>
+  <command id="reload_remote_calendars" oncommand="gCalendarWindow.calendarManager.refreshAllRemoteCalendars()"/>
   <command id="publish_calendar" oncommand="publishEntireCalendar()"/>
   <command id="publish_events_command" oncommand="publishCalendarData()" disabled="true" disabledwhennoeventsselected="true"/>
 
@@ -405,9 +405,9 @@
   <menuitem label="&calendar.context.deleteserver.label;"
             accesskey="&calendar.context.deleteserver.accesskey;"
             observes="delete_server_command"/>
-  <menuitem label="&calendar.context.refreshserver.label;"
-            accesskey="&calendar.context.refreshserver.accesskey;"
-            observes="refresh_remote_calendars"/>
+  <menuitem label="&calendar.context.reloadserver.label;"
+            accesskey="&calendar.context.reloadserver.accesskey;"
+            observes="reload_remote_calendars"/>
   <menuitem label="&calendar.context.publish.label;"
             accesskey="&calendar.context.publish.accesskey;"
             observes="publish_calendar"/>

calendar/resources/content/menuOverlay.xul

@@ -128,10 +128,10 @@
                    label="&calendar.subscribe.label;"
                    accesskey="&calendar.subscribe.accesskey;"
                    observes="new_server_command"/>
-         <menuitem id="calendar-refreshserver-menu"
-                   label="&calendar.context.refreshserver.label;"
-                   accesskey="&calendar.context.refreshserver.accesskey;"
-                   observes="refresh_remote_calendars"/>
+         <menuitem id="calendar-reloadserver-menu"
+                   label="&calendar.context.reloadserver.label;"
+                   accesskey="&calendar.context.reloadserver.accesskey;"
+                   observes="reload_remote_calendars"/>
          <menuseparator/>
 
          <!-- import: pulling data into existing files -->

calendar/resources/locale/en-US/calendar.dtd

@@ -281,6 +281,11 @@
 <!ENTITY calendar.subscribe.button.label           "Subscribe" >
 <!ENTITY calendar.publish.button.label             "Publish" >
 
+<!ENTITY calendar.localreload.button.label   "Local Reload" >
+<!ENTITY calendar.localreload.button.tooltip  "Reload all local calendars" >
+<!ENTITY calendar.remotereload.button.label   "Reload" >
+<!ENTITY calendar.remotereload.button.tooltip   "Reload all remote calendars" >
+
 <!ENTITY calendar.dayview.button.label          "Day View" >
 <!ENTITY calendar.weekview.button.label         "Week View" >
 <!ENTITY calendar.monthview.button.label        "Month View" >
@@ -397,8 +402,8 @@
 <!ENTITY calendar.context.editserver.accesskey         "E">
 <!ENTITY calendar.context.deleteserver.label           "Delete Calendar">
 <!ENTITY calendar.context.deleteserver.accesskey       "D">
-<!ENTITY calendar.context.refreshserver.label          "Refresh Remote Calendars">
-<!ENTITY calendar.context.refreshserver.accesskey      "R">
+<!ENTITY calendar.context.reloadserver.label           "Reload Remote Calendars">
+<!ENTITY calendar.context.reloadserver.accesskey       "R">
 <!ENTITY calendar.context.publish.label                "Publish Entire Calendar">
 <!ENTITY calendar.context.publish.accesskey            "P">
 

calendar/sunbird/base/content/calendar-menubar.inc

@@ -81,10 +81,10 @@
                      label="&calendar.subscribe.label;"
                      accesskey="&calendar.subscribe.accesskey;"
                      observes="new_server_command"/>
-           <menuitem id="calendar-refreshserver-menu"
-                     label="&calendar.context.refreshserver.label;"
-                     accesskey="&calendar.context.refreshserver.accesskey;"
-                     observes="refresh_remote_calendars"/>
+           <menuitem id="calendar-reloadserver-menu"
+                     label="&calendar.context.reloadserver.label;"
+                     accesskey="&calendar.context.reloadserver.accesskey;"
+                     observes="reload_remote_calendars"/>
            <menuseparator/>
 
            <!-- import: pulling data into existing files -->

calendar/sunbird/base/content/calendar-sets.inc

@@ -82,7 +82,7 @@
   <command id="import_command" oncommand="startImport()"/>
   <command id="export_command" oncommand="saveEventsToFile()" disabled="true" disabledwhennoeventsselected="true"/>
 
-  <command id="refresh_remote_calendars" oncommand="gCalendarWindow.calendarManager.refreshAllRemoteCalendars()"/>
+  <command id="reload_remote_calendars" oncommand="gCalendarWindow.calendarManager.refreshAllRemoteCalendars()"/>
   <command id="publish_calendar" oncommand="publishEntireCalendar()"/>
   <command id="publish_events_command" oncommand="publishCalendarData()" disabled="true" disabledwhennoeventsselected="true"/>
 

calendar/sunbird/base/content/calendar.xul

@@ -247,9 +247,9 @@
   <menuitem label="&calendar.context.deleteserver.label;"
             accesskey="&calendar.context.deleteserver.accesskey;"
             observes="delete_server_command"/>
-  <menuitem label="&calendar.context.refreshserver.label;"
-            accesskey="&calendar.context.refreshserver.accesskey;"
-            observes="refresh_remote_calendars"/>
+  <menuitem label="&calendar.context.reloadserver.label;"
+            accesskey="&calendar.context.reloadserver.accesskey;"
+            observes="reload_remote_calendars"/>
   <menuitem label="&calendar.context.publish.label;"
             accesskey="&calendar.context.publish.accesskey;"
             observes="publish_calendar"/>
@@ -378,6 +378,18 @@
                    tooltiptext="&calendar.choosedate.button.tooltip;"
                    observes="go_date_command"/>
                    
+<!--    <toolbarbutton class="toolbarbutton-1"
+                   id="calendar-local-reload-button"
+                   label="&calendar.localreload.button.label;"
+                   tooltiptext="&calendar.localreload.button.tooltip;"
+                   observes="reload_local_calendars"/> -->
+                   
+    <toolbarbutton class="toolbarbutton-1"
+                   id="calendar-remote-reload-button"
+                   label="&calendar.remotereload.button.label;"
+                   tooltiptext="&calendar.remotereload.button.tooltip;"
+                   observes="reload_remote_calendars"/>
+
     <toolbaritem id="throbber-box" align="center" pack="center">
       <button id="navigator-throbber"
               oncommand="openAboutDialog();"

calendar/sunbird/base/content/hiddenWindow.js

@@ -57,7 +57,7 @@ function hiddenWindowStartup()
                        'new_server_command', 'publish_events_command', 'modify_todo_command', 
                        'edit_local_calendar_command', 'edit_server_command', 
                        'delete_server_command', 'find_new_calendar_command', 
-                       'refresh_remote_calendars', 'publish_calendar'];
+                       'reload_remote_calendars', 'publish_calendar'];
   for (var id in disabledItems) 
   {
     var broadcaster = document.getElementById(disabledItems[id]);

calendar/sunbird/themes/winstripe/sunbird/calendar.css

@@ -666,6 +666,77 @@ toolbar[iconsize="small"] #calendar-publish-button:hover {
 toolbar[iconsize="small"] #calendar-publish-button:hover:active {
 }
 
+/*--------------------------------------------------------------------
+ *   Local Reload button
+ *-------------------------------------------------------------------*/
+
+/*#calendar-local-reload-button {
+        -moz-image-region: rect(0px 456px 24px 432px);
+}
+#calendar-local-reload[disabled="true"],
+#calendar-local-reload[disabled="true"]:hover,
+#calendar-local-reload[disabled="true"]:hover:active {
+        -moz-image-region: rect(48px 456px 72px 432px);
+}
+#calendar-local-reload:hover {
+        -moz-image-region: rect(24px 456px 48px 432px);
+}
+#calendar-local-reload:hover:active {
+}*/
+
+/*--------------------------------------------------------------------
+ *   Local Reload button - small
+ *-------------------------------------------------------------------*/
+
+/*toolbar[iconsize="small"] #calendar-local-reload {
+        -moz-image-region: rect(0px 224px 16px 208px);
+}
+toolbar[iconsize="small"] #calendar-local-reload[disabled="true"],
+toolbar[iconsize="small"] #calendar-local-reload[disabled="true"]:hover,
+toolbar[iconsize="small"] #calendar-local-reload[disabled="true"]:hover:active {
+        -moz-image-region: rect(32px 224px 48px 208px);
+}
+toolbar[iconsize="small"] #calendar-local-reload:hover {
+        -moz-image-region: rect(16px 224px 32px 208px);
+}
+toolbar[iconsize="small"] #calendar-local-reload:hover:active {
+}*/
+
+/*--------------------------------------------------------------------
+ *   Remote Reload button
+ *-------------------------------------------------------------------*/
+
+#calendar-remote-reload-button {
+        -moz-image-region: rect(0px 480px 24px 456px);
+}
+#calendar-remote-reload-button[disabled="true"],
+#calendar-remote-reload-button[disabled="true"]:hover,
+#calendar-remote-reload-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(48px 480px 72px 456px);
+}
+#calendar-remote-reload-button:hover {
+        -moz-image-region: rect(24px 480px 48px 456px);
+}
+#calendar-remote-reload-button:hover:active {
+}
+
+/*--------------------------------------------------------------------
+ *   Remote Reload button - small
+ *-------------------------------------------------------------------*/
+
+toolbar[iconsize="small"] #calendar-remote-reload-button { 
+        -moz-image-region: rect(0px 322px 16px 306px);
+}
+toolbar[iconsize="small"] #calendar-remote-reload-button[disabled="true"],
+toolbar[iconsize="small"] #calendar-remote-reload-button[disabled="true"]:hover,
+toolbar[iconsize="small"] #calendar-remote-reload-button[disabled="true"]:hover:active {
+        -moz-image-region: rect(32px 322px 48px 306px);
+}
+toolbar[iconsize="small"] #calendar-remote-reload-button:hover {
+        -moz-image-region: rect(16px 322px 32px 306px);
+}
+toolbar[iconsize="small"] #calendar-remote-reload-button:hover:active {
+}
 /*--------------------------------------------------------------------
  *   Print button
  *-------------------------------------------------------------------*/