diff --git a/ChangeLog b/ChangeLog index 3d6a2d1a9..a6f6f3f30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2007-06-28 Wolfgang Sourdeau + * UI/Common/UIxSortableTableHeader.m: removed useless class + module. + * UI/Contacts/UIxContactsListView.m ([UIxContactsListView -contactInfos]): use the "asc" url parameter instead of "desc" to determine the ordering. diff --git a/UI/Common/GNUmakefile b/UI/Common/GNUmakefile index 9adbb6dc3..c7815175f 100644 --- a/UI/Common/GNUmakefile +++ b/UI/Common/GNUmakefile @@ -23,8 +23,6 @@ CommonUI_OBJC_FILES += \ UIxTabItem.m \ UIxUserRightsEditor.m \ \ - UIxSortableTableHeader.m \ - \ UIxToolbar.m CommonUI_RESOURCE_FILES += \ diff --git a/UI/Common/UIxSortableTableHeader.m b/UI/Common/UIxSortableTableHeader.m deleted file mode 100644 index 668625239..000000000 --- a/UI/Common/UIxSortableTableHeader.m +++ /dev/null @@ -1,130 +0,0 @@ -/* - Copyright (C) 2004-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 - -/* - UIxSortableTableHeader - - TODO: document. - - Note: needs to inherit from SoComponent so that resource lookup properly - works! -*/ - -@interface UIxSortableTableHeader : SoComponent -{ - NSString *label; - NSString *sortKey; - NSString *href; - NSDictionary *queryDictionary; - BOOL isDefault; -} - -@end - -#include "common.h" - -@implementation UIxSortableTableHeader - -- (void)dealloc { - [self->label release]; - [self->sortKey release]; - [self->href release]; - [self->queryDictionary release]; - [super dealloc]; -} - -/* Accessors */ - -- (void)setLabel:(NSString *)_label { - ASSIGNCOPY(self->label, _label); -} -- (NSString *)label { - return self->label; -} - -- (void)setSortKey:(NSString *)_sortKey { - ASSIGNCOPY(self->sortKey, _sortKey); -} - -- (NSString *)sortKey { - return self->sortKey; -} - -- (void)setHref:(NSString *)_href { - ASSIGNCOPY(self->href, _href); -} -- (NSString *)href { - return self->href; -} - -- (void)setQueryDictionary:(NSDictionary *)_queryDictionary { - ASSIGN(self->queryDictionary, _queryDictionary); -} -- (NSDictionary *)queryDictionary { - return self->queryDictionary; -} - -- (id)singleQueryValueForKey:(NSString *)_key { - id so; - - so = [self->queryDictionary objectForKey:_key]; - if (![so isNotNull]) return nil; - - if (![so isKindOfClass:[NSArray class]]) - return so; - - return ([so count] > 0) ? [so objectAtIndex:0] : nil; -} - -- (void)setIsDefault:(BOOL)_isDefault { - self->isDefault = _isDefault; -} -- (BOOL)isDefault { - return self->isDefault; -} - -/* derived accessors */ - -- (BOOL) isSelected -{ - NSString *so; - - so = [self singleQueryValueForKey:@"sort"]; - - return ((so) - ? [so isEqualToString:self->sortKey] - : isDefault); -} - -- (BOOL)isSortedDescending -{ - NSString *desc; - - desc = [[[self context] request] formValueForKey:@"desc"]; - - return ((desc) - ? [desc boolValue] - : YES); -} - -@end /* UIxSortableTableHeader */