--- hatari/src/gui-osx/PrefsController.h	2019/04/01 07:14:42	1.1.1.3
+++ hatari/src/gui-osx/PrefsController.h	2019/04/09 08:55:20	1.1.1.10
@@ -1,73 +1,150 @@
 /*
   Hatari - PrefsController.h
 
-  This file is distributed under the GNU Public License, version 2 or at
-  your option any later version. Read the file gpl.txt for details.
+  This file is distributed under the GNU General Public License, version 2
+  or at your option any later version. Read the file gpl.txt for details.
 */
 
 #import <Cocoa/Cocoa.h>
 
+
 @interface PrefsController : NSObject
 {
-    IBOutlet NSWindow *window;
-    IBOutlet NSButton *autoInsertB;
-    IBOutlet NSButton *blitter;
-    IBOutlet NSButton *bootFromHD;
-    IBOutlet NSButton *captureOnChange;
-    IBOutlet NSTextField *cartridgeImage;
-    IBOutlet NSMatrix *colorDepth;
-    IBOutlet NSButton *compatibleCpu;
-    IBOutlet NSMatrix *cpuClock;
-    IBOutlet NSMatrix *cpuType;
-    IBOutlet NSPopUpButton *currentJoystick;
-    IBOutlet NSTextField *defaultImagesLocation;
-    IBOutlet NSButton *enableAutoFire;
-    IBOutlet NSButton *enableMidi;
-    IBOutlet NSButton *enablePrinter;
-    IBOutlet NSButton *enableRS232;
-    IBOutlet NSButton *enableSound;
-    IBOutlet NSTextField *floppyImageA;
-    IBOutlet NSTextField *floppyImageB;
-    IBOutlet NSButton *force8bpp;
-    IBOutlet NSButton *showStatusBar;
-    IBOutlet NSPopUpButton *frameSkip;
-    IBOutlet NSTextField *gemdosImage;
-    IBOutlet NSTextField *hdImage;
-    IBOutlet NSButton *interleaved;
-    IBOutlet NSPopUpButton *joystickDown;
-    IBOutlet NSPopUpButton *joystickFire;
-    IBOutlet NSPopUpButton *joystickLeft;
-    IBOutlet NSMatrix *joystickMode;
-    IBOutlet NSPopUpButton *joystickRight;
-    IBOutlet NSPopUpButton *joystickUp;
-    IBOutlet NSMatrix *keyboardMapping;
-    IBOutlet NSTextField *keyboardMappingFile;
-    IBOutlet NSMatrix *machineType;
-    IBOutlet NSMatrix *monitor;
-    IBOutlet NSButton *patchTimerD;
-    IBOutlet NSPopUpButton *enableDSP;
-    IBOutlet NSMatrix *playbackQuality;
-    IBOutlet NSTextField *printToFile;
-    IBOutlet NSMatrix *ramSize;
-    IBOutlet NSTextField *readRS232FromFile;
-    IBOutlet NSPopUpButton *realJoystick;
-    IBOutlet NSButton *realTime;
-    IBOutlet NSMatrix *resolution;
-    IBOutlet NSButton *slowFDC;
-    IBOutlet NSTextField *tosImage;
-    IBOutlet NSButton *useBorders;
-    IBOutlet NSButton *useVDIResolution;
-    IBOutlet NSTextField *writeMidiToFile;
-    IBOutlet NSMatrix *writeProtection;
-    IBOutlet NSTextField *writeRS232ToFile;
-    IBOutlet NSButton *zoomSTLowRes;
-    IBOutlet NSSlider *nSpec512Treshold;
-
-    IBOutlet NSTextField *configFile;
-
-	BOOL bInitialized;
-	int cRealJoysticks;
-	int nCurrentJoystick;
+	// Preferences window
+	IBOutlet NSWindow *window ;
+	IBOutlet NSView   *partage ;						// add
+	IBOutlet NSView   *hartage ;						// add
+
+	// Disks
+	IBOutlet NSTextField *floppyImageA;					// T
+	IBOutlet NSTextField *floppyImageB;					// T
+	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 NSButton    *bootFromHD ;
+	IBOutlet NSMatrix    *HDWriteProtection;
+
+	// ROM
+	IBOutlet NSTextField *tosImage;						// T
+	IBOutlet NSTextField *cartridgeImage;				// T
+	
+	// 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;
+
+	// Display
+	IBOutlet NSButton *showStatusBar;
+	IBOutlet NSButton *fullScreen;
+	IBOutlet NSButton *ledDisks;
+	IBOutlet NSPopUpButton *frameSkip;
+	IBOutlet NSTextField *maxZoomedWidth;				// N
+	IBOutlet NSTextField *maxZoomedHeight;				// N
+	IBOutlet NSButton *keepDesktopResolution;
+		// Hidestatus, Capture only, Avi codec, Avi FPS
+
+	// Sound
+	IBOutlet NSButton *enableSound;
+	IBOutlet NSMatrix *playbackQuality;
+	IBOutlet NSMatrix *YMVoicesMixing;
+
+	// System
+    
+   
+ 
+	IBOutlet NSMatrix *cpuType;
+	IBOutlet NSMatrix *cpuClock;
+	IBOutlet NSMatrix *machineType;
+	IBOutlet NSMatrix *ramSize;
+	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;
+
+    
+		// load/save state
+	IBOutlet NSPopUpButton *enableDSP;
+    
+    
+    
+	// Joysticks
+	IBOutlet NSPopUpButton *currentJoystick;
+	IBOutlet NSMatrix *joystickMode;
+	IBOutlet NSPopUpButton *realJoystick;
+	IBOutlet NSPopUpButton *joystickUp;
+	IBOutlet NSPopUpButton *joystickRight;
+	IBOutlet NSPopUpButton *joystickDown;
+	IBOutlet NSPopUpButton *joystickLeft;
+	IBOutlet NSPopUpButton *joystickFire;
+	IBOutlet NSButton *enableAutoFire;
+
+	// Keyboard
+	IBOutlet NSMatrix *keyboardMapping;
+	IBOutlet NSTextField *keyboardMappingFile;			// T
+		// Disable Key Repeat
+
+	// Peripheral
+	IBOutlet NSButton *enablePrinter;
+	IBOutlet NSTextField *printToFile;					// T
+	IBOutlet NSButton *enableRS232;
+	IBOutlet NSTextField *writeRS232ToFile;				// T
+	IBOutlet NSTextField *readRS232FromFile;			// T
+	IBOutlet NSButton *enableMidi;
+	IBOutlet NSTextField *writeMidiToFile;				// T
+
+	// Other
+
+	IBOutlet NSButton *captureOnChange;
+	IBOutlet NSButton *interleaved;
+	IBOutlet NSSlider *nSpec512Treshold;
+	IBOutlet NSStepper *widthStepper;
+	IBOutlet NSStepper *heightStepper;
+	IBOutlet NSTextField *configFile;					// T ??
+
+	BOOL		bInitialized;
+	int			cRealJoysticks;
+	int			nCurrentJoystick;
+
+	BOOL		applyChanges ;							// moved from  
+	NSOpenPanel	*opnPanel ;
+	NSSavePanel *savPanel ;
+
+	NSMutableString		*cartridge ;
+	NSMutableString		*imgeDir ;
+	NSMutableString		*floppyA ;
+	NSMutableString		*floppyB ;
+	NSMutableString		*gemdos ;
+	NSMutableString		*hrdDisk ;
+	NSMutableString		*masterIDE ;
+	NSMutableString		*slaveIDE ;
+	NSMutableString		*keyboard ;
+	NSMutableString		*midiOut ;
+	NSMutableString		*printit ;
+	NSMutableString		*rs232In ;
+	NSMutableString		*rs232Out ;
+	NSMutableString		*TOS ;
+	NSMutableString		*configNm ;
 }
 - (IBAction)changeViewedJoystick:(id)sender;
 - (IBAction)chooseCartridgeImage:(id)sender;
