add 'Go to line' feature

Author: katahiromz

CHANGELOG_es.txt

@@ -369,3 +369,4 @@
     - Updated mcpp.exe to make UTF-16/UTF-32 buffer length unlimitted.
     - Renamed HISTORY*.txt as ChangeLog*.txt.
     - Renamed README-*.txt as README_*.txt.
+    - Added the "Go to line" feature.

CHANGELOG_id.txt

@@ -369,3 +369,4 @@
     - Updated mcpp.exe to make UTF-16/UTF-32 buffer length unlimited.
     - Renamed HISTORY*.txt as ChangeLog*.txt.
     - Renamed README-*.txt as README_*.txt.
+    - Added the "Go to line" feature.

CHANGELOG_ja.txt

@@ -713,3 +713,4 @@
     - UTF-16/UTF-32バッファ長を無制限にするために mcpp.exe を更新。
     - HISTORY*.txt を ChangeLog*.txt に改名。
     - README-*.txt を README_*.txt に改名。
+    - 「指定行へ移動」機能を追加。

CHANGELOG_ko.txt

@@ -370,3 +370,4 @@
     - Updated mcpp.exe to make UTF-16/UTF-32 buffer length unlimited.
     - Renamed HISTORY*.txt as ChangeLog*.txt.
     - Renamed README-*.txt as README_*.txt.
+    - Added the "Go to line" feature.

CHANGELOG_pt.txt

@@ -369,3 +369,4 @@
     - Updated mcpp.exe to make UTF-16/UTF-32 buffer length unlimited.
     - Renamed HISTORY*.txt as ChangeLog*.txt.
     - Renamed README-*.txt as README_*.txt.
+    - Added the "Go to line" feature.

ChangeLog.txt

@@ -369,3 +369,4 @@
     - Updated mcpp.exe to make UTF-16/UTF-32 buffer length unlimited.
     - Renamed HISTORY*.txt as ChangeLog*.txt.
     - Renamed README-*.txt as README_*.txt.
+    - Added the "Go to line" feature.

ChangeLog_it.txt

@@ -369,3 +369,4 @@
     - Aggiornato mcpp.exe per rendere illimitata la lunghezza del buffer UTF-16/UTF-32.
     - Rinominati HISTORY*.txt come ChangeLog*.txt.
     - Rinominati README-*.txt come README_*.txt.
+    - Added the "Go to line" feature.

src/MGoToLineDlg.hpp

@@ -0,0 +1,64 @@
+// MGoToLineDlg.hpp --- "Go To Line" Dialog
+//////////////////////////////////////////////////////////////////////////////
+// RisohEditor --- Another free Win32 resource editor
+// Copyright (C) 2017-2018 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
+// License: GPL-3 or later
+
+#pragma once
+
+#include "resource.h"
+#include "MWindowBase.hpp"
+#include "Common.hpp"
+
+//////////////////////////////////////////////////////////////////////////////
+
+class MGoToLineDlg : public MDialogBase
+{
+public:
+	INT m_line;
+
+	MGoToLineDlg()
+		: MDialogBase(IDD_GOTOLINE)
+		, m_line(0)
+	{
+	}
+
+	~MGoToLineDlg()
+	{
+	}
+
+	BOOL OnInitDialog(HWND hwnd, HWND hwndFocus, LPARAM lParam)
+	{
+		return TRUE;
+	}
+
+	void OnOK(HWND hwnd)
+	{
+		m_line = GetDlgItemInt(hwnd, edt1, NULL, FALSE);
+		EndDialog(IDOK);
+	}
+
+	void OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify)
+	{
+		switch (id)
+		{
+		case IDOK:
+			OnOK(hwnd);
+			break;
+		case IDCANCEL:
+			EndDialog(IDCANCEL);
+			break;
+		}
+	}
+
+	virtual INT_PTR CALLBACK
+	DialogProcDx(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+	{
+		switch (uMsg)
+		{
+			HANDLE_MSG(hwnd, WM_INITDIALOG, OnInitDialog);
+			HANDLE_MSG(hwnd, WM_COMMAND, OnCommand);
+		}
+		return 0;
+	}
+};

