From 7bffa9ab51670d43e31964c4d4c886f211f98981 Mon Sep 17 00:00:00 2001 From: znek Date: Wed, 13 Jul 2005 14:57:15 +0000 Subject: [PATCH] minor changes git-svn-id: http://svn.opengroupware.org/SOGo/trunk@740 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/SoObjects/SOGo/ChangeLog | 1 - SOGo/UI/Common/ChangeLog | 5 +++ .../Common/English.lproj/Localizable.strings | 2 +- SOGo/UI/Common/Version | 2 +- SOGo/UI/SOGoUI/ChangeLog | 5 +++ SOGo/UI/SOGoUI/GNUmakefile | 2 + SOGo/UI/SOGoUI/Version | 2 +- SOGo/UI/SOGoUI/WOContext+UIx.h | 33 +++++++++++++++ SOGo/UI/SOGoUI/WOContext+UIx.m | 42 +++++++++++++++++++ SOGo/UI/Templates/ChangeLog | 5 +++ SOGo/UI/Templates/UIxAppNavView.wox | 35 +++++++++------- 11 files changed, 115 insertions(+), 19 deletions(-) create mode 100644 SOGo/UI/SOGoUI/WOContext+UIx.h create mode 100644 SOGo/UI/SOGoUI/WOContext+UIx.m diff --git a/SOGo/SoObjects/SOGo/ChangeLog b/SOGo/SoObjects/SOGo/ChangeLog index 27c77a68..53e9726a 100644 --- a/SOGo/SoObjects/SOGo/ChangeLog +++ b/SOGo/SoObjects/SOGo/ChangeLog @@ -60,7 +60,6 @@ * added AgenorUserDefaults class (incomplete) as a wrapper for the profile data of Agenor users ->>>>>>> .r719 2005-07-08 Helge Hess * v0.9.42 diff --git a/SOGo/UI/Common/ChangeLog b/SOGo/UI/Common/ChangeLog index d55096da..d239cc14 100644 --- a/SOGo/UI/Common/ChangeLog +++ b/SOGo/UI/Common/ChangeLog @@ -1,3 +1,8 @@ +2005-07-13 Marcus Mueller + + * English.lproj/Localizable.strings: removed label "You are here" and + provided new label "User" (v0.9.40) + 2005-07-07 Marcus Mueller * v0.9.39 diff --git a/SOGo/UI/Common/English.lproj/Localizable.strings b/SOGo/UI/Common/English.lproj/Localizable.strings index 7d0719c7..b3f4b8c5 100644 --- a/SOGo/UI/Common/English.lproj/Localizable.strings +++ b/SOGo/UI/Common/English.lproj/Localizable.strings @@ -6,6 +6,6 @@ "Mail" = "Mail"; "Administration" = "Right Administration"; -"You are here" = "You are here"; +"User" = "User"; "Help" = "Help"; diff --git a/SOGo/UI/Common/Version b/SOGo/UI/Common/Version index 8679947c..eee34e2b 100644 --- a/SOGo/UI/Common/Version +++ b/SOGo/UI/Common/Version @@ -1,5 +1,5 @@ # Version file -SUBMINOR_VERSION:=39 +SUBMINOR_VERSION:=40 # v0.9.28 requires NGExtensions v4.5.136 diff --git a/SOGo/UI/SOGoUI/ChangeLog b/SOGo/UI/SOGoUI/ChangeLog index d9bd8878..7882308f 100644 --- a/SOGo/UI/SOGoUI/ChangeLog +++ b/SOGo/UI/SOGoUI/ChangeLog @@ -1,3 +1,8 @@ +2005-07-13 Marcus Mueller + + * WOContext+UIx.[hm]: new category to WOContext, currently provides + -isUIxDebugEnabled (v0.9.29) + 2005-07-08 Marcus Mueller * UIxComponent.m: moved -isAccessRestricted method to diff --git a/SOGo/UI/SOGoUI/GNUmakefile b/SOGo/UI/SOGoUI/GNUmakefile index e624bf63..ad2337d4 100644 --- a/SOGo/UI/SOGoUI/GNUmakefile +++ b/SOGo/UI/SOGoUI/GNUmakefile @@ -15,12 +15,14 @@ libSOGoUI_HEADER_FILES += \ SOGoDateFormatter.h \ SOGoAptFormatter.h \ SOGoJSStringFormatter.h \ + WOContext+UIx.h \ libSOGoUI_OBJC_FILES += \ UIxComponent.m \ SOGoDateFormatter.m \ SOGoAptFormatter.m \ SOGoJSStringFormatter.m \ + WOContext+UIx.m \ # make diff --git a/SOGo/UI/SOGoUI/Version b/SOGo/UI/SOGoUI/Version index 6b91cf1a..99566d65 100644 --- a/SOGo/UI/SOGoUI/Version +++ b/SOGo/UI/SOGoUI/Version @@ -1,5 +1,5 @@ # version file -SUBMINOR_VERSION:=28 +SUBMINOR_VERSION:=29 # v0.9.18 requires NGExtensions v4.5.136 diff --git a/SOGo/UI/SOGoUI/WOContext+UIx.h b/SOGo/UI/SOGoUI/WOContext+UIx.h new file mode 100644 index 00000000..b104d9d0 --- /dev/null +++ b/SOGo/UI/SOGoUI/WOContext+UIx.h @@ -0,0 +1,33 @@ +/* + Copyright (C) 2000-2005 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + OGo is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + OGo is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with OGo; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ + +#ifndef __SOGoUI_WOContext_UIx_H_ +#define __SOGoUI_WOContext_UIx_H_ + +#include + +@interface WOContext (UIx) + +- (BOOL)isUIxDebugEnabled; + +@end + +#endif /* __SOGoUI_WOContext_UIx_H_ */ diff --git a/SOGo/UI/SOGoUI/WOContext+UIx.m b/SOGo/UI/SOGoUI/WOContext+UIx.m new file mode 100644 index 00000000..3ebf7a1f --- /dev/null +++ b/SOGo/UI/SOGoUI/WOContext+UIx.m @@ -0,0 +1,42 @@ +/* + Copyright (C) 2000-2005 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + OGo is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + OGo is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with OGo; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ + +#include "WOContext+UIx.h" +#include "common.h" + +@implementation WOContext (UIx) + +- (BOOL)isUIxDebugEnabled { + NSNumber *bv; + + if ((bv = [self objectForKey:@"_isUIxDebugEnabled"]) == nil) { + NSUserDefaults *ud; + BOOL uixDebugEnabled; + + ud = [NSUserDefaults standardUserDefaults]; + uixDebugEnabled = [ud boolForKey:@"SOGoUIxDebugEnabled"]; + bv = [NSNumber numberWithBool:uixDebugEnabled]; + [self setObject:bv forKey:@"_isUIxDebugEnabled"]; + } + return [bv boolValue]; +} + +@end diff --git a/SOGo/UI/Templates/ChangeLog b/SOGo/UI/Templates/ChangeLog index e87c1c98..cc64448d 100644 --- a/SOGo/UI/Templates/ChangeLog +++ b/SOGo/UI/Templates/ChangeLog @@ -1,3 +1,8 @@ +2005-07-13 Marcus Mueller + + * UIxAppNavView.wox: traversal path is only shown when debugging app, + instead inserted user's CN as requested + 2005-07-13 Helge Hess * ContactsUI/UIxContactEditor.wox: disable editing when being used on diff --git a/SOGo/UI/Templates/UIxAppNavView.wox b/SOGo/UI/Templates/UIxAppNavView.wox index 47826585..31faad4d 100644 --- a/SOGo/UI/Templates/UIxAppNavView.wox +++ b/SOGo/UI/Templates/UIxAppNavView.wox @@ -1,20 +1,25 @@ - - : - - - - / - - - - - - + : + + + (: + + + + / + + + + + ) + + + -- 2.39.5