@@ -76,6 +153,8 @@
 - (IBAction)chooseFloppyImageB:(id)sender;
 - (IBAction)chooseGemdosImage:(id)sender;
 - (IBAction)chooseHdImage:(id)sender;
+- (IBAction)chooseIdeMasterHdImage:(id)sender;
+- (IBAction)chooseIdeSlaveHdImage:(id)sender;
 - (IBAction)chooseKeyboardMappingFile:(id)sender;
 - (IBAction)chooseMidiOutputFile:(id)sender;
 - (IBAction)choosePrintToFile:(id)sender;
@@ -87,16 +166,30 @@
 - (IBAction)ejectFloppyB:(id)sender;
 - (IBAction)ejectGemdosImage:(id)sender;
 - (IBAction)ejectHdImage:(id)sender;
+- (IBAction)ejectIdeMasterHdImage:(id)sender;
+- (IBAction)ejectIdeSlaveHdImage:(id)sender;
 - (IBAction)loadPrefs:(id)sender;
 - (IBAction)saveConfigAs:(id)sender;
 - (IBAction)loadConfigFrom:(id)sender;
+- (IBAction)aller:(id)sender ;						// add
+- (IBAction)halle:(id)sender ;						// add
+- (IBAction)finished:(id)sender;					// add
+
 - (void)setAllControls;
 - (void)saveAllControls;
-- (void)insertFloppyImageIntoDrive:(int)drive forTextField:(NSTextField*)floppyTextField;
-- (BOOL)choosePathForControl:(NSTextField*)textField chooseDirectories:(bool)chooseDirectories defaultInitialDir:(NSString*)defaultInitialDir;
+- (void)insertFloppyImageIntoDrive:(int)drive forTextField:(NSTextField*)floppyTextField  realPath:(NSMutableString *)realPath ;
+- (BOOL)choosePathForControl:(NSTextField*)textField chooseDirectories:(BOOL)chooseDirectories defaultInitialDir:(NSString*)defaultInitialDir 
+																					mutString:(NSMutableString *)mutString what:(NSArray *)what ;
 - (void)initKeysDropDown:(NSPopUpButton*)dropDown;
 - (void)setJoystickControls;
 - (void)saveJoystickControls;
 - (IBAction)updateEnabledStates:(id)sender;
+- (IBAction)setWidth:(id)sender;
+- (IBAction)setHeight:(id)sender;
+//System RAM Stepper
+- (IBAction)setTTRAMSize:(id)sender;
+
+
++(PrefsController*)prefs ;
 
 @end