--- hatari/src/gui-sdl/dlgMain.c	2019/04/09 08:53:30	1.1.1.12
+++ hatari/src/gui-sdl/dlgMain.c	2019/04/09 08:57:08	1.1.1.14
@@ -15,8 +15,8 @@ const char DlgMain_fileid[] = "Hatari dl
 #include "screen.h"
 
 
-#define MAINDLG_ABOUT    2
-#define MAINDLG_SYSTEM   3
+#define MAINDLG_SYSTEM   2
+#define MAINDLG_CPU      3
 #define MAINDLG_ROM      4
 #define MAINDLG_MEMORY   5
 #define MAINDLG_FLOPPYS  6
@@ -27,13 +27,14 @@ const char DlgMain_fileid[] = "Hatari dl
 #define MAINDLG_KEYBD    11
 #define MAINDLG_DEVICES  12
 #define MAINDLG_SOUND    13
-#define MAINDLG_LOADCFG  14
-#define MAINDLG_SAVECFG  15
-#define MAINDLG_NORESET  16
-#define MAINDLG_RESET    17
-#define MAINDLG_OK       18
-#define MAINDLG_QUIT     19
-#define MAINDLG_CANCEL   20
+#define MAINDLG_ABOUT    14
+#define MAINDLG_LOADCFG  15
+#define MAINDLG_SAVECFG  16
+#define MAINDLG_NORESET  17
+#define MAINDLG_RESET    18
+#define MAINDLG_OK       19
+#define MAINDLG_QUIT     20
+#define MAINDLG_CANCEL   21
 
 
 /* The main dialog: */
@@ -41,26 +42,27 @@ static SGOBJ maindlg[] =
 {
 	{ SGBOX, 0, 0, 0,0, 50,19, NULL },
 	{ SGTEXT, 0, 0, 17,1, 16,1, "Hatari main menu" },
-	{ SGBUTTON, 0, 0, 2,4, 13,1, "About" },
-	{ SGBUTTON, 0, 0, 2,6, 13,1, "System" },
-	{ SGBUTTON, 0, 0, 2,8, 13,1, "ROM" },
-	{ SGBUTTON, 0, 0, 2,10, 13,1, "Memory" },
-	{ SGBUTTON, 0, 0, 17,4, 16,1, "Floppy disks" },
-	{ SGBUTTON, 0, 0, 17,6, 16,1, "Hard disks" },
-	{ SGBUTTON, 0, 0, 17,8, 16,1, "Atari screen" },
-	{ SGBUTTON, 0, 0, 17,10, 16,1, "Hatari screen" },
-	{ SGBUTTON, 0, 0, 35,4, 13,1, "Joysticks" },
-	{ SGBUTTON, 0, 0, 35,6, 13,1, "Keyboard" },
-	{ SGBUTTON, 0, 0, 35,8, 13,1, "Devices" },
-	{ SGBUTTON, 0, 0, 35,10, 13,1, "Sound" },
-	{ SGBUTTON, 0, 0, 7,13, 16,1, "Load config." },
-	{ SGBUTTON, 0, 0, 27,13, 16,1, "Save config." },
-	{ SGRADIOBUT, 0, 0, 3,15, 15,1, "No Reset" },
-	{ SGRADIOBUT, 0, 0, 3,17, 15,1, "Reset machine" },
+	{ SGBUTTON, 0, 0,  2, 4, 13,1, "S_ystem" },
+	{ SGBUTTON, 0, 0,  2, 6, 13,1, "CP_U" },
+	{ SGBUTTON, 0, 0,  2, 8, 13,1, "_ROM" },
+	{ SGBUTTON, 0, 0,  2,10, 13,1, "_Memory" },
+	{ SGBUTTON, 0, 0, 17, 4, 16,1, "_Floppy disks" },
+	{ SGBUTTON, 0, 0, 17, 6, 16,1, "Hard _disks" },
+	{ SGBUTTON, 0, 0, 17, 8, 16,1, "_Atari screen" },
+	{ SGBUTTON, 0, 0, 17,10, 16,1, "_Hatari screen" },
+	{ SGBUTTON, 0, 0, 35, 4, 13,1, "_Joysticks" },
+	{ SGBUTTON, 0, 0, 35, 6, 13,1, "_Keyboard" },
+	{ SGBUTTON, 0, 0, 35, 8, 13,1, "D_evices" },
+	{ SGBUTTON, 0, 0, 35,10, 13,1, "S_ound" },
+	{ SGBUTTON, 0, 0,  2,13, 13,1, "A_bout" },
+	{ SGBUTTON, 0, 0, 17,13, 16,1, "_Load config" },
+	{ SGBUTTON, 0, 0, 35,13, 13,1, "_Save config" },
+	{ SGRADIOBUT, 0, 0, 3,15, 10,1, "_No Reset" },
+	{ SGRADIOBUT, 0, 0, 3,17, 15,1, "Reset ma_chine" },
 	{ SGBUTTON, SG_DEFAULT, 0, 21,15, 8,3, "OK" },
-	{ SGBUTTON, 0, 0, 36,15, 10,1, "Quit" },
+	{ SGBUTTON, 0, 0, 36,15, 10,1, "_Quit" },
 	{ SGBUTTON, SG_CANCEL, 0, 36,17, 10,1, "Cancel" },
-	{ -1, 0, 0, 0,0, 0,0, NULL }
+	{ SGSTOP, 0, 0, 0,0, 0,0, NULL }
 };
 
 
