Skip to content
This repository has been archived by the owner on Dec 12, 2020. It is now read-only.

Make correct set project, context and priority when add several tasks (fixes #239) #243

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Make correct set project, context and priority when add several tasks (fixes #239) #243

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c9a489
Make correct set context and project when add several tasks
roadhump Feb 7, 2015
6abe1e2
Make correct set priority when add several tasks
roadhump Feb 8, 2015
7fe2a13
Replace whitespaces to tabs
roadhump Feb 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 36 additions & 9 deletions View Controllers/TaskEditViewController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,20 +391,47 @@ - (IBAction)helpCloseButtonPressed:(id)sender {
[self.textView becomeFirstResponder];
}

- (NSString *) getCurrentTaskText {
NSString *taskText;
if (self.task) {
taskText = self.textView.text;
} else {
NSRange r = [self.textView.text lineRangeForRange:self.textView.selectedRange];
taskText = [self.textView.text substringWithRange:r];
}

return taskText;
}

- (void) priorityWasSelected:(NSInteger *)selectedIndex element:(id)element {
self.actionSheetPicker = nil;
if (selectedIndex >= 0) {
Priority *selectedPriority = [Priority byName:(PriorityName)selectedIndex];
NSString *newText = nil;
NSString *newTaskText = nil;
NSString *oldTaskText = [self getCurrentTaskText];

if (selectedPriority == [Priority NONE]) {
newText = [NSString stringWithString:[[PriorityTextSplitter split:self.textView.text] text]];
newTaskText = [NSString stringWithString:[[PriorityTextSplitter split:oldTaskText] text]];
} else {
newText = [NSString stringWithFormat:@"%@ %@",
newTaskText = [NSString stringWithFormat:@"%@ %@",
[selectedPriority fileFormat],
[[PriorityTextSplitter split:self.textView.text] text]];
[[PriorityTextSplitter split:oldTaskText] text]];
}
self.curSelectedRange = [Strings calculateSelectedRange:self.curSelectedRange oldText:self.textView.text newText:newText];
self.textView.text = newText;

NSString *result = @"";
if (self.task) {
result = newTaskText;
} else {
NSRange range = [self.textView.text lineRangeForRange:self.textView.selectedRange];

result = [result stringByAppendingString:[self.textView.text substringToIndex:range.location]];
result = [result stringByAppendingString:newTaskText];
NSString *end = [self.textView.text substringFromIndex:range.location + range.length];
result = [result stringByAppendingString:end];
}

self.curSelectedRange = [Strings calculateSelectedRange:self.curSelectedRange oldText:self.textView.text newText:result];
self.textView.text = result;
self.textView.selectedRange = self.curSelectedRange;
}
[self.textView becomeFirstResponder];
Expand All @@ -416,7 +443,7 @@ - (void) projectWasSelected:(NSInteger *)selectedIndex element:(id)element {
id<TaskBag> taskBag = self.appDelegate.taskBag;
NSString *item = [[taskBag projects] objectAtIndex:selectedIndex];

if (! [TaskUtil taskHasProject:self.textView.text project:item]) {
if (! [TaskUtil taskHasProject:[self getCurrentTaskText] project:item]) {
item = [NSString stringWithFormat:@"+%@", item];
NSString *newText = [Strings insertPaddedString:self.textView.text atRange:self.curSelectedRange withString:item];
self.curSelectedRange = [Strings calculateSelectedRange:self.curSelectedRange oldText:self.textView.text newText:newText];
Expand All @@ -432,8 +459,8 @@ - (void) contextWasSelected:(NSInteger *)selectedIndex element:(id)element {
if (selectedIndex >= 0) {
id<TaskBag> taskBag = self.appDelegate.taskBag;
NSString *item = [[taskBag contexts] objectAtIndex:selectedIndex];
if (! [TaskUtil taskHasContext:self.textView.text context:item]) {

if (! [TaskUtil taskHasContext:[self getCurrentTaskText] context:item]) {
item = [NSString stringWithFormat:@"@%@", item];
NSString *newText = [Strings insertPaddedString:self.textView.text atRange:self.curSelectedRange withString:item];
self.curSelectedRange = [Strings calculateSelectedRange:self.curSelectedRange oldText:self.textView.text newText:newText];
Expand Down