- new toolbar code and images;

Monotone-Parent: cd6e43ebd8d873923fb9ad3c40158a6ce63a1f09
Monotone-Revision: 21ae9d2d632db73281a8277df02900d3e48a6e98

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-07-05T21:15:21
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2006-07-05 21:15:21 +00:00
parent ea60a204c0
commit b653b4d8e2
26 changed files with 647 additions and 6 deletions

View File

@ -1,5 +1,8 @@
2006-07-05 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Common/UIxToolbarSeparator.m, UI/Common/UIxToolbarButton.m:
new toolbar objects.
* UI/Templates/UIxPageFrame.wox: use the exact html code as below.
* UI/Templates/MailerUI/UIxMailMainFrame.wox: redone the

View File

@ -19,7 +19,9 @@ CommonUI_OBJC_FILES += \
UIxElemBuilder.m \
UIxTabView.m \
UIxTabItem.m \
\
UIxToolbarButton.m \
UIxToolbarSeparator.m
CommonUI_RESOURCE_FILES += \
Version \

View File

@ -0,0 +1,113 @@
#import <Foundation/NSObject.h>
#import <Foundation/NSString.h>
#import <SOGoUI/UIxComponent.h>
@interface UIxToolbarButton : UIxComponent
{
NSString *buttonImage;
NSString *buttonLabel;
NSString *buttonLink;
NSString *buttonTooltip;
}
- (void) setButtonImage: (NSString *) newButtonImage;
- (NSString *) buttonImage;
- (void) setButtonLabel: (NSString *) newButtonLabel;
- (NSString *) buttonLabel;
- (void) setButtonLink: (NSString *) newButtonLink;
- (NSString *) buttonLink;
- (void) setButtonTooltip: (NSString *) newButtonTooltip;
- (NSString *) buttonTooltip;
@end
@implementation UIxToolbarButton
- (id) init
{
if ((self = [super init]))
{
buttonImage = nil;
buttonLabel = nil;
buttonLink = nil;
buttonTooltip = nil;
}
return self;
}
- (void) dealloc
{
if (buttonImage)
[buttonImage release];
if (buttonLabel)
[buttonLabel release];
if (buttonLink)
[buttonLink release];
if (buttonTooltip)
[buttonTooltip release];
[super dealloc];
}
- (void) setButtonLabel: (NSString *) newButtonLabel
{
if (buttonLabel)
[buttonLabel release];
buttonLabel = newButtonLabel;
if (buttonLabel)
[buttonLabel retain];
}
- (NSString *) buttonLabel
{
return buttonLabel;
}
- (void) setButtonImage: (NSString *) newButtonImage
{
if (buttonImage)
[buttonImage release];
buttonImage = newButtonImage;
if (buttonImage)
[buttonImage retain];
}
- (NSString *) buttonImage
{
return buttonImage;
}
- (void) setButtonLink: (NSString *) newButtonLink
{
if (buttonLink)
[buttonLink release];
buttonLink = newButtonLink;
if (buttonLink)
[buttonLink retain];
}
- (NSString *) buttonLink
{
return [self completeHrefForMethod: buttonLink];
}
- (void) setButtonTooltip: (NSString *) newButtonTooltip
{
if (buttonTooltip)
[buttonTooltip release];
buttonTooltip = newButtonTooltip;
if (buttonTooltip)
[buttonTooltip retain];
}
- (NSString *) buttonTooltip
{
return buttonTooltip;
}
@end

View File

@ -0,0 +1,14 @@
#import <Foundation/NSObject.h>
#import <Foundation/NSString.h>
#import <SOGoUI/UIxComponent.h>
@interface UIxToolbarSeparator : UIxComponent
{
}
@end
@implementation UIxToolbarSeparator
@end

View File

