RLogin-2.29.0

kmiya-culti · Jan 21, 2024 · 2565fde · 2565fde
1 parent 06100db
commit 2565fde
Show file tree

Hide file tree

Showing 111 changed files with 7,744 additions and 87,539 deletions.
diff --git a/RLogin/AlgoDlg.cpp b/RLogin/AlgoDlg.cpp
@@ -110,7 +110,9 @@ BOOL CAlgoDlg::OnInitDialog()
 		m_List[n].GetClientRect(rect);
 		m_List[n].SetColumnWidth(0, rect.Width() * 95 / 100);
 	}
-
+
+	SetSaveProfile(_T("AlgoDlg"));
+
 	return TRUE;
 }
 

diff --git a/RLogin/AnyPastDlg.cpp b/RLogin/AnyPastDlg.cpp
@@ -216,24 +216,8 @@ BOOL CAnyPastDlg::OnInitDialog()
 	m_EditWnd.SetWindowText(m_EditText);
 	CtrlCount();
 
-	CRect rect;
-	int sx = 0, sy = 0;
-	int cx, cy;
-
-	GetWindowRect(rect);
-	cx = AfxGetApp()->GetProfileInt(_T("AnyPastDlg"), _T("cx"), rect.Width());
-	cy = AfxGetApp()->GetProfileInt(_T("AnyPastDlg"), _T("cy"), rect.Height());
-
-	if ( cx < rect.Width() )
-		cx = rect.Width();
-	if ( cy < rect.Height() )
-		cy = rect.Height();
-
-	AfxGetMainWnd()->GetWindowRect(rect);
-	sx = rect.left + (rect.Width()  - cx) / 2;
-	sy = rect.top  + (rect.Height() - cy) / 2;
-
-	MoveWindow(sx, sy, cx, cy, FALSE);
+	SetSaveProfile(_T("AnyPastDlg"));
+	SetLoadPosition(LOADPOS_MAINWND);
 
 	AddShortCutKey(0, VK_RETURN, MASK_CTRL, 0, IDOK);
 
@@ -271,13 +255,6 @@ BOOL CAnyPastDlg::UpdateTextData(BOOL bOk)
 {
 	ASSERT(m_pMain != NULL);
 
-	if ( !IsIconic() ) {
-		CRect rect;
-		GetWindowRect(rect);
-		AfxGetApp()->WriteProfileInt(_T("AnyPastDlg"), _T("cx"), MulDiv(rect.Width(), m_InitDpi.cx, m_NowDpi.cx));
-		AfxGetApp()->WriteProfileInt(_T("AnyPastDlg"), _T("cy"), MulDiv(rect.Height(), m_InitDpi.cy, m_NowDpi.cy));
-	}
-
 	AfxGetApp()->WriteProfileInt(_T("AnyPastDlg"), _T("DelayPast"), m_bDelayPast);
 	AfxGetApp()->WriteProfileInt(_T("AnyPastDlg"), _T("CtrlView"),  m_bCtrlView);
 	m_pMain->m_PastNoCheck = m_NoCheck;

diff --git a/RLogin/AutoRenDlg.cpp b/RLogin/AutoRenDlg.cpp
@@ -63,15 +63,15 @@ void CAutoRenDlg::OnEnUpdateEdit3()
 
 	UpdateData(TRUE);
 	node.AutoRename(m_Name[2], tmp, 1);
-	m_NameOK = (tmp.Compare(m_Name[2]) == 0 ? _T("○") : _T("×"));
+	m_NameOK = (tmp.Compare(m_Name[2]) == 0 ? UniToTstr(L"\u25CB") : UniToTstr(L"\u00D7"));	// _T("○") : _T("×")));
 	UpdateData(FALSE);
 }
 
 BOOL CAutoRenDlg::OnInitDialog()
 {
 	CDialogExt::OnInitDialog();
 
-	// not use
+	SetSaveProfile(_T("AutoRenDlg"));
 
 	return TRUE;
 }
