Open-Source-Software-Entwicklung und Downloads

Browse Subversion Repository

Diff of /trunk/teraterm/teraterm/addsetting.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2607 by maya, Sun Nov 2 14:25:21 2008 UTC revision 2628 by doda, Wed Dec 24 09:38:42 2008 UTC
# Line 101  BOOL CGeneralPropPageDlg::OnInitDialog() Line 101  BOOL CGeneralPropPageDlg::OnInitDialog()
101  {  {
102          char uimsg[MAX_UIMSG];          char uimsg[MAX_UIMSG];
103          char buf[64];          char buf[64];
104          CButton *btn;          CButton *btn, *btn2;
105          CComboBox *cmb;          CComboBox *cmb;
106    
107          CPropertyPage::OnInitDialog();          CPropertyPage::OnInitDialog();
# Line 110  BOOL CGeneralPropPageDlg::OnInitDialog() Line 110  BOOL CGeneralPropPageDlg::OnInitDialog()
110          GetObject(font, sizeof(LOGFONT), &logfont);          GetObject(font, sizeof(LOGFONT), &logfont);
111          if (get_lang_font("DLG_TAHOMA_FONT", GetSafeHwnd(), &logfont, &DlgGeneralFont, ts.UILanguageFile)) {          if (get_lang_font("DLG_TAHOMA_FONT", GetSafeHwnd(), &logfont, &DlgGeneralFont, ts.UILanguageFile)) {
112                  SendDlgItemMessage(IDC_CLICKABLE_URL, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_CLICKABLE_URL, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
                 SendDlgItemMessage(IDC_DELIMITER, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));  
                 SendDlgItemMessage(IDC_DELIM_LIST, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));  
113                  SendDlgItemMessage(IDC_DISABLE_SENDBREAK, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_DISABLE_SENDBREAK, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
114                  SendDlgItemMessage(IDC_ACCEPT_BROADCAST, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0)); // 337: 2007/03/20                  SendDlgItemMessage(IDC_ACCEPT_BROADCAST, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0)); // 337: 2007/03/20
115                  SendDlgItemMessage(IDC_MOUSEWHEEL_SCROLL_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_MOUSEWHEEL_SCROLL_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
116                  SendDlgItemMessage(IDC_SCROLL_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_SCROLL_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
117                  SendDlgItemMessage(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
118                  SendDlgItemMessage(IDC_ACCEPT_MOUSE_EVENT_TRACKING, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_ACCEPT_MOUSE_EVENT_TRACKING, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
119                    SendDlgItemMessage(IDC_DISABLE_MOUSE_TRACKING_CTRL, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
120                  SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING_LABEL, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING_LABEL, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
121                  SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, WM_SETFONT, (WPARAM)DlgGeneralFont, MAKELPARAM(TRUE,0));
122          }          }
# Line 128  BOOL CGeneralPropPageDlg::OnInitDialog() Line 127  BOOL CGeneralPropPageDlg::OnInitDialog()
127          GetDlgItemText(IDC_CLICKABLE_URL, uimsg, sizeof(uimsg));          GetDlgItemText(IDC_CLICKABLE_URL, uimsg, sizeof(uimsg));
128          get_lang_msg("DLG_TAB_GENERAL_CLICKURL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);          get_lang_msg("DLG_TAB_GENERAL_CLICKURL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
129          SetDlgItemText(IDC_CLICKABLE_URL, ts.UIMsg);          SetDlgItemText(IDC_CLICKABLE_URL, ts.UIMsg);
         GetDlgItemText(IDC_DELIMITER, uimsg, sizeof(uimsg));  
         get_lang_msg("DLG_TAB_GENERAL_DEMILITER", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);  
         SetDlgItemText(IDC_DELIMITER, ts.UIMsg);  
130          GetDlgItemText(IDC_DISABLE_SENDBREAK, uimsg, sizeof(uimsg));          GetDlgItemText(IDC_DISABLE_SENDBREAK, uimsg, sizeof(uimsg));
131          get_lang_msg("DLG_TAB_GENERAL_DISABLESENDBREAK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);          get_lang_msg("DLG_TAB_GENERAL_DISABLESENDBREAK", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
132          SetDlgItemText(IDC_DISABLE_SENDBREAK, ts.UIMsg);          SetDlgItemText(IDC_DISABLE_SENDBREAK, ts.UIMsg);
# Line 146  BOOL CGeneralPropPageDlg::OnInitDialog() Line 142  BOOL CGeneralPropPageDlg::OnInitDialog()
142          GetDlgItemText(IDC_ACCEPT_MOUSE_EVENT_TRACKING, uimsg, sizeof(uimsg));          GetDlgItemText(IDC_ACCEPT_MOUSE_EVENT_TRACKING, uimsg, sizeof(uimsg));
143          get_lang_msg("DLG_TAB_GENERAL_ACCEPT_MOUSE_EVENT_TRACKING", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);          get_lang_msg("DLG_TAB_GENERAL_ACCEPT_MOUSE_EVENT_TRACKING", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
144          SetDlgItemText(IDC_ACCEPT_MOUSE_EVENT_TRACKING, ts.UIMsg);          SetDlgItemText(IDC_ACCEPT_MOUSE_EVENT_TRACKING, ts.UIMsg);
145            GetDlgItemText(IDC_DISABLE_MOUSE_TRACKING_CTRL, uimsg, sizeof(uimsg));
146            get_lang_msg("DLG_TAB_GENERAL_DISABLE_MOUSE_TRACKING_CTRL", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
147            SetDlgItemText(IDC_DISABLE_MOUSE_TRACKING_CTRL, ts.UIMsg);
148          GetDlgItemText(IDC_ACCEPT_TITLE_CHANGING_LABEL, uimsg, sizeof(uimsg));          GetDlgItemText(IDC_ACCEPT_TITLE_CHANGING_LABEL, uimsg, sizeof(uimsg));
149          get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);          get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
150          SetDlgItemText(IDC_ACCEPT_TITLE_CHANGING_LABEL, ts.UIMsg);          SetDlgItemText(IDC_ACCEPT_TITLE_CHANGING_LABEL, ts.UIMsg);
# Line 154  BOOL CGeneralPropPageDlg::OnInitDialog() Line 153  BOOL CGeneralPropPageDlg::OnInitDialog()
153          SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);          SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
154          get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_OVERWRITE", ts.UIMsg, sizeof(ts.UIMsg), "overwrite", ts.UILanguageFile);          get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_OVERWRITE", ts.UIMsg, sizeof(ts.UIMsg), "overwrite", ts.UILanguageFile);
155          SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);          SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
156          get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_BEFORE", ts.UIMsg, sizeof(ts.UIMsg), "before", ts.UILanguageFile);          get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_AHEAD", ts.UIMsg, sizeof(ts.UIMsg), "ahead", ts.UILanguageFile);
157          SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);          SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
158          get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_AFTER", ts.UIMsg, sizeof(ts.UIMsg), "after", ts.UILanguageFile);          get_lang_msg("DLG_TAB_GENERAL_ACCEPT_TITLE_CHANGING_LAST", ts.UIMsg, sizeof(ts.UIMsg), "last", ts.UILanguageFile);
159          SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);          SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
160    
161    
# Line 168  BOOL CGeneralPropPageDlg::OnInitDialog() Line 167  BOOL CGeneralPropPageDlg::OnInitDialog()
167          btn = (CButton *)GetDlgItem(IDC_CLICKABLE_URL);          btn = (CButton *)GetDlgItem(IDC_CLICKABLE_URL);
168          btn->SetCheck(ts.EnableClickableUrl);          btn->SetCheck(ts.EnableClickableUrl);
169    
170          // (3)delimiter characters          // (3)AcceptBroadcast 337: 2007/03/20
         SetDlgItemText(IDC_DELIM_LIST, ts.DelimList);  
   
         // (4)AcceptBroadcast 337: 2007/03/20  
171          btn = (CButton *)GetDlgItem(IDC_ACCEPT_BROADCAST);          btn = (CButton *)GetDlgItem(IDC_ACCEPT_BROADCAST);
172          btn->SetCheck(ts.AcceptBroadcast);          btn->SetCheck(ts.AcceptBroadcast);
173    
174          // (5)IDC_MOUSEWHEEL_SCROLL_LINE          // (4)IDC_MOUSEWHEEL_SCROLL_LINE
175          _snprintf_s(buf, sizeof(buf), "%d", ts.MouseWheelScrollLine);          _snprintf_s(buf, sizeof(buf), "%d", ts.MouseWheelScrollLine);
176          SetDlgItemText(IDC_SCROLL_LINE, buf);          SetDlgItemText(IDC_SCROLL_LINE, buf);
177    
178          // (6)IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE          // (5)IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE
179          btn = (CButton *)GetDlgItem(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE);          btn = (CButton *)GetDlgItem(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE);
180          btn->SetCheck(ts.AutoScrollOnlyInBottomLine);          btn->SetCheck(ts.AutoScrollOnlyInBottomLine);
181    
182          // (7)IDC_ACCEPT_MOUSE_EVENT_TRACKING          // (6)IDC_ACCEPT_MOUSE_EVENT_TRACKING
183          btn = (CButton *)GetDlgItem(IDC_ACCEPT_MOUSE_EVENT_TRACKING);          btn = (CButton *)GetDlgItem(IDC_ACCEPT_MOUSE_EVENT_TRACKING);
184            btn2 = (CButton *)GetDlgItem(IDC_DISABLE_MOUSE_TRACKING_CTRL);
185          btn->SetCheck(ts.MouseEventTracking);          btn->SetCheck(ts.MouseEventTracking);
186            if (ts.MouseEventTracking) {
187                    btn2->EnableWindow(TRUE);
188            } else {
189                    btn2->EnableWindow(FALSE);
190            }
191    
192            // (7)IDC_DISABLE_MOUSE_TRACKING_CTRL
193            btn2->SetCheck(ts.DisableMouseTrackingByCtrl);
194    
195          // (8)IDC_ACCEPT_TITLE_CHANGING          // (8)IDC_ACCEPT_TITLE_CHANGING
196          cmb = (CComboBox *)GetDlgItem(IDC_ACCEPT_TITLE_CHANGING);          cmb = (CComboBox *)GetDlgItem(IDC_ACCEPT_TITLE_CHANGING);
# Line 199  BOOL CGeneralPropPageDlg::OnInitDialog() Line 204  BOOL CGeneralPropPageDlg::OnInitDialog()
204    
205  BOOL CGeneralPropPageDlg::OnCommand(WPARAM wParam, LPARAM lParam)  BOOL CGeneralPropPageDlg::OnCommand(WPARAM wParam, LPARAM lParam)
206  {  {
207            CButton *btn, *btn2;
208    
209            switch (wParam) {
210                    case IDC_ACCEPT_MOUSE_EVENT_TRACKING | (BN_CLICKED << 16):
211                            btn = (CButton *)GetDlgItem(IDC_ACCEPT_MOUSE_EVENT_TRACKING);
212                            btn2 = (CButton *)GetDlgItem(IDC_DISABLE_MOUSE_TRACKING_CTRL);
213                            if (btn->GetCheck()) {
214                                    btn2->EnableWindow(TRUE);
215                            } else {
216                                    btn2->EnableWindow(FALSE);
217                            }
218                            return TRUE;
219            }
220          return CPropertyPage::OnCommand(wParam, lParam);          return CPropertyPage::OnCommand(wParam, lParam);
221  }  }
222    
# Line 217  void CGeneralPropPageDlg::OnOK() Line 235  void CGeneralPropPageDlg::OnOK()
235          btn = (CButton *)GetDlgItem(IDC_CLICKABLE_URL);          btn = (CButton *)GetDlgItem(IDC_CLICKABLE_URL);
236          ts.EnableClickableUrl = btn->GetCheck();          ts.EnableClickableUrl = btn->GetCheck();
237    
238          // (3)          // (3) 337: 2007/03/20
         GetDlgItemText(IDC_DELIM_LIST, ts.DelimList, sizeof(ts.DelimList));  
   
         // (4) 337: 2007/03/20  
239          btn = (CButton *)GetDlgItem(IDC_ACCEPT_BROADCAST);          btn = (CButton *)GetDlgItem(IDC_ACCEPT_BROADCAST);
240          ts.AcceptBroadcast = btn->GetCheck();          ts.AcceptBroadcast = btn->GetCheck();
241    
242          // (5)IDC_MOUSEWHEEL_SCROLL_LINE          // (4)IDC_MOUSEWHEEL_SCROLL_LINE
243          GetDlgItemText(IDC_SCROLL_LINE, buf, sizeof(buf));          GetDlgItemText(IDC_SCROLL_LINE, buf, sizeof(buf));
244          val = atoi(buf);          val = atoi(buf);
245          if (val > 0)          if (val > 0)
246                  ts.MouseWheelScrollLine = val;                  ts.MouseWheelScrollLine = val;
247    
248          // (6)IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE          // (5)IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE
249          btn = (CButton *)GetDlgItem(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE);          btn = (CButton *)GetDlgItem(IDC_AUTOSCROLL_ONLY_IN_BOTTOM_LINE);
250          ts.AutoScrollOnlyInBottomLine = btn->GetCheck();          ts.AutoScrollOnlyInBottomLine = btn->GetCheck();
251    
252          // (7)IDC_ACCEPT_MOUSE_EVENT_TRACKING          // (6)IDC_ACCEPT_MOUSE_EVENT_TRACKING
253          btn = (CButton *)GetDlgItem(IDC_ACCEPT_MOUSE_EVENT_TRACKING);          btn = (CButton *)GetDlgItem(IDC_ACCEPT_MOUSE_EVENT_TRACKING);
254          ts.MouseEventTracking = btn->GetCheck();          ts.MouseEventTracking = btn->GetCheck();
255    
256            // (7)IDC_DISABLE_MOUSE_TRACKING_CTRL
257            btn = (CButton *)GetDlgItem(IDC_DISABLE_MOUSE_TRACKING_CTRL);
258            ts.DisableMouseTrackingByCtrl = btn->GetCheck();
259    
260          // (8)IDC_ACCEPT_TITLE_CHANGING          // (8)IDC_ACCEPT_TITLE_CHANGING
261          cmb = (CComboBox *)GetDlgItem(IDC_ACCEPT_TITLE_CHANGING);          cmb = (CComboBox *)GetDlgItem(IDC_ACCEPT_TITLE_CHANGING);
262          ts.AcceptTitleChangeRequest = cmb->GetCurSel();          ts.AcceptTitleChangeRequest = cmb->GetCurSel();
# Line 281  BOOL CCopypastePropPageDlg::OnInitDialog Line 300  BOOL CCopypastePropPageDlg::OnInitDialog
300                  SendDlgItemMessage(IDC_CONFIRM_PASTE_RBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_CONFIRM_PASTE_RBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
301                  SendDlgItemMessage(IDC_SELECT_LBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_SELECT_LBUTTON, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
302                  SendDlgItemMessage(IDC_CONFIRM_CHANGE_PASTE, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_CONFIRM_CHANGE_PASTE, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
303                    SendDlgItemMessage(IDC_DELIMITER, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
304                    SendDlgItemMessage(IDC_DELIM_LIST, WM_SETFONT, (WPARAM)DlgCopypasteFont, MAKELPARAM(TRUE,0));
305          }          }
306          else {          else {
307                  DlgCopypasteFont = NULL;                  DlgCopypasteFont = NULL;
# Line 301  BOOL CCopypastePropPageDlg::OnInitDialog Line 322  BOOL CCopypastePropPageDlg::OnInitDialog
322          GetDlgItemText(IDC_CONFIRM_CHANGE_PASTE, uimsg, sizeof(uimsg));          GetDlgItemText(IDC_CONFIRM_CHANGE_PASTE, uimsg, sizeof(uimsg));
323          get_lang_msg("DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);          get_lang_msg("DLG_TAB_COPYPASTE_CONFIRM_CHANGE_PASTE", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
324          SetDlgItemText(IDC_CONFIRM_CHANGE_PASTE, ts.UIMsg);          SetDlgItemText(IDC_CONFIRM_CHANGE_PASTE, ts.UIMsg);
325            GetDlgItemText(IDC_DELIMITER, uimsg, sizeof(uimsg));
326            get_lang_msg("DLG_TAB_COPYPASTE_DELIMITER", ts.UIMsg, sizeof(ts.UIMsg), uimsg, ts.UILanguageFile);
327            SetDlgItemText(IDC_DELIMITER, ts.UIMsg);
328    
329          // (1)Enable continued-line copy          // (1)Enable continued-line copy
330          btn = (CButton *)GetDlgItem(IDC_LINECOPY);          btn = (CButton *)GetDlgItem(IDC_LINECOPY);
# Line 327  BOOL CCopypastePropPageDlg::OnInitDialog Line 351  BOOL CCopypastePropPageDlg::OnInitDialog
351          btn = (CButton *)GetDlgItem(IDC_CONFIRM_CHANGE_PASTE);          btn = (CButton *)GetDlgItem(IDC_CONFIRM_CHANGE_PASTE);
352          btn->SetCheck(ts.ConfirmChangePaste);          btn->SetCheck(ts.ConfirmChangePaste);
353    
354            // (6)delimiter characters
355            SetDlgItemText(IDC_DELIM_LIST, ts.DelimList);
356    
357    
358          // ダイアログにフォーカスを当てる          // ダイアログにフォーカスを当てる
359          ::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_LINECOPY));          ::SetFocus(::GetDlgItem(GetSafeHwnd(), IDC_LINECOPY));
360    
# Line 375  void CCopypastePropPageDlg::OnOK() Line 403  void CCopypastePropPageDlg::OnOK()
403          // (5)IDC_CONFIRM_CHANGE_PASTE          // (5)IDC_CONFIRM_CHANGE_PASTE
404          btn = (CButton *)GetDlgItem(IDC_CONFIRM_CHANGE_PASTE);          btn = (CButton *)GetDlgItem(IDC_CONFIRM_CHANGE_PASTE);
405          ts.ConfirmChangePaste = btn->GetCheck();          ts.ConfirmChangePaste = btn->GetCheck();
406    
407            // (6)
408            GetDlgItemText(IDC_DELIM_LIST, ts.DelimList, sizeof(ts.DelimList));
409  }  }
410    
411    
# Line 848  BOOL CCygwinPropPageDlg::OnInitDialog() Line 879  BOOL CCygwinPropPageDlg::OnInitDialog()
879                  SendDlgItemMessage(IDC_ENV2, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_ENV2, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
880                  SendDlgItemMessage(IDC_LOGIN_SHELL, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_LOGIN_SHELL, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
881                  SendDlgItemMessage(IDC_HOME_CHDIR, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));                  SendDlgItemMessage(IDC_HOME_CHDIR, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
882                    SendDlgItemMessage(IDC_AGENT_PROXY, WM_SETFONT, (WPARAM)DlgCygwinFont, MAKELPARAM(TRUE,0));
883          }          }
884          else {          else {
885                  DlgCygwinFont = NULL;                  DlgCygwinFont = NULL;
# Line 859  BOOL CCygwinPropPageDlg::OnInitDialog() Line 891  BOOL CCygwinPropPageDlg::OnInitDialog()
891    
892          // try to read CygTerm config file          // try to read CygTerm config file
893          memset(&settings, 0, sizeof(settings));          memset(&settings, 0, sizeof(settings));
894          _snprintf_s(settings.term, sizeof(settings.term), _TRUNCATE, ".\\ttermpro.exe %%s %%d /KR=SJIS /KT=SJIS /nossh");          _snprintf_s(settings.term, sizeof(settings.term), _TRUNCATE, "ttermpro.exe %%s %%d /E /KR=SJIS /KT=SJIS /VTICON=CygTerm /nossh");
895          _snprintf_s(settings.term_type, sizeof(settings.term_type), _TRUNCATE, "vt100");          _snprintf_s(settings.term_type, sizeof(settings.term_type), _TRUNCATE, "vt100");
896          _snprintf_s(settings.port_start, sizeof(settings.port_start), _TRUNCATE, "20000");          _snprintf_s(settings.port_start, sizeof(settings.port_start), _TRUNCATE, "20000");
897          _snprintf_s(settings.port_range, sizeof(settings.port_range), _TRUNCATE, "40");          _snprintf_s(settings.port_range, sizeof(settings.port_range), _TRUNCATE, "40");
898          _snprintf_s(settings.shell, sizeof(settings.shell), _TRUNCATE, "/bin/tcsh");          _snprintf_s(settings.shell, sizeof(settings.shell), _TRUNCATE, "auto");
899          _snprintf_s(settings.env1, sizeof(settings.env1), _TRUNCATE, "MAKE_MODE=unix");          _snprintf_s(settings.env1, sizeof(settings.env1), _TRUNCATE, "MAKE_MODE=unix");
900          _snprintf_s(settings.env2, sizeof(settings.env2), _TRUNCATE, "");          _snprintf_s(settings.env2, sizeof(settings.env2), _TRUNCATE, "");
901          settings.login_shell = FALSE;          settings.login_shell = FALSE;
902          settings.home_chdir = FALSE;          settings.home_chdir = FALSE;
903            settings.agent_proxy = FALSE;
904    
905          strncpy_s(cfg, sizeof(cfg), ts.HomeDir, _TRUNCATE);          strncpy_s(cfg, sizeof(cfg), ts.HomeDir, _TRUNCATE);
906          AppendSlash(cfg, sizeof(cfg));          AppendSlash(cfg, sizeof(cfg));
# Line 916  BOOL CCygwinPropPageDlg::OnInitDialog() Line 949  BOOL CCygwinPropPageDlg::OnInitDialog()
949                                          settings.home_chdir = TRUE;                                          settings.home_chdir = TRUE;
950                                  }                                  }
951    
952                            } else if (_stricmp(head, "SSH_AGENT_PROXY") == 0) {
953                                    if (strchr("YyTt", *body)) {
954                                            settings.agent_proxy = TRUE;
955                                    }
956    
957                          } else {                          } else {
958                                  // TODO: error check                                  // TODO: error check
959    
# Line 934  BOOL CCygwinPropPageDlg::OnInitDialog() Line 972  BOOL CCygwinPropPageDlg::OnInitDialog()
972          btn->SetCheck(settings.login_shell);          btn->SetCheck(settings.login_shell);
973          btn = (CButton *)GetDlgItem(IDC_HOME_CHDIR);          btn = (CButton *)GetDlgItem(IDC_HOME_CHDIR);
974          btn->SetCheck(settings.home_chdir);          btn->SetCheck(settings.home_chdir);
975            btn = (CButton *)GetDlgItem(IDC_AGENT_PROXY);
976            btn->SetCheck(settings.agent_proxy);
977    
978          // Cygwin install path          // Cygwin install path
979          SetDlgItemText(IDC_CYGWIN_PATH, ts.CygwinDirectory);          SetDlgItemText(IDC_CYGWIN_PATH, ts.CygwinDirectory);
# Line 985  void CCygwinPropPageDlg::OnOK() Line 1025  void CCygwinPropPageDlg::OnOK()
1025          settings.login_shell = btn->GetCheck();          settings.login_shell = btn->GetCheck();
1026          btn = (CButton *)GetDlgItem(IDC_HOME_CHDIR);          btn = (CButton *)GetDlgItem(IDC_HOME_CHDIR);
1027          settings.home_chdir = btn->GetCheck();          settings.home_chdir = btn->GetCheck();
1028            btn = (CButton *)GetDlgItem(IDC_AGENT_PROXY);
1029            settings.agent_proxy = btn->GetCheck();
1030    
1031          strncpy_s(cfg, sizeof(cfg), ts.HomeDir, _TRUNCATE);          strncpy_s(cfg, sizeof(cfg), ts.HomeDir, _TRUNCATE);
1032          AppendSlash(cfg, sizeof(cfg));          AppendSlash(cfg, sizeof(cfg));
# Line 1050  void CCygwinPropPageDlg::OnOK() Line 1092  void CCygwinPropPageDlg::OnOK()
1092                                          fprintf(tmp_fp, "HOME_CHDIR = %s\n", (settings.home_chdir == TRUE) ? "yes" : "no");                                          fprintf(tmp_fp, "HOME_CHDIR = %s\n", (settings.home_chdir == TRUE) ? "yes" : "no");
1093                                          settings.home_chdir = FALSE;                                          settings.home_chdir = FALSE;
1094                                  }                                  }
1095                                    else if (_stricmp(head, "SSH_AGENT_PROXY") == 0) {
1096                                            fprintf(tmp_fp, "SSH_AGENT_PROXY = %s\n", (settings.agent_proxy == TRUE) ? "yes" : "no");
1097                                            settings.agent_proxy = FALSE;
1098                                    }
1099                                  else {                                  else {
1100                                          fprintf(tmp_fp, "%s = %s\n", head, body);                                          fprintf(tmp_fp, "%s = %s\n", head, body);
1101                                  }                                  }
# Line 1087  void CCygwinPropPageDlg::OnOK() Line 1133  void CCygwinPropPageDlg::OnOK()
1133                  if (settings.home_chdir) {                  if (settings.home_chdir) {
1134                          fprintf(tmp_fp, "HOME_CHDIR = yes\n");                          fprintf(tmp_fp, "HOME_CHDIR = yes\n");
1135                  }                  }
1136                    if (settings.agent_proxy) {
1137                            fprintf(tmp_fp, "SSH_AGENT_PROXY = yes\n");
1138                    }
1139                  fclose(tmp_fp);                  fclose(tmp_fp);
1140    
1141                  if (remove(cfg) != 0 && errno != ENOENT) {                  if (remove(cfg) != 0 && errno != ENOENT) {

Legend:
Removed from v.2607  
changed lines
  Added in v.2628

Back to OSDN">Back to OSDN
ViewVC Help
Powered by ViewVC 1.1.26