@@ -91,12 +93,15 @@ int Dialog_MainDlg(bool *bReset, bool *b
 
 	do
 	{
-		retbut = SDLGui_DoDialog(maindlg, NULL);
+		retbut = SDLGui_DoDialog(maindlg, NULL, false);
 		switch (retbut)
 		{
 		 case MAINDLG_ABOUT:
 			Dialog_AboutDlg();
 			break;
+		 case MAINDLG_CPU:
+			DlgCpu_Main();
+			break;
 		 case MAINDLG_FLOPPYS:
 			DlgFloppy_Main();
 			break;
@@ -113,7 +118,7 @@ int Dialog_MainDlg(bool *bReset, bool *b
 			Dialog_WindowDlg();
 			break;
 		 case MAINDLG_SYSTEM:
-			Dialog_SystemDlg();
+			DlgSystem_Main();
 			break;
 		 case MAINDLG_MEMORY:
 			if (Dialog_MemDlg())
@@ -121,7 +126,7 @@ int Dialog_MainDlg(bool *bReset, bool *b
 				/* Memory snapshot has been loaded - leave GUI immediately */
 				*bLoadedSnapshot = true;
 				SDL_ShowCursor(bOldMouseVisibility);
-				Main_WarpMouse(nOldMouseX, nOldMouseY);
+				Main_WarpMouse(nOldMouseX, nOldMouseY, true);
 				return true;
 			}
 			break;
@@ -138,7 +143,7 @@ int Dialog_MainDlg(bool *bReset, bool *b
 			Dialog_SoundDlg();
 			break;
 		 case MAINDLG_LOADCFG:
-			psNewCfg = SDLGui_FileSelect(sConfigFileName, NULL, false);
+			psNewCfg = SDLGui_FileSelect("Load configuration:", sConfigFileName, NULL, false);
 			if (psNewCfg)
 			{
 				strcpy(sConfigFileName, psNewCfg);
@@ -147,7 +152,7 @@ int Dialog_MainDlg(bool *bReset, bool *b
 			}
 			break;
 		 case MAINDLG_SAVECFG:
-			psNewCfg = SDLGui_FileSelect(sConfigFileName, NULL, true);
+			psNewCfg = SDLGui_FileSelect("Save configuration:", sConfigFileName, NULL, true);
 			if (psNewCfg)
 			{
 				strcpy(sConfigFileName, psNewCfg);
@@ -168,7 +173,7 @@ int Dialog_MainDlg(bool *bReset, bool *b
 		*bReset = true;
 
 	SDL_ShowCursor(bOldMouseVisibility);
-	Main_WarpMouse(nOldMouseX, nOldMouseY);
+	Main_WarpMouse(nOldMouseX, nOldMouseY, true);
 
 	return (retbut == MAINDLG_OK);
 }