[Ttssh2-commit] [5819] チケット #34943 設定フォルダを開く

svnno****@sourc***** svnno****@sourc*****
2015年 3月 8日 (日) 01:09:57 JST


Revision: 5819
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5819
Author:   yutakapon
Date:     2015-03-08 01:09:55 +0900 (Sun, 08 Mar 2015)
Log Message:
-----------
チケット #34943 設定フォルダを開く

フォルダ名とファイル名を合わせて、エディットボックスに表示するようにした。

Ticket Links:
------------
    http://sourceforge.jp/projects/ttssh2/tracker/detail/34943

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttermpro.rc
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2015-03-07 13:16:37 UTC (rev 5818)
+++ trunk/teraterm/teraterm/ttermpro.rc	2015-03-07 16:09:55 UTC (rev 5819)
@@ -29,10 +29,10 @@
 CAPTION "Setup directory"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    LTEXT           "TERATERM.INI",IDC_INI_SETUPDIR_STATIC,7,18,49,8
+    LTEXT           "INI",IDC_INI_SETUPDIR_STATIC,7,18,11,8
     EDITTEXT        IDC_INI_SETUPDIR_EDIT,73,16,253,14,ES_AUTOHSCROLL | ES_READONLY
     PUSHBUTTON      "...",IDC_INI_SETUPDIR_BUTTON,338,16,26,14
-    LTEXT           "KEYBOARD.CNF",IDC_KEYCNF_SETUPDIR_STATIC,7,38,52,8
+    LTEXT           "CNF",IDC_KEYCNF_SETUPDIR_STATIC,7,38,14,8
     EDITTEXT        IDC_KEYCNF_SETUPDIR_EDIT,73,37,253,14,ES_AUTOHSCROLL | ES_READONLY
     PUSHBUTTON      "...",IDC_KEYCNF_SETUPDIR_BUTTON,338,37,26,14
     LTEXT           "cygterm.cfg",IDC_CYGTERM_SETUPDIR_STATIC,7,59,40,8

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2015-03-07 13:16:37 UTC (rev 5818)
+++ trunk/teraterm/teraterm/vtwin.cpp	2015-03-07 16:09:55 UTC (rev 5819)
@@ -4728,36 +4728,40 @@
 		// \x90ݒ\xE8\x83t\x83@\x83C\x83\x8B(teraterm.ini)\x82̃p\x83X\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B
 		ExtractFileName(ts.SetupFName, inifilename, sizeof(inifilename));
 		ExtractDirName(ts.SetupFName, inipath);
-		SetDlgItemText(hDlgWnd, IDC_INI_SETUPDIR_STATIC, inifilename);
-		SetDlgItemText(hDlgWnd, IDC_INI_SETUPDIR_EDIT, inipath);
+		//SetDlgItemText(hDlgWnd, IDC_INI_SETUPDIR_STATIC, inifilename);
+		SetDlgItemText(hDlgWnd, IDC_INI_SETUPDIR_EDIT, ts.SetupFName);
 
 		// \x90ݒ\xE8\x83t\x83@\x83C\x83\x8B(KEYBOARD.CNF)\x82̃p\x83X\x82\xF0\x8E擾\x82\xB7\x82\xE9\x81B
 		ExtractFileName(ts.KeyCnfFN, keycnffilename, sizeof(keycnfpath));
 		ExtractDirName(ts.KeyCnfFN, keycnfpath);
-		SetDlgItemText(hDlgWnd, IDC_KEYCNF_SETUPDIR_STATIC, keycnffilename);
-		SetDlgItemText(hDlgWnd, IDC_KEYCNF_SETUPDIR_EDIT, keycnfpath);
+		//SetDlgItemText(hDlgWnd, IDC_KEYCNF_SETUPDIR_STATIC, keycnffilename);
+		SetDlgItemText(hDlgWnd, IDC_KEYCNF_SETUPDIR_EDIT, ts.KeyCnfFN);
 
 		// cygterm.cfg \x82\xCD ttermpro.exe \x94z\x89\xBA\x82Ɉʒu\x82\xB7\x82\xE9\x81B
 		strncpy_s(cygtermfilename, sizeof(cygtermfilename), "cygterm.cfg", _TRUNCATE);
 		strncpy_s(cygtermpath, sizeof(cygtermpath), teratermexepath, _TRUNCATE);