src/MMainWnd.hpp

@@ -81,6 +81,7 @@ class MMainWnd : public MWindowBase
 	MIdOrString     m_type;
 	MIdOrString     m_name;
 	WORD            m_lang;
+    BOOL            m_bShowBinEdit;
 
 	// classes
 	MRadWindow      m_rad_window;               // the RADical window
@@ -132,6 +133,7 @@ class MMainWnd : public MWindowBase
 		m_bUpxCompressed = FALSE;
 
 		m_lang = BAD_LANG;
+		m_bShowBinEdit = FALSE;
 		m_pAutoComplete = NULL;
 	}
 
@@ -229,7 +231,8 @@ class MMainWnd : public MWindowBase
 		SHOW_MOVIE, SHOW_CODEONLY, SHOW_CODEANDBMP
 	};
 	SHOW_MODE m_nShowMode;
-	void SetShowMode(SHOW_MODE mode);
+	void SetShowMode(SHOW_MODE mode, BOOL bShowBinary);
+	void SetShowMode(SHOW_MODE mode) { SetShowMode(mode, m_bShowBinEdit); }
 	void ShowStatusBar(BOOL bShow = TRUE);
 	BOOL ShowLangArrow(BOOL bShow, HTREEITEM hItem = NULL);
 	void UpdateLangArrow();
@@ -502,6 +505,7 @@ class MMainWnd : public MWindowBase
 	std::wstring GetRisohEditorVersion() const;
 	std::wstring ParseVersionFile(LPCWSTR pszFile, std::wstring& url) const;
 	void OnInternalTest(HWND hwnd);
+	void OnGoToLine(HWND hwnd);
 };
 
 extern MMainWnd *s_pMainWnd;

src/RisohEditor.cpp

@@ -9,6 +9,7 @@
 #define LINENUMEDIT_IMPL
 #include "LineNumEdit.hpp"
 #include "MChooseLangDlg.hpp"
+#include "MGoToLineDlg.hpp"
 #include "ToolbarRes.hpp"
 #include "Utils.h"
 #include <thread>
@@ -2192,26 +2193,17 @@ void MMainWnd::OnPlay(HWND hwnd)
 
 void MMainWnd::OnSelChange(HWND hwnd, INT iSelected)
 {
-	if (iSelected != m_tab.GetCurSel())
-	{
-		// update tab control selection
-		m_tab.SetCurSel(iSelected);
-	}
-
-	// update g_settings.bShowBinEdit
+	// update show
 	switch (iSelected)
 	{
 	case 0:
-		g_settings.bShowBinEdit = FALSE;
+		SetShowMode(m_nShowMode, FALSE);
 		break;
 	case 1:
-		g_settings.bShowBinEdit = TRUE;
+		SetShowMode(m_nShowMode, TRUE);
 		break;
 	}
 
-	// update show
-	SetShowMode(m_nShowMode);
-
 	// relayout
 	PostMessage(hwnd, WM_SIZE, 0, 0);
 }
@@ -2803,11 +2795,14 @@ void MMainWnd::OnDebugTreeNode(HWND hwnd)
 	MsgBoxDx(sz, MB_ICONINFORMATION);
 }
 
