Skip to content

Commit

Permalink
Cleanup string table
Browse files Browse the repository at this point in the history
  • Loading branch information
@itagagaki
itagagaki committed Nov 25, 2023
1 parent 687d975 commit 685440b
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 300 deletions.
6 changes: 3 additions & 3 deletions Charu3.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@ void CCharu3App::SaveData()
}

CString strRes;
(void)strRes.LoadString(APP_MES_FAILURE_DATA_SAVE);
(void)strRes.LoadString(APP_MES_SAVE_FAILURE);
AfxMessageBox(strRes, MB_ICONEXCLAMATION, 0);
}

Expand Down Expand Up @@ -1589,7 +1589,7 @@ CString CCharu3App::convertMacro(STRING_DATA* SourceData, CString strSelect, CSt
}
else {
CString strRes;
(void)strRes.LoadString(APP_MES_NO_ENTRY_FUNC);
(void)strRes.LoadString(APP_MES_CANT_GET_FUNCTION_ADDRESS);
AfxMessageBox(strRes, MB_ICONEXCLAMATION | MB_SYSTEMMODAL, 0);
}
FreeLibrary(hDLL);
Expand Down Expand Up @@ -2176,7 +2176,7 @@ void CCharu3App::OnExport()
if (file != _T("")) {
if (!m_pTree->saveDataToFile(file, DAT_FORMAT, NULL)) {
CString strRes;
(void)strRes.LoadString(APP_MES_FAILURE_DATA_SAVE);
(void)strRes.LoadString(APP_MES_EXPORT_FAILURE);
AfxMessageBox(strRes, MB_ICONEXCLAMATION, 0);
}
}
Expand Down
263 changes: 8 additions & 255 deletions Charu3.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,84 +661,21 @@ END
STRINGTABLE
BEGIN
AFX_IDS_APP_TITLE "Charu3 SE"
AFX_IDS_IDLEMESSAGE "��ި"
END

STRINGTABLE
BEGIN
ID_INDICATOR_EXT "EXT"
ID_INDICATOR_CAPS "CAP"
ID_INDICATOR_NUM "NUM"
ID_INDICATOR_SCRL "SCRL"
ID_INDICATOR_OVR "�㏑"
ID_INDICATOR_REC "�L�^"
ID_INDICATOR_KANA "��"
END

STRINGTABLE
BEGIN
ID_APP_ABOUT "��۸��т̏��A�ް�ޮ݂����Ē��쌠��\��\n�ް�ޮݏ��"
ID_APP_EXIT "���ع���݂��I�����A̧�ق̕ۑ����w��\n�I��"
END

STRINGTABLE
BEGIN
ID_NEXT_PANE "���̳���޳�ɐ؂�ւ���\n�����߲�"
ID_PREV_PANE "�O�̳���޳�ɐ؂�ւ���\n�O���߲�"
END

STRINGTABLE
BEGIN
ID_WINDOW_SPLIT "��ƒ��̳���޳�𕪊�\n����"
END

STRINGTABLE
BEGIN
ID_EDIT_CLEAR "�I��͈͂�����\n����"
ID_EDIT_CLEAR_ALL "���ׂď���\n���ׂď���"
ID_EDIT_COPY "�I��͈͂��߰���ĸد���ް�ނɕۑ�\n��߰"
ID_EDIT_CUT "�I��͈͂�؂����ĸد���ް�ނɕۑ�\n�؂���"
ID_EDIT_FIND "�w�肵��������̌���\n����"
ID_EDIT_PASTE "�د���ް�ނ̓��e��\��t��\n�\��t��"
ID_EDIT_REPEAT "���O�ɍs����������J��Ԃ�\n�J��Ԃ�"
ID_EDIT_REPLACE "�w�肵��������𑼂̕�����Œu��\n�u��"
ID_EDIT_SELECT_ALL "̧�ٓ��̂��ׂĂ�I��\n���ׂđI��"
ID_EDIT_UNDO "���O�ɍs������������ɖ߂�\n���ɖ߂�"
ID_EDIT_REDO "���O�ɍs����������J��Ԃ�\n�J��Ԃ�"
END

STRINGTABLE
BEGIN
AFX_IDS_SCSIZE "����޳�̻��ނ�ύX"
AFX_IDS_SCMOVE "����޳�̈ʒu��ύX"
AFX_IDS_SCMINIMIZE "����޳���ŏ�������"
AFX_IDS_SCMAXIMIZE "����޳���ő剻����"
AFX_IDS_SCNEXTWINDOW "���̳���޳�ɐ؂�ւ���"
AFX_IDS_SCPREVWINDOW "�O�̳���޳�ɐ؂�ւ���"
AFX_IDS_SCCLOSE "��ƒ��̳���޳��‚��A�ύX����̧�ق̕ۑ����w��"
END

