Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

印刷ページ設定ダイアログの文字切れ等の修正 #1674

Merged
merged 2 commits into from
May 22, 2021
Merged

印刷ページ設定ダイアログの文字切れ等の修正 #1674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28dc64a
印刷ページ設定の変更
dep5 Apr 12, 2021
3de243a
メイリオ/英語モードの時の文字切れ修正
suconbu May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 43 additions & 43 deletions sakura_core/sakura_rc.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ BEGIN
LTEXT "Static",IDC_STATIC_PAPER,251,19,149,10
END

IDD_PRINTSETTING DIALOGEX 0, 0, 302, 253
IDD_PRINTSETTING DIALOGEX 0, 0, 302, 257
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | DS_CONTEXTHELP | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTEXTHELP
CAPTION "印刷ページ設定"
Expand All @@ -355,74 +355,74 @@ BEGIN
LTEXT "ページ設定(&1)",IDC_STATIC,7,9,45,10
COMBOBOX IDC_COMBO_SETTINGNAME,56,7,163,170,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
PUSHBUTTON "設定名変更(&2)...",IDC_BUTTON_EDITSETTINGNAME,224,7,69,14
GROUPBOX "設定",IDC_STATIC,4,22,289,204
GROUPBOX "設定",IDC_STATIC,4,22,294,208
RTEXT "半角フォント(&F)",IDC_STATIC,7,37,45,10
COMBOBOX IDC_COMBO_FONT_HAN,56,35,84,230,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_COMBO_FONT_HAN,56,35,114,230,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
RTEXT "全角フォント(&K)",IDC_STATIC,7,52,45,10
COMBOBOX IDC_COMBO_FONT_ZEN,56,50,84,230,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
COMBOBOX IDC_COMBO_FONT_ZEN,56,50,114,230,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
RTEXT "フォント高(&P)",IDC_STATIC,7,71,45,10
EDITTEXT IDC_EDIT_FONTHEIGHT,56,69,30,12,ES_AUTOHSCROLL
CONTROL "Spin1",IDC_SPIN_FONTHEIGHT,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,69,9,12
LTEXT "(1/10mm)",IDC_STATIC,88,71,32,10
RTEXT "144.5pt",IDC_STATIC_FONTSIZE,120,71,22,10
LTEXT "(1/10mm)",IDC_STATIC,88,71,40,10
RTEXT "144.5pt",IDC_STATIC_FONTSIZE,128,71,24,10
RTEXT "行送り(&S)",IDC_STATIC,7,85,45,10
EDITTEXT IDC_EDIT_LINESPACE,56,83,30,12,ES_AUTOHSCROLL
CONTROL "Spin2",IDC_SPIN_LINESPACE,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,83,9,12
LTEXT "(%)",IDC_STATIC,88,85,10,10
LTEXT "(%)",IDC_STATIC,88,85,20,10
RTEXT "段数 (&C)",IDC_STATIC,7,99,45,10
EDITTEXT IDC_EDIT_DANSUU,56,97,30,12,ES_AUTOHSCROLL
CONTROL "Spin3",IDC_SPIN_DANSUU,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,97,9,12
RTEXT "段の隙間(&E)",IDC_STATIC,7,113,45,10
EDITTEXT IDC_EDIT_DANSPACE,56,111,30,12,ES_AUTOHSCROLL
CONTROL "Spin4",IDC_SPIN_DANSPACE,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,111,9,12
LTEXT "(mm)",IDC_STATIC,88,113,17,10
LTEXT "(mm)",IDC_STATIC,88,113,25,10
RTEXT "用紙サイズ(&Z)",IDC_STATIC,7,131,45,10
COMBOBOX IDC_COMBO_PAPER,56,129,169,145,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
RTEXT "用紙の向き",IDC_STATIC,7,146,45,10
CONTROL "縦(&I)",IDC_RADIO_PORTRAIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,58,145,40,10
CONTROL "横(&A)",IDC_RADIO_LANDSCAPE,"Button",BS_AUTORADIOBUTTON,102,145,40,10
RTEXT "用紙の向き",IDC_STATIC,7,148,45,10
CONTROL "縦(&I)",IDC_RADIO_PORTRAIT,"Button",BS_AUTORADIOBUTTON | WS_GROUP,58,147,40,10
CONTROL "横(&A)",IDC_RADIO_LANDSCAPE,"Button",BS_AUTORADIOBUTTON,102,147,40,10
RTEXT "余白／上(&T)",IDC_STATIC,7,163,45,10
EDITTEXT IDC_EDIT_MARGINTY,56,161,30,12,ES_AUTOHSCROLL
CONTROL "Spin5",IDC_SPIN_MARGINTY,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,161,9,12
LTEXT "(mm)",IDC_STATIC,88,163,17,10
LTEXT "(mm)",IDC_STATIC,88,163,25,10
RTEXT "下(&B)",IDC_STATIC,7,177,45,10
EDITTEXT IDC_EDIT_MARGINBY,56,175,30,12,ES_AUTOHSCROLL
CONTROL "Spin6",IDC_SPIN_MARGINBY,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,175,9,12
LTEXT "(mm)",IDC_STATIC,88,177,17,10
LTEXT "(mm)",IDC_STATIC,88,177,25,10
RTEXT "左(&L)",IDC_STATIC,7,191,45,10
EDITTEXT IDC_EDIT_MARGINLX,56,189,30,12,ES_AUTOHSCROLL
CONTROL "Spin7",IDC_SPIN_MARGINLX,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,189,9,12
LTEXT "(mm)",IDC_STATIC,88,191,17,10
LTEXT "(mm)",IDC_STATIC,88,191,25,10
RTEXT "右(&R)",IDC_STATIC,7,205,45,10
EDITTEXT IDC_EDIT_MARGINRX,56,202,30,12,ES_AUTOHSCROLL
CONTROL "Spin8",IDC_SPIN_MARGINRX,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,202,9,12
LTEXT "(mm)",IDC_STATIC,88,205,17,10
CONTROL "行番号を印刷(&N)",IDC_CHECK_LINENUMBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,35,70,10
CONTROL "英文ワードラップ(&W)",IDC_CHECK_WORDWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,49,78,10
CONTROL "行頭禁則",IDC_CHECK_PS_KINSOKUHEAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,63,46,10
CONTROL "行末禁則",IDC_CHECK_PS_KINSOKUTAIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,77,46,10
CONTROL "改行ぶら下げ",IDC_CHECK_PS_KINSOKURET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,197,63,60,10
CONTROL "句読点ぶら下げ",IDC_CHECK_PS_KINSOKUKUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,197,77,67,10
LTEXT "行あたりの文字数：",IDC_STATIC,150,96,65,10
LTEXT "縦方向の行数：",IDC_STATIC,150,110,65,10
RTEXT "0",IDC_STATIC_ENABLECOLUMNS,215,96,20,10
RTEXT "0",IDC_STATIC_ENABLELINES,215,110,20,10
GROUPBOX "",IDC_STATIC,145,87,112,37
CONTROL "カラー印刷(&V)",IDC_CHECK_COLORPRINT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,145,61,10
LTEXT "ヘッダー(&U)",IDC_STATIC,107,163,38,10
EDITTEXT IDC_EDIT_HEAD1,107,175,50,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_HEAD2,158,175,50,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_HEAD3,209,175,50,12,ES_AUTOHSCROLL
CONTROL "使用",IDC_CHECK_USE_FONT_HEAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,260,164,30,10
PUSHBUTTON "フォント",IDC_BUTTON_FONT_HEAD,260,174,30,14
RTEXT "Font(xxpt/xx.xmm)",IDC_STATIC_FONT_HEAD,145,160,114,14,SS_CENTERIMAGE
LTEXT "フッター(&D)",IDC_STATIC,107,191,38,10
EDITTEXT IDC_EDIT_FOOT1,107,203,50,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_FOOT2,158,203,50,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_FOOT3,209,203,50,12,ES_AUTOHSCROLL
CONTROL "使用",IDC_CHECK_USE_FONT_FOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,260,192,30,10
PUSHBUTTON "フォント",IDC_BUTTON_FONT_FOOT,260,202,30,14
RTEXT "Font(xxpt/xx.xmm)",IDC_STATIC_FONT_FOOT,145,189,114,14,SS_CENTERIMAGE
EDITTEXT IDC_EDIT_MARGINRX,56,203,30,12,ES_AUTOHSCROLL
CONTROL "Spin8",IDC_SPIN_MARGINRX,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,203,9,12
LTEXT "(mm)",IDC_STATIC,88,205,25,10
CONTROL "行番号を印刷(&N)",IDC_CHECK_LINENUMBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,174,35,70,10
CONTROL "英文ワードラップ(&W)",IDC_CHECK_WORDWRAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,174,49,78,10
CONTROL "行頭禁則",IDC_CHECK_PS_KINSOKUHEAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,174,63,46,10
CONTROL "行末禁則",IDC_CHECK_PS_KINSOKUTAIL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,174,77,46,10
CONTROL "改行ぶら下げ",IDC_CHECK_PS_KINSOKURET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,227,63,60,10
CONTROL "句読点ぶら下げ",IDC_CHECK_PS_KINSOKUKUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,227,77,67,10
LTEXT "行あたりの文字数：",IDC_STATIC,174,96,65,10
LTEXT "縦方向の行数：",IDC_STATIC,174,110,65,10
RTEXT "0",IDC_STATIC_ENABLECOLUMNS,229,96,20,10
RTEXT "0",IDC_STATIC_ENABLELINES,229,110,20,10
GROUPBOX "",IDC_STATIC,169,87,112,37
CONTROL "カラー印刷(&V)",IDC_CHECK_COLORPRINT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,160,147,61,10
LTEXT "ヘッダー(&U)",IDC_STATIC,111,163,38,10
EDITTEXT IDC_EDIT_HEAD1,111,175,50,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_HEAD2,162,175,50,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_HEAD3,213,175,50,12,ES_AUTOHSCROLL
CONTROL "使用",IDC_CHECK_USE_FONT_HEAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,164,30,10
PUSHBUTTON "フォント",IDC_BUTTON_FONT_HEAD,264,174,30,14
RTEXT "Font(xxpt/xx.xmm)",IDC_STATIC_FONT_HEAD,149,160,110,14,SS_CENTERIMAGE
LTEXT "フッター(&D)",IDC_STATIC,111,191,38,10
EDITTEXT IDC_EDIT_FOOT1,111,203,50,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_FOOT2,162,203,50,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_FOOT3,213,203,50,12,ES_AUTOHSCROLL
CONTROL "使用",IDC_CHECK_USE_FONT_FOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,192,30,10
PUSHBUTTON "フォント",IDC_BUTTON_FONT_FOOT,264,202,30,14
RTEXT "Font(xxpt/xx.xmm)",IDC_STATIC_FONT_FOOT,149,188,110,14,SS_CENTERIMAGE
DEFPUSHBUTTON "&OK",IDOK,128,234,50,14
PUSHBUTTON "キャンセル(&X)",IDCANCEL,183,234,50,14
PUSHBUTTON "ヘルプ(&H)",IDC_BUTTON_HELP,238,234,50,14
Expand Down
6 changes: 3 additions & 3 deletions sakura_lang_en_US/sakura_lang_rc.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ BEGIN
RTEXT "Line &Spacing",IDC_STATIC,5,85,49,8
EDITTEXT IDC_EDIT_LINESPACE,56,83,30,12,ES_AUTOHSCROLL
CONTROL "Spin2",IDC_SPIN_LINESPACE,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,83,9,12
LTEXT "(%)",IDC_STATIC,88,85,10,8
LTEXT "(%)",IDC_STATIC,88,85,14,8
RTEXT "&Col sz",IDC_STATIC,7,99,45,8
EDITTEXT IDC_EDIT_DANSUU,56,97,30,12,ES_AUTOHSCROLL
CONTROL "Spin3",IDC_SPIN_DANSUU,"msctls_updown32",UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,76,97,9,12
Expand Down Expand Up @@ -430,14 +430,14 @@ BEGIN
EDITTEXT IDC_EDIT_HEAD3,209,175,50,12,ES_AUTOHSCROLL
CONTROL "Use",IDC_CHECK_USE_FONT_HEAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,260,164,30,10
PUSHBUTTON "Font",IDC_BUTTON_FONT_HEAD,260,174,30,14
RTEXT "Font(xxpt/xx.xmm)",IDC_STATIC_FONT_HEAD,145,161,114,14,SS_CENTERIMAGE
RTEXT "Font(xxpt/xx.xmm)",IDC_STATIC_FONT_HEAD,145,160,114,14,SS_CENTERIMAGE
LTEXT "Footer(&D)",IDC_STATIC,107,193,38,8
EDITTEXT IDC_EDIT_FOOT1,107,203,50,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_FOOT2,158,203,50,12,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_FOOT3,209,203,50,12,ES_AUTOHSCROLL
CONTROL "Use",IDC_CHECK_USE_FONT_FOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,260,192,30,10
PUSHBUTTON "Font",IDC_BUTTON_FONT_FOOT,260,202,30,14
RTEXT "Font(xxpt/xx.xmm)",IDC_STATIC_FONT_FOOT,145,189,114,14,SS_CENTERIMAGE
RTEXT "Font(xxpt/xx.xmm)",IDC_STATIC_FONT_FOOT,145,188,114,14,SS_CENTERIMAGE
DEFPUSHBUTTON "&OK",IDOK,128,234,50,14
PUSHBUTTON "Cancel(&X)",IDCANCEL,183,234,50,14
PUSHBUTTON "&Help",IDC_BUTTON_HELP,238,234,50,14
Expand Down