Monotone-Parent: a69abbeb98d87b2c2133114138ad7fa46a7b220d
Monotone-Revision: d5f1a516bfd1d0f094ade872c5342a9001e80b86 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-03-18T15:13:05 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
6a211407f7
commit
d399013ffe
|
@ -1,5 +1,9 @@
|
|||
2007-03-18 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* UI/Common/UIxToolbar.m ([UIxToolbar -toolbarConfig]): the
|
||||
toolbar can have the special value "none" to indicate there is
|
||||
none attached to the window.
|
||||
|
||||
* SoObjects/Appointments/SOGoCalendarComponent.m
|
||||
([SOGoCalendarComponent -isOrganizer:emailorOwner:login]): new
|
||||
method.
|
||||
|
|
|
@ -158,7 +158,8 @@
|
|||
return tb;
|
||||
}
|
||||
|
||||
- (id)toolbarConfig {
|
||||
- (id) toolbarConfig
|
||||
{
|
||||
id tb;
|
||||
|
||||
if (toolbarConfig != nil)
|
||||
|
@ -167,7 +168,7 @@
|
|||
if (toolbar)
|
||||
tb = toolbar;
|
||||
else
|
||||
tb = [[self clientObject] lookupName:@"toolbar" inContext:[self context]
|
||||
tb = [[self clientObject] lookupName: @"toolbar" inContext:[self context]
|
||||
acquire:NO];
|
||||
|
||||
if ([tb isKindOfClass:[NSException class]]) {
|
||||
|
@ -178,10 +179,16 @@
|
|||
return nil;
|
||||
}
|
||||
|
||||
if ([tb isKindOfClass:[NSString class]])
|
||||
tb = [self loadToolbarConfigFromResourceNamed:tb];
|
||||
if ([tb isKindOfClass: [NSString class]])
|
||||
{
|
||||
if ([tb isEqualToString: @"none"])
|
||||
tb = [NSNull null];
|
||||
else
|
||||
tb = [self loadToolbarConfigFromResourceNamed:tb];
|
||||
}
|
||||
|
||||
toolbarConfig = [tb retain];
|
||||
|
||||
return toolbarConfig;
|
||||
}
|
||||
|
||||
|
@ -240,6 +247,11 @@
|
|||
return (amount > 0);
|
||||
}
|
||||
|
||||
- (BOOL) hasMenu
|
||||
{
|
||||
return [[[self buttonInfo] valueForKey:@"hasMenu"] boolValue];
|
||||
}
|
||||
|
||||
- (void) setToolbar: (NSString *) newToolbar
|
||||
{
|
||||
ASSIGN(toolbar, newToolbar);
|
||||
|
|
Loading…
Reference in a new issue