• further improvements to open/save spf files

- rearrange invoking procedure for spf data if SP asks for passwords
• fine-tuned and fixed table history for BETWEEN operator

1 files changed, 30 insertions, 11 deletions

diff --git a/Source/TableContent.m b/Source/TableContent.m
index ca8a3ea5..3d737de5 100644
--- a/Source/TableContent.m
+++ b/Source/TableContent.m
@@ -324,10 +324,15 @@
 				|| [compareField itemWithTitle:filterComparisonToRestore]))
 		{
 			if (filterComparisonToRestore) [compareField selectItemWithTitle:filterComparisonToRestore];
+			if([filterComparisonToRestore isEqualToString:@"BETWEEN"]) {
+				[argumentField setHidden:YES];
+				if (firstBetweenValueToRestore) [firstBetweenField setStringValue:firstBetweenValueToRestore];
+				if (secondBetweenValueToRestore) [secondBetweenField setStringValue:secondBetweenValueToRestore];
+			} else {
+				if (filterValueToRestore) [argumentField setStringValue:filterValueToRestore];
+			}
 			[self toggleFilterField:self];
-			if (filterValueToRestore) [argumentField setStringValue:filterValueToRestore];
-			if (firstBetweenValueToRestore) [firstBetweenField setStringValue:firstBetweenValueToRestore];
-			if (secondBetweenValueToRestore) [secondBetweenField setStringValue:secondBetweenValueToRestore];
+			
 		}
 	}
 
@@ -1749,7 +1754,7 @@
 						[[compareField selectedItem] title], @"filterComparison",
 						[NSNumber numberWithInt:[[compareField selectedItem] tag]], @"filterComparisonTag",
 						[argumentField stringValue], @"filterValue",
-						[firstBetweenField stringValue], @"firstBetweenValue",
+						[firstBetweenField stringValue], @"firstBetweenField",
 						[secondBetweenField stringValue], @"secondBetweenField",
 						nil];
 
@@ -1809,14 +1814,28 @@
 	if (filterSettings) {
 		if ([filterSettings objectForKey:@"filterField"])
 			filterFieldToRestore = [[NSString alloc] initWithString:[filterSettings objectForKey:@"filterField"]];
-		if ([filterSettings objectForKey:@"filterComparison"])
+		if ([filterSettings objectForKey:@"filterComparison"]) {
+			// Check if operator is BETWEEN, if so set up input fields
+			if([[filterSettings objectForKey:@"filterComparison"] isEqualToString:@"BETWEEN"]) {
+				[argumentField setHidden:YES];
+				[betweenTextField setHidden:NO];
+				[firstBetweenField setHidden:NO];
+				[secondBetweenField setHidden:NO];
+				[firstBetweenField setEnabled:YES];
+				[secondBetweenField setEnabled:YES];
+			}
+			
 			filterComparisonToRestore = [[NSString alloc] initWithString:[filterSettings objectForKey:@"filterComparison"]];
-		if ([filterSettings objectForKey:@"filterValue"])
-			filterValueToRestore = [[NSString alloc] initWithString:[filterSettings objectForKey:@"filterValue"]];
-		if ([filterSettings objectForKey:@"firstBetweenField"])
-			firstBetweenValueToRestore = [[NSString alloc] initWithString:[filterSettings objectForKey:@"firstBetweenField"]];
-		if ([filterSettings objectForKey:@"secondBetweenField"])
-			secondBetweenValueToRestore = [[NSString alloc] initWithString:[filterSettings objectForKey:@"secondBetweenField"]];
+		}
+		if([[filterSettings objectForKey:@"filterComparison"] isEqualToString:@"BETWEEN"]) {
+			if ([filterSettings objectForKey:@"firstBetweenField"])
+				firstBetweenValueToRestore = [[NSString alloc] initWithString:[filterSettings objectForKey:@"firstBetweenField"]];
+			if ([filterSettings objectForKey:@"secondBetweenField"])
+				secondBetweenValueToRestore = [[NSString alloc] initWithString:[filterSettings objectForKey:@"secondBetweenField"]];
+		} else {
+			if ([filterSettings objectForKey:@"filterValue"])
+				filterValueToRestore = [[NSString alloc] initWithString:[filterSettings objectForKey:@"filterValue"]];
+		}
 	}
 }