LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 4b71e3eef15cd1ab9ca89e11d3ac734a8d821243 

Monotone-Revision: 94a876e445d85c07068605284844c8c23125a590

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-07-17T17:25:16
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2006-07-17 17:25:16 +00:00
parent 082212d13f
commit 24c6a21e37
2 changed files with 63 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-07-17 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/MailerUI/UIxMailFilterPanel.m ([UIxMailFilterPanel -setSearchCriteria:])
([UIxMailFilterPanel -searchCriteria]): new methods, similar to
s/Criteria/Text/ to handle the "criteria" form parameter.
2006-07-11 Wolfgang Sourdeau <wsourdeau@inverse.ca> 2006-07-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/uix.css: enhanced the toolbar appearance * UI/WebServerResources/uix.css: enhanced the toolbar appearance

72
UI/MailerUI/UIxMailFilterPanel.m
View File

@ -24,6 +24,7 @@
@interface UIxMailFilterPanel : WOComponent @interface UIxMailFilterPanel : WOComponent
{ {
NSString *searchText; NSString *searchText;
NSString *searchCriteria;
struct { struct {
int hideFrame:1; int hideFrame:1;
int reserved:31; int reserved:31;
@ -72,41 +73,78 @@ static NSDictionary *filterToQualifier = nil;
[ma release]; ma = nil; [ma release]; ma = nil;
} }
- (id) init
{
if ((self = [super init]))
{
searchText = nil;
searchCriteria = nil;
mfFlags.hideFrame = 0;
mfFlags.reserved = 0;
}
return self;
}
- (void)dealloc { - (void)dealloc {
[self->searchCriteria release];
[self->searchText release]; [self->searchText release];
[super dealloc]; [super dealloc];
} }
/* accessors */ /* accessors */
- (void)setHideFrame:(BOOL)_flag { - (void)setHideFrame:(BOOL)_flag
{
self->mfFlags.hideFrame = _flag ? 1 : 0; self->mfFlags.hideFrame = _flag ? 1 : 0;
} }
- (BOOL)hideFrame {
- (BOOL)hideFrame
{
return self->mfFlags.hideFrame ? YES : NO; return self->mfFlags.hideFrame ? YES : NO;
} }
- (void)setSearchText:(NSString *)_txt { - (void)setSearchText: (NSString *)_txt
{
ASSIGNCOPY(self->searchText, _txt); ASSIGNCOPY(self->searchText, _txt);
} }
- (NSString *)searchText {
if (self->searchText == nil) { - (void)setSearchCriteria: (NSString *)_txt
// TODO: kinda hack {
self->searchText = ASSIGNCOPY(self->searchText, _txt);
[[[[self context] request] formValueForKey:@"search"] copy]; }
}
- (NSString *)searchText
{
if (self->searchText == nil)
{
self->searchText =
[[[[self context] request] formValueForKey:@"search"] copy];
}
return self->searchText; return self->searchText;
} }
- (NSString *)searchCriteria
{
if (self->searchCriteria == nil)
{
self->searchCriteria =
[[[[self context] request] formValueForKey:@"criteria"] copy];
}
return self->searchCriteria;
}
/* filters */ /* filters */
- (NSArray *)filters { - (NSArray *)filters
{
return filters; return filters;
} }
/* qualifiers */ /* qualifiers */
- (EOQualifier *)searchTextQualifier { - (EOQualifier *)searchTextQualifier
{
EOQualifier *q; EOQualifier *q;
NSString *s; NSString *s;
@ -121,7 +159,8 @@ static NSDictionary *filterToQualifier = nil;
return q; return q;
} }
- (NSString *)filterLabel { - (NSString *)filterLabel
{
#if 1 #if 1
return [[[self context] page] labelForKey:[self valueForKey:@"filter"]]; return [[[self context] page] labelForKey:[self valueForKey:@"filter"]];
#else #else
@ -129,11 +168,13 @@ static NSDictionary *filterToQualifier = nil;
#endif #endif
} }
- (NSString *)selectedFilter { - (NSString *)selectedFilter
{
return [[[self context] request] formValueForKey:@"filterpopup"]; return [[[self context] request] formValueForKey:@"filterpopup"];
} }
- (EOQualifier *)filterQualifier { - (EOQualifier *)filterQualifier
{
NSString *selectedFilter; NSString *selectedFilter;
selectedFilter = [self selectedFilter]; selectedFilter = [self selectedFilter];
@ -142,7 +183,8 @@ static NSDictionary *filterToQualifier = nil;
? [filterToQualifier objectForKey:selectedFilter] : nil; ? [filterToQualifier objectForKey:selectedFilter] : nil;
} }
- (EOQualifier *)qualifier { - (EOQualifier *) qualifier
{
EOQualifier *sq, *fq; EOQualifier *sq, *fq;
NSArray *qa; NSArray *qa;