Preferences instead of Settings renaming

MacPass/Base.lproj/PasswordCreatorView.xib

@@ -293,7 +293,7 @@
                 <constraint firstItem="178" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="20" symbolic="YES" id="pAc-di-F68"/>
                 <constraint firstItem="500" firstAttribute="leading" secondItem="4yb-SC-vau" secondAttribute="leading" id="xv1-5v-Ljh"/>
             </constraints>
-            <point key="canvasLocation" x="-61.5" y="-402"/>
+            <point key="canvasLocation" x="-429" y="-374"/>
         </customView>
     </objects>
     <resources>

MacPass/Base.lproj/PluginPreferences.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14313.18"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="MPPluginSettingsController">
+        <customObject id="-2" userLabel="File's Owner" customClass="MPPluginPreferencesController">
             <connections>
                 <outlet property="addRemovePluginsControl" destination="B9Q-hq-K4N" id="Oqj-Ko-8UR"/>
                 <outlet property="fallbackDescriptionTextField" destination="qPL-FR-ky7" id="xCb-ED-NIX"/>
@@ -26,14 +26,14 @@
                 <box borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="vBs-Ga-aq0">
                     <rect key="frame" x="175" y="46" width="408" height="321"/>
                     <view key="contentView" id="tD5-Na-7XI">
-                        <rect key="frame" x="1" y="1" width="406" height="319"/>
+                        <rect key="frame" x="3" y="3" width="402" height="315"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="wIk-iw-Tcz">
-                                <rect key="frame" x="20" y="20" width="366" height="279"/>
+                                <rect key="frame" x="20" y="20" width="362" height="275"/>
                                 <subviews>
                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qPL-FR-ky7">
-                                        <rect key="frame" x="18" y="242" width="330" height="17"/>
+                                        <rect key="frame" x="18" y="238" width="326" height="17"/>
                                         <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" title="Plugin Settings Info" id="OOr-SW-jZb">
                                             <font key="font" metaFont="system"/>
                                             <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -144,11 +144,11 @@
                         <constraint firstAttribute="width" constant="150" id="ZpW-Bc-fSx"/>
                         <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="150" id="eXb-yq-O8y"/>
                     </constraints>
-                    <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="UK5-gt-5o5">
+                    <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="UK5-gt-5o5">
                         <rect key="frame" x="1" y="328" width="148" height="16"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
-                    <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="oqL-7I-4H1">
+                    <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="oqL-7I-4H1">
                         <rect key="frame" x="224" y="17" width="15" height="102"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
@@ -167,8 +167,8 @@
                     </connections>
                 </segmentedControl>
                 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SNe-cc-CZs">
-                    <rect key="frame" x="463" y="18" width="117" height="25"/>
-                    <buttonCell key="cell" type="roundTextured" title="Browse Plugins…" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="sqO-8H-n1y">
+                    <rect key="frame" x="406" y="19" width="174" height="23"/>
+                    <buttonCell key="cell" type="roundTextured" title="Browse Available Plugins…" bezelStyle="texturedRounded" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="sqO-8H-n1y">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>

MacPass/MPPluginPreferencesController.h

@@ -23,7 +23,7 @@
 #import "MPViewController.h"
 #import "MPPreferencesTab.h"
 
-@interface MPPluginSettingsController : MPViewController <MPPreferencesTab>
+@interface MPPluginPreferencesController : MPViewController <MPPreferencesTab>
 
 - (IBAction)addOrRemovePlugin:(id)sender;
 - (IBAction)browsePlugins:(id)sender;

MacPass/MPPluginPreferencesController.m

@@ -20,7 +20,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import "MPPluginSettingsController.h"
+#import "MPPluginPreferencesController.h"
 #import "MPPluginTabelCellView.h"
 #import "MPPluginHost.h"
 #import "MPPlugin.h"
@@ -40,7 +40,7 @@ typedef NS_ENUM(NSUInteger, MPPluginSegmentType) {
   MPRemovePluginSegment = 1
 };
 
