3.8.2

Fix initial settings for copy/paste method

Author: itagagaki

Charu3.rc

@@ -925,8 +925,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,8,1,0
- PRODUCTVERSION 3,8,1,0
+ FILEVERSION 3,8,2,0
+ PRODUCTVERSION 3,8,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -944,12 +944,12 @@ BEGIN
             VALUE "Comments", "Text input assistant"
             VALUE "CompanyName", "C+ Factory / Itagaki Fumihiko"
             VALUE "FileDescription", "Charu3(Clipbord and High Amenity Routine for Utility 3) Successor Edition"
-            VALUE "FileVersion", "3.8.1.0"
+            VALUE "FileVersion", "3.8.2.0"
             VALUE "InternalName", "Charu3 SE"
             VALUE "LegalCopyright", "Copyright (C) 1998-2003 matsumoto keizi, 2021-2023 Itagaki Fumihiko"
             VALUE "OriginalFilename", "Charu3.EXE"
             VALUE "ProductName", "Charu3 SE"
-            VALUE "ProductVersion", "3.8.1.0"
+            VALUE "ProductVersion", "3.8.2.0"
         END
     END
     BLOCK "VarFileInfo"

Init.cpp

@@ -26,7 +26,7 @@ namespace {
 	{
 		nlohmann::json snippets;
 		try { snippets = nlohmann::json::parse(std::ifstream(filePath)); }
-		catch (...) {}
+		catch (...) { snippets = nlohmann::json(); }
 		for (nlohmann::json::iterator it = snippets.begin(); it != snippets.end(); it++) {
 			nlohmann::json jnode = it.value();
 			MACRO_STRUCT snippet;
@@ -115,7 +115,7 @@ void CInit::initialize()
 
 	// read state
 	try { m_state = nlohmann::json::parse(std::ifstream(m_strStateFile)); }
-	catch (...) {}
+	catch (...) { m_state = nlohmann::json(); }
 
 	m_strDataPath = CGeneral::getSettingCString(m_state, "data.path", _T(""));
 	m_strDataFormat = CGeneral::getSettingCString(m_state, "data.format", DAT_FORMAT);
@@ -135,7 +135,7 @@ void CInit::initialize()
 
 	// read settings
 	try { m_settings = nlohmann::json::parse(std::ifstream(m_strSettingsFile)); }
-	catch (...) {}
+	catch (...) { m_settings = nlohmann::json(); }
 
 	m_etc.m_bPutBackClipboard = CGeneral::getSettingBool(m_settings, "clipboard.putBackAfterPasting", false);
 	m_nClipboardOpenDelay = static_cast<int>(CGeneral::getSettingNumber(m_settings, "clipboard.openDelay", 0));

Init.h

@@ -129,28 +129,36 @@ struct COPYPASTE_KEY
 
 	COPYPASTE_KEY()
 		: m_nMessage(0)
-		, m_uMod_Paste(0)
-		, m_uVK_Paste(0)
-		, m_uMod_Copy(0)
-		, m_uVK_Copy(0)
+		, m_uMod_Paste(MOD_CONTROL)
+		, m_uVK_Paste('V')
+		, m_uMod_Copy(MOD_CONTROL)
+		, m_uVK_Copy('C')
 		, m_copyMessage(WINDOWS_MESSAGE())
 		, m_pasteMessage(WINDOWS_MESSAGE())
-		, m_nCopyWait(0)
-		, m_nPasteWait(0)
+		, m_nCopyWait(50)
+		, m_nPasteWait(50)
 	{
 	}
 
 	COPYPASTE_KEY(nlohmann::json& obj)
+		: m_nMessage(0)
+		, m_uMod_Paste(MOD_CONTROL)
+		, m_uVK_Paste('V')
+		, m_uMod_Copy(MOD_CONTROL)
+		, m_uVK_Copy('C')
+		, m_copyMessage(WINDOWS_MESSAGE())
+		, m_pasteMessage(WINDOWS_MESSAGE())
+		, m_nCopyWait(50)
+		, m_nPasteWait(50)
 	{
-		COPYPASTE_KEY();
 		if (obj.is_object()) {
 			m_nMessage = static_cast<int>(CGeneral::getSettingNumber(obj, "method", 0));
-			m_uMod_Copy = static_cast<UINT>(CGeneral::getSettingNumber(obj, "copy.keyCode", 0));
-			m_uVK_Copy = static_cast<UINT>(CGeneral::getSettingNumber(obj, "copy.keyModifier", 0));
-			m_nCopyWait = static_cast<int>(CGeneral::getSettingNumber(obj, "copy.delay", 0));
-			m_uMod_Paste = static_cast<UINT>(CGeneral::getSettingNumber(obj, "paste.keyCode", 0));
-			m_uVK_Paste = static_cast<UINT>(CGeneral::getSettingNumber(obj, "paste.keyModifier", 0));
-			m_nPasteWait = static_cast<int>(CGeneral::getSettingNumber(obj, "paste.delay", 0));
+			m_uMod_Copy = static_cast<UINT>(CGeneral::getSettingNumber(obj, "copy.keyCode", 'C'));
+			m_uVK_Copy = static_cast<UINT>(CGeneral::getSettingNumber(obj, "copy.keyModifier", MOD_CONTROL));
+			m_nCopyWait = static_cast<int>(CGeneral::getSettingNumber(obj, "copy.delay", 50));
+			m_uMod_Paste = static_cast<UINT>(CGeneral::getSettingNumber(obj, "paste.keyCode", 'V'));
+			m_uVK_Paste = static_cast<UINT>(CGeneral::getSettingNumber(obj, "paste.keyModifier", MOD_CONTROL));
+			m_nPasteWait = static_cast<int>(CGeneral::getSettingNumber(obj, "paste.delay", 50));
 
 			nlohmann::json msg;
 			msg = obj["copy.message"];