Add few more settings to setting dialog

Author: SinghRajenM

NppJSONViewer/NppJsonViewer/Define.h

@@ -46,12 +46,16 @@ const TCHAR STR_COPYPATH[] = TEXT("Copy path");
 const TCHAR STR_EXPANDALL[] = TEXT("Expand all");
 const TCHAR STR_COLLAPSEALL[] = TEXT("Collapse all");
 
-const TCHAR STR_INI_FORMATTING_SEC[] = TEXT("FORMATTING");
+const TCHAR STR_INI_FORMATTING_SEC[] = TEXT("Formatting");
 const TCHAR STR_INI_FORMATTING_EOL[] = TEXT("EOL");
 const TCHAR STR_INI_FORMATTING_LINE[] = TEXT("LINE_FORMATTING");
 const TCHAR STR_INI_FORMATTING_INDENT[] = TEXT("INDENTATION");
 const TCHAR STR_INI_FORMATTING_INDENTCOUNT[] = TEXT("INDENTATION_COUNT");
 
+const TCHAR STR_INI_OTHER_SEC[] = TEXT("Others");
+const TCHAR STR_INI_OTHER_FOLLOW_TAB[] = TEXT("FOLLOW_TAB");
+const TCHAR STR_INI_OTHER_AUTO_FORMAT[] = TEXT("AUTO_FORMAT");
+
 enum class IndentStyle { AUTO, TAB, SPACE };
 struct Indent
 {
@@ -67,5 +71,7 @@ struct Setting
 	LineEnding le = LineEnding::AUTO;
 	LineFormat lf = LineFormat::DEFAULT;
 	Indent indent{};
+	bool follow_current_tab = false;
+	bool auto_format_on_open = false;
 };
 

NppJSONViewer/NppJsonViewer/Profile.cpp

@@ -90,6 +90,14 @@ bool ProfileSetting::GetSettings(Setting& info) const
 	if (bRetVal)
 		info.indent.len = nVal;
 
+	bRetVal &= ReadValue(STR_INI_OTHER_SEC, STR_INI_OTHER_FOLLOW_TAB, nVal);
+	if (bRetVal)
+		info.follow_current_tab = static_cast<bool>(nVal);
+
+	bRetVal &= ReadValue(STR_INI_OTHER_SEC, STR_INI_OTHER_AUTO_FORMAT, nVal);
+	if (bRetVal)
+		info.auto_format_on_open = static_cast<bool>(nVal);
+
 	return bRetVal;
 }
 
@@ -101,6 +109,8 @@ bool ProfileSetting::SetSettings(const Setting& info) const
 	bRetVal &= WriteValue(STR_INI_FORMATTING_SEC, STR_INI_FORMATTING_LINE, static_cast<int>(info.lf));
 	bRetVal &= WriteValue(STR_INI_FORMATTING_SEC, STR_INI_FORMATTING_INDENT, static_cast<int>(info.indent.style));
 	bRetVal &= WriteValue(STR_INI_FORMATTING_SEC, STR_INI_FORMATTING_INDENTCOUNT, info.indent.len);
+	bRetVal &= WriteValue(STR_INI_OTHER_SEC, STR_INI_OTHER_FOLLOW_TAB, info.follow_current_tab);
+	bRetVal &= WriteValue(STR_INI_OTHER_SEC, STR_INI_OTHER_AUTO_FORMAT, info.auto_format_on_open);
 
 	return bRetVal;
 }

NppJSONViewer/NppJsonViewer/SettingsDlg.cpp

@@ -123,6 +123,9 @@ bool SettingsDlg::Apply()
 	else if (IsDlgButtonChecked(_hSelf, IDC_RADIO_LINEFORMAT_SINGLE))
 		m_pSetting->lf = LineFormat::SINGLELINE;
 
+	m_pSetting->follow_current_tab = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_FOLLOW_CURRENT_DOC));
+	m_pSetting->auto_format_on_open = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_FORMAT_ON_OPEN));
+
 	return WriteINI();
 }
 
@@ -179,6 +182,8 @@ void SettingsDlg::InitDlg()
 	CUtility::SetEditCtrlText(::GetDlgItem(_hSelf, IDC_EDT_INDENT_SPACECOUNT), std::to_wstring(m_pSetting->indent.len));
 	ShowSpaceCountCtrls(m_pSetting->indent.style == IndentStyle::SPACE);
 
+	CUtility::SetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_FOLLOW_CURRENT_DOC), m_pSetting->follow_current_tab);
+	CUtility::SetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_FORMAT_ON_OPEN), m_pSetting->auto_format_on_open);
 }
 
 void SettingsDlg::ShowSpaceCountCtrls(bool bShow)

