Project structure cleanup and renaming

MacPass/Base.lproj/GeneralPreferences.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="MPGeneralSettingsController">
+        <customObject id="-2" userLabel="File's Owner" customClass="MPGeneralPreferencesController">
             <connections>
                 <outlet property="clearPasteboardOnQuitCheckButton" destination="447" id="520"/>
                 <outlet property="clearPasteboardTimeoutPopup" destination="419" id="521"/>

MacPass/Base.lproj/IntegrationPreferences.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="MPIntegrationSettingsController">
+        <customObject id="-2" userLabel="File's Owner" customClass="MPIntegrationPreferencesController">
             <connections>
                 <outlet property="autotypeStackView" destination="j52-9L-k7c" id="Mxw-aa-elx"/>
                 <outlet property="autotypeWarningTextField" destination="hMJ-Mo-xOM" id="LcH-X2-TAm"/>

MacPass/Base.lproj/UpdatePreferences.xib

@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="MPUpdateSettingsController">
+        <customObject id="-2" userLabel="File's Owner" customClass="MPUpdatePreferencesController">
             <connections>
                 <outlet property="automaticallyCheckForUpdatesCheckButton" destination="Z6x-oU-NC5" id="xHU-Lt-PmA"/>
                 <outlet property="checkIntervallPopupButton" destination="pWJ-eJ-MBf" id="znu-Me-2Me"/>

MacPass/Base.lproj/WorkflowPreferences.xib

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="MPWorkflowSettingsController">
+        <customObject id="-2" userLabel="File's Owner" customClass="MPWorkflowPreferencesController">
             <connections>
                 <outlet property="browserPopup" destination="ehI-gq-lsb" id="YMy-L1-pQw"/>
                 <outlet property="doubleClickTitlePopup" destination="40" id="aKJ-q9-xjb"/>
@@ -175,7 +175,7 @@
                 <constraint firstItem="lOo-NI-b07" firstAttribute="leading" secondItem="1" secondAttribute="leading" constant="20" symbolic="YES" id="kaP-lB-tDY"/>
                 <constraint firstItem="2" firstAttribute="top" secondItem="lOo-NI-b07" secondAttribute="bottom" constant="8" symbolic="YES" id="xlS-Dj-cOt"/>
             </constraints>
-            <point key="canvasLocation" x="280" y="528"/>
+            <point key="canvasLocation" x="-2" y="125"/>
         </customView>
     </objects>
 </document>

MacPass/MPGeneralPreferencesController.h

@@ -24,7 +24,7 @@
 #import "MPViewController.h"
 #import "MPPreferencesTab.h"
 
-@interface MPGeneralSettingsController : MPViewController <MPPreferencesTab>
+@interface MPGeneralPreferencesController : MPViewController <MPPreferencesTab>
 
 @property (strong) IBOutlet NSButton *clearPasteboardOnQuitCheckButton;
 @property (strong) IBOutlet NSPopUpButton *clearPasteboardTimeoutPopup;

MacPass/MPGeneralPreferencesController.m

@@ -20,20 +20,18 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import "MPGeneralSettingsController.h"
+#import "MPGeneralPreferencesController.h"
 #import "MPSettingsHelper.h"
 #import "MPIconHelper.h"
 