-		SetDlgItemText(hDlgWnd, IDC_CYGTERM_SETUPDIR_STATIC, cygtermfilename);
-		SetDlgItemText(hDlgWnd, IDC_CYGTERM_SETUPDIR_EDIT, cygtermpath);
+		//SetDlgItemText(hDlgWnd, IDC_CYGTERM_SETUPDIR_STATIC, cygtermfilename);
+		_snprintf_s(temp, sizeof(temp), "%s\\%s", cygtermpath, cygtermfilename);
+		SetDlgItemText(hDlgWnd, IDC_CYGTERM_SETUPDIR_EDIT, temp);
 
 		// TODO: Eterm look-feel \x8A֘A\x82\xCD BGThemeFile \x83G\x83\x93\x83g\x83\x8A\x82\xA9\x82\xE7\x8E擾\x82\xB7\x82\xE9\x81B
 		strncpy_s(eterm1filename, sizeof(eterm1filename), "ImageFile.INI", _TRUNCATE);
 		_snprintf_s(eterm1path, sizeof(eterm1path), "%s\\theme", teratermexepath);
-		SetDlgItemText(hDlgWnd, IDC_ETERM1_SETUPDIR_STATIC, eterm1filename);
-		SetDlgItemText(hDlgWnd, IDC_ETERM1_SETUPDIR_EDIT, eterm1path);
+		//SetDlgItemText(hDlgWnd, IDC_ETERM1_SETUPDIR_STATIC, eterm1filename);
+		_snprintf_s(temp, sizeof(temp), "%s\\%s", eterm1path, eterm1filename);
+		SetDlgItemText(hDlgWnd, IDC_ETERM1_SETUPDIR_EDIT, temp);
 
 		strncpy_s(eterm2filename, sizeof(eterm2filename), "Scale.INI", _TRUNCATE);
 		_snprintf_s(eterm2path, sizeof(eterm2path), "%s\\theme", teratermexepath);
-		SetDlgItemText(hDlgWnd, IDC_ETERM2_SETUPDIR_STATIC, eterm2filename);
-		SetDlgItemText(hDlgWnd, IDC_ETERM2_SETUPDIR_EDIT, eterm2path);
+		//SetDlgItemText(hDlgWnd, IDC_ETERM2_SETUPDIR_STATIC, eterm2filename);
+		_snprintf_s(temp, sizeof(temp), "%s\\%s", eterm2path, eterm2filename);
+		SetDlgItemText(hDlgWnd, IDC_ETERM2_SETUPDIR_EDIT, temp);
 
 		strncpy_s(eterm3filename, sizeof(eterm3filename), "Tile.INI", _TRUNCATE);
 		_snprintf_s(eterm3path, sizeof(eterm3path), "%s\\theme", teratermexepath);
-		SetDlgItemText(hDlgWnd, IDC_ETERM3_SETUPDIR_STATIC, eterm3filename);
-		SetDlgItemText(hDlgWnd, IDC_ETERM3_SETUPDIR_EDIT, eterm3path);
+		//SetDlgItemText(hDlgWnd, IDC_ETERM3_SETUPDIR_STATIC, eterm3filename);
+		_snprintf_s(temp, sizeof(temp), "%s\\%s", eterm3path, eterm3filename);
+		SetDlgItemText(hDlgWnd, IDC_ETERM3_SETUPDIR_EDIT, temp);
 
 		// TODO: ssh_known_hosts
 



Ttssh2-commit メーリングリストの案内