@ -14,7 +14,6 @@ SchedulerUI_OBJC_FILES = \
NSCalendarDate+UIx.m \
SOGoAppointment+UIx.m \
UIxComponent+Agenor.m \
\
UIxCalView.m \
UIxCalDayView.m \
UIxCalWeekView.m \
@ -74,6 +73,15 @@ SchedulerUI_RESOURCE_FILES += \
images/green_corner.gif \
images/invisible_space_2.gif \
images/apt_icon_private.gif \
images/day-view.png \
images/delete.png \
images/edit.png \
images/goto-today.png \
images/month-view.png \
images/multiweek-view.png \
images/new-event.png \
images/new-task.png \
images/week-view.png
SchedulerUI_LOCALIZED_RESOURCE_FILES += \
Localizable.strings \

Binary file not shown.

After

Width:  |  Height:  |  Size: 647 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 979 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 832 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 857 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 917 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 679 B

View File

@ -7,6 +7,54 @@
className="UIxPageFrame"
title="name"
>
<div class="toolbar">
<var:component className="UIxToolbarButton"
const:buttonLink="new"
const:buttonLabel="New Event"
rsrc:buttonImage="new-event.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="new_task"
const:buttonLabel="New Task"
rsrc:buttonImage="new-task.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="edit"
const:buttonLabel="Edit"
rsrc:buttonImage="edit.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="delete"
const:buttonLabel="Delete"
rsrc:buttonImage="delete.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="today"
const:buttonLabel="Go to Today"
rsrc:buttonImage="goto-today.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="dayoverview"
const:buttonLabel="Day View"
rsrc:buttonImage="day-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="weekoverview"
const:buttonLabel="Week View"
rsrc:buttonImage="week-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="monthoverview"
const:buttonLabel="Month View"
rsrc:buttonImage="month-view.png" />
</div>
<table id="skywintable"
class="wintable"
cellspacing="0"

View File

@ -7,6 +7,54 @@
className="UIxPageFrame"
title="name"
>
<div class="toolbar">
<var:component className="UIxToolbarButton"
const:buttonLink="new"
const:buttonLabel="New Event"
rsrc:buttonImage="new-event.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="new_task"
const:buttonLabel="New Task"
rsrc:buttonImage="new-task.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="edit"
const:buttonLabel="Edit"
rsrc:buttonImage="edit.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="delete"
const:buttonLabel="Delete"
rsrc:buttonImage="delete.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="today"
const:buttonLabel="Go to Today"
rsrc:buttonImage="goto-today.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="dayoverview"
const:buttonLabel="Day View"
rsrc:buttonImage="day-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="weekoverview"
const:buttonLabel="Week View"
rsrc:buttonImage="week-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="monthoverview"
const:buttonLabel="Month View"
rsrc:buttonImage="month-view.png" />
</div>
<table id="skywintable"
class="wintable"
cellspacing="0"

View File

@ -7,6 +7,54 @@
className="UIxPageFrame"
title="name"
>
<div class="toolbar">
<var:component className="UIxToolbarButton"
const:buttonLink="new"
const:buttonLabel="New Event"
rsrc:buttonImage="new-event.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="new_task"
const:buttonLabel="New Task"
rsrc:buttonImage="new-task.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="edit"
const:buttonLabel="Edit"
rsrc:buttonImage="edit.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="delete"
const:buttonLabel="Delete"
rsrc:buttonImage="delete.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="today"
const:buttonLabel="Go to Today"
rsrc:buttonImage="goto-today.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="dayoverview"
const:buttonLabel="Day View"
rsrc:buttonImage="day-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="weekoverview"
const:buttonLabel="Week View"
rsrc:buttonImage="week-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="monthoverview"
const:buttonLabel="Month View"
rsrc:buttonImage="month-view.png" />
</div>
<table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
<tr>
<td class="wintitle">
@ -52,10 +100,11 @@
<table border="0" width="100%" cellpadding="0" cellspacing="0">
<tr>
<td colspan="2">
<var:component className="UIxCalSelectTab"
const:selection="day"
currentDate="selectedDate"
>
<var:component className="UIxCalSelectTab"
const:selection="day"
currentDate="selectedDate"
>
<table border="0" cellpadding="4" width="100%" cellspacing="2">
<tr>
<td width="1%" align="left" valign="middle" bgcolor="#e8e8e0">

View File

