зеркало из https://github.com/mozilla/pjs.git
Fixes to loading, caching, and UI.
This commit is contained in:
sman%netscape.com
Родитель
026ac2bbc7
Коммит
17567da51f
|
|
@ -760,13 +760,26 @@ private:
|
|||
*/
|
||||
void createVFreebusyHelper(Freebusy * f, DateTime start, DateTime end);
|
||||
|
||||
public:
|
||||
/**
|
||||
* update the m_EventsSpanStart and m_EventsSpanEnd members
|
||||
* taking into account new VEvent.
|
||||
*/
|
||||
void updateEventsRange(VEvent * v);
|
||||
|
||||
/**
|
||||
* caller of FetchEventsByRange must be able to set the known
|
||||
* event range span. There may not have been any events in
|
||||
* the database within a range. If ther are, the events do not
|
||||
* necessarily span the full range. In any case, we need to be
|
||||
* able to update known limits on the event range...
|
||||
* -sman 10/12/98
|
||||
* @param DTStart Known good start time
|
||||
* @param DTEnd Known good stop time
|
||||
*/
|
||||
void updateEventsRange(DateTime DTStart, DateTime DTEnd);
|
||||
|
||||
private:
|
||||
/* -- private data members -- */
|
||||
|
||||
/* parsing flags */
|
||||
|
|
|
|||
|
|
@ -1158,37 +1158,42 @@ JulianPtrArray * NSCalendar::changeEventsOwnership()
|
|||
return out;
|
||||
}
|
||||
//---------------------------------------------------------------------
|
||||
void NSCalendar::updateEventsRange(DateTime dStart, DateTime dEnd)
|
||||
{
|
||||
if (dStart.isValid())
|
||||
{
|
||||
if (!m_EventsSpanStart.isValid())
|
||||
m_EventsSpanStart = dStart;
|
||||
else
|
||||
{
|
||||
if (m_EventsSpanStart.afterDateTime(dStart))
|
||||
m_EventsSpanStart = dStart;
|
||||
}
|
||||
|
||||
/*
|
||||
* set m_EventsSpanEnd to dStart if dEnd. not valid and m_EventsSpanNotSet
|
||||
*/
|
||||
if (!m_EventsSpanEnd.isValid() && (!dEnd.isValid()))
|
||||
{
|
||||
m_EventsSpanEnd = dStart;
|
||||
}
|
||||
}
|
||||
|
||||
if (dEnd.isValid())
|
||||
{
|
||||
if (!m_EventsSpanEnd.isValid())
|
||||
m_EventsSpanEnd = dEnd;
|
||||
else
|
||||
{
|
||||
if (m_EventsSpanEnd.beforeDateTime(dEnd))
|
||||
m_EventsSpanEnd = dEnd;
|
||||
}
|
||||
}
|
||||
}
|
||||
void NSCalendar::updateEventsRange(VEvent * v)
|
||||
{
|
||||
DateTime start, end;
|
||||
PR_ASSERT(v->isValid());
|
||||
start = v->getDTStart();
|
||||
end = v->getDTEnd();
|
||||
if (start.isValid())
|
||||
{
|
||||
if (!m_EventsSpanStart.isValid())
|
||||
m_EventsSpanStart = start;
|
||||
else
|
||||
{
|
||||
if (m_EventsSpanStart.afterDateTime(start))
|
||||
m_EventsSpanStart = start;
|
||||
}
|
||||
// set m_EventsSpanEnd to start if end not valid and m_EventsSpanNotSet
|
||||
if (!m_EventsSpanEnd.isValid() && (!end.isValid()))
|
||||
{
|
||||
m_EventsSpanEnd = start;
|
||||
}
|
||||
}
|
||||
if (end.isValid())
|
||||
{
|
||||
if (!m_EventsSpanEnd.isValid())
|
||||
m_EventsSpanEnd = end;
|
||||
else
|
||||
{
|
||||
if (m_EventsSpanEnd.beforeDateTime(end))
|
||||
m_EventsSpanEnd = end;
|
||||
}
|
||||
}
|
||||
updateEventsRange( v->getDTStart(), v->getDTEnd() );
|
||||
}
|
||||
//---------------------------------------------------------------------
|
||||
void NSCalendar::addEvent(ICalComponent * v)
|
||||
|
|
|
|||
|
|
@ -222,8 +222,6 @@ nsresult nsLayer::FetchEventsByRange(
|
|||
JulianPtrArray* anArray
|
||||
)
|
||||
{
|
||||
nsresult res;
|
||||
|
||||
/*
|
||||
* Before we do anything, see if we've cached the info..
|
||||
*/
|
||||
|
|
@ -391,6 +389,12 @@ nsresult nsLayer::FetchEventsByRange(
|
|||
PR_DestroyMonitor(pThreadMonitor);
|
||||
PR_DestroyMonitor(pCBReaderMonitor);
|
||||
|
||||
/*
|
||||
* now that we have successfully retrieved information from aStart
|
||||
* to aStop, update the Calendar's known range for events.
|
||||
*/
|
||||
mpCal->updateEventsRange(*aStart, *aStop);
|
||||
|
||||
/*
|
||||
* todo: need to delete calendars in pParsedCalList without
|
||||
* deleting events in it
|
||||
|
|
@ -402,8 +406,7 @@ nsresult nsLayer::FetchEventsByRange(
|
|||
/*
|
||||
* register the calendar...
|
||||
*/
|
||||
if (NS_OK != (res = mpShell->mCalList.Add(mpCal)))
|
||||
return res;
|
||||
mpShell->mCalList.Add(mpCal);
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -287,6 +287,75 @@ nsresult nsLayerCollection::FetchEventsByRange(
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
#if 0
|
||||
nsresult nsLayerCollection::FetchEventsByRange(
|
||||
DateTime* aStart,
|
||||
DateTime* aStop,
|
||||
JulianPtrArray* anArray
|
||||
)
|
||||
{
|
||||
PRLock *pLock;
|
||||
PRCondVar *pSomeThreadsCompleted;
|
||||
NSVector PendingThreadCompletions;
|
||||
PRInt32 i;
|
||||
PRInt32 iTmpSize;
|
||||
PRInt32 iFinishedThreadCount = 0;
|
||||
PRInt32 iCount = mLayers->Count();
|
||||
nsILayer *pLayer = 0;
|
||||
PRThread *pThread = 0;
|
||||
|
||||
pLock = PR_NewLock();
|
||||
pAThreadCompleted = PR_NewCondVar(pLock);
|
||||
|
||||
/*
|
||||
* Create a thread for each layer in the collection...
|
||||
*/
|
||||
for ( i = 0; i < iCount; i++)
|
||||
{
|
||||
pLayer = (nsILayer*)mLayers->ElementAt(i);
|
||||
/*
|
||||
* create a thread for pLayer..
|
||||
*/
|
||||
pThread = PR_CreateThread(
|
||||
PR_USER_THREAD,
|
||||
main_LayerOpHandler,
|
||||
pLayerOp,
|
||||
PR_PRIORITY_NORMAL,
|
||||
PR_LOCAL_THREAD,
|
||||
PR_UNJOINABLE_THREAD,
|
||||
0);
|
||||
}
|
||||
|
||||
while (iFinishedThreadCount < iCount)
|
||||
{
|
||||
/*
|
||||
* Wait for individual layers to complete...
|
||||
*/
|
||||
PR_Lock(pLock);
|
||||
while ( 0 == PendingThreadCompletions.Count() )
|
||||
{
|
||||
PR_WaitCondVar(pSomeThreadsCompleted,PR_INTERVAL_NO_TIMEOUT);
|
||||
}
|
||||
|
||||
/*
|
||||
* At least one layer is now complete. Remove any threads from
|
||||
* the pending list and put them into the completed list
|
||||
*/
|
||||
iFinishedThreadCount += PendingThreadCompletions.Count();
|
||||
PendingThreadCompletions.RemoveAll();
|
||||
PR_Unlock(pLock);
|
||||
}
|
||||
|
||||
/*
|
||||
* All threads are done. Send command indicating data collection is done.
|
||||
*/
|
||||
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @param aUrl the url for comparison. In this case, we check to see if
|
||||
* both the host and cal store id match on any layer in
|
||||
|
|
|
|||
|
|
@ -1,77 +0,0 @@
|
|||
<?xml version="1.0" standalone="no" encoding="UTF-8"?>
|
||||
<!DOCTYPE julian SYSTEM "http://kirkwood.mcom.com/julian.dtd">
|
||||
<Calendar>
|
||||
|
||||
<!-- This is the User Heading Rule -->
|
||||
<panel name="UserHeadingRule" >
|
||||
<tcc backgroundcolor="#C0C0C0" foregroundcolor="#0000FF" name="PrevDay" orientation="west" control="MultiCalendarEventWeekView" usectxrule="day-1" weightminor="0" weightmajor="0"/>
|
||||
<object class="timebaruserheading" backgroundcolor="#C0C0C0" name="tuh" title="Julian Calendar 0.1" weightmajor="1"/>
|
||||
<tcc foregroundcolor="#0000FF" backgroundcolor="#C0C0C0" name="NextDay" orientation="east" control="MultiCalendarEventWeekView" usectxrule="day+1" weightminor="0" weightmajor="0"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the HTML Pane -->
|
||||
<panel name="FolderViewRule" layout="ybox">
|
||||
<object class="timebaruserheading" backgroundcolor="#C0C0C0" title="Folders" weightmajor="0"/>
|
||||
<foldercanvas>
|
||||
<xpitem label="Trex" halign="left" valign="bottom" fullimage="resource://res/ui/images/trex_full.gif" />
|
||||
<xpitem label="Inbox" halign="left" valign="bottom" fullimage="resource://res/ui/images/inbox_full.gif" />
|
||||
<xpitem label="Outbox" halign="left" valign="bottom" fullimage="resource://res/ui/images/outbox_full.gif" />
|
||||
<xpitem label="Sent" halign="left" valign="bottom" fullimage="resource://res/ui/images/sent_full.gif" />
|
||||
<xpitem label="Trash" halign="left" valign="bottom" fullimage="resource://res/ui/images/trash_full.gif" />
|
||||
<xpitem label="Portal" halign="left" valign="bottom" fullimage="resource://res/ui/images/portal_full.gif" />
|
||||
<xpitem label="Mail" halign="left" valign="bottom" fullimage="resource://res/ui/images/mail_full.gif" />
|
||||
<xpitem label="Browser" halign="left" valign="bottom" fullimage="resource://res/ui/images/browser_full.gif" />
|
||||
<xpitem label="Address Book" halign="left" valign="bottom" fullimage="resource://res/ui/images/addrbook_full.gif" />
|
||||
</foldercanvas>
|
||||
</panel>
|
||||
|
||||
<!-- This is the Timebar Scale Rule -->
|
||||
<panel name="ScaleViewRule" layout="ybox">
|
||||
<tcc foregroundcolor="#0000FF" name="PrevHour" orientation="north" control="MultiCalendarEventWeekView" usectxrule="hour-1" weightminor="0" weightmajor="0"/>
|
||||
<timebarscale name="TimebarScale" weightminor="0" weightmajor="1" layout="ybox"/>
|
||||
<tcc foregroundcolor="#0000FF" name="NextHour" orientation="south" control="MultiCalendarEventWeekView" usectxrule="hour+1" weightminor="0" weightmajor="0"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the MonthController and Todo List -->
|
||||
<panel name="ToDoCalViewRule">
|
||||
<mcc name="MiniCalendar" control="MultiCalendarEventWeekView" usectxrule="DayList"/>
|
||||
<todocanvas name="ToDoCanvas"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the MultiDayView and Command Bar -->
|
||||
<panel name="MultiDayViewRule">
|
||||
<multidayviewcanvas name="MultiCalendarEventWeekView" control="MiniCalendar" repeatable="DayContext" minrepeat="1" maxrepeat="17" >
|
||||
<commandcanvas name="CommandCanvas" weightmajor="0" weightminor="0">
|
||||
</panel>
|
||||
|
||||
|
||||
<!-- This is the MultiDay, Scale and Todo together -->
|
||||
<panel name="MultiCalendarEventWeekViewPanel">
|
||||
<control rule="ScaleViewRule" layout="ybox" weightmajor="0" weightminor="0"/>
|
||||
<control rule="MultiDayViewRule" layout="ybox" width="400" weightmajor="1"/>
|
||||
<control rule="ToDoCalViewRule" layout="ybox" weightmajor="0" weightminor="0"/>
|
||||
</panel>
|
||||
|
||||
|
||||
<!-- This is the user header with the big Multi One -->
|
||||
<panel id="MultiCalendarUserEventWeekView" label="Day View">
|
||||
<control id="uhr" rule="UserHeadingRule" layout="xbox" weightminor="0" weightmajor="0"/>
|
||||
<control id="mcewv" rule="MultiCalendarEventWeekViewPanel" layout="xbox"/>
|
||||
<!--<commandcanvas name="CommandCanvas" weightmajor="0" weightminor="0">-->
|
||||
</panel>
|
||||
|
||||
<!-- Calendar with Folder Views -->
|
||||
<panel id="CalendarAndFolder" label="CalendarAndFolder">
|
||||
<control rule="FolderViewRule" layout="ybox" weightminor="0" weightmajor="0"/>
|
||||
<control id="mcuewv" rule="MultiCalendarUserEventWeekView" layout="ybox"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the root GUI panel. This is where life begins -->
|
||||
<panel id="MainCalendarPanel" label="Calendar UI">
|
||||
<control id="uhr" rule="CalendarAndFolder" layout="xbox"/>
|
||||
<ctx id="StartContext" majorinterval="PT01H" minorinterval="PT15M" default="today"/>
|
||||
</panel>
|
||||
|
||||
|
||||
</Calendar>
|
||||
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
<?xml version="1.0" standalone="no" encoding="UTF-8"?>
|
||||
<!DOCTYPE julian SYSTEM "http://kirkwood.mcom.com/julian.dtd">
|
||||
<Calendar>
|
||||
|
||||
<!-- This is the User Heading Rule -->
|
||||
<panel name="UserHeadingRule" >
|
||||
<tcc backgroundcolor="#C0C0C0" foregroundcolor="#0000FF" name="PrevDay" orientation="west" control="MultiCalendarEventWeekView" usectxrule="day-1" weightminor="0" weightmajor="0"/>
|
||||
<object class="timebaruserheading" backgroundcolor="#C0C0C0" name="tuh" title="Julian Calendar 0.1" weightmajor="1"/>
|
||||
<tcc foregroundcolor="#0000FF" backgroundcolor="#C0C0C0" name="NextDay" orientation="east" control="MultiCalendarEventWeekView" usectxrule="day+1" weightminor="0" weightmajor="0"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the HTML Pane -->
|
||||
<panel name="FolderViewRule">
|
||||
<object class="timebaruserheading" backgroundcolor="#C0C0C0" title="Folders" weightmajor="0"/>
|
||||
<foldercanvas >
|
||||
<xpitem label="Trex" halign="left" valign="bottom" fullimage="resource://res/ui/images/trex_full.gif" />
|
||||
<xpitem label="Inbox" halign="left" valign="bottom" fullimage="resource://res/ui/images/inbox_full.gif" />
|
||||
<xpitem label="Outbox" halign="left" valign="bottom" fullimage="resource://res/ui/images/outbox_full.gif" />
|
||||
<xpitem label="Sent" halign="left" valign="bottom" fullimage="resource://res/ui/images/sent_full.gif" />
|
||||
<xpitem label="Trash" halign="left" valign="bottom" fullimage="resource://res/ui/images/trash_full.gif" />
|
||||
<xpitem label="Portal" halign="left" valign="bottom" fullimage="resource://res/ui/images/portal_full.gif" />
|
||||
<xpitem label="Mail" halign="left" valign="bottom" fullimage="resource://res/ui/images/mail_full.gif" />
|
||||
<xpitem label="Browser" halign="left" valign="bottom" fullimage="resource://res/ui/images/browser_full.gif" />
|
||||
<xpitem label="Address Book" halign="left" valign="bottom" fullimage="resource://res/ui/images/addrbook_full.gif" />
|
||||
</foldercanvas>
|
||||
</panel>
|
||||
|
||||
<!-- This is the Timebar Scale Rule -->
|
||||
<panel name="ScaleViewRule">
|
||||
<tcc foregroundcolor="#0000FF" name="PrevHour" orientation="north" control="MultiCalendarEventWeekView" usectxrule="hour-1" weightminor="0" weightmajor="0"/>
|
||||
<timebarscale name="TimebarScale" weightminor="0" weightmajor="1" layout="ybox"/>
|
||||
<tcc foregroundcolor="#0000FF" name="NextHour" orientation="south" control="MultiCalendarEventWeekView" usectxrule="hour+1" weightminor="0" weightmajor="0"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the MonthController and Todo List -->
|
||||
<panel name="ToDoCalViewRule">
|
||||
<mcc name="MiniCalendar" control="MultiCalendarEventWeekView" usectxrule="DayList"/>
|
||||
<todocanvas name="ToDoCanvas"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the MultiDayView and Command Bar -->
|
||||
<panel name="MultiDayViewRule">
|
||||
<multidayviewcanvas name="MultiCalendarEventWeekView" control="MiniCalendar" repeatable="DayContext" minrepeat="1" maxrepeat="5" >
|
||||
<commandcanvas name="CommandCanvas" weightmajor="0" weightminor="0">
|
||||
</panel>
|
||||
|
||||
|
||||
<!-- This is the MultiDay, Scale and Todo together -->
|
||||
<panel name="MultiCalendarEventWeekViewPanel">
|
||||
<!-- <control rule="FolderViewRule" layout="ybox" weightmajor="0" weightminor="0"/> -->
|
||||
<control rule="ScaleViewRule" layout="ybox" weightmajor="0" weightminor="0"/>
|
||||
<control rule="MultiDayViewRule" layout="ybox" width="400" weightmajor="1"/>
|
||||
<control rule="ToDoCalViewRule" layout="ybox" weightmajor="0" weightminor="0"/>
|
||||
<!<!-- <set tag="Canvas" type="EventComponentCanvas"/>-->
|
||||
</panel>
|
||||
|
||||
|
||||
<!-- This is the user header with the big Multi One -->
|
||||
<panel id="MultiCalendarUserEventWeekView" label="Day View">
|
||||
<control id="uhr" rule="UserHeadingRule" layout="xbox" weightminor="0" weightmajor="0"/>
|
||||
<control id="mcewv" rule="MultiCalendarEventWeekViewPanel" layout="xbox"/>
|
||||
</panel>
|
||||
|
||||
<!-- Calendar with Folder Views -->
|
||||
<panel id="CalendarAndFolder" label="CalendarAndFolder">
|
||||
<control rule="FolderViewRule" layout="ybox" weightminor="0" weightmajor="0"/>
|
||||
<control id="mcuewv" rule="MultiCalendarUserEventWeekView" layout="ybox"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the root GUI panel. This is where life begins -->
|
||||
<panel id="MainCalendarPanel" label="Calendar UI">
|
||||
<control id="uhr" rule="CalendarAndFolder" layout="xbox"/>
|
||||
<ctx id="StartContext" majorinterval="PT01H" minorinterval="PT15M" default="today"/>
|
||||
</panel>
|
||||
|
||||
|
||||
</Calendar>
|
||||
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
<!-- This is the User Heading Rule -->
|
||||
<panel name="UserHeadingRule">
|
||||
<tcc foregroundcolor="#0000FF" name="PrevDay" orientation="west" control="MultiCalendarEventWeekView" usectxrule="day-1" weightminor="0" weightmajor="0"/>
|
||||
<object class="timebaruserheading" name="tuh" title="Julian Calendar 0.1" weightmajor="1"/>
|
||||
<object class="timebaruserheading" name="tuh" title="Zulu Calendar 0.1" weightmajor="1"/>
|
||||
<tcc foregroundcolor="#0000FF" name="NextDay" orientation="east" control="MultiCalendarEventWeekView" usectxrule="day+1" weightminor="0" weightmajor="0"/>
|
||||
</panel>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,78 +0,0 @@
|
|||
<?xml version="1.0" standalone="no" encoding="UTF-8"?>
|
||||
<!DOCTYPE julian SYSTEM "http://kirkwood.mcom.com/julian.dtd">
|
||||
<Calendar>
|
||||
|
||||
<!-- This is the User Heading Rule -->
|
||||
<panel name="UserHeadingRule" >
|
||||
<tcc backgroundcolor="#C0C0C0" foregroundcolor="#0000FF" name="PrevDay" orientation="west" control="MultiCalendarEventWeekView" major="tbh" usectxrule="day-1" weightminor="0" weightmajor="0"/>
|
||||
<object class="timebaruserheading" backgroundcolor="#C0C0C0" name="tuh" title="Julian Calendar 0.1" weightmajor="1"/>
|
||||
<tcc foregroundcolor="#0000FF" backgroundcolor="#C0C0C0" name="NextDay" orientation="east" control="MultiCalendarEventWeekView" usectxrule="day+1" weightminor="0" weightmajor="0"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the HTML Pane -->
|
||||
<panel name="FolderViewRule">
|
||||
<object class="timebaruserheading" backgroundcolor="#C0C0C0" title="Folders" weightmajor="0"/>
|
||||
<foldercanvas >
|
||||
<xpitem label="Trex" halign="left" valign="bottom" fullimage="resource://res/ui/images/trex_full.gif" />
|
||||
<xpitem label="Inbox" halign="left" valign="bottom" fullimage="resource://res/ui/images/inbox_full.gif" />
|
||||
<xpitem label="Outbox" halign="left" valign="bottom" fullimage="resource://res/ui/images/outbox_full.gif" />
|
||||
<xpitem label="Sent" halign="left" valign="bottom" fullimage="resource://res/ui/images/sent_full.gif" />
|
||||
<xpitem label="Trash" halign="left" valign="bottom" fullimage="resource://res/ui/images/trash_full.gif" />
|
||||
<xpitem label="Portal" halign="left" valign="bottom" fullimage="resource://res/ui/images/portal_full.gif" />
|
||||
<xpitem label="Mail" halign="left" valign="bottom" fullimage="resource://res/ui/images/mail_full.gif" />
|
||||
<xpitem label="Browser" halign="left" valign="bottom" fullimage="resource://res/ui/images/browser_full.gif" />
|
||||
<xpitem label="Address Book" halign="left" valign="bottom" fullimage="resource://res/ui/images/addrbook_full.gif" />
|
||||
</foldercanvas>
|
||||
</panel>
|
||||
|
||||
<!-- This is the Timebar Scale Rule -->
|
||||
<panel name="ScaleViewRule">
|
||||
<tcc foregroundcolor="#0000FF" name="PrevHour" orientation="north" control="MultiCalendarEventWeekView" usectxrule="hour-1" weightminor="0" weightmajor="0"/>
|
||||
<timebarscale name="TimebarScale" weightminor="0" weightmajor="1" layout="ybox"/>
|
||||
<tcc foregroundcolor="#0000FF" name="NextHour" orientation="south" control="MultiCalendarEventWeekView" usectxrule="hour+1" weightminor="0" weightmajor="0"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the MonthController and Todo List -->
|
||||
<panel name="ToDoCalViewRule">
|
||||
<mcc name="MiniCalendar" control="MultiCalendarEventWeekView" usectxrule="DayList"/>
|
||||
<todocanvas name="ToDoCanvas"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the MultiDayView and Command Bar -->
|
||||
<panel name="MultiDayViewRule">
|
||||
<multidayviewcanvas name="MultiCalendarEventWeekView" control="MiniCalendar" repeatable="DayContext" minrepeat="1" maxrepeat="17" >
|
||||
<commandcanvas name="CommandCanvas" weightmajor="0" weightminor="0">
|
||||
</panel>
|
||||
|
||||
|
||||
<!-- This is the MultiDay, Scale and Todo together -->
|
||||
<panel name="MultiCalendarEventWeekViewPanel">
|
||||
<!-- <control rule="FolderViewRule" layout="ybox" weightmajor="0" weightminor="0"/> -->
|
||||
<control rule="ScaleViewRule" layout="ybox" weightmajor="0" weightminor="0"/>
|
||||
<control rule="MultiDayViewRule" layout="ybox" width="400" weightmajor="1"/>
|
||||
<control rule="ToDoCalViewRule" layout="ybox" weightmajor="0" weightminor="0"/>
|
||||
<!<!-- <set tag="Canvas" type="EventComponentCanvas"/>-->
|
||||
</panel>
|
||||
|
||||
|
||||
<!-- This is the user header with the big Multi One -->
|
||||
<panel id="MultiCalendarUserEventWeekView" label="Day View">
|
||||
<control id="uhr" rule="UserHeadingRule" layout="xbox" weightminor="0" weightmajor="0"/>
|
||||
<control id="mcewv" rule="MultiCalendarEventWeekViewPanel" layout="xbox"/>
|
||||
</panel>
|
||||
|
||||
<!-- Calendar with Folder Views -->
|
||||
<panel id="CalendarAndFolder" label="CalendarAndFolder">
|
||||
<control rule="FolderViewRule" layout="ybox" weightminor="0" weightmajor="0"/>
|
||||
<control id="mcuewv" rule="MultiCalendarUserEventWeekView" layout="ybox"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the root GUI panel. This is where life begins -->
|
||||
<panel id="MainCalendarPanel" label="Calendar UI">
|
||||
<control id="uhr" rule="CalendarAndFolder" layout="xbox"/>
|
||||
<ctx id="StartContext" majorinterval="PT01H" minorinterval="PT15M" default="today"/>
|
||||
</panel>
|
||||
|
||||
|
||||
</Calendar>
|
||||
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
<!-- This is the User Heading Rule -->
|
||||
<panel name="UserHeadingRule">
|
||||
<tcc foregroundcolor="#0000FF" name="PrevDay" orientation="west" control="MultiCalendarEventWeekView" usectxrule="day-1" weightminor="0" weightmajor="0"/>
|
||||
<object class="timebaruserheading" name="tuh" title="Julian Calendar 0.1" weightmajor="1"/>
|
||||
<object class="timebaruserheading" name="tuh" title="Zulu Calendar 0.1" weightmajor="1"/>
|
||||
<tcc foregroundcolor="#0000FF" name="NextDay" orientation="east" control="MultiCalendarEventWeekView" usectxrule="day+1" weightminor="0" weightmajor="0"/>
|
||||
</panel>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<!-- This is the User Heading Rule -->
|
||||
<panel name="UserHeadingRule">
|
||||
<tcc foregroundcolor="#0000FF" name="PrevDay" orientation="west" control="MultiCalendarEventWeekView" usectxrule="day-1" weightminor="0" weightmajor="0"/>
|
||||
<object class="timebaruserheading" name="tuh" title="Julian Calendar 0.1" weightmajor="1"/>
|
||||
<object class="timebaruserheading" name="tuh" title="Zulu Calendar 0.1" weightmajor="1"/>
|
||||
<tcc foregroundcolor="#0000FF" name="NextDay" orientation="east" control="MultiCalendarEventWeekView" usectxrule="day+1" weightminor="0" weightmajor="0"/>
|
||||
</panel>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
<?xml version="1.0" standalone="no" encoding="UTF-8"?>
|
||||
<!DOCTYPE julian SYSTEM "http://kirkwood.mcom.com/julian.dtd">
|
||||
<Calendar>
|
||||
|
||||
<!-- This is the User Heading Rule -->
|
||||
<panel name="UserHeadingRule">
|
||||
<tcc foregroundcolor="#0000FF" name="PrevDay" orientation="west" control="MultiCalendarEventWeekView" usectxrule="day-1" weightminor="0" weightmajor="0"/>
|
||||
<object class="timebaruserheading" name="tuh" title="Julian Calendar 0.1" weightmajor="1"/>
|
||||
<tcc foregroundcolor="#0000FF" name="NextDay" orientation="east" control="MultiCalendarEventWeekView" usectxrule="day+1" weightminor="0" weightmajor="0"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the Timebar Scale Rule -->
|
||||
<panel name="ScaleViewRule">
|
||||
<tcc foregroundcolor="#0000FF" name="PrevHour" orientation="north" control="MultiCalendarEventWeekView" usectxrule="hour-1" weightminor="0" weightmajor="0"/>
|
||||
<timebarscale name="TimebarScale" weightminor="0" weightmajor="1" layout="ybox"/>
|
||||
<tcc foregroundcolor="#0000FF" name="NextHour" orientation="south" control="MultiCalendarEventWeekView" usectxrule="hour+1" weightminor="0" weightmajor="0"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the MonthController and Todo List -->
|
||||
<panel name="ToDoCalViewRule">
|
||||
<mcc name="MiniCalendar" control="MultiCalendarEventWeekView" usectxrule="DayList"/>
|
||||
<todocanvas name="ToDoCanvas"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the MultiDayView and Command Bar -->
|
||||
<panel name="MultiDayViewRule">
|
||||
<multiuserviewcanvas layout="ybox" name="MultiCalendarEventWeekView" control="MiniCalendar" repeatable="DayContext">
|
||||
<commandcanvas name="CommandCanvas" weightmajor="0" weightminor="0">
|
||||
</panel>
|
||||
|
||||
|
||||
<!-- This is the MultiDay, Scale and Todo together -->
|
||||
<panel name="MultiCalendarEventWeekViewPanel">
|
||||
<control rule="ScaleViewRule" layout="ybox" weightmajor="0" weightminor="0"/>
|
||||
<control rule="MultiDayViewRule" layout="ybox" width="400" weightmajor="1"/>
|
||||
<control rule="ToDoCalViewRule" layout="ybox" weightmajor="0" weightminor="0"/>
|
||||
<!-- <set tag="Canvas" type="EventComponentCanvas"/>-->
|
||||
</panel>
|
||||
|
||||
|
||||
<!-- This is the user header with the big Multi One -->
|
||||
<panel id="MultiCalendarUserEventWeekView" label="Day View">
|
||||
<control id="uhr" rule="UserHeadingRule" layout="xbox" weightminor="0" weightmajor="0"/>
|
||||
<control id="mcewv" rule="MultiCalendarEventWeekViewPanel" layout="xbox"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the root GUI panel. This is where life begins -->
|
||||
<panel id="MainCalendarPanel" label="Calendar UI">
|
||||
<control id="uhr" rule="MultiCalendarUserEventWeekView" layout="ybox"/>
|
||||
<ctx id="StartContext" default="today"/>
|
||||
</panel>
|
||||
|
||||
|
||||
</Calendar>
|
||||
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
<!-- This is the User Heading Rule -->
|
||||
<panel name="UserHeadingRule">
|
||||
<tcc foregroundcolor="#0000FF" name="PrevDay" orientation="west" control="MultiCalendarEventWeekView" usectxrule="day-1" weightminor="0" weightmajor="0"/>
|
||||
<object class="timebaruserheading" name="tuh" title="Julian Calendar 0.1" weightmajor="1"/>
|
||||
<object class="timebaruserheading" name="tuh" title="Zulu Calendar 0.1" weightmajor="1"/>
|
||||
<tcc foregroundcolor="#0000FF" name="NextDay" orientation="east" control="MultiCalendarEventWeekView" usectxrule="day+1" weightminor="0" weightmajor="0"/>
|
||||
</panel>
|
||||
|
||||
|
|
@ -19,7 +19,9 @@
|
|||
<!-- This is the MonthController and Todo List -->
|
||||
<panel name="ToDoCalViewRule">
|
||||
<mcc name="MiniCalendar" control="MultiCalendarEventWeekView" usectxrule="DayList"/>
|
||||
<todocanvas name="ToDoCanvas"/>
|
||||
<!--
|
||||
<todocanvas name="ToDoCanvas"/>
|
||||
-->
|
||||
</panel>
|
||||
|
||||
<!-- This is the MultiDayView and Command Bar -->
|
||||
|
|
|
|||
|
|
@ -1,83 +0,0 @@
|
|||
<?xml version="1.0" standalone="no" encoding="UTF-8"?>
|
||||
<!DOCTYPE julian SYSTEM "http://kirkwood.mcom.com/julian.dtd">
|
||||
<Calendar>
|
||||
|
||||
<!-- This is the User Heading Rule -->
|
||||
<panel name="UserHeadingRule" >
|
||||
<tcc backgroundcolor="#C0C0C0" foregroundcolor="#0000FF" name="PrevDay" orientation="west" control="MultiCalendarEventWeekView" usectxrule="day-1" weightminor="0" weightmajor="0"/>
|
||||
<object class="timebaruserheading" backgroundcolor="#C0C0C0" name="tuh" title="Julian Calendar 0.1" weightmajor="1"/>
|
||||
<tcc foregroundcolor="#0000FF" backgroundcolor="#C0C0C0" name="NextDay" orientation="east" control="MultiCalendarEventWeekView" usectxrule="day+1" weightminor="0" weightmajor="0"/>
|
||||
</panel>
|
||||
|
||||
<panel name="HTMLCanvas">
|
||||
<object class="htmlcanvas" src="resource://res/samples/test1.html" weightminor="1" weightmajor="1"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the HTML Pane -->
|
||||
<panel name="FolderViewRule">
|
||||
<object class="timebaruserheading" backgroundcolor="#C0C0C0" title="Folders" weightmajor="0"/>
|
||||
<foldercanvas >
|
||||
<xpitem label="Trex" halign="left" valign="bottom" fullimage="resource://res/ui/images/trex_full.gif" />
|
||||
<xpitem label="Inbox" halign="left" valign="bottom" fullimage="resource://res/ui/images/inbox_full.gif" />
|
||||
<xpitem label="Outbox" halign="left" valign="bottom" fullimage="resource://res/ui/images/outbox_full.gif" />
|
||||
<xpitem label="Sent" halign="left" valign="bottom" fullimage="resource://res/ui/images/sent_full.gif" />
|
||||
<xpitem label="Trash" halign="left" valign="bottom" fullimage="resource://res/ui/images/trash_full.gif" />
|
||||
<xpitem label="Portal" halign="left" valign="bottom" fullimage="resource://res/ui/images/portal_full.gif" />
|
||||
<xpitem label="Mail" halign="left" valign="bottom" fullimage="resource://res/ui/images/mail_full.gif" />
|
||||
<xpitem label="Browser" halign="left" valign="bottom" fullimage="resource://res/ui/images/browser_full.gif" />
|
||||
<xpitem label="Address Book" halign="left" valign="bottom" fullimage="resource://res/ui/images/addrbook_full.gif" />
|
||||
</foldercanvas>
|
||||
</panel>
|
||||
|
||||
<!-- This is the Timebar Scale Rule -->
|
||||
<panel name="ScaleViewRule">
|
||||
<tcc foregroundcolor="#0000FF" name="PrevHour" orientation="north" control="MultiCalendarEventWeekView" usectxrule="hour-1" weightminor="0" weightmajor="0"/>
|
||||
<timebarscale name="TimebarScale" weightminor="0" weightmajor="1" layout="ybox"/>
|
||||
<tcc foregroundcolor="#0000FF" name="NextHour" orientation="south" control="MultiCalendarEventWeekView" usectxrule="hour+1" weightminor="0" weightmajor="0"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the MonthController and Todo List -->
|
||||
<panel name="ToDoCalViewRule">
|
||||
<mcc name="MiniCalendar" control="MultiCalendarEventWeekView" usectxrule="DayList"/>
|
||||
<todocanvas name="ToDoCanvas"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the MultiDayView and Command Bar -->
|
||||
<panel name="MultiDayViewRule">
|
||||
<multidayviewcanvas name="MultiCalendarEventWeekView" control="MiniCalendar" repeatable="DayContext" minrepeat="1" maxrepeat="5" >
|
||||
<commandcanvas name="CommandCanvas" weightmajor="0" weightminor="0">
|
||||
</panel>
|
||||
|
||||
|
||||
<!-- This is the MultiDay, Scale and Todo together -->
|
||||
<panel name="MultiCalendarEventWeekViewPanel">
|
||||
<!-- <control rule="FolderViewRule" layout="ybox" weightmajor="0" weightminor="0"/> -->
|
||||
<control rule="ScaleViewRule" layout="ybox" weightmajor="0" weightminor="0"/>
|
||||
<control rule="MultiDayViewRule" layout="ybox" width="400" weightmajor="1"/>
|
||||
<control rule="ToDoCalViewRule" layout="ybox" weightmajor="0" weightminor="0"/>
|
||||
<control id="uhr" rule="HTMLCanvas" layout="xbox" weightminor="1" weightmajor="1"/>
|
||||
<!<!-- <set tag="Canvas" type="EventComponentCanvas"/>-->
|
||||
</panel>
|
||||
|
||||
|
||||
<!-- This is the user header with the big Multi One -->
|
||||
<panel id="MultiCalendarUserEventWeekView" label="Day View">
|
||||
<control id="uhr" rule="UserHeadingRule" layout="xbox" weightminor="0" weightmajor="0"/>
|
||||
<control id="mcewv" rule="MultiCalendarEventWeekViewPanel" layout="xbox"/>
|
||||
</panel>
|
||||
|
||||
<!-- Calendar with Folder Views -->
|
||||
<panel id="CalendarAndFolder" label="CalendarAndFolder">
|
||||
<control rule="FolderViewRule" layout="ybox" weightminor="0" weightmajor="0"/>
|
||||
<control id="mcuewv" rule="MultiCalendarUserEventWeekView" layout="ybox"/>
|
||||
</panel>
|
||||
|
||||
<!-- This is the root GUI panel. This is where life begins -->
|
||||
<panel id="MainCalendarPanel" label="Calendar UI">
|
||||
<control id="uhr" rule="CalendarAndFolder" layout="xbox"/>
|
||||
<ctx id="StartContext" majorinterval="PT01H" minorinterval="PT15M" default="today"/>
|
||||
</panel>
|
||||
|
||||
|
||||
</Calendar>
|
||||
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
<?xml version="1.0" standalone="no" encoding="UTF-8"?>
|
||||
<!DOCTYPE application SYSTEM "http://kirkwood.mcom.com/ui.dtd">
|
||||
<UI>
|
||||
|
||||
<!-- This is the Application XML
|
||||
|
||||
In general, this file will reference other XML files
|
||||
defining things like Toolbars, MenuBars, App-specific
|
||||
widgets, HTML Views, etc....
|
||||
|
||||
In our case, it defines the references to separate XML
|
||||
files which compose a specific window. It does not define
|
||||
application specific features.
|
||||
-->
|
||||
|
||||
<!-- This is the Application Definition -->
|
||||
<application name="Trex 0.1" layout="ybox">
|
||||
<canvas src="resource://res/ui/menubar.ui" name="menubar"/>
|
||||
<canvas src="resource://res/ui/toolbar.ui" name="toolbar"/>
|
||||
<canvas src="resource://res/ui/julian_day.cal" name="content" layout="ybox"/>
|
||||
</application>
|
||||
|
||||
</UI>
|
||||
|
||||
Загрузка…
Ссылка в новой задаче