Fix/correct dialog fonts

CLCL.rc

@@ -294,7 +294,7 @@ END
 IDD_DIALOG_SELECT_FOLDER DIALOG 0, 0, 211, 195
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "繝輔か繝ｫ繝縺ｮ驕ｸ謚"
-FONT 9, "�ｭ�ｳ �ｰ繧ｴ繧ｷ繝�け"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "msg",IDC_STATIC_MSG,5,5,203,15
     CONTROL         "Tree1",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,5,25,200,145
@@ -306,7 +306,7 @@ IDD_DIALOG_SELECT_FORMAT DIALOGEX 0, 0, 202, 105
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
 CAPTION "譁ｰ隕丈ｽ懈�"
-FONT 9, "�ｭ�ｳ �ｰ繧ｴ繧ｷ繝�け", 0, 0, 0x1
+FONT 9, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     LTEXT           "霑ｽ蜉縺吶ｋ蠖｢蠑(&A):",IDC_STATIC,5,5,115,10
     COMBOBOX        IDC_COMBO_FORMAT,5,15,190,145,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
@@ -321,7 +321,7 @@ END
 IDD_DIALOG_SET_HOTKEY DIALOG 0, 0, 127, 73
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "繝帙ャ繝医く繝ｼ險ｭ螳"
-FONT 9, "�ｭ�ｳ �ｰ繧ｴ繧ｷ繝�け"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "繝帙ャ繝医く繝ｼ(&H):",IDC_STATIC,10,5,75,10
     CONTROL         "HotKey1",IDC_HOTKEY_ITEM,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,10,15,75,15
@@ -774,7 +774,7 @@ END
 IDD_DIALOG_SELECT_FOLDER DIALOGEX 0, 0, 232, 195
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "ﾐ漬ｸﾐｱﾑﾐｰﾑひｸ ﾐｿﾐｰﾐｿﾐｺﾑ"
-FONT 8, "Microsoft Sans Serif", 400, 0, 0xCC
+FONT 8, "MS Shell Dlg", 400, 0, 0xCC
 BEGIN
     LTEXT           "msg",IDC_STATIC_MSG,5,5,220,19
     CONTROL         "Tree1",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,5,25,220,145
@@ -786,7 +786,7 @@ IDD_DIALOG_SELECT_FORMAT DIALOGEX 0, 0, 227, 105
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
 CAPTION "ﾐ斷ｾﾐｲﾐｸﾐｹ ﾐｵﾐｻﾐｵﾐｼﾐｵﾐｽﾑ"
-FONT 8, "Microsoft Sans Serif", 400, 0, 0xCC
+FONT 8, "MS Shell Dlg", 400, 0, 0xCC
 BEGIN
     LTEXT           "ﾐ､ﾐｾﾑﾐｼﾐｰﾑ ﾐｴﾐｻﾑ ﾐｴﾐｾﾐｴﾐｰﾐｲﾐｰﾐｽﾐｽﾑ:",IDC_STATIC,5,5,211,10
     COMBOBOX        IDC_COMBO_FORMAT,5,15,215,145,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
@@ -801,7 +801,7 @@ END
 IDD_DIALOG_SET_HOTKEY DIALOGEX 0, 0, 125, 72
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "ﾐ柘�ひｰﾐｽﾐｾﾐｲﾐｸﾑひｸ ﾐｳﾐｰﾑﾑ肖� ﾐｺﾐｻﾐｰﾐｲﾑ毛尉"
-FONT 8, "Microsoft Sans Serif", 400, 0, 0xCC
+FONT 8, "MS Shell Dlg", 400, 0, 0xCC
 BEGIN
     LTEXT           "ﾐ寅ｰﾑﾑ肖�ｰ ﾐｺﾐｻﾐｰﾐｲﾑ毛威ｰ:",IDC_STATIC,10,5,104,10
     CONTROL         "HotKey1",IDC_HOTKEY_ITEM,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,10,15,70,15
@@ -1186,7 +1186,7 @@ END
 IDD_DIALOG_SELECT_FOLDER DIALOG 0, 0, 232, 195
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ordner auswﾃ､hlen"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "msg",IDC_STATIC_MSG,5,5,220,19
     CONTROL         "Tree1",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,5,25,220,145
@@ -1198,7 +1198,7 @@ IDD_DIALOG_SELECT_FORMAT DIALOGEX 0, 0, 227, 105
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
 CAPTION "Neues Element"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     LTEXT           "Format zum &Hinzufﾃｼgen:",IDC_STATIC,5,5,115,10
     COMBOBOX        IDC_COMBO_FORMAT,5,15,215,145,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