@ -7,6 +7,54 @@
className="UIxPrintPageFrame"
title="title"
>
<div class="toolbar">
<var:component className="UIxToolbarButton"
const:buttonLink="new"
const:buttonLabel="New Event"
rsrc:buttonImage="new-event.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="new_task"
const:buttonLabel="New Task"
rsrc:buttonImage="new-task.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="edit"
const:buttonLabel="Edit"
rsrc:buttonImage="edit.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="delete"
const:buttonLabel="Delete"
rsrc:buttonImage="delete.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="today"
const:buttonLabel="Go to Today"
rsrc:buttonImage="goto-today.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="dayoverview"
const:buttonLabel="Day View"
rsrc:buttonImage="day-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="weekoverview"
const:buttonLabel="Week View"
rsrc:buttonImage="week-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="monthoverview"
const:buttonLabel="Month View"
rsrc:buttonImage="month-view.png" />
</div>
<table border="1" cellpadding="5" cellspacing="0" width="100%">
<tr>
<td colspan="2" align="center">

View File

@ -7,6 +7,54 @@
className="UIxPageFrame"
title="name"
>
<div class="toolbar">
<var:component className="UIxToolbarButton"
const:buttonLink="new"
const:buttonLabel="New Event"
rsrc:buttonImage="new-event.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="new_task"
const:buttonLabel="New Task"
rsrc:buttonImage="new-task.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="edit"
const:buttonLabel="Edit"
rsrc:buttonImage="edit.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="delete"
const:buttonLabel="Delete"
rsrc:buttonImage="delete.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="today"
const:buttonLabel="Go to Today"
rsrc:buttonImage="goto-today.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="dayoverview"
const:buttonLabel="Day View"
rsrc:buttonImage="day-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="weekoverview"
const:buttonLabel="Week View"
rsrc:buttonImage="week-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="monthoverview"
const:buttonLabel="Month View"
rsrc:buttonImage="month-view.png" />
</div>
<table id="skywintable"
class="wintable"
cellspacing="0"

View File

@ -8,6 +8,53 @@
className="UIxPageFrame"
title="name">
<div class="toolbar">
<var:component className="UIxToolbarButton"
const:buttonLink="new"
const:buttonLabel="New Event"
rsrc:buttonImage="new-event.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="new_task"
const:buttonLabel="New Task"
rsrc:buttonImage="new-task.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="edit"
const:buttonLabel="Edit"
rsrc:buttonImage="edit.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="delete"
const:buttonLabel="Delete"
rsrc:buttonImage="delete.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="today"
const:buttonLabel="Go to Today"
rsrc:buttonImage="goto-today.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="dayoverview"
const:buttonLabel="Day View"
rsrc:buttonImage="day-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="weekoverview"
const:buttonLabel="Week View"
rsrc:buttonImage="week-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="monthoverview"
const:buttonLabel="Month View"
rsrc:buttonImage="month-view.png" />
</div>
<table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
<tr>
<td class="wintitle">

View File

@ -8,6 +8,53 @@
className="UIxPageFrame"
title="name">
<div class="toolbar">
<var:component className="UIxToolbarButton"
const:buttonLink="new"
const:buttonLabel="New Event"
rsrc:buttonImage="new-event.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="new_task"
const:buttonLabel="New Task"
rsrc:buttonImage="new-task.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="edit"
const:buttonLabel="Edit"
rsrc:buttonImage="edit.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="delete"
const:buttonLabel="Delete"
rsrc:buttonImage="delete.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="today"
const:buttonLabel="Go to Today"
rsrc:buttonImage="goto-today.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="dayoverview"
const:buttonLabel="Day View"
rsrc:buttonImage="day-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="weekoverview"
const:buttonLabel="Week View"
rsrc:buttonImage="week-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="monthoverview"
const:buttonLabel="Month View"
rsrc:buttonImage="month-view.png" />
</div>
<table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
<tr>
<td class="wintitle">

View File