diff --git a/RLogin/BlockDlg.cpp b/RLogin/BlockDlg.cpp
@@ -228,8 +228,11 @@ BOOL CBlockDlg::OnInitDialog()
 	m_BlockList.SetExtendedStyle(LVS_EX_FULLROWSELECT | LVS_EX_CHECKBOXES);
 	m_BlockList.InitColumn(_T("BlockDlg"), InitListTab, 2);
 	m_BlockList.SetPopUpMenu(IDR_POPUPMENU, 4);
+
 	InitList();
 
+	SetSaveProfile(_T("BlockDlg"));
+
 	return TRUE;
 }
 void CBlockDlg::OnOK()

diff --git a/RLogin/CertKeyDlg.cpp b/RLogin/CertKeyDlg.cpp
@@ -57,6 +57,8 @@ BOOL CCertKeyDlg::OnInitDialog()
 	m_SaveKeyFlag = ::AfxGetApp()->GetProfileInt(_T("CCertKeyDlg"), _T("SaveKeyFlag"), TRUE);
 	UpdateData(FALSE);
 
+	SetSaveProfile(_T("CCertKeyDlg"));
+
 	return TRUE;
 }
 

diff --git a/RLogin/ChModDlg.cpp b/RLogin/ChModDlg.cpp
@@ -43,6 +43,8 @@ BOOL CChModDlg::OnInitDialog()
 
 	UpdateData(FALSE);
 
+	SetSaveProfile(_T("ChModDlg"));
+
 	return TRUE;
 }
 

diff --git a/RLogin/CharSetPage.cpp b/RLogin/CharSetPage.cpp
@@ -12,6 +12,7 @@
 #include "CharSetPage.h"
 #include "FontParaDlg.h"
 #include "IConvDlg.h"
+#include "InitAllDlg.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -99,7 +100,10 @@ void CCharSetPage::InitList()
 		m_List.SetItemText(i, 2, m_FontTab[n].m_IndexName);
 		m_List.SetItemText(i, 3, CFontParaDlg::CharSetName(m_FontTab[n].m_CharSet));
 		m_List.SetItemText(i, 4, m_FontTab[n].m_FontName[m_AltFont]);
-		m_List.SetItemText(i, 5, m_FontTab[n].m_CharSet == DEFAULT_CHARSET ? _T("") : ((int)m_FontSet[m_FontTab[n].m_FontName[m_AltFont].IsEmpty() ? m_DefFontName : m_FontTab[n].m_FontName[m_AltFont]][m_FontTab[n].m_CharSet] == 1 ? _T("○") : _T("×")));
+		m_List.SetItemText(i, 5, m_FontTab[n].m_CharSet == DEFAULT_CHARSET ? _T("") : 
+			((int)m_FontSet[m_FontTab[n].m_FontName[m_AltFont].IsEmpty() ? m_DefFontName : m_FontTab[n].m_FontName[m_AltFont]]
+					[m_FontTab[n].m_CharSet] == 1 ? 
+					UniToTstr(L"\u25CB") : UniToTstr(L"\u00D7"))); // _T("○") : _T("×")));
 		m_List.SetItemData(i, n);
 		i++;
 	}
@@ -131,6 +135,54 @@ static const LV_COLUMN InitListTab[6] = {
 		{ LVCF_TEXT | LVCF_WIDTH, 0,  90, _T("Face"),  0, 0 }, 
 		{ LVCF_TEXT | LVCF_WIDTH, 0,  30, _T("In"),    0, 0 }, 
 	};