@@ -1213,7 +1213,7 @@ END
 IDD_DIALOG_SET_HOTKEY DIALOG 0, 0, 125, 72
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Hotkey setzen"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "&Hotkey:",IDC_STATIC,10,5,75,10
     CONTROL         "HotKey1",IDC_HOTKEY_ITEM,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,10,15,70,15
@@ -1577,7 +1577,7 @@ END
 IDD_DIALOG_SELECT_FOLDER DIALOG 0, 0, 232, 195
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Browse for Folder"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "msg",IDC_STATIC_MSG,5,5,220,19
     CONTROL         "Tree1",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,5,25,220,145
@@ -1589,7 +1589,7 @@ IDD_DIALOG_SELECT_FORMAT DIALOGEX 0, 0, 227, 105
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
 CAPTION "New Item"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     LTEXT           "Format to &Add:",IDC_STATIC,5,5,115,10
     COMBOBOX        IDC_COMBO_FORMAT,5,15,215,145,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
@@ -1604,7 +1604,7 @@ END
 IDD_DIALOG_SET_HOTKEY DIALOG 0, 0, 125, 72
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Set Hot key"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "&Hot key:",IDC_STATIC,10,5,75,10
     CONTROL         "HotKey1",IDC_HOTKEY_ITEM,"msctls_hotkey32",WS_BORDER | WS_TABSTOP,10,15,70,15

CLCL.vcxproj.filters

@@ -145,11 +145,6 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="CLCL.rc">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="BinView.h">
       <Filter>Header Files</Filter>
@@ -347,4 +342,9 @@
       <Filter>Resource Files</Filter>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="CLCL.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>

CLCLPlugin/tool_test/tool_test.vcxproj.filters

@@ -34,7 +34,7 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="tool_test.rc">
-      <Filter>Source Files</Filter>
+      <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
 </Project>

CLCLPlugin/tool_text/tool_text.rc

@@ -54,7 +54,7 @@ END
 IDD_DIALOG_DATE_TIME_FORMAT DIALOG 0, 0, 154, 99
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "日時形式設定"
-FONT 9, "ＭＳ Ｐゴシック"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "日付形式(&D):",IDC_STATIC,11,10,100,10
     LTEXT           "時間形式(&T):",IDC_STATIC,11,40,100,10
@@ -67,7 +67,7 @@ END
 IDD_DIALOG_QUOTE DIALOG 0, 0, 151, 69
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "引用符の設定"
-FONT 9, "ＭＳ Ｐゴシック"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "引用符(&Q):",IDC_STATIC,10,10,90,10
     EDITTEXT        IDC_EDIT_QUOTE_CHAR,10,20,130,13,ES_AUTOHSCROLL
@@ -78,7 +78,7 @@ END
 IDD_DIALOG_JOIN_TEXT DIALOG 0, 0, 179, 79
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "テキストの連結"
-FONT 9, "ＭＳ Ｐゴシック"
+FONT 9, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,65,60,50,14
     PUSHBUTTON      "キャンセル",IDCANCEL,120,60,50,14
@@ -88,7 +88,7 @@ END
 IDD_DIALOG_TEXT_EDIT DIALOG 0, 0, 218, 168
 STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "テキスト編集"
-FONT 9, "ＭＳ Ｐゴシック"
+FONT 9, "MS Shell Dlg"
 BEGIN
     EDITTEXT        IDC_EDIT_TEXT,0,0,215,145,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
     DEFPUSHBUTTON   "OK",IDOK,110,150,50,14
@@ -98,7 +98,7 @@ END
 IDD_DIALOG_DELETE_CRLF DIALOG 0, 0, 165, 65
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "改行の除去"
-FONT 9, "ＭＳ Ｐゴシック"
+FONT 9, "MS Shell Dlg"
 BEGIN
     CONTROL         "行頭の空白を除去する(&S)",IDC_CHECK_DELETE_SPACE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,10,150,10
     DEFPUSHBUTTON   "OK",IDOK,30,40,50,14
@@ -108,7 +108,7 @@ END
 IDD_DIALOG_BREAK_CNT DIALOG 0, 0, 126, 65
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "テキスト整形"
-FONT 9, "ＭＳ Ｐゴシック"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "折り返すバイト数(&B):",IDC_STATIC,10,10,90,10
     EDITTEXT        IDC_EDIT_BREAK_CNT,10,20,35,13,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
@@ -120,7 +120,7 @@ END
 IDD_DIALOG_WORD_BREAK DIALOG 0, 0, 214, 185
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "テキスト整形"
-FONT 9, "ＭＳ Ｐゴシック"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "タブサイズ(&T):",IDC_STATIC,10,10,90,10
     EDITTEXT        IDC_EDIT_TAB_SIZE,10,20,35,13,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