-void MMainWnd::SetShowMode(SHOW_MODE mode)
+void MMainWnd::SetShowMode(SHOW_MODE mode, BOOL bShowBinary)
 {
+	m_bShowBinEdit = bShowBinary;
 	m_nShowMode = mode;
-	if (g_settings.bShowBinEdit)
+	if (m_bShowBinEdit)
 	{
+		if (m_tab.GetCurSel() != 1)
+			m_tab.SetCurSel(1);
 		ShowWindow(m_hCodeEditor, SW_HIDE);
 		ShowWindow(m_hBmpView, SW_HIDE);
 		ShowWindow(m_hHexViewer, SW_SHOWNOACTIVATE);
@@ -2816,6 +2811,8 @@ void MMainWnd::SetShowMode(SHOW_MODE mode)
 	}
 	else
 	{
+		if (m_tab.GetCurSel() != 0)
+			m_tab.SetCurSel(0);
 		switch (mode)
 		{
 		case SHOW_MOVIE:
@@ -3024,7 +3021,7 @@ void MMainWnd::OnInitMenu(HWND hwnd, HMENU hMenu)
 	else
 		CheckMenuItem(hMenu, ID_STATUSBAR, MF_UNCHECKED);
 
-	if (g_settings.bShowBinEdit)
+	if (m_bShowBinEdit)
 		CheckMenuItem(hMenu, ID_BINARYPANE, MF_CHECKED);
 	else
 		CheckMenuItem(hMenu, ID_BINARYPANE, MF_UNCHECKED);
@@ -3579,7 +3576,7 @@ void MMainWnd::SelectTV(EntryBase *entry, BOOL bDoubleClick, STV stv)
 		bEditable = FALSE;
 
 		// update show mode
-		SetShowMode(SHOW_CODEONLY);
+		SetShowMode(SHOW_CODEONLY, m_bShowBinEdit);
 	}
 
 	if (stv == STV_DONTRESET || stv == STV_RESETTEXT)
@@ -3621,7 +3618,7 @@ void MMainWnd::SelectTV(EntryBase *entry, BOOL bDoubleClick, STV stv)
 	}
 
 	// update show
-	SetShowMode(m_nShowMode);
+	SetShowMode(m_nShowMode, m_bShowBinEdit);
 
 	// recalculate the splitter
 	PostMessageDx(WM_SIZE);
@@ -8933,6 +8930,23 @@ void MMainWnd::OnRefreshAll(HWND hwnd)
 	PostUpdateLangArrow(hwnd);
 }
 
+// ID_GOTOLINE
+void MMainWnd::OnGoToLine(HWND hwnd) {
+	MGoToLineDlg dialog;
+	if (dialog.DialogBoxDx(hwnd) == IDOK) {
+		SetShowMode(SHOW_CODEONLY, FALSE);
+		INT line = dialog.m_line;
+		INT ich = Edit_LineIndex(m_hCodeEditor, (line <= 0) ? 0 : (line - 1));
+		INT cch = Edit_GetTextLength(m_hCodeEditor);
+		if (ich == -1)
+			Edit_SetSel(m_hCodeEditor, cch, cch);
+		else
+			Edit_SetSel(m_hCodeEditor, ich, ich);
+		Edit_ScrollCaret(m_hCodeEditor);
+		SetFocus(m_hCodeEditor);
+	}
+}
+
 // WM_COMMAND
 void MMainWnd::OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify)
 {
@@ -9098,10 +9112,10 @@ void MMainWnd::OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify)
 		break;
 	case ID_BINARYPANE:
 		// toggle the flag
-		g_settings.bShowBinEdit = !g_settings.bShowBinEdit;
+		m_bShowBinEdit = !m_bShowBinEdit;
 		// show/hide the binary
-		m_tab.SetCurSel(!!g_settings.bShowBinEdit);
-		OnSelChange(hwnd, !!g_settings.bShowBinEdit);
+		m_tab.SetCurSel(!!m_bShowBinEdit);
+		OnSelChange(hwnd, !!m_bShowBinEdit);
 		break;
 	case ID_ALWAYSCONTROL:
 		{
@@ -9459,6 +9473,9 @@ void MMainWnd::OnCommand(HWND hwnd, int id, HWND hwndCtl, UINT codeNotify)
 	case ID_INTERNALTEST:
 		OnInternalTest(hwnd);
 		break;
+	case ID_GOTOLINE:
+		OnGoToLine(hwnd);
+		break;
 	default:
 		bUpdateStatus = FALSE;
 		break;