--- hatari/src/includes/dialog.h	2019/04/01 07:09:16	1.1
+++ hatari/src/includes/dialog.h	2019/04/01 07:10:18	1.1.1.3
@@ -11,18 +11,6 @@ typedef struct {
   int nGEMColours;
 } DLG_TOSGEM;
 
-enum {
-  GEMRES_640x480,
-  GEMRES_800x600,
-  GEMRES_1024x768
-};
-
-enum {
-  GEMCOLOUR_2,
-  GEMCOLOUR_4,
-  GEMCOLOUR_16
-};
-
 
 /* Dialog Sound */
 typedef struct {
@@ -55,7 +43,7 @@ enum {
 /* Dialog Keyboard */
 typedef struct {
   BOOL bDisableKeyRepeat;
-  int ShortCuts[2][3];                // F11+F12, NORMAL+SHIFT+CTRL
+  int ShortCuts[2][3];     /* F11+F12, NORMAL+SHIFT+CTRL */
   char szMappingFileName[MAX_FILENAME_LENGTH];
 } DLG_KEYBOARD;
 
@@ -93,7 +81,6 @@ typedef struct {
 } JOYSTICK;
 
 typedef struct {
-  BOOL bUseDirectInput;
   JOYSTICK Joy[2];
 } DLG_JOYSTICKS;
 
@@ -120,14 +107,15 @@ enum {
 };
 
 
-/* Dialog hard disc image */
-#define MAX_HARDDRIVES  4
+/* Dialog hard discs */
+#define MAX_HARDDRIVES  1
 #define DRIVELIST_TO_DRIVE_INDEX(DriveList)  (DriveList+1)
 typedef struct {
   int nDriveList;
   BOOL bBootFromHardDisc;
   int nHardDiscDir;
   char szHardDiscDirectories[MAX_HARDDRIVES][MAX_FILENAME_LENGTH];
+  char szHardDiscImage[MAX_FILENAME_LENGTH];
 } DLG_HARDDISC;
 
 enum {
@@ -174,10 +162,19 @@ typedef struct {
 } DLG_PRINTER;
 
 
+/* Dialog System */
+typedef struct {
+  int nCpuLevel;
+  BOOL bCompatibleCpu;
+  BOOL bAddressSpace24;
+  BOOL bBlitter;                /* TRUE if blitter is enabled */
+} DLG_SYSTEM;
+
+
 /* State of system is stored in this structure */
 /* On reset, variables are copied into system globals and used. */
 typedef struct {
-  // Configure
+  /* Configure */
   DLG_CONFIGURE Configure;
   DLG_SCREEN Screen;
   DLG_JOYSTICKS Joysticks;
@@ -189,48 +186,12 @@ typedef struct {
   DLG_TOSGEM TOSGEM;
   DLG_RS232 RS232;
   DLG_PRINTER Printer;
+  DLG_SYSTEM System;
 } DLG_PARAMS;
 
-enum {
-  DIALOG_PAGE_CONFIGURE,
-  DIALOG_PAGE_SCREEN,
-  DIALOG_PAGE_JOYSTICKS,
-  DIALOG_PAGE_KEYBOARD,
-  DIALOG_PAGE_SOUND,
-  DIALOG_PAGE_MEMORY,
-  DIALOG_PAGE_DISCIMAGE,
-  DIALOG_PAGE_HARDDISC,
-  DIALOG_PAGE_TOSGEM,
-  DIALOG_PAGE_RS232,
-  DIALOG_PAGE_PRINTER
-};
-
-extern DLG_PARAMS ConfigureParams,DialogParams;
-extern BOOL bOKDialog;
-extern int nLastOpenPage;
+
+extern DLG_PARAMS ConfigureParams, DialogParams;
 
 extern void Dialog_DefaultConfigurationDetails(void);
 extern void Dialog_CopyDetailsFromConfiguration(BOOL bReset);
-extern BOOL Dialog_DoProperty(int StartingPage,BOOL bForceReset);
-//extern void Dialog_SetButton(HWND hDlg,int ButtonID,int Flag);
-//extern BOOL Dialog_ReadButton(HWND hDlg,int ButtonID);
-//extern void Dialog_EnableItem(HWND hDlg,int ButtonID,int State);
-//extern void Dialog_EnableItems(HWND hDlg,int *pButtonIDs,int State);
-//extern void Dialog_ShowItemRange(HWND hDlg,int LowButtonID,int HighButtonID,int Show);
-//extern void Dialog_SetText(HWND hDlg,int ButtonID,char *szString);
-#if 0
-extern void Dialog_ReadText(HWND hDlg,int ButtonID,char *szString);
-extern void Dialog_SetTrackBar(HWND hDlg, int nTrackBarID, int nMin, int nMax, int nSelected);
-extern int Dialog_GetTrackBar(HWND hDlg, int nTrackBarID);
-extern void Dialog_SetComboBoxItems(HWND hDlg, int ComboBoxID, char *pComboBoxStrings[], int nSelectedItem);
-extern void Dialog_ComboBoxSelectString(HWND hDlg, int ComboBoxID, char *pszSelectedString);
-extern int Dialog_GetSelectedComboBoxItem(HWND hDlg, int ComboBoxID);
-extern void Dialog_SetListBoxItems(HWND hDlg, int ListBoxID, char *pListBoxStrings[], int nSelectedItem);
-extern int Dialog_GetSelectedListBoxItem(HWND hDlg, int ListBoxID);
-extern int Dialog_SetSpinList(HWND hDlg, int nEditBoxID, int nSpinID, char *pSpinStrings[], int nItems, int nSelectedItem);
-extern int Dialog_GetSpinList(HWND hDlg, int nSpinID);
-extern int Dialog_UpdateSpinList(HWND hDlg, int nEditBoxID, char *pSpinStrings[], int nNumSpinItems, int nNewSelectedItem);
-extern void Dialog_SetRadioButtons(HWND hDlg,int StartButtonID,int EndButtonID,int nSelectedItem);
-extern int Dialog_ReadRadioButtons(HWND hDlg,int StartButtonID,int EndButtonID);
-extern void Dialog_AddListViewColumn(HWND hDlg, int ListViewID, int Order, char *pString, int Width);
-#endif
+extern BOOL Dialog_DoProperty(void);