amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-19 18:35:25 +00:00
Code Issues Projects Releases Wiki Activity

merge of '68efb362b1c9c00b393ee099cf802bf8e59899b3'

Browse Source 
and 'e273e1fc79bb27da2ab8838b78616c5fb161fd58'

Monotone-Parent: 68efb362b1c9c00b393ee099cf802bf8e59899b3
Monotone-Parent: e273e1fc79bb27da2ab8838b78616c5fb161fd58
Monotone-Revision: 2b69d044a61bdcebe73dd14659a3edfec3fd3530

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2008-08-29T22:39:11
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2008-08-29 22:39:11 +00:00
parent d1a0696644 344d0e00b3
commit 94891d3e3f
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Contacts/UIxContactsListViewContainer.m
+6 -6
View File
@@ -147,7 +147,7 @@
[self _setupContext];
vertical = [moduleSettings objectForKey: @"DragHandleVertical"];
return (vertical ? [vertical stringByAppendingFormat: @"px"] : nil);
return ((vertical && [vertical intValue] > 0) ? [vertical stringByAppendingFormat: @"px"] : nil);
}
- (NSString *) horizontalDragHandleStyle
@@ -157,17 +157,17 @@
[self _setupContext];
horizontal = [moduleSettings objectForKey: @"DragHandleHorizontal"];
return (horizontal ? [horizontal stringByAppendingFormat: @"px"] : nil);
return ((horizontal && [horizontal intValue] > 0) ? [horizontal stringByAppendingFormat: @"px"] : nil);
}
- (NSString *) contactsListContentStyle
{
int height;
NSString *height;
[self _setupContext];
height = [[moduleSettings objectForKey: @"DragHandleVertical"] intValue];
[self _setupContext];
height = [moduleSettings objectForKey: @"DragHandleVertical"];
return (height ? [NSString stringWithFormat: @"%ipx", (height - 27)] : nil);
return ((height && [height intValue] > 0) ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil);
}
@end
UI/MailerUI/UIxMailMainFrame.m
+3 -3
View File
@@ -270,7 +270,7 @@
[self _setupContext];
vertical = [moduleSettings objectForKey: @"DragHandleVertical"];
return (vertical ? [vertical stringByAppendingFormat: @"px"] : nil);
return ((vertical && [vertical intValue] > 0) ? [vertical stringByAppendingFormat: @"px"] : nil);
}
- (NSString *) horizontalDragHandleStyle
@@ -280,7 +280,7 @@
[self _setupContext];
horizontal = [moduleSettings objectForKey: @"DragHandleHorizontal"];
return (horizontal ? [horizontal stringByAppendingFormat: @"px"] : nil);
return ((horizontal && [horizontal intValue] > 0) ? [horizontal stringByAppendingFormat: @"px"] : nil);
}
- (NSString *) mailboxContentStyle
@@ -290,7 +290,7 @@
[self _setupContext];
height = [moduleSettings objectForKey: @"DragHandleVertical"];
return (height ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil);
return ((height && [height intValue] > 0) ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil);
}
- (WOResponse *) saveDragHandleStateAction
UI/Scheduler/UIxCalMainView.m
+10 -6
View File
@@ -126,18 +126,22 @@ static NSMutableArray *yearMenuItems = nil;
- (NSString *) verticalDragHandleStyle
{
NSString *vertical;
[self _setupContext];
vertical = [moduleSettings objectForKey: @"DragHandleVertical"];
return [[moduleSettings objectForKey: @"DragHandleVertical"]
stringByAppendingString: @"px"];
return ((vertical && [vertical intValue] > 0) ? [vertical stringByAppendingFormat: @"px"] : nil);
}
- (NSString *) horizontalDragHandleStyle
{
[self _setupContext];
NSString *horizontal;
return [[moduleSettings objectForKey: @"DragHandleHorizontal"]
stringByAppendingString: @"px"];
[self _setupContext];
horizontal = [moduleSettings objectForKey: @"DragHandleHorizontal"];
return ((horizontal && [horizontal intValue] > 0) ? [horizontal stringByAppendingFormat: @"px"] : nil);
}
- (NSString *) eventsListViewStyle
@@ -147,7 +151,7 @@ static NSMutableArray *yearMenuItems = nil;
[self _setupContext];
height = [moduleSettings objectForKey: @"DragHandleVertical"];
return (height ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil);
return ((height && [height intValue] > 0) ? [NSString stringWithFormat: @"%ipx", ([height intValue] - 27)] : nil);
}
- (WOResponse *) saveDragHandleStateAction