STRINGTABLE
BEGIN
AFX_IDS_SCRESTORE "����޳��ʏ�̻��ނɖ߂�"
AFX_IDS_SCTASKLIST "���ع���݂̐؂�ւ�"
END

STRINGTABLE
BEGIN
APP_MES_FAILURE_HOTKEY "�z�b�g�L�[�̐ݒ�Ɏ��s"
APP_MES_DELETE_OK """%s"" ���폜���܂����H"
APP_MES_NO_ENTRY_FUNC "�֐��̃G���g��������܂���B"
APP_MES_CANT_GET_FUNCTION_ADDRESS "�֐��̃A�h���X���擾�ł��܂���B"
APP_MES_NOT_FOUND "%s�����‚���܂���B"
APP_MES_FAILURE_DATA_SAVE "�f�[�^�̕ۑ��Ɏ��s���܂����B�t�@�C�������[�h�I�����[���m�F���Ă��������B"
APP_MES_DECIDE_ICONS "�A�C�R���̎������ʂ����܂����H"
APP_MES_SAVE_FAILURE "�t�@�C���Ƀf�[�^��ۑ��ł��܂���ł����B�t�@�C����t�H���_�[���ǂݎ���p�ɂȂ��Ă��Ȃ����m�F���Ă��������B"
APP_MES_DECIDE_ICONS "���ׂĂ̍��ڂ̃A�C�R���������őI�тȂ����܂����H"
APP_MES_UNKNOWN_FORMAT "���m�̃f�[�^�`���ł��B"
APP_MES_ADD_OK "%s��lj����܂����H"
APP_MES_EXPORT_FAILURE "�t�@�C���Ƀf�[�^���G�N�X�|�[�g�ł��܂���ł����B�t�@�C����t�H���_�[���ǂݎ���p�ɂȂ��Ă��Ȃ����m�F���Ă��������B"
END

STRINGTABLE
BEGIN
APP_MES_ADD_OK2 "%s��lj����܂����B"
APP_MES_ALL_EMPTY "�f�[�^�Ɩ��O����ł�"
APP_MES_NOT_FOUND_WRITEPLUGIN "�������݂ɓK�؂ȃv���O�C��������܂���B"
APP_MES_NOT_FOUND_READPLUGIN "�ǂݍ��݂ɓK�؂ȃv���O�C��������܂���B"
Expand Down Expand Up @@ -802,60 +739,10 @@ BEGIN
APP_INF_COPY " - �R�s�["
APP_INF_NEW_FOLDER "�V�����t�H���_�["
APP_INF_CLASS_HISTORY "�A�[�J�C�u���ꂽ����"
APP_INF_DEF_FONT "�l�r �o�S�V�b�N"
APP_INF_DEF_ICON "�W�����\�[�X"
APP_INF_CHECKBOX_IMPORT "���[�g�ɃC���|�[�g����"
APP_INF_CHECKBOX_MACRO "�}�N���v���O�C���������؊�������"
END

STRINGTABLE
BEGIN
APP_INF_MACRO_TEMPLATE01 "����4��@D@<charuMACRO>$Y/$M/$D</charuMACRO>"
APP_INF_MACRO_TEMPLATE02 "�a��@D@<charuMACRO>����$WH�N$M��$D��</charuMACRO>"
APP_INF_MACRO_TEMPLATE03 "�j��@D@<charuMACRO>$d�j��</charuMACRO>"
APP_INF_MACRO_TEMPLATE04 "�j��(�p��)@D@<charuMACRO>$ddd</charuMACRO>"
APP_INF_MACRO_TEMPLATE05
"����(23:59:59)@D@<charuMACRO>$H:$m:$s</charuMACRO>"
APP_INF_MACRO_TEMPLATE06
"����(PM 11:59:59)@D@<charuMACRO>$AMPM $h:$m:$s</charuMACRO>"
APP_INF_MACRO_TEMPLATE07
"����(�ߌ� 11�� 59��)@D@<charuMACRO>$ampm $h�� $m��</charuMACRO>"
APP_INF_MACRO_TEMPLATE08
"�V�F�����s@D@<charuMACRO>$SHELL<���s�t�@�C����>$SHELL</charuMACRO>"
APP_INF_MACRO_TEMPLATE09
"�֘A�t�����s@D@<charuMACRO>$RELATE<�t�@�C����>$RELATE</charuMACRO>"
APP_INF_MACRO_TEMPLATE10 "�I�𕶎���@D@<charuMACRO>$SEL</charuMACRO>"
APP_INF_MACRO_TEMPLATE11 "�N���b�v�{�[�h@D@<charuMACRO>$CLIP</charuMACRO>"
APP_INF_MACRO_TEMPLATE12
"�v���O�C��@D@<charuMACRO>$PLUG-IN<DLL,������>$PLUG-IN</charuMACRO>"
APP_INF_MACRO_TEMPLATE13
"�L�[����@D@<charuMACRO_KEY>�L�[;��;�҂�</charuMACRO_KEY>"
APP_INF_MACRO_TEMPLATE14
"���̓v���O�C��@D@<charuMACRO>$PLUG-IN<.\\plugin\\input.dll,�^�C�g��>$PLUG-IN</charuMACRO>"
END

STRINGTABLE
BEGIN
APP_INF_MACRO_TEMPLATE15 "end"
APP_INF_EXMACRO_TEMPLATE01 "�����f�[�^��@R@Count="
APP_INF_EXMACRO_TEMPLATE02 "�擪�Ɉړ�@F@Move=yes/no"
APP_INF_EXMACRO_TEMPLATE03 "�����ɕt�Ԃ���@R@Number=yes/no"
APP_INF_EXMACRO_TEMPLATE04 "�����^�C�v@R@Lock=yes/no"
APP_INF_EXMACRO_TEMPLATE05 "�N�����ɃN���A����@R@ClearRec=yes/no"
APP_INF_EXMACRO_TEMPLATE06 "�}�N��@A@Macro=�}�N����"
APP_INF_EXMACRO_TEMPLATE07 "�\��t���O�L�[@A@BeforKey=�L�[;��;�҂�"
APP_INF_EXMACRO_TEMPLATE08 "�\��t����L�[@A@AfterKey=�L�[;��;�҂�"
APP_INF_EXMACRO_TEMPLATE09 "�z�b�g�L�[@A@HotKey="
APP_INF_EXMACRO_TEMPLATE10 "�������A�[�J�C�u����P��@R@ArchiveUnit="
END

STRINGTABLE
BEGIN
APP_INF_EXMACRO_TEMPLATE11 "�^�C�g���̒���@F@TitleLen="
APP_INF_EXMACRO_TEMPLATE12 "�_�C���N�g�R�s�[@A@DirectCopyKey="
APP_INF_EXMACRO_TEMPLATE13 "�d���`�F�b�N@R@DuplicationCheck="
APP_INF_EXMACRO_TEMPLATE14 "end"
IDS_PREFERENCE_LOAD_VISUAL "�X�^�C���ݒ�t�@�C����ǂݍ���"
APP_INF_DATA_PERMANENT "�P�v�f�[�^"
APP_INF_DATA_ONETIME "�����^�C���f�[�^"
APP_INF_FOLDER_REGULAR "�ʏ�t�H���_�["
Expand Down Expand Up @@ -929,26 +816,6 @@ IDI_RUN256 ICON "res\\c2p256_16_run.ico"
IDI_STOP256 ICON "res\\c2p256_16_stop.ico"


/////////////////////////////////////////////////////////////////////////////
//
// Accelerator
//

IDR_MAINFRAME ACCELERATORS
BEGIN
"C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
"V", ID_EDIT_PASTE, VIRTKEY, CONTROL, NOINVERT
VK_BACK, ID_EDIT_UNDO, VIRTKEY, ALT, NOINVERT
VK_DELETE, ID_EDIT_CUT, VIRTKEY, SHIFT, NOINVERT
VK_F6, ID_NEXT_PANE, VIRTKEY, NOINVERT
VK_F6, ID_PREV_PANE, VIRTKEY, SHIFT, NOINVERT
VK_INSERT, ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT
VK_INSERT, ID_EDIT_PASTE, VIRTKEY, SHIFT, NOINVERT
"X", ID_EDIT_CUT, VIRTKEY, CONTROL, NOINVERT
"Z", ID_EDIT_UNDO, VIRTKEY, CONTROL, NOINVERT
END


/////////////////////////////////////////////////////////////////////////////
//
// Version
Expand Down Expand Up @@ -1710,84 +1577,21 @@ END
STRINGTABLE
BEGIN
AFX_IDS_APP_TITLE "Charu3 SE"
AFX_IDS_IDLEMESSAGE "????"
END

STRINGTABLE
BEGIN
ID_INDICATOR_EXT "EXT"
ID_INDICATOR_CAPS "CAP"
ID_INDICATOR_NUM "NUM"
ID_INDICATOR_SCRL "SCRL"
ID_INDICATOR_OVR "??"
ID_INDICATOR_REC "??"
ID_INDICATOR_KANA "??"
END

STRINGTABLE
BEGIN
ID_APP_ABOUT "???????????????????????????\n?????????"
ID_APP_EXIT "????????????????????????\n??"
END

STRINGTABLE
BEGIN
ID_NEXT_PANE "??????????????\n??????"
ID_PREV_PANE "??????????????\n??????"
END

STRINGTABLE
BEGIN
ID_WINDOW_SPLIT "?????????????\n??"
END

STRINGTABLE
BEGIN
ID_EDIT_CLEAR "???????\n??"
ID_EDIT_CLEAR_ALL "?????\n?????"
ID_EDIT_COPY "????????????????????????\n????"
ID_EDIT_CUT "???????????????????????\n????"
ID_EDIT_FIND "??????????\n??"
ID_EDIT_PASTE "??????????????????\n????"
ID_EDIT_REPEAT "?????????????\n????"
ID_EDIT_REPLACE "????????????????\n??"
ID_EDIT_SELECT_ALL "????????????\n?????"
ID_EDIT_UNDO "?????????????\n????"
ID_EDIT_REDO "?????????????\n????"
END

STRINGTABLE
BEGIN
AFX_IDS_SCSIZE "??????????????"
AFX_IDS_SCMOVE "????????????"
AFX_IDS_SCMINIMIZE "????????????"
AFX_IDS_SCMAXIMIZE "????????????"
AFX_IDS_SCNEXTWINDOW "??????????????"
AFX_IDS_SCPREVWINDOW "??????????????"
AFX_IDS_SCCLOSE "????????????????????????????"
END

STRINGTABLE
BEGIN
AFX_IDS_SCRESTORE "?????????????????"
AFX_IDS_SCTASKLIST "??????????????"
END

STRINGTABLE
BEGIN
APP_MES_FAILURE_HOTKEY "???????????"
APP_MES_DELETE_OK "Delete ""%s"" ?"
APP_MES_NO_ENTRY_FUNC "??????????????"
APP_MES_CANT_GET_FUNCTION_ADDRESS "Can't get function address."
APP_MES_NOT_FOUND "%s not found."
APP_MES_FAILURE_DATA_SAVE "????????????????????????????????????"
APP_MES_DECIDE_ICONS "???????????????"
APP_MES_SAVE_FAILURE "Could not save data to file. Check to see if the file or folder is read-only."
APP_MES_DECIDE_ICONS "Want to automatically select icons for all items?"
APP_MES_UNKNOWN_FORMAT "Unknown format."
APP_MES_ADD_OK "%s????????"
APP_MES_EXPORT_FAILURE "Could not export data to file. Check to see if the file or folder is read-only."
END

STRINGTABLE
BEGIN
APP_MES_ADD_OK2 "%s????????"
APP_MES_ALL_EMPTY "Both name and data are empty."
APP_MES_NOT_FOUND_WRITEPLUGIN "No plugin for writing."
APP_MES_NOT_FOUND_READPLUGIN "No plugin for reading."
Expand Down Expand Up @@ -1851,61 +1655,10 @@ BEGIN
APP_INF_COPY " - Copy"
APP_INF_NEW_FOLDER "New folder"
APP_INF_CLASS_HISTORY "Archived history"
APP_INF_DEF_FONT "MS P????"
APP_INF_DEF_ICON "??????"
APP_INF_CHECKBOX_IMPORT "???????????"
APP_INF_CHECKBOX_MACRO "????????????????"
END

STRINGTABLE
BEGIN
APP_INF_MACRO_TEMPLATE01 "??4?@D@<charuMACRO>$Y/$M/$D</charuMACRO>"
APP_INF_MACRO_TEMPLATE02 "??@D@<charuMACRO>??$WH?$M?$D?</charuMACRO>"
APP_INF_MACRO_TEMPLATE03 "??@D@<charuMACRO>$d??</charuMACRO>"
APP_INF_MACRO_TEMPLATE04 "??(??)@D@<charuMACRO>$ddd</charuMACRO>"
APP_INF_MACRO_TEMPLATE05
"??(23:59:59)@D@<charuMACRO>$H:$m:$s</charuMACRO>"
APP_INF_MACRO_TEMPLATE06
"??(PM 11:59:59)@D@<charuMACRO>$AMPM $h:$m:$s</charuMACRO>"
APP_INF_MACRO_TEMPLATE07
"??(?? 11? 59?)@D@<charuMACRO>$ampm $h? $m?</charuMACRO>"
APP_INF_MACRO_TEMPLATE08
"?????@D@<charuMACRO>$SHELL<???????>$SHELL</charuMACRO>"
APP_INF_MACRO_TEMPLATE09
"??????@D@<charuMACRO>$RELATE<?????>$RELATE</charuMACRO>"
APP_INF_MACRO_TEMPLATE10 "?????@D@<charuMACRO>$SEL</charuMACRO>"
APP_INF_MACRO_TEMPLATE11 "???????@D@<charuMACRO>$CLIP</charuMACRO>"
APP_INF_MACRO_TEMPLATE12
"?????@D@<charuMACRO>$PLUG-IN<DLL,???>$PLUG-IN</charuMACRO>"
APP_INF_MACRO_TEMPLATE13
"????@D@<charuMACRO_KEY>??;??;??</charuMACRO_KEY>"
APP_INF_MACRO_TEMPLATE14
"???????@D@<charuMACRO>$PLUG-IN<.\\plugin\\input.dll,????>$PLUG-IN</charuMACRO>"
END

STRINGTABLE
BEGIN
APP_INF_MACRO_TEMPLATE15 "end"
APP_INF_EXMACRO_TEMPLATE01 "???@R@Count="
APP_INF_EXMACRO_TEMPLATE02 "?????@F@Move=yes/no"
APP_INF_EXMACRO_TEMPLATE03 "???????@R@Number=yes/no"
APP_INF_EXMACRO_TEMPLATE04 "?????@R@Lock=yes/no"
APP_INF_EXMACRO_TEMPLATE05 "????????@R@ClearRec=yes/no"
APP_INF_EXMACRO_TEMPLATE06 "???@A@Macro=????"
APP_INF_EXMACRO_TEMPLATE07 "???????@A@BeforKey=??;??;??"
APP_INF_EXMACRO_TEMPLATE08 "???????@A@AfterKey=??;??;??"
APP_INF_EXMACRO_TEMPLATE09 "?????@A@HotKey="
APP_INF_EXMACRO_TEMPLATE10 "????@R@ClassHistory=??"
END

STRINGTABLE
BEGIN
APP_INF_EXMACRO_TEMPLATE11 "???????@F@TitleLen="
APP_INF_EXMACRO_TEMPLATE12 "????????@A@DirectCopyKey="
APP_INF_EXMACRO_TEMPLATE13 "??????@R@DuplicationCheck="
APP_INF_EXMACRO_TEMPLATE14 "end"
IDS_PREFERENCE_LOAD_VISUAL "???????????????"
APP_INF_DATA_PERMANENT "Permanent Data"
APP_INF_DATA_ONETIME "One-Time Data"
APP_INF_FOLDER_REGULAR "Regular Folder"
APP_INF_FOLDER_HISTORY "History Folder"
Expand Down
8 changes: 6 additions & 2 deletions Charu3.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
</ClCompile>
<ClCompile Include="Init.cpp" />
<ClCompile Include="clipboard.cpp" />
<ClCompile Include="PaletStatic.cpp" />
<ClCompile Include="Charu3.cpp" />
<ClCompile Include="MainFrm.cpp" />
<ClCompile Include="Charu3Tree.cpp" />
Expand All @@ -87,6 +86,9 @@
<ClCompile Include="color.cpp">
<Filter>util</Filter>
</ClCompile>
<ClCompile Include="PaletStatic.cpp">
<Filter>controls</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="MyEditCtrl.h">
Expand Down Expand Up @@ -134,7 +136,6 @@
<ClInclude Include="Init.h" />
<ClInclude Include="clipboard.h" />
<ClInclude Include="hotkey.h" />
<ClInclude Include="PaletStatic.h" />
<ClInclude Include="search.h" />
<ClInclude Include="Charu3.h" />
<ClInclude Include="MainFrm.h" />
Expand Down Expand Up @@ -167,6 +168,9 @@
<ClInclude Include="color.h">
<Filter>util</Filter>
</ClInclude>
<ClInclude Include="PaletStatic.h">
<Filter>controls</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Image Include="res\c2p256_16_run.ico">
Expand Down
2 changes: 1 addition & 1 deletion MyTreeDialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1227,7 +1227,7 @@ void CMyTreeDialog::OnExport()
if (file != _T("")) {
if (!m_pTreeCtrl->saveDataToFile(file, DAT_FORMAT, hTreeItem)) {
CString strRes;
(void)strRes.LoadString(APP_MES_FAILURE_DATA_SAVE);
(void)strRes.LoadString(APP_MES_EXPORT_FAILURE);
AfxMessageBox(strRes, MB_ICONEXCLAMATION, 0);
}
}
Expand Down
Loading

0 comments on commit 685440b

Please sign in to comment.