[Ttssh2-commit] [5740] チケット #34762

svnno****@sourc***** svnno****@sourc*****
2014年 12月 30日 (火) 20:15:46 JST


Revision: 5740
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5740
Author:   yutakapon
Date:     2014-12-30 20:15:45 +0900 (Tue, 30 Dec 2014)
Log Message:
-----------
チケット #34762

マクロファイル名が長い場合においても、マクロウィンドウに行番号が表示されるようにした。

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

Modified Paths:
--------------
    trunk/teraterm/ttpmacro/ttm_res.h
    trunk/teraterm/ttpmacro/ttmmain.cpp
    trunk/teraterm/ttpmacro/ttpmacro.rc

-------------- next part --------------
Modified: trunk/teraterm/ttpmacro/ttm_res.h
===================================================================
--- trunk/teraterm/ttpmacro/ttm_res.h	2014-12-25 13:56:50 UTC (rev 5739)
+++ trunk/teraterm/ttpmacro/ttm_res.h	2014-12-30 11:15:45 UTC (rev 5740)
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by ttpmacro.rc
+// Microsoft Visual C++ \x82Ő\xB6\x90\xAC\x82\xB3\x82ꂽ\x83C\x83\x93\x83N\x83\x8B\x81[\x83h \x83t\x83@\x83C\x83\x8B\x81B
+// ttpmacro.rc \x82Ŏg\x97p
 //
 #define IDD_CTRLWIN                     100
 #define IDI_TTMACRO                     100
@@ -22,6 +22,7 @@
 #define IDC_MACROERRHELP                603
 #define IDC_EDIT1                       604
 #define IDC_EDIT_ERRLINE                604
+#define IDC_FILENAME                    605
 
 // Next default values for new objects
 // 
@@ -29,7 +30,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        601
 #define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         605
+#define _APS_NEXT_CONTROL_VALUE         606
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: trunk/teraterm/ttpmacro/ttmmain.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttmmain.cpp	2014-12-25 13:56:50 UTC (rev 5739)
+++ trunk/teraterm/ttpmacro/ttmmain.cpp	2014-12-30 11:15:45 UTC (rev 5740)
@@ -365,7 +365,9 @@
 	// line number (2005.7.18 yutaka)
 	// added line buffer (2005.7.22 yutaka)
 	// added MACRO filename (2013.9.8 yutaka)
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%s:%d:%s", GetMacroFileName(), GetLineNo(), GetLineBuffer());
+	// \x83t\x83@\x83C\x83\x8B\x96\xBC\x82̖\x96\x94\xF6\x82͏ȗ\xAA\x95\\x8E\xA6\x82Ƃ\xB7\x82\xE9\x81B(2014.12.30 yutaka)
+	SetDlgItemText(IDC_FILENAME, GetMacroFileName());
+	_snprintf_s(buf, sizeof(buf), _TRUNCATE, ":%d:%s", GetLineNo(), GetLineBuffer());
 	SetDlgItemText(IDC_LINENO, buf);
 
 	OldMapMode = dc.GetMapMode();

Modified: trunk/teraterm/ttpmacro/ttpmacro.rc
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.rc	2014-12-25 13:56:50 UTC (rev 5739)
+++ trunk/teraterm/ttpmacro/ttpmacro.rc	2014-12-30 11:15:45 UTC (rev 5740)
@@ -16,10 +16,8 @@
 // \x89p\x8C\xEA (\x95č\x91) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
-#endif //_WIN32
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -58,7 +56,8 @@
 BEGIN
     DEFPUSHBUTTON   "&Pau&se",IDC_CTRLPAUSESTART,21,14,30,14
     PUSHBUTTON      "&End",IDC_CTRLEND,65,14,30,14
-    LTEXT           "LineNo:",IDC_LINENO,4,32,108,8
+    LTEXT           "LineNo:",IDC_LINENO,42,32,70,8
+    RTEXT           "FILENAME",IDC_FILENAME,3,32,35,8,SS_ENDELLIPSIS
 END
 
 IDD_ERRDLG DIALOGEX 20, 20, 263, 49
@@ -117,13 +116,21 @@
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
+    IDD_CTRLWIN, DIALOG
+    BEGIN
+    END
+
     IDD_ERRDLG, DIALOG
     BEGIN
         RIGHTMARGIN, 260
     END
 
+    IDD_STATDLG, DIALOG
+    BEGIN
+    END
+
     IDD_LISTDLG, DIALOG
     BEGIN
         LEFTMARGIN, 7



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