+static const INITDLGTAB ItemTab[] = {
+	{ IDC_CHARSET1,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_CHARSET2,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_CHARSET3,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_CHARSET4,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_ICONVSET,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+
+	{ IDC_BANKGL1,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_BANKGL2,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_BANKGL3,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_BANKGL4,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+
+	{ IDC_BANKGR1,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_BANKGR2,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_BANKGR3,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_BANKGR4,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+
+	{ IDC_CHARBANK1,	ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_CHARBANK2,	ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_CHARBANK3,	ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_CHARBANK4,	ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+
+	{ IDC_FONTNAME,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_FONTSAMPLE,	ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+
+	{ IDC_FONTLIST,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_BTM },
+
+	{ IDC_FONTNUM,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_TOP_BTM | ITM_BTM_BTM },
+	{ IDC_FONTLISTNEW,	ITM_LEFT_PER | ITM_RIGHT_PER | ITM_TOP_BTM | ITM_BTM_BTM },
+	{ IDC_FONTLISTEDIT,	ITM_LEFT_PER | ITM_RIGHT_PER | ITM_TOP_BTM | ITM_BTM_BTM },
+	{ IDC_FONTLISTDEL,	ITM_LEFT_PER | ITM_RIGHT_PER | ITM_TOP_BTM | ITM_BTM_BTM },
+
+	{ IDC_TITLE1,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_TITLE2,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_TITLE3,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_TITLE4,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+
+	{ IDC_TITLE5,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_TITLE6,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_TITLE7,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_TITLE8,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+	{ IDC_TITLE9,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_BTM },
+
+	{ IDC_TITLE10,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_TOP_BTM | ITM_BTM_BTM },
+	{ IDC_TITLE11,		ITM_LEFT_PER | ITM_RIGHT_PER | ITM_BTM_TOP },
+
+	{ 0,				0 },
+};
 
 void CCharSetPage::DoInit()
 {
@@ -162,6 +214,8 @@ BOOL CCharSetPage::OnInitDialog()
 
 	CTreePage::OnInitDialog();
 
+	InitItemOffset(ItemTab);
+
 	int n, i;
 	CComboBox *pCombo[4];
 	LPCTSTR pStr;
@@ -267,17 +321,26 @@ void CCharSetPage::OnFontListNew()
 	m_FontTab[dlg.m_CodeSet] = tmp;
 	m_FontTab.InitUniBlock();
 	InitList();
+	m_List.SetSelectMarkItem(m_List.GetParamItem(dlg.m_CodeSet));
 
 	SetModified(TRUE);
 	m_pSheet->m_ModFlag |= UMOD_TEXTRAM;
 }
 void CCharSetPage::OnFontListEdit() 
 {
-	int n;
+	int n, pos;
 	CFontParaDlg dlg;
 	CFontNode tmp;
+	CDWordArray save;
 
-	if ( (n = m_List.GetSelectMarkData()) < 0 )
+	for ( pos = 0 ; pos < m_List.GetItemCount() ; pos++ ) {
+		if ( m_List.GetItemState(pos, LVIS_SELECTED) != 0 )
+			break;
+	}
+	if ( pos >= m_List.GetItemCount() )
+		return;
+
+	if ( (n = (int)m_List.GetItemData(pos)) < 0 )
 		return;
 
 	tmp = m_FontTab[n];
@@ -291,28 +354,53 @@ void CCharSetPage::OnFontListEdit()
 	if ( dlg.DoModal() != IDOK )
 		return;
 
+	for ( n = 0 ; n < m_List.GetItemCount() ; n++ ) {
+		if ( n != pos && m_List.GetItemState(n, LVIS_SELECTED) != 0 )
+			save.Add((DWORD)m_List.GetItemData(n));
+	}
+
 	m_FontTab[dlg.m_CodeSet] = tmp;
 	m_FontTab.InitUniBlock();
+
 	InitList();
 
-	if ( (n = m_List.GetParamItem(dlg.m_CodeSet)) >= 0 ) {
-		m_List.SetItemState(n, LVIS_SELECTED, LVIS_SELECTED);
-		m_List.EnsureVisible(n, FALSE);
-	}
-	m_ListIndex = dlg.m_CodeSet;
+	if ( save.GetSize() > 0 ) {
+		pos = m_List.GetParamItem((int)save[0]);
+		for ( n = 1 ; n < save.GetSize() ; n++ )
+			m_List.SetItemState(m_List.GetParamItem((int)save[n]), LVIS_SELECTED, LVIS_SELECTED);
+	} else
+		pos = m_List.GetParamItem(dlg.m_CodeSet);
+
+	m_List.SetSelectMarkItem(pos);
+
+	if ( (pos = m_List.GetSelectionMark()) < 0 )
+		m_ListIndex = (-1);
+	else
+		m_ListIndex = (int)m_List.GetItemData(pos);
 
 	SetModified(TRUE);
 	m_pSheet->m_ModFlag |= UMOD_TEXTRAM;
 }
 void CCharSetPage::OnFontListDel() 
 {
-	int n;
+	int n, i, a, pos;
 
-	if ( (n = m_List.GetSelectMarkData()) < 0 )
+	if ( (pos = m_List.GetSelectionMark()) < 0 )
 		return;
 
-	m_FontTab.IndexRemove(n);
+	for ( n = a = 0 ; n < m_List.GetItemCount() ; n++ ) {
+		if ( m_List.GetItemState(n, LVIS_SELECTED) == 0 )
+			continue;
+		if ( (i = (int)m_List.GetItemData(n)) < 0 )
+			continue;
+		m_FontTab.IndexRemove(i);
+		if ( n < pos )
+			a++;
+	}
+	pos -= a;
+
 	InitList();
+	m_List.SetSelectMarkItem(pos);
 
 	SetModified(TRUE);
 	m_pSheet->m_ModFlag |= UMOD_TEXTRAM;
@@ -340,11 +428,7 @@ void CCharSetPage::OnEditDups()
 	m_FontTab[dlg.m_CodeSet] = tmp;
 	m_FontTab.InitUniBlock();
 	InitList();
-
-	if ( (n = m_List.GetParamItem(dlg.m_CodeSet)) >= 0 ) {
-		m_List.SetItemState(n, LVIS_SELECTED, LVIS_SELECTED);
-		m_List.EnsureVisible(n, FALSE);
-	}
+	m_List.SetSelectMarkItem(m_List.GetParamItem(dlg.m_CodeSet));
 
 	SetModified(TRUE);
 	m_pSheet->m_ModFlag |= UMOD_TEXTRAM;
@@ -397,10 +481,32 @@ void CCharSetPage::OnCbnSelchangeFontnum()
 
 void CCharSetPage::OnEditDelall()
 {
-	if ( MessageBox(CStringLoad(IDS_ALLINITREQ), _T("Warning"), MB_ICONWARNING | MB_OKCANCEL) != IDOK )
+	CInitAllDlg dlg;
+
+	dlg.m_Title.LoadString(IDS_INITFONTSETTITLE);
+
+	if ( dlg.DoModal() != IDOK )
 		return;
 
-	m_FontTab.Init();
+	switch(dlg.m_InitType) {
+	case 0:		// Init Default Entry
+		m_FontTab.Serialize(FALSE);
+		break;
+
+	case 1:		// Init Program Default
+		m_FontTab.Init();
+		break;
+
+	case 2:		// Copy Entry option
+		ASSERT(dlg.m_pInitEntry != NULL);
+		{
+			CBuffer tmp(dlg.m_pInitEntry->m_ProBuffer.GetPtr(), dlg.m_pInitEntry->m_ProBuffer.GetSize());
+			CStringArrayExt stra;
+			stra.GetBuffer(tmp);	// CTextRam::Serialize(mode, buf);
+			m_FontTab.Serialize(FALSE, tmp);
+		}
+		break;
+	}
 
 	UpdateData(TRUE);
 	InitList();

diff --git a/RLogin/ChatDlg.cpp b/RLogin/ChatDlg.cpp
@@ -34,7 +34,6 @@ void CChatDlg::DoDataExchange(CDataExchange* pDX)
 	DDX_Check(pDX, IDC_MAKECHAT, m_MakeChat);
 }
 
-
 BEGIN_MESSAGE_MAP(CChatDlg, CDialogExt)
 	ON_BN_CLICKED(IDC_NEWNODE, &CChatDlg::OnBnClickedNewnode)
 	ON_BN_CLICKED(IDC_NEXTNODE, &CChatDlg::OnBnClickedNextnode)
@@ -47,13 +46,37 @@ BEGIN_MESSAGE_MAP(CChatDlg, CDialogExt)
 	ON_COMMAND(ID_EDIT_PASTE_ALL, &CChatDlg::OnEditPasteAll)
 END_MESSAGE_MAP()
 
+static const INITDLGTAB ItemTab[] = {
+	{ IDC_NODETREE,		ITM_RIGHT_RIGHT | ITM_BTM_BTM  },
+
+	{ IDC_RECVSTR,		ITM_RIGHT_MID | ITM_TOP_BTM | ITM_BTM_BTM },
+	{ IDC_SENDSTR,		ITM_LEFT_MID | ITM_RIGHT_RIGHT | ITM_TOP_BTM | ITM_BTM_BTM },
+
+	{ IDC_NEWNODE,		ITM_LEFT_MID | ITM_RIGHT_MID | ITM_TOP_BTM | ITM_BTM_BTM },
+	{ IDC_NEXTNODE,		ITM_LEFT_MID | ITM_RIGHT_MID | ITM_TOP_BTM | ITM_BTM_BTM },
+	{ IDC_UPDATENODE,	ITM_LEFT_MID | ITM_RIGHT_MID | ITM_TOP_BTM | ITM_BTM_BTM },
+	{ IDC_DELNODE,		ITM_LEFT_MID | ITM_RIGHT_MID | ITM_TOP_BTM | ITM_BTM_BTM },
+
+	{ IDC_MAKECHAT,		ITM_RIGHT_RIGHT | ITM_TOP_BTM | ITM_BTM_BTM },
+
+	{ IDOK,				ITM_LEFT_MID | ITM_RIGHT_MID | ITM_TOP_BTM | ITM_BTM_BTM  },
+	{ IDCANCEL,			ITM_LEFT_MID | ITM_RIGHT_MID | ITM_TOP_BTM | ITM_BTM_BTM  },
+
+	{ IDC_TITLE1,		ITM_RIGHT_MID | ITM_TOP_BTM | ITM_BTM_BTM },
+	{ IDC_TITLE2,		ITM_LEFT_MID | ITM_RIGHT_RIGHT | ITM_TOP_BTM | ITM_BTM_BTM },
+	{ IDC_TITLE3,		ITM_RIGHT_RIGHT | ITM_BTM_BTM },
+
+	{ 0,	0 },
+};
 
 // CChatDlg メッセージ ハンドラ
 
 BOOL CChatDlg::OnInitDialog()
 {
 	CDialogExt::OnInitDialog();
 
+	InitItemOffset(ItemTab);
+
 	m_Script.SetTreeCtrl(m_NodeTree);
 
 	m_RecvStr.Empty();
@@ -62,6 +85,8 @@ BOOL CChatDlg::OnInitDialog()
 
 	UpdateData(FALSE);
 
+	SetSaveProfile(_T("ChatDlg"));
+
 	return TRUE;
 }
 

diff --git a/RLogin/ChildFrm.cpp b/RLogin/ChildFrm.cpp
@@ -197,16 +197,16 @@ void CChildFrame::OnMDIActivate(BOOL bActivate, CWnd* pActivateWnd, CWnd* pDeact
 	}
 }
 
-void CChildFrame::OnUpdateFrameMenu(BOOL bActive, CWnd* pActiveWnd, HMENU hMenuAlt)
+void CChildFrame::OnUpdateFrameMenu(BOOL bActivate, CWnd* pActivateWnd, HMENU hMenuAlt)
 {
 	CMainFrame *pFrame = (CMainFrame *)GetMDIFrame();
 
-	if ( bActive && AfxGetApp()->GetProfileInt(_T("ChildFrame"), _T("VMenu"), TRUE) == FALSE ) {
+	if ( bActivate && AfxGetApp()->GetProfileInt(_T("ChildFrame"), _T("VMenu"), TRUE) == FALSE ) {
 		pFrame->SetMenu(NULL);
-	} else if ( !bActive && pActiveWnd == NULL && pFrame != NULL && pFrame->m_StartMenuHand != NULL ) {
-		CMDIChildWnd::OnUpdateFrameMenu(bActive, pActiveWnd, pFrame->m_StartMenuHand);
+	} else if ( !bActivate && pActivateWnd == NULL && pFrame != NULL && pFrame->m_StartMenuHand != NULL ) {
+		CMDIChildWnd::OnUpdateFrameMenu(bActivate, pActivateWnd, pFrame->m_StartMenuHand);
 	} else {
-		CMDIChildWnd::OnUpdateFrameMenu(bActive, pActiveWnd, hMenuAlt);
+		CMDIChildWnd::OnUpdateFrameMenu(bActivate, pActivateWnd, hMenuAlt);
 	}
 }