git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1305 d1b88da0-ebda-0310...

[scalable-opengroupware.org] / UI / Common / UIxToolbar.m

diff --git a/UI/Common/UIxToolbar.m b/UI/Common/UIxToolbar.m
index c36eaece2964b987aeddcb6f15f2044c6ae5c16b..1959aaac6da3a34b11520a4faaf1aa50a0cc43b3 100644 (file)
--- a/UI/Common/UIxToolbar.m
+++ b/UI/Common/UIxToolbar.m
@@ -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]]) {
@@ -177,11 +178,17 @@
     toolbarConfig = [[NSNull null] retain];
     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;
 }
 
@@ -207,6 +214,15 @@
   return image;
 }
 
+- (NSString *) buttonTooltip
+{
+  NSString          *key;
+  
+  key = [[self buttonInfo] valueForKey: @"tooltip"];
+
+  return [self labelForKey: key];
+}
+
 /* enable/disable buttons */
 
 - (BOOL)isButtonEnabled {
@@ -240,6 +256,11 @@
   return (amount > 0);
 }
 
+- (BOOL) hasMenu
+{
+  return [[[self buttonInfo] valueForKey:@"hasMenu"] boolValue];
+}
+
 - (void) setToolbar: (NSString *) newToolbar
 {
   ASSIGN(toolbar, newToolbar);