@ -8,6 +8,54 @@
className="UIxPageFrame"
title="name"
>
<div class="toolbar">
<var:component className="UIxToolbarButton"
const:buttonLink="new"
const:buttonLabel="New Event"
rsrc:buttonImage="new-event.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="new_task"
const:buttonLabel="New Task"
rsrc:buttonImage="new-task.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="edit"
const:buttonLabel="Edit"
rsrc:buttonImage="edit.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="delete"
const:buttonLabel="Delete"
rsrc:buttonImage="delete.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="today"
const:buttonLabel="Go to Today"
rsrc:buttonImage="goto-today.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="dayoverview"
const:buttonLabel="Day View"
rsrc:buttonImage="day-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="weekoverview"
const:buttonLabel="Week View"
rsrc:buttonImage="week-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="monthoverview"
const:buttonLabel="Month View"
rsrc:buttonImage="month-view.png" />
</div>
<table id="skywintable"
class="wintable"
cellspacing="0"

View File

@ -8,6 +8,54 @@
className="UIxPageFrame"
title="name"
>
<div class="toolbar">
<var:component className="UIxToolbarButton"
const:buttonLink="new"
const:buttonLabel="New Event"
rsrc:buttonImage="new-event.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="new_task"
const:buttonLabel="New Task"
rsrc:buttonImage="new-task.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="edit"
const:buttonLabel="Edit"
rsrc:buttonImage="edit.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="delete"
const:buttonLabel="Delete"
rsrc:buttonImage="delete.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="today"
const:buttonLabel="Go to Today"
rsrc:buttonImage="goto-today.png" />
<var:component className="UIxToolbarSeparator" />
<var:component className="UIxToolbarButton"
const:buttonLink="dayoverview"
const:buttonLabel="Day View"
rsrc:buttonImage="day-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="weekoverview"
const:buttonLabel="Week View"
rsrc:buttonImage="week-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="monthoverview"
const:buttonLabel="Month View"
rsrc:buttonImage="month-view.png" />
</div>
<table id="skywintable" class="wintable" cellspacing="0" cellpadding="5"
width="100%">
<tr>

View File

@ -7,6 +7,50 @@
className="UIxPageFrame"
title="name"
>
<div class="toolbar">
<var:component className="UIxToolbarButton"
const:buttonLink="new"
const:buttonLabel="New Event"
rsrc:buttonImage="new-event.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="new_task"
const:buttonLabel="New Task"
rsrc:buttonImage="new-task.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="edit"
const:buttonLabel="Edit"
rsrc:buttonImage="edit.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="delete"
const:buttonLabel="Delete"
rsrc:buttonImage="delete.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="today"
const:buttonLabel="Go to Today"
rsrc:buttonImage="goto-today.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="dayoverview"
const:buttonLabel="Day View"
rsrc:buttonImage="day-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="weekoverview"
const:buttonLabel="Week View"
rsrc:buttonImage="week-view.png" />
<var:component className="UIxToolbarButton"
const:buttonLink="monthoverview"
const:buttonLabel="Month View"
rsrc:buttonImage="month-view.png" />
</div>
<table id="skywintable" class="wintable" cellspacing="0" cellpadding="5"
width="100%">
<tr>

View File

@ -0,0 +1,18 @@
<?xml version='1.0' standalone='yes'?>
<a xmlns="http://www.w3.org/1999/xhtml"
xmlns:var="http://www.skyrix.com/od/binding"
xmlns:const="http://www.skyrix.com/od/constant"
xmlns:rsrc="OGo:url"
class="toolbarButton"
var:href="buttonLink">
<span class="toolbarButton">
<img class="buttonImage"
var:src="buttonImage"
var:alt="buttonTooltip"
var:title="buttonTooltip" /><br />
<span class="buttonLabel"
var:alt="buttonTooltip"
var:title="buttonTooltip"><var:string
value="buttonLabel" /></span>
</span>
</a>

View File

@ -0,0 +1,8 @@
<?xml version='1.0' standalone='yes'?>
<span class="toolbarSeparator"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:var="http://www.skyrix.com/od/binding"
xmlns:const="http://www.skyrix.com/od/constant"
xmlns:rsrc="OGo:url">
<var:entity value="nbsp" />
</span>