-NSString *const MPGeneralSetingsIdentifier = @"GeneralSettingsTab";
-
-@implementation MPGeneralSettingsController
+@implementation MPGeneralPreferencesController
 
 - (NSString *)nibName {
-  return @"GeneralSettings";
+  return @"GeneralPreferences";
 }
 
 - (NSString *)identifier {
-  return MPGeneralSetingsIdentifier;
+  return @"GeneralPreferences";
 }
 
 - (NSImage *)image {
@@ -41,7 +39,7 @@ NSString *const MPGeneralSetingsIdentifier = @"GeneralSettingsTab";
 }
 
 - (NSString *)label {
-  return NSLocalizedString(@"GENERAL_SETTINGS", @"General Settings Label");
+  return NSLocalizedString(@"GENERAL_PREFERENCES", @"General Settings Label");
 }
 
 - (void)viewDidLoad {

MacPass/MPIntegrationPreferencesController.h

@@ -25,7 +25,7 @@
 
 @class DDHotKeyTextField;
 
-@interface MPIntegrationSettingsController : MPViewController <MPPreferencesTab, NSTextFieldDelegate>
+@interface MPIntegrationPreferencesController : MPViewController <MPPreferencesTab, NSTextFieldDelegate>
 /* Autotype */
 @property (strong) IBOutlet NSButton *enableGlobalAutotypeCheckBox;
 @property (strong) IBOutlet DDHotKeyTextField *hotKeyTextField;

MacPass/MPIntegrationPreferencesController.m

@@ -20,7 +20,7 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import "MPIntegrationSettingsController.h"
+#import "MPIntegrationPreferencesController.h"
 #import "MPSettingsHelper.h"
 #import "MPIconHelper.h"
 #import "MPAutotypeDaemon.h"
@@ -29,16 +29,16 @@
 #import "DDHotKey+MacPassAdditions.h"
 #import "DDHotKeyTextField.h"
 
-@interface MPIntegrationSettingsController ()
+@interface MPIntegrationPreferencesController ()
 
 @property (nonatomic, strong) DDHotKey *hotKey;
 
 @end
 
-@implementation MPIntegrationSettingsController
+@implementation MPIntegrationPreferencesController
 
 - (NSString *)nibName {
-  return @"IntegrationSettings";
+  return @"IntegrationPreferences";
 }
 
 - (NSString *)identifier {

MacPass/MPPlugin.h

@@ -53,6 +53,13 @@ FOUNDATION_EXPORT NSString *const MPPluginUnkownVersion;
 
 @end
 
+#pragma mark Supported Plugin Protocolls
+
+/*
+ Adopting this protocolls allows for custom settings in the Plugin settings pane.
+ MacPass will load your view controller and place it inside the settings window
+ when a user has selected your plugin in the list
+ */
 @protocol MPPluginSettings <NSObject>
 
 @required
@@ -60,6 +67,20 @@ FOUNDATION_EXPORT NSString *const MPPluginUnkownVersion;
 
 @end
 
+/*
+ Adopt this protocoll if you plugin can extract window title information for a set of applications
+ This way, MacPass might yield better results for autotype. Beware that his might break interoparbility
+ */
+@protocol MPAutotypeWindowTitleResolverPlugin <NSObject>
+@required
+
+- (BOOL)acceptsRunningApplication:(NSRunningApplication *)runningApplication;
+- (NSString *)windowTitleForRunningApplication:(NSRunningApplication *)runningApplication;
+@end
+
+
+#pragma mark Proposed Plugin Protocolls
+
 /*
  Adopt this protocoll if your plugin supports actions on entries.
  Actions will get listed in various places in menues.
@@ -111,19 +132,17 @@ FOUNDATION_EXPORT NSString *const MPPluginUnkownVersion;
  This will get called when the open panel is closed by the user.
  You should retrieve any results from the panel and act accordingly.
  
+ If you need custom UI in the process, you can show them here.
+ For example, if a CVS import might need user input on how to handle the parsed files this is the place to show it.
+
  @param panel The open panel used for selecting what file(s) to import
  @param response The response for of the user for running the panel
- @return The tree constructed from the selected input file(s)
+ @return The KPKTree constructed from the selected input file(s)
  */
 - (KPKTree *)treeForRunningOpenPanel:(NSOpenPanel *)panel withResponse:(NSModalResponse)response;
 @end
 
-@protocol MPAutotypeWindowTitleResolverPlugin <NSObject>
-@required
-
-- (BOOL)acceptsRunningApplication:(NSRunningApplication *)runningApplication;
-- (NSString *)windowTitleForRunningApplication:(NSRunningApplication *)runningApplication;
-@end
+#pragma mark Deprecated
 
 @interface MPPlugin (Deprecated)
 

MacPass/MPPreferencesWindowController.m

@@ -24,10 +24,10 @@
 
 #import "MPPreferencesTab.h"
 
-#import "MPGeneralSettingsController.h"
-#import "MPIntegrationSettingsController.h"
-#import "MPWorkflowSettingsController.h"
-#import "MPUpdateSettingsController.h"
+#import "MPGeneralPreferencesController.h"
+#import "MPIntegrationPreferencesController.h"
+#import "MPWorkflowPreferencesController.h"
+#import "MPUpdatePreferencesController.h"
 #import "MPPluginPreferencesController.h"
 
 @interface MPPreferencesWindowController () {
@@ -121,14 +121,14 @@
       tabClass = MPPluginPreferencesController.class;
       break;
     case MPPreferencesTabUpdate:
-      tabClass = MPUpdateSettingsController.class;
+      tabClass = MPUpdatePreferencesController.class;
       break;
     case MPPreferencesTabWorkflow:
-      tabClass = MPWorkflowSettingsController.class;
+      tabClass = MPWorkflowPreferencesController.class;
       break;
     case MPPreferencesTabGeneral:
     default:
-      tabClass = MPGeneralSettingsController.class;
+      tabClass = MPGeneralPreferencesController.class;
       break;
   }
   NSString *identifier;
@@ -164,10 +164,10 @@
 }
 
 - (void)_setupDefaultPreferencesTabs {
-  NSArray *controllers = @[ [[MPGeneralSettingsController alloc] init],
-                            [[MPIntegrationSettingsController alloc] init],
-                            [[MPWorkflowSettingsController alloc] init],
-                            [[MPUpdateSettingsController alloc] init],
+  NSArray *controllers = @[ [[MPGeneralPreferencesController alloc] init],
+                            [[MPIntegrationPreferencesController alloc] init],
+                            [[MPWorkflowPreferencesController alloc] init],
+                            [[MPUpdatePreferencesController alloc] init],
                             [[MPPluginPreferencesController alloc] init] ];
   NSMutableArray *identifier = [[NSMutableArray alloc] initWithCapacity:controllers.count];
   for(id<MPPreferencesTab> controller in controllers) {

MacPass/MPUpdatePreferencesController.h

@@ -23,6 +23,6 @@
 #import "MPViewController.h"
 #import "MPPreferencesTab.h"
 
-@interface MPUpdateSettingsController : MPViewController <MPPreferencesTab>
+@interface MPUpdatePreferencesController : MPViewController <MPPreferencesTab>
 
 @end

MacPass/MPUpdatePreferencesController.m

@@ -20,23 +20,23 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import "MPUpdateSettingsController.h"
+#import "MPUpdatePreferencesController.h"
 #import <Sparkle/Sparkle.h>
 
-@interface MPUpdateSettingsController ()
+@interface MPUpdatePreferencesController ()
 @property (weak) IBOutlet NSButton *automaticallyCheckForUpdatesCheckButton;
 @property (weak) IBOutlet NSPopUpButton *checkIntervallPopupButton;
 
 @end
 
-@implementation MPUpdateSettingsController
+@implementation MPUpdatePreferencesController
 
 - (NSString *)nibName {
-  return @"UpdateSettings";
+  return @"UpdatePreferences";
 }
 
 - (NSString *)identifier {
-  return @"UpdateSettings";
+  return @"UpdatePreferences";
 }
 
 - (NSImage *)image {
@@ -44,7 +44,7 @@
 }
 
 - (NSString *)label {
-  return NSLocalizedString(@"UPDATE_SETTINGS", @"Update Settings Label");
+  return NSLocalizedString(@"UPDATE_PREFERENCES", @"Update Settings Label");
 }
 
 - (void)awakeFromNib {

MacPass/MPWorkflowPreferencesController.h

@@ -23,7 +23,7 @@
 #import "MPViewController.h"
 #import "MPPreferencesTab.h"
 
-@interface MPWorkflowSettingsController : MPViewController <MPPreferencesTab>
+@interface MPWorkflowPreferencesController : MPViewController <MPPreferencesTab>
 
 @property (strong) IBOutlet NSPopUpButton *browserPopup;
 @property (strong) IBOutlet NSPopUpButton *doubleClickURLPopup;

MacPass/MPWorkflowPreferencesController.m

@@ -20,18 +20,18 @@
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import "MPWorkflowSettingsController.h"
+#import "MPWorkflowPreferencesController.h"
 
 #import "MPSettingsHelper.h"
 
-@interface MPWorkflowSettingsController ()
+@interface MPWorkflowPreferencesController ()
 
 @end
 
-@implementation MPWorkflowSettingsController
+@implementation MPWorkflowPreferencesController
 
 - (NSString *)nibName {
-  return @"WorkflowSettings";
+  return @"WorkflowPreferences";
 }
 
 - (void)viewDidLoad {

MacPass/de.lproj/Localizable.strings

@@ -363,7 +363,7 @@
 "FILE_OPEN_ERROR" = "Fehler beim Öffnen der Datei.";
 
 /* General Settings Label */
-"GENERAL_SETTINGS" = "Allgemein";
+"GENERAL_PREFERENCES" = "Allgemein";
 
 /* Group column title */
 "GROUP" = "Gruppe";
@@ -698,7 +698,7 @@
 "UNKNOWN_TOOLBAR_ITEM" = "Unbekanntes Toolbar-Element";
 
 /* Update Settings Label */
-"UPDATE_SETTINGS" = "Aktualisierung";
+"UPDATE_PREFERENCES" = "Aktualisierung";
 
 /* Menu item to toggle display of url column in entry table
    Submenu with options what to do with the URL of an entry