macosx: refactor simple preferences to work without object in xib

extras/package/macosx/vlc.xcodeproj/project.pbxproj

@@ -463,6 +463,7 @@
 		7D8BB0BA1830367200FAE9B7 /* PlaylistMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0B81830367200FAE9B7 /* PlaylistMenu.xib */; };
 		7D8BB0C01830393300FAE9B7 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D8BB0BE1830393300FAE9B7 /* MainWindow.xib */; };
 		7DB65D5618ABD6490053B874 /* AddonManager.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DB65D5418ABD6490053B874 /* AddonManager.xib */; };
+		7DD6EC101B58136D0047CF5C /* SimplePreferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DD6EC0E1B58136D0047CF5C /* SimplePreferences.xib */; };
 		7DE88F2A1831396A00CD9DA2 /* PlaylistAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7DE88F281831396A00CD9DA2 /* PlaylistAccessoryView.xib */; };
 		7DFFA16C16124F38001AF89F /* effects-one-button-pressed-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DFFA16A16124F38001AF89F /* effects-one-button-pressed-dark.png */; };
 		7DFFA16D16124F38001AF89F /* effects-one-button-pressed-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7DFFA16B16124F38001AF89F /* effects-one-button-pressed-dark@2x.png */; };
@@ -1246,6 +1247,7 @@
 		7DB65D5218ABD6380053B874 /* AddonsWindowController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AddonsWindowController.h; path = ../../../modules/gui/macosx/AddonsWindowController.h; sourceTree = SOURCE_ROOT; };
 		7DB65D5318ABD6380053B874 /* AddonsWindowController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AddonsWindowController.m; path = ../../../modules/gui/macosx/AddonsWindowController.m; sourceTree = SOURCE_ROOT; };
 		7DB65D5518ABD6490053B874 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/AddonManager.xib; sourceTree = "<group>"; };
+		7DD6EC0F1B58136D0047CF5C /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/SimplePreferences.xib; sourceTree = "<group>"; };
 		7DE88F291831396A00CD9DA2 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/PlaylistAccessoryView.xib; sourceTree = "<group>"; };
 		7DF0435E1972E26A0022B534 /* AddonListDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AddonListDataSource.h; path = ../../../modules/gui/macosx/AddonListDataSource.h; sourceTree = SOURCE_ROOT; };
 		7DF0435F1972E26A0022B534 /* AddonListDataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AddonListDataSource.m; path = ../../../modules/gui/macosx/AddonListDataSource.m; sourceTree = SOURCE_ROOT; };
@@ -2883,6 +2885,7 @@
 				CCD83E3813FEA143004F1652 /* MediaInfo.xib */,
 				CCD83E3A13FEA143004F1652 /* Open.xib */,
 				CCD83E3C13FEA143004F1652 /* Preferences.xib */,
+				7DD6EC0E1B58136D0047CF5C /* SimplePreferences.xib */,
 				CCD83E3E13FEA143004F1652 /* SyncTracks.xib */,
 				CCD83E4013FEA143004F1652 /* VideoEffects.xib */,
 				CCD83E2B13FE9B90004F1652 /* MainMenu.xib */,
@@ -3081,6 +3084,7 @@
 				CC04323F13B246DF00D7D52E /* effects-double-buttons-pressed_dark.png in Resources */,
 				CC04324013B246DF00D7D52E /* effects-one-button_dark.png in Resources */,
 				CC04324413B246DF00D7D52E /* fullscreen-double-buttons_dark.png in Resources */,
+				7DD6EC101B58136D0047CF5C /* SimplePreferences.xib in Resources */,
 				CC04324513B246DF00D7D52E /* fullscreen-double-buttons-pressed_dark.png in Resources */,
 				CC04324613B246DF00D7D52E /* pause_dark.png in Resources */,
 				1C88BC9B19DC7CB300645190 /* ys-fs_pause_highlight@2x.png in Resources */,
@@ -3988,6 +3992,14 @@
 			name = AddonManager.xib;
 			sourceTree = "<group>";
 		};
+		7DD6EC0E1B58136D0047CF5C /* SimplePreferences.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				7DD6EC0F1B58136D0047CF5C /* English */,
+			);
+			name = SimplePreferences.xib;
+			sourceTree = "<group>";
+		};
 		7DE88F281831396A00CD9DA2 /* PlaylistAccessoryView.xib */ = {
 			isa = PBXVariantGroup;
 			children = (

modules/gui/macosx/intf.m

@@ -1285,7 +1285,7 @@ audio_output_t *getAout(void)
         o_sprefs = [[VLCSimplePrefs alloc] init];
 
     if (!nib_prefs_loaded)
-        nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: NSApp];
+        nib_prefs_loaded = [NSBundle loadNibNamed:@"SimplePreferences" owner: o_sprefs];
 
     return o_sprefs;
 }
@@ -1296,7 +1296,7 @@ audio_output_t *getAout(void)
         o_prefs = [[VLCPrefs alloc] init];
 
     if (!nib_prefs_loaded)
-        nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: NSApp];
+        nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: o_prefs];
 
     return o_prefs;
 }