From: Toni Wilen <twilen@winuae.net>
Date: Fri, 3 Jul 2020 09:46:21 +0000 (+0300)
Subject: 4400
X-Git-Tag: 4400^0
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=c7b24b37f63de170d8e8d8225d5441fd488b1a5f;p=francis%2Fwinuae.git

4400
---

diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc
index 2ac2ba9f..9074396d 100644
--- a/od-win32/resources/winuae_minimal.rc
+++ b/od-win32/resources/winuae_minimal.rc
@@ -1169,7 +1169,7 @@ IDD_DEBUGGER DIALOGEX 0, 0, 454, 368
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT
 CAPTION "WinUAE Debugger"
-FONT 8, "MS Sans Serif", 0, 0, 0x0
+FONT 8, "Courier New", 0, 0, 0x0
 BEGIN
     LISTBOX         IDC_DBG_DREG,1,1,52,66,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT
     LISTBOX         IDC_DBG_AREG,54,1,52,66,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT
@@ -1396,8 +1396,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,3,0,0
- PRODUCTVERSION 4,3,0,0
+ FILEVERSION 4,4,0,0
+ PRODUCTVERSION 4,4,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1413,12 +1413,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "4.3.0.0"
+            VALUE "FileVersion", "4.4.0.0"
             VALUE "InternalName", "WinUAE"
-            VALUE "LegalCopyright", "© 1996-2019 under the GNU Public License (GPL)"
+            VALUE "LegalCopyright", "© 1996-2020 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "4.3.0.0"
+            VALUE "ProductVersion", "4.4.0.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -1515,6 +1515,7 @@ BEGIN
     END
 END
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // DESIGNINFO
@@ -1543,7 +1544,6 @@ BEGIN
 
     IDD_CPU, DIALOG
     BEGIN
-        BOTTOMMARGIN, 316
     END
 
     IDD_FLOPPY, DIALOG
@@ -1886,7 +1886,7 @@ BEGIN
     IDS_MUSTSELECTCONFIGFORDELETE 
                             "You must select a configuration or enter a name before selecting Delete...\n"
     IDS_DELETECONFIGCONFIRMATION 
-                            "Are you sure you want to Delete configuration '%s'?\n"
+                            "Are you sure you want to Delete configuration\n%s?\n"
     IDS_DELETECONFIGTITLE   "Confirm Delete"
     IDS_MUSTSELECTPATH      "You must select a path!"
     IDS_SETTINGSERROR       "Settings error"
@@ -2103,6 +2103,10 @@ BEGIN
     IDS_GENERIC             "Generic"
     IDS_AUTODETECT          "Autodetect"
     IDS_OFF                 "off"
+    IDS_DELETECONFIGDIRCONFIRMATION 
+                            "Delete empty configuration directory\n%s\n"
+    IDS_DELETECONFIGDIRNOTEMPTY 
+                            "Only empty configuration directory can be deleted."
 END
 
 STRINGTABLE
@@ -2127,7 +2131,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_MISCLISTITEMS4      "Windows shutdown/logoff notification\nWarn when attempting to close window\nPower led dims when audio filter is disabled\nAutomatically capture mouse when window is activated\n"
+    IDS_MISCLISTITEMS4      "Windows shutdown/logoff notification\nWarn when attempting to close window\nPower led dims when audio filter is disabled\nAutomatically capture mouse when window is activated\nDebug memory space\n"
     IDS_SHUTDOWN_NOTIFICATION "Emulation session active"
     IDS_QUIT_WARNING        "Are you sure you want to quit WinUAE?"
     IDS_UNMAPPED_ADDRESS    "Floating\nAll zeros\nAll ones\n"
diff --git a/od-win32/win32.h b/od-win32/win32.h
index 974e70f8..a5d88381 100644
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -25,13 +25,13 @@
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2020, 6, 28)
+#define WINUAEDATE MAKEBD(2020, 7, 1)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
 
 #ifndef WINUAEEXTRA
-#define WINUAEEXTRA _T("RC2")
+#define WINUAEEXTRA _T("")
 #endif
 #ifndef WINUAEREV
 #define WINUAEREV _T("")
diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index e16d1df9..2b842d7f 100644
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,5 @@
 
+4.4.0
 
 Beta 9 (RC2):
 
diff --git a/od-win32/wix/Product.wxs b/od-win32/wix/Product.wxs
index 6492503e..f83f0905 100644
--- a/od-win32/wix/Product.wxs
+++ b/od-win32/wix/Product.wxs
@@ -2,8 +2,8 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
   <?define ProductName = "WinUAE" ?>
-  <?define ProductVersion = "4.3.0" ?>
-  <?define ProductFullVersion = "4.3.0.0" ?>
+  <?define ProductVersion = "4.4.0" ?>
+  <?define ProductFullVersion = "4.4.0.0" ?>
   <?define ProductAuthor = "Arabuusimiehet" ?>
 
   <?if $(var.Platform) = x64 ?>