@@ -139,7 +139,7 @@ END
 IDD_DIALOG_PUT_TEXT DIALOG 0, 0, 149, 93
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "テキストの挟み込み"
-FONT 9, "ＭＳ Ｐゴシック"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "開始文字(&S):",IDC_STATIC,5,5,60,10
     EDITTEXT        IDC_EDIT_OPEN,5,15,135,13,ES_AUTOHSCROLL
@@ -303,7 +303,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 IDD_DIALOG_DATE_TIME_FORMAT DIALOG 0, 0, 154, 99
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Date and time formatting"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "&Date Format:",IDC_STATIC,11,10,100,10
     LTEXT           "&Time Format:",IDC_STATIC,11,40,100,10
@@ -316,7 +316,7 @@ END
 IDD_DIALOG_QUOTE DIALOG 0, 0, 151, 69
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Quotation"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "&Quotation character:",IDC_STATIC,10,10,90,10
     EDITTEXT        IDC_EDIT_QUOTE_CHAR,10,20,130,13,ES_AUTOHSCROLL
@@ -327,7 +327,7 @@ END
 IDD_DIALOG_JOIN_TEXT DIALOG 0, 0, 203, 69
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Connection of text"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     DEFPUSHBUTTON   "OK",IDOK,50,45,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,105,45,50,14
@@ -338,7 +338,7 @@ END
 IDD_DIALOG_TEXT_EDIT DIALOG 0, 0, 218, 168
 STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "Edit"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     EDITTEXT        IDC_EDIT_TEXT,0,0,215,145,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_NOHIDESEL | ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
     DEFPUSHBUTTON   "OK",IDOK,110,150,50,14
@@ -348,7 +348,7 @@ END
 IDD_DIALOG_DELETE_CRLF DIALOG 0, 0, 195, 65
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Delete CRLF"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "The blank of the head of the sentence is removed.",IDC_CHECK_DELETE_SPACE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,10,175,10
@@ -359,7 +359,7 @@ END
 IDD_DIALOG_BREAK_CNT DIALOG 0, 0, 126, 65
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Word Wrap"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "&Number of word wrap:",IDC_STATIC,10,10,90,10
     EDITTEXT        IDC_EDIT_BREAK_CNT,10,20,35,13,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
@@ -371,7 +371,7 @@ END
 IDD_DIALOG_WORD_BREAK DIALOG 0, 0, 135, 65
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Word Wrap"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "&TAB size:",IDC_STATIC,10,10,90,10
     EDITTEXT        IDC_EDIT_TAB_SIZE,10,20,35,13,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER
@@ -382,7 +382,7 @@ END
 IDD_DIALOG_PUT_TEXT DIALOG 0, 0, 149, 93
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "<TAG></TAG>"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "&Start character:",IDC_STATIC,5,5,60,10
     EDITTEXT        IDC_EDIT_OPEN,5,15,135,13,ES_AUTOHSCROLL

CLCLPlugin/tool_text/tool_text.vcxproj.filters

@@ -49,11 +49,6 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="tool_text.rc">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\CLCLPlugin.h">
       <Filter>Header Files</Filter>
@@ -67,4 +62,9 @@
       <Filter>Source Files</Filter>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="tool_text.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>

CLCLPlugin/tool_utl/tool_utl.rc

@@ -53,7 +53,7 @@ END
 IDD_DIALOG_MULTI_SAVE DIALOG 0, 0, 187, 149
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "保存情報設定"
-FONT 9, "ＭＳ Ｐゴシック"
+FONT 9, "MS Shell Dlg"
 BEGIN
     LTEXT           "保存する形式(&F):",IDC_STATIC,10,10,165,8
     COMBOBOX        IDC_COMBO_FORMAT,10,20,165,170,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
@@ -170,7 +170,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 IDD_DIALOG_MULTI_SAVE DIALOG 0, 0, 187, 149
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Save Information"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "&Format:",IDC_STATIC,10,10,165,8
     COMBOBOX        IDC_COMBO_FORMAT,10,20,165,170,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP

CLCLPlugin/tool_utl/tool_utl.vcxproj.filters

@@ -22,11 +22,6 @@
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="tool_utl.rc">
-      <Filter>Source Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\CLCLPlugin.h">
       <Filter>Header Files</Filter>
@@ -40,4 +35,9 @@
       <Filter>Source Files</Filter>
     </CustomBuild>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="tool_utl.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>