--- hatari/src/gui-osx/PrefsController.h	2019/04/09 08:55:20	1.1.1.10
+++ hatari/src/gui-osx/PrefsController.h	2019/04/09 08:57:49	1.1.1.12
@@ -12,33 +12,38 @@
 {
 	// Preferences window
 	IBOutlet NSWindow *window ;
-	IBOutlet NSView   *partage ;						// add
-	IBOutlet NSView   *hartage ;						// add
+	IBOutlet NSView   *partage ;
+	IBOutlet NSView   *hartage ;
 
 	// Disks
-	IBOutlet NSTextField *floppyImageA;					// T
-	IBOutlet NSTextField *floppyImageB;					// T
+	IBOutlet NSTextField *floppyImageA;
+	IBOutlet NSButton    *enableDriveA;
+	IBOutlet NSButton    *driveA_NumberOfHeads;
+	IBOutlet NSTextField *floppyImageB;
+	IBOutlet NSButton    *enableDriveB;
+	IBOutlet NSButton    *driveB_NumberOfHeads;
 	IBOutlet NSButton    *autoInsertB;
 	IBOutlet NSButton    *fastFDC;
 	IBOutlet NSMatrix    *floppyWriteProtection;
-	IBOutlet NSTextField *defaultImagesLocation;		// T
-	IBOutlet NSTextField *hdImage;						// T
-	IBOutlet NSTextField *ideMasterHdImage;				// T
-	IBOutlet NSTextField *ideSlaveHdImage;				// T
-	IBOutlet NSTextField *gemdosImage;					// T
+	IBOutlet NSTextField *defaultImagesLocation;
+	IBOutlet NSTextField *hdImage;
+	IBOutlet NSTextField *ideMasterHdImage;
+	IBOutlet NSTextField *ideSlaveHdImage;
+	IBOutlet NSTextField *gemdosImage;
 	IBOutlet NSButton    *bootFromHD ;
 	IBOutlet NSMatrix    *HDWriteProtection;
 
+	IBOutlet NSButton *bFilenameConversion;
+	IBOutlet NSButton *nGemdosDrive;
 	// ROM
-	IBOutlet NSTextField *tosImage;						// T
-	IBOutlet NSTextField *cartridgeImage;				// T
+	IBOutlet NSTextField *tosImage;
+	IBOutlet NSTextField *cartridgeImage;
 	
 	// Atari screen
 	IBOutlet NSMatrix *monitor;
 	IBOutlet NSButton *useBorders;
 	IBOutlet NSButton *falconTTRatio;
 	IBOutlet NSButton *zoomSTLowRes;
-	IBOutlet NSButton *force8bpp;
 	IBOutlet NSButton *useVDIResolution;
 	IBOutlet NSMatrix *resolution;
 	IBOutlet NSMatrix *colorDepth;
@@ -51,8 +56,11 @@
 	IBOutlet NSTextField *maxZoomedWidth;				// N
 	IBOutlet NSTextField *maxZoomedHeight;				// N
 	IBOutlet NSButton *keepDesktopResolution;
-		// Hidestatus, Capture only, Avi codec, Avi FPS
+	IBOutlet NSButton *SDL2UseLinearScaling;
+	IBOutlet NSButton *SDL2Resizable ;
+	IBOutlet NSButton *SDL2UseVSync ;
 
+	// Hidestatus, Capture only, Avi codec, Avi FPS
 	// Sound
 	IBOutlet NSButton *enableSound;
 	IBOutlet NSMatrix *playbackQuality;
@@ -60,34 +68,30 @@
 
 	// System
     
-   
- 
 	IBOutlet NSMatrix *cpuType;
 	IBOutlet NSMatrix *cpuClock;
 	IBOutlet NSMatrix *machineType;
-	IBOutlet NSMatrix *ramSize;
-	IBOutlet NSButton *compatibleCpu; //bCompatibleCpu
+	IBOutlet NSMatrix *ramSize;					// ram size
+	IBOutlet NSButton *compatibleCpu; 			// bCompatibleCpu
 	IBOutlet NSButton *blitter;
 	IBOutlet NSButton *realTime;
 	IBOutlet NSButton *patchTimerD;
 	IBOutlet NSButton *FastBootPatch;
-    // for ENABLE_WINUAE_CPU CORE
-    IBOutlet NSButton *cycleExactCPU; //bCycleExactCpu
-    IBOutlet NSButton *MMU_Emulation;
-    IBOutlet NSButton *adressSpace24; //bAddressSpace24
-    __unsafe_unretained IBOutlet NSStepper *TTRAMSizeStepper;
-    __unsafe_unretained IBOutlet NSTextField *TTRAMSizeValue;
-    IBOutlet NSButton *CompatibleFPU;
-    IBOutlet NSMatrix *FPUType;
-    
-    __unsafe_unretained IBOutlet NSButtonCell *bCell68060;
+	IBOutlet NSPopUpButton *videoTiming;
+	// for ENABLE_WINUAE_CPU CORE
+	IBOutlet NSButton *cycleExactCPU;			//bCycleExactCpu
+	IBOutlet NSButton *MMU_Emulation;
+	IBOutlet NSButton *adressSpace24;			// bAddressSpace24
+	IBOutlet NSStepper *TTRAMSizeStepper; 		// MS 12-2016
+	IBOutlet NSTextField *TTRAMSizeValue;		// MS 12-2016
+	//IBOutlet NSButton *CompatibleFPU;
+	IBOutlet NSMatrix *FPUType;
 
-    
-		// load/save state
+	IBOutlet NSButtonCell *bCell68060;
+
+	// load/save state
 	IBOutlet NSPopUpButton *enableDSP;
-    
-    
-    
+ 
 	// Joysticks
 	IBOutlet NSPopUpButton *currentJoystick;
 	IBOutlet NSMatrix *joystickMode;
@@ -101,7 +105,8 @@
 
 	// Keyboard
 	IBOutlet NSMatrix *keyboardMapping;
-	IBOutlet NSTextField *keyboardMappingFile;			// T
+	IBOutlet NSTextField *keyboardMappingFile;
+        // T
 		// Disable Key Repeat
 
 	// Peripheral
@@ -112,15 +117,18 @@
 	IBOutlet NSTextField *readRS232FromFile;			// T
 	IBOutlet NSButton *enableMidi;
 	IBOutlet NSTextField *writeMidiToFile;				// T
+	__unsafe_unretained IBOutlet NSPopUpButton *midiInPort;
+	__unsafe_unretained IBOutlet NSPopUpButton *midiOutPort;
 
 	// Other
 
+	__unsafe_unretained IBOutlet NSButtonCell *confirmQuit;
 	IBOutlet NSButton *captureOnChange;
 	IBOutlet NSButton *interleaved;
 	IBOutlet NSSlider *nSpec512Treshold;
 	IBOutlet NSStepper *widthStepper;
 	IBOutlet NSStepper *heightStepper;
-	IBOutlet NSTextField *configFile;					// T ??
+	IBOutlet NSTextField *configFile;		// T ??
 
 	BOOL		bInitialized;
 	int			cRealJoysticks;