-@interface MPPluginSettingsController () <NSTableViewDataSource, NSTableViewDelegate>
+@interface MPPluginPreferencesController () <NSTableViewDataSource, NSTableViewDelegate>
 
 @property (strong) IBOutlet NSTableView *pluginTableView;
 @property (strong) IBOutlet NSView *settingsView;
@@ -52,10 +52,10 @@ typedef NS_ENUM(NSUInteger, MPPluginSegmentType) {
 
 @end
 
-@implementation MPPluginSettingsController
+@implementation MPPluginPreferencesController
 
 - (NSString *)nibName {
-  return @"PluginSettings";
+  return @"PluginPreferences";
 }
 
 - (NSString *)identifier {

MacPass/MPPreferencesWindowController.m

@@ -28,7 +28,7 @@
 #import "MPIntegrationSettingsController.h"
 #import "MPWorkflowSettingsController.h"
 #import "MPUpdateSettingsController.h"
-#import "MPPluginSettingsController.h"
+#import "MPPluginPreferencesController.h"
 
 @interface MPPreferencesWindowController () {
   NSString *lastIdentifier;
@@ -118,7 +118,7 @@
   Class tabClass;
   switch(tab) {
     case MPPreferencesTabPlugins:
-      tabClass = MPPluginSettingsController.class;
+      tabClass = MPPluginPreferencesController.class;
       break;
     case MPPreferencesTabUpdate:
       tabClass = MPUpdateSettingsController.class;
@@ -168,7 +168,7 @@
                             [[MPIntegrationSettingsController alloc] init],
                             [[MPWorkflowSettingsController alloc] init],
                             [[MPUpdateSettingsController alloc] init],
-                            [[MPPluginSettingsController alloc] init] ];
+                            [[MPPluginPreferencesController alloc] init] ];
   NSMutableArray *identifier = [[NSMutableArray alloc] initWithCapacity:controllers.count];
   for(id<MPPreferencesTab> controller in controllers) {
     [self _addSettingsTab:controller];

MacPass/en.lproj/PluginPreferences.strings

@@ -1,24 +1,27 @@
+
 /* Class = "NSTextFieldCell"; title = "If enabled, Plugins without proper signatures will be allowed to load. Keep in mind, that Plugins have full access to your data! Changes take affect on restart."; ObjectID = "2bX-8S-9XM"; */
 "2bX-8S-9XM.title" = "If enabled, Plugins without proper signatures will be allowed to load. Keep in mind, that Plugins have full access to your data! Changes take affect on restart.";
 
 /* Class = "NSButtonCell"; title = "Load unsecure Plugins"; ObjectID = "C4B-6z-ZqX"; */
 "C4B-6z-ZqX.title" = "Load unsecure Plugins";
 
-/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "fug-79-n9g"; */
-"fug-79-n9g.title" = "Table View Cell";
-
 /* Class = "NSTextFieldCell"; title = "Plugin Settings Info"; ObjectID = "OOr-SW-jZb"; */
 "OOr-SW-jZb.title" = "Plugin Settings Info";
 
-/* Class = "NSButtonCell"; title = "Browse Plugins…"; ObjectID = "sqO-8H-n1y"; */
-"sqO-8H-n1y.title" = "Browse Plugins…";
-
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "STt-PQ-Szr"; */
 "STt-PQ-Szr.title" = "Text Cell";
 
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "fug-79-n9g"; */
+"fug-79-n9g.title" = "Table View Cell";
+
+/* Class = "NSButtonCell"; title = "Browse Available Plugins…"; ObjectID = "sqO-8H-n1y"; */
+"sqO-8H-n1y.title" = "Browse Available Plugins…";
+
 /* Class = "NSBox"; title = "Box"; ObjectID = "vBs-Ga-aq0"; */
 "vBs-Ga-aq0.title" = "Box";
 
+/* Class = "NSButtonCell"; title = "Force loading of incompatible Plugins"; ObjectID = "yak-fS-jtA"; */
+"yak-fS-jtA.title" = "Force loading of incompatible Plugins";
+
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "yuK-qH-jxx"; */
 "yuK-qH-jxx.title" = "Label";
-