From b5b76310d47cf00f64475d8db661cbda56bc8759 Mon Sep 17 00:00:00 2001
From: mrexodia <mr.exodia.tpodt@gmail.com>
Date: Fri, 18 Nov 2016 18:13:19 +0100
Subject: [PATCH] GUI: undocumented AsciiSeparator setting
 https://i.imgur.com/Ri7Czrg.png

---
 src/gui/Src/BasicView/Disassembly.cpp |  2 +-
 src/gui/Src/BasicView/HexDump.cpp     |  4 ++--
 src/gui/Src/Gui/CPUDisassembly.cpp    |  2 +-
 src/gui/Src/Gui/CPUDump.cpp           | 12 ++++++++----
 src/gui/Src/Gui/CPUDump.h             |  1 +
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/gui/Src/BasicView/Disassembly.cpp b/src/gui/Src/BasicView/Disassembly.cpp
index 531a2b58..cfaf849d 100644
--- a/src/gui/Src/BasicView/Disassembly.cpp
+++ b/src/gui/Src/BasicView/Disassembly.cpp
@@ -35,7 +35,7 @@ Disassembly::Disassembly(QWidget* parent) : AbstractTableView(parent), mDisassem
 
     mCodeFoldingManager = nullptr;
     duint setting;
-    if(BridgeSettingGetUint("GUI", "DisableBranchDestinationPreview", &setting))
+    if(BridgeSettingGetUint("Gui", "DisableBranchDestinationPreview", &setting))
         mPopupEnabled = !setting;
     else
         mPopupEnabled = true;
diff --git a/src/gui/Src/BasicView/HexDump.cpp b/src/gui/Src/BasicView/HexDump.cpp
index e51d6457..9db09069 100644
--- a/src/gui/Src/BasicView/HexDump.cpp
+++ b/src/gui/Src/BasicView/HexDump.cpp
@@ -57,9 +57,9 @@ void HexDump::updateColors()
 void HexDump::updateFonts()
 {
     duint setting;
-    if(BridgeSettingGetUint("GUI", "NonprintReplaceCharacter", &setting))
+    if(BridgeSettingGetUint("Gui", "NonprintReplaceCharacter", &setting))
         mNonprintReplace = QChar(uint(setting));
-    if(BridgeSettingGetUint("GUI", "NullReplaceCharacter", &setting))
+    if(BridgeSettingGetUint("Gui", "NullReplaceCharacter", &setting))
         mNullReplace = QChar(uint(setting));
     setFont(ConfigFont("HexDump"));
     invalidateCachedFont();
diff --git a/src/gui/Src/Gui/CPUDisassembly.cpp b/src/gui/Src/Gui/CPUDisassembly.cpp
index f9830fe0..984f4f38 100644
--- a/src/gui/Src/Gui/CPUDisassembly.cpp
+++ b/src/gui/Src/Gui/CPUDisassembly.cpp
@@ -1897,7 +1897,7 @@ void CPUDisassembly::togglePreviewSlot()
     if(mPopupEnabled == true)
         ShowDisassemblyPopup(0, 0, 0);
     mPopupEnabled = !mPopupEnabled;
-    BridgeSettingSetUint("GUI", "DisableBranchDestinationPreview", !mPopupEnabled);
+    BridgeSettingSetUint("Gui", "DisableBranchDestinationPreview", !mPopupEnabled);
 }
 
 void CPUDisassembly::analyzeModuleSlot()
diff --git a/src/gui/Src/Gui/CPUDump.cpp b/src/gui/Src/Gui/CPUDump.cpp
index 69ca3779..d9b6ec85 100644
--- a/src/gui/Src/Gui/CPUDump.cpp
+++ b/src/gui/Src/Gui/CPUDump.cpp
@@ -22,6 +22,10 @@ CPUDump::CPUDump(CPUDisassembly* disas, CPUMultiDump* multiDump, QWidget* parent
     mDisas = disas;
     mMultiDump = multiDump;
 
+    duint setting;
+    if(BridgeSettingGetUint("Gui", "AsciiSeparator", &setting))
+        mAsciiSeparator = setting & 0xF;
+
     setView((ViewEnum_t)ConfigUint("HexDump", "DefaultView"));
 
     connect(this, SIGNAL(selectionUpdated()), this, SLOT(selectionUpdatedSlot()));
@@ -506,7 +510,7 @@ void CPUDump::hexAsciiSlot()
 
     wColDesc.isData = true; //hex byte
     wColDesc.itemCount = 16;
-    wColDesc.separator = 4;
+    wColDesc.separator = mAsciiSeparator ? mAsciiSeparator : 4;
     dDesc.itemSize = Byte;
     dDesc.byteMode = HexByte;
     wColDesc.data = dDesc;
@@ -540,7 +544,7 @@ void CPUDump::hexUnicodeSlot()
 
     wColDesc.isData = true; //hex byte
     wColDesc.itemCount = 16;
-    wColDesc.separator = 4;
+    wColDesc.separator = mAsciiSeparator ? mAsciiSeparator : 4;
     dDesc.itemSize = Byte;
     dDesc.byteMode = HexByte;
     wColDesc.data = dDesc;
@@ -578,7 +582,7 @@ void CPUDump::hexCodepageSlot()
 
     wColDesc.isData = true; //hex byte
     wColDesc.itemCount = 16;
-    wColDesc.separator = 4;
+    wColDesc.separator = mAsciiSeparator ? mAsciiSeparator : 4;
     dDesc.itemSize = Byte;
     dDesc.byteMode = HexByte;
     wColDesc.data = dDesc;
@@ -608,7 +612,7 @@ void CPUDump::hexLastCodepageSlot()
 
     wColDesc.isData = true; //hex byte
     wColDesc.itemCount = 16;
-    wColDesc.separator = 4;
+    wColDesc.separator = mAsciiSeparator ? mAsciiSeparator : 4;
     dDesc.itemSize = Byte;
     dDesc.byteMode = HexByte;
     wColDesc.data = dDesc;
diff --git a/src/gui/Src/Gui/CPUDump.h b/src/gui/Src/Gui/CPUDump.h
index 11df6de4..30b007d2 100644
--- a/src/gui/Src/Gui/CPUDump.h
+++ b/src/gui/Src/Gui/CPUDump.h
@@ -120,6 +120,7 @@ private:
     GotoDialog* mGotoOffset = nullptr;
     CPUDisassembly* mDisas;
     CPUMultiDump* mMultiDump;
+    int mAsciiSeparator = 0;
 
     enum ViewEnum_t
     {