diff options
-rw-r--r-- | macosx/English.lproj/MainMenu.xib | 10 | ||||
-rw-r--r-- | macosx/English.lproj/Presets.xib | 13 | ||||
-rw-r--r-- | macosx/HBController.m | 4 | ||||
-rw-r--r-- | macosx/HBPreset.h | 4 | ||||
-rw-r--r-- | macosx/HBPreset.m | 6 | ||||
-rw-r--r-- | macosx/HBPresetsManager.m | 4 | ||||
-rw-r--r-- | macosx/HBPresetsViewController.h | 2 | ||||
-rw-r--r-- | macosx/HBPresetsViewController.m | 8 |
8 files changed, 26 insertions, 25 deletions
diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib index b7717da76..4e3f344a2 100644 --- a/macosx/English.lproj/MainMenu.xib +++ b/macosx/English.lproj/MainMenu.xib @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13770" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> <dependencies> <deployment identifier="macosx"/> - <development version="7000" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/> + <development version="8000" identifier="xcode"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13770"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="NSApplication"> @@ -320,9 +320,9 @@ <action selector="showAddPresetPanel:" target="-1" id="83j-3C-fCg"/> </connections> </menuItem> - <menuItem title="New Folder" tag="-1" keyEquivalent="N" id="wvb-60-cWL"> + <menuItem title="New Category" tag="-1" keyEquivalent="N" id="wvb-60-cWL"> <connections> - <action selector="insertFolder:" target="-1" id="HpS-UY-h3l"/> + <action selector="insertCategory:" target="-1" id="JL7-bI-H97"/> </connections> </menuItem> <menuItem isSeparatorItem="YES" tag="-1" id="1954"> diff --git a/macosx/English.lproj/Presets.xib b/macosx/English.lproj/Presets.xib index d1e1c6f37..e00f51f5d 100644 --- a/macosx/English.lproj/Presets.xib +++ b/macosx/English.lproj/Presets.xib @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> +<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13770" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none"> <dependencies> <deployment identifier="macosx"/> - <development version="7000" identifier="xcode"/> - <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/> + <development version="8000" identifier="xcode"/> + <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13770"/> + <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> <customObject id="-2" userLabel="File's Owner" customClass="HBPresetsViewController"> @@ -53,7 +54,7 @@ Overrides all encode settings. Settings may be further adjusted after selecting <rect key="frame" x="1" y="1" width="219" height="14"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> - <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" id="VdJ-Vk-fzJ"> + <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" id="VdJ-Vk-fzJ"> <rect key="frame" x="0.0" y="0.0" width="219" height="14"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/> <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="oBC-Nh-TwB"> @@ -122,9 +123,9 @@ Overrides all encode settings. Settings may be further adjusted after selecting <menu key="menu" title="Presets Action Menu" id="LQk-kD-5sj"> <items> <menuItem state="on" image="NSActionTemplate" hidden="YES" id="KPx-Ep-mb4"/> - <menuItem title="New Folder" id="Io0-Vm-Qez"> + <menuItem title="New Category" id="Io0-Vm-Qez"> <connections> - <action selector="insertFolder:" target="-2" id="ufd-hE-TG1"/> + <action selector="insertCategory:" target="-2" id="ZWP-Z4-cHu"/> </connections> </menuItem> <menuItem title="Make Default" id="D2t-YG-Frn"> diff --git a/macosx/HBController.m b/macosx/HBController.m index 2085cbcb3..c2b7b3caf 100644 --- a/macosx/HBController.m +++ b/macosx/HBController.m @@ -1476,9 +1476,9 @@ [fPresetsView setSelection:_currentPreset]; } -- (IBAction)insertFolder:(id)sender +- (IBAction)insertCategory:(id)sender { - [fPresetsView insertFolder:sender]; + [fPresetsView insertCategory:sender]; } - (IBAction)selectPresetFromMenu:(id)sender diff --git a/macosx/HBPreset.h b/macosx/HBPreset.h index 7d4551fed..3e95d3bab 100644 --- a/macosx/HBPreset.h +++ b/macosx/HBPreset.h @@ -17,11 +17,11 @@ typedef NS_ENUM(NSUInteger, HBPresetFormat) { * HBPreset * Stores a preset dictionary. * - * An instance of HBPreset can be an actual preset or a folder. + * An instance of HBPreset can be an actual preset or a category. */ @interface HBPreset : HBTreeNode <NSCopying, NSMutableCopying> -- (instancetype)initWithFolderName:(NSString *)title builtIn:(BOOL)builtIn; +- (instancetype)initWithCategoryName:(NSString *)title builtIn:(BOOL)builtIn; - (instancetype)initWithName:(NSString *)title content:(NSDictionary *)content builtIn:(BOOL)builtIn; - (instancetype)initWithDictionary:(NSDictionary *)dict; diff --git a/macosx/HBPreset.m b/macosx/HBPreset.m index 5fad6ba4a..067f49773 100644 --- a/macosx/HBPreset.m +++ b/macosx/HBPreset.m @@ -68,7 +68,7 @@ return self; } -- (instancetype)initWithFolderName:(NSString *)title builtIn:(BOOL)builtIn; +- (instancetype)initWithCategoryName:(NSString *)title builtIn:(BOOL)builtIn; { self = [self init]; if (self) @@ -90,7 +90,7 @@ if ([dict[@"Folder"] boolValue]) { - self = [self initWithFolderName:name builtIn:builtIn]; + self = [self initWithCategoryName:name builtIn:builtIn]; for (NSDictionary *childDict in [dict[@"ChildrenArray"] reverseObjectEnumerator]) { @@ -175,7 +175,7 @@ // Convert the array to a HBPreset tree. if (presetsArray.count) { - self = [self initWithFolderName:@"Imported Presets" builtIn:NO]; + self = [self initWithCategoryName:@"Imported Presets" builtIn:NO]; if (self) { diff --git a/macosx/HBPresetsManager.m b/macosx/HBPresetsManager.m index c79d5b45b..5c11d9359 100644 --- a/macosx/HBPresetsManager.m +++ b/macosx/HBPresetsManager.m @@ -28,7 +28,7 @@ NSString *HBPresetsChangedNotification = @"HBPresetsChangedNotification"; if (self) { // Init the root of the tree, it won't never be shown in the UI - _root = [[HBPreset alloc] initWithFolderName:@"Root" builtIn:YES]; + _root = [[HBPreset alloc] initWithCategoryName:@"Root" builtIn:YES]; _root.delegate = self; } return self; @@ -359,7 +359,7 @@ typedef NS_ENUM(NSUInteger, HBPresetLoadingResult) { #pragma mark - Built In Generation /** - * Built-in preset folders at the root of the hierarchy + * Built-in preset categories at the root of the hierarchy */ - (void)generateBuiltInPresets { diff --git a/macosx/HBPresetsViewController.h b/macosx/HBPresetsViewController.h index d3356fe64..36dc44dfb 100644 --- a/macosx/HBPresetsViewController.h +++ b/macosx/HBPresetsViewController.h @@ -28,7 +28,7 @@ - (void)deselect; - (void)setSelection:(HBPreset *)preset; -- (IBAction)insertFolder:(id)sender; +- (IBAction)insertCategory:(id)sender; @property (nonatomic, readonly, weak) HBPreset *selectedPreset; @property (nonatomic, readonly) NSUInteger indexOfSelectedItem; diff --git a/macosx/HBPresetsViewController.m b/macosx/HBPresetsViewController.m index 1eaab7e30..fba20ae75 100644 --- a/macosx/HBPresetsViewController.m +++ b/macosx/HBPresetsViewController.m @@ -52,7 +52,7 @@ @property (nonatomic, strong) NSArray *dragNodesArray; /** - * The status (expanded or not) of the folders. + * The status (expanded or not) of the categories. */ @property (nonatomic, strong) NSMutableArray *expandedNodes; @@ -117,7 +117,7 @@ - (IBAction)exportPreset:(id)sender { - // Find the current selection, it can be a folder too. + // Find the current selection, it can be a category too. HBPreset *selectedPreset = [[[self.treeController selectedObjects] firstObject] copy]; // Open a panel to let the user choose where and how to save the export file @@ -226,7 +226,7 @@ } } -- (IBAction)insertFolder:(id)sender +- (IBAction)insertCategory:(id)sender { NSIndexPath *selectionIndexPath = [self.treeController selectionIndexPath]; if (!selectionIndexPath || [[[self.treeController selectedObjects] firstObject] isBuiltIn]) @@ -234,7 +234,7 @@ selectionIndexPath = [NSIndexPath indexPathWithIndex:self.presets.root.children.count]; } - HBPreset *node = [[HBPreset alloc] initWithFolderName:@"New Folder" builtIn:NO]; + HBPreset *node = [[HBPreset alloc] initWithCategoryName:@"New Category" builtIn:NO]; [self.treeController insertObject:node atArrangedObjectIndexPath:selectionIndexPath]; } |