From 28dc64abb3087c50521c93f6d540f22ac8677ad2 Mon Sep 17 00:00:00 2001 From: dep5 <66961537+dep5@users.noreply.github.com> Date: Mon, 12 Apr 2021 21:17:40 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8D=B0=E5=88=B7=E3=83=9A=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E8=A8=AD=E5=AE=9A=E3=81=AE=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/sakura_rc.rc | 82 ++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index 9612b17fc8..6916b10a1a 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -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 "印刷ページ設定" @@ -355,73 +355,73 @@ 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 + 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,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 + 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,145,189,114,14,SS_CENTERIMAGE DEFPUSHBUTTON "&OK",IDOK,128,234,50,14 PUSHBUTTON "キャンセル(&X)",IDCANCEL,183,234,50,14 From 3de243ad3dcae7171430f198067d6e91255edcc4 Mon Sep 17 00:00:00 2001 From: "D.Miwa" Date: Fri, 21 May 2021 23:44:03 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=A1=E3=82=A4=E3=83=AA=E3=82=AA/?= =?UTF-8?q?=E8=8B=B1=E8=AA=9E=E3=83=A2=E3=83=BC=E3=83=89=E3=81=AE=E6=99=82?= =?UTF-8?q?=E3=81=AE=E6=96=87=E5=AD=97=E5=88=87=E3=82=8C=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sakura_core/sakura_rc.rc | 4 ++-- sakura_lang_en_US/sakura_lang_rc.rc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sakura_core/sakura_rc.rc b/sakura_core/sakura_rc.rc index 6916b10a1a..b9c00b7d65 100644 --- a/sakura_core/sakura_rc.rc +++ b/sakura_core/sakura_rc.rc @@ -415,14 +415,14 @@ BEGIN 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,145,160,114,14,SS_CENTERIMAGE + 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,145,189,114,14,SS_CENTERIMAGE + 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 diff --git a/sakura_lang_en_US/sakura_lang_rc.rc b/sakura_lang_en_US/sakura_lang_rc.rc index 85c9bceb84..a5738d6b87 100644 --- a/sakura_lang_en_US/sakura_lang_rc.rc +++ b/sakura_lang_en_US/sakura_lang_rc.rc @@ -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 @@ -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