Skip to content

Commit

Permalink
Fixed a bug in the pref controller when switching panes. When deletin…
Browse files Browse the repository at this point in the history
…g a skill plan, make sure the newly selected plan displays properly. The skill search field is now cleared when switching between types of searches.
  • Loading branch information
Bleyddyn committed Oct 3, 2014
1 parent 615be9f commit 708b30b
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 11 deletions.
24 changes: 24 additions & 0 deletions ReleaseNotes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,27 @@
Version 0.3.0a
October 2, 2014

This is a pre-release, experimental version.

The minimum database version has been updated to 17 for the Oceanus 1.0 database.

Large changes to the skill plan view. Skill plans are now a master/detail pair of tables.
All columns can be moved by dragging and dropping the column header.
Right clicking on a column header will bring up a contextual menu letting you show or hide columns, along with menu items related to sorting.
Because of the previous changes the Skill Plan related Preference pane is no longer necessary and has been removed.
Skill plans and skills can be sorted by clicking on a column header, except for columns whose data is calculated (e.g. Running Total, Start/Finish Date).
The Manual Sort menu item will undo all sorting, reverting you to the last manual sort.
Sorting skills within a plan may well violate skill pre-requisites. Skills that no longer follow their pre-requisites are displayed with a red name. The "Fix Prerequisites" menu item will attempt a minimal re-ordering of skills to satisfy all pre-requisites. The new order will be set as the latest manual sort.

When changing tabs in the Skill Planner search section (i.e. Skills, Certs, Ships, Modules) the search field is cleared since it's likely to not make much sense for a different kind of search.

The Database preference pane now updates properly if the database has just been updated.

Changed the way ships are sorted into races in the Ships search view so all ships should now be visible, specifically ORE ships.

The code has been cleaned up a lot to remove compiler warnings and to eliminiate some memory leaks.


Version 0.2.11a
September 9, 2014

Expand Down
2 changes: 1 addition & 1 deletion src/Preferences/MBPreferencesController.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* MBPreferencesController has enough information to accurately populate the
* toolbar.
*/
@protocol MBPreferencesModule
@protocol MBPreferencesModule<NSObject>
/**
* @name Module Attributes
*/
Expand Down
3 changes: 2 additions & 1 deletion src/Preferences/MBPreferencesController.m
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ - (id)autorelease {

- (void)showWindow:(id)sender {
[self.window center];
[_currentModule willBeDisplayed];
if( [_currentModule respondsToSelector:@selector(willBeDisplayed)] )
[_currentModule willBeDisplayed];
[super showWindow:sender];
}

Expand Down
3 changes: 2 additions & 1 deletion src/Views/Skill Planner/PlanOverview.m
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ -(void) deleteSkillPlan:(NSIndexSet*)planIndexes
}
[character removeSkillPlan:plan];
}


[tableView selectRowIndexes:planIndexes byExtendingSelection:NO];
[self refreshPlanView];
}

Expand Down
6 changes: 4 additions & 2 deletions src/Views/Skill Planner/SkillPlanController.m
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,9 @@ -(void) awakeFromNib
if (skillItemDatasource != nil){
[skillSearchView addDatasource: skillItemDatasource];
}


[skillSearchView selectDefaultGroup];

[skillView2 setDelegate:self];
[planOverview setDelegate:self];

Expand Down Expand Up @@ -229,7 +231,7 @@ -(void) viewIsActive
[skillCharDatasource setCharacter:activeCharacter];

[skillSearchView reloadDatasource:skillCharDatasource];
[skillSearchView selectDefaultGroup];
// [skillSearchView selectDefaultGroup];

[skillView2 refreshPlanView];
[planOverview refreshPlanView];
Expand Down
21 changes: 17 additions & 4 deletions src/Views/Skill Planner/SkillSearchView.m
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,17 @@ - (NSSearchField *)searchField
-(IBAction) skillSearchCategoriesClick:(id)sender
{
NSInteger tag = [[sender cell] tagForSegment:[sender selectedSegment]];
id<SkillSearchDatasource,NSOutlineViewDataSource> data = [datasources objectAtIndex:tag];
[skillList setDataSource:data];
currentDatasource = tag;
if( tag != currentDatasource )
{
// first clear the current search since it's not likely to make sense for a different tab
id<SkillSearchDatasource,NSOutlineViewDataSource> oldData = [datasources objectAtIndex:currentDatasource];
[search setStringValue:@""];
[oldData skillSearchFilter:search];

id<SkillSearchDatasource,NSOutlineViewDataSource> data = [datasources objectAtIndex:tag];
[skillList setDataSource:data];
currentDatasource = tag;
}
}

-(IBAction) skillGroupsClick:(id)sender
Expand Down Expand Up @@ -194,7 +202,12 @@ -(void) menuAddSkillClick:(id)sender
-(void) selectDefaultGroup
{
[skillSearchCategories setSelectedSegment:0];
[self skillSearchCategoriesClick:skillSearchCategories];
NSInteger tag = [[skillSearchCategories cell] tagForSegment:[skillSearchCategories selectedSegment]];
id<SkillSearchDatasource,NSOutlineViewDataSource> data = [datasources objectAtIndex:tag];
[skillList setDataSource:data];
currentDatasource = tag;

// [self skillSearchCategoriesClick:skillSearchCategories];
}

/*pop up the skill window*/
Expand Down
4 changes: 2 additions & 2 deletions src/vitality.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.2.11</string>
<string>0.3.0a</string>
<key>CFBundleVersion</key>
<string>0.2.11</string>
<string>0.3.0a</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSMainNibFile</key>
Expand Down

0 comments on commit 708b30b

Please sign in to comment.