NppJSONViewer/NppJsonViewer/resource.h

@@ -36,6 +36,8 @@
 #define IDC_STATIC_SPACECOUNT           1024
 #define IDC_RADIO_LINEFORMAT_DEFAULT    1025
 #define IDC_RADIO_LINEFORMAT_SINGLE     1026
+#define IDC_CHK_FOLLOW_CURRENT_DOC      1028
+#define IDC_CHK_FORMAT_ON_OPEN          1029
 #define IDM_COPY_TREEITEM               40001
 #define IDM_COPY_NODENAME               40002
 #define IDM_COPY_NODEVALUE              40003
@@ -49,7 +51,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        110
 #define _APS_NEXT_COMMAND_VALUE         40007
-#define _APS_NEXT_CONTROL_VALUE         1027
+#define _APS_NEXT_CONTROL_VALUE         1030
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

NppJSONViewer/NppJsonViewer/resource.rc

@@ -97,21 +97,24 @@ CAPTION "JSON Viewer Settings"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     PUSHBUTTON      "",IDC_HOR_BAR_TOP,0,1,300,1,WS_DISABLED,WS_EX_STATICEDGE
-    GROUPBOX        " Line Ending: ",IDC_STATIC,7,7,140,43
-    CONTROL         "Auto detect",IDC_RADIO_LINE_AUTO,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14,21,50,10
-    CONTROL         "Window (CR LF)",IDC_RADIO_LINE_WINDOW,"Button",BS_AUTORADIOBUTTON,72,21,65,10
-    CONTROL         "Unix (LF)",IDC_RADIO_LINE_UNIX,"Button",BS_AUTORADIOBUTTON,14,33,50,10
-    CONTROL         "Macintosh (LF)",IDC_RADIO_LINE_MAC,"Button",BS_AUTORADIOBUTTON,72,33,65,10
+    CONTROL         "Follow current tab",IDC_CHK_FOLLOW_CURRENT_DOC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,7,140,10
+    CONTROL         "Auto format josn file when openend",IDC_CHK_FORMAT_ON_OPEN,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,20,140,10
     GROUPBOX        " Indentation: ",IDC_STATIC,153,7,140,43
     CONTROL         "Auto detect",IDC_RADIO_INDENT_AUTO,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,160,21,50,10
     CONTROL         "Use tab",IDC_RADIO_INDENT_TAB,"Button",BS_AUTORADIOBUTTON,240,21,50,10
     CONTROL         "Use space",IDC_RADIO_INDENT_SPACE,"Button",BS_AUTORADIOBUTTON,160,33,50,10
     LTEXT           "Count:",IDC_STATIC_SPACECOUNT,240,33,24,8
     EDITTEXT        IDC_EDT_INDENT_SPACECOUNT,266,32,20,11,ES_AUTOHSCROLL | ES_NUMBER
-    GROUPBOX        " Line formating: ",IDC_STATIC,7,57,140,43
-    CONTROL         "Default formatting",IDC_RADIO_LINEFORMAT_DEFAULT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14,71,110,10
+    GROUPBOX        " Line Ending: ",IDC_STATIC,153,52,140,43
+    CONTROL         "Auto detect",IDC_RADIO_LINE_AUTO,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,160,66,50,10
+    CONTROL         "Window (CR LF)",IDC_RADIO_LINE_WINDOW,"Button",BS_AUTORADIOBUTTON,218,66,65,10
+    CONTROL         "Unix (LF)",IDC_RADIO_LINE_UNIX,"Button",BS_AUTORADIOBUTTON,160,78,50,10
+    CONTROL         "Macintosh (LF)",IDC_RADIO_LINE_MAC,"Button",BS_AUTORADIOBUTTON,218,78,65,10
+    GROUPBOX        " Line formating: ",IDC_STATIC,153,97,140,43
+    CONTROL         "Default formatting",IDC_RADIO_LINEFORMAT_DEFAULT,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,160,111,110,10
     CONTROL         "Format arrays on a single line",IDC_RADIO_LINEFORMAT_SINGLE,
-                    "Button",BS_AUTORADIOBUTTON,14,83,110,10
+                    "Button",BS_AUTORADIOBUTTON,160,123,110,10
     PUSHBUTTON      "",IDC_HOR_BAR_BOTTOM,0,145,300,1,WS_DISABLED,WS_EX_STATICEDGE
     DEFPUSHBUTTON   "OK",IDOK,185,151,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,243,151,50,14
@@ -205,7 +208,6 @@ BEGIN
     0
 END
 
-
 IDD_SETTING AFX_DIALOG_LAYOUT
 BEGIN
     0