Skip to content

Commit

Permalink
关于对话框中显示的最后编译时间改为由生成事件自动生成
Browse files Browse the repository at this point in the history
  • Loading branch information
zhongyang219 committed Apr 18, 2021
1 parent e8d107f commit a827eee
Show file tree
Hide file tree
Showing 10 changed files with 51 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -295,3 +295,4 @@ __pycache__/
[Dd]ebug (without temperature)/
[Rr]elease (without temperature)/

/TrafficMonitor/compile_time.txt
3 changes: 2 additions & 1 deletion TrafficMonitor/AboutDlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ BOOL CAboutDlg::OnInitDialog()
//设置最后编译日期
CString temp_str;
GetDlgItemText(IDC_STATIC_COPYRIGHT, temp_str);
temp_str.Replace(_T("<compile_date>"), COMPILE_DATE);
CString str_compile_time = CCommon::GetLastCompileTime();
temp_str.Replace(_T("<compile_date>"), str_compile_time);
SetDlgItemText(IDC_STATIC_COPYRIGHT, temp_str);

m_tool_tip.Create(this, TTS_ALWAYSTIP | TTS_NOPREFIX);
Expand Down
10 changes: 9 additions & 1 deletion TrafficMonitor/Common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ wstring CCommon::GetStartUpPath()

void CCommon::GetFiles(const wchar_t* path, vector<wstring>& files)
{
//文件句柄
//文件句柄
intptr_t hFile = 0;
//文件信息(用Unicode保存使用_wfinddata_t,多字节字符集使用_finddata_t)
_wfinddata_t fileinfo;
Expand Down Expand Up @@ -925,6 +925,14 @@ CString CCommon::GetTextResource(UINT id, int code_type)
return res_str;
}

CString CCommon::GetLastCompileTime()
{
CString str_compile_time = GetTextResource(IDR_COMPILE_TIME, 0);
str_compile_time.Replace(_T("\r\n"), _T(""));
str_compile_time.Delete(str_compile_time.GetLength() - 1, 1);
return str_compile_time;
}

HICON CCommon::LoadIconResource(UINT id, int size)
{
return (HICON)LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(id), IMAGE_ICON, size, size, 0);
Expand Down
3 changes: 3 additions & 0 deletions TrafficMonitor/Common.h
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,9 @@ class CCommon
//从资源加载自定义文本资源。id:资源的ID,code_type:文本的编码格式:0:ANSI, 1:UTF8, 2:UTF16
static CString GetTextResource(UINT id, int code_type);

//从资源文件读取上次编译时间
static CString GetLastCompileTime();

//从资源加载一个图标
static HICON LoadIconResource(UINT id, int size);

Expand Down
3 changes: 3 additions & 0 deletions TrafficMonitor/TrafficMonitor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,9 @@ CString CTrafficMonitorApp::GetSystemInfoString()
info += CCommon::LoadText(_T(" ("), IDS_WITHOUT_TEMPERATURE, _T(")"));
#endif

info += _T("\r\nLast compiled date: ");
info += CCommon::GetLastCompileTime();

return info;
}

Expand Down
Binary file modified TrafficMonitor/TrafficMonitor.rc
Binary file not shown.
25 changes: 25 additions & 0 deletions TrafficMonitor/TrafficMonitor.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PreBuildEvent>
<Command>print_compile_time.bat</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug (without temperature)|Win32'">
<ClCompile>
Expand All @@ -235,6 +238,9 @@
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PreBuildEvent>
<Command>print_compile_time.bat</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
Expand All @@ -259,6 +265,9 @@
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PreBuildEvent>
<Command>print_compile_time.bat</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug (without temperature)|x64'">
<ClCompile>
Expand All @@ -282,6 +291,9 @@
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PreBuildEvent>
<Command>print_compile_time.bat</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
Expand Down Expand Up @@ -311,6 +323,9 @@
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PreBuildEvent>
<Command>print_compile_time.bat</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release (without temperature)|Win32'">
<ClCompile>
Expand Down Expand Up @@ -339,6 +354,9 @@
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PreBuildEvent>
<Command>print_compile_time.bat</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
Expand Down Expand Up @@ -367,6 +385,9 @@
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PreBuildEvent>
<Command>print_compile_time.bat</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release (without temperature)|x64'">
<ClCompile>
Expand Down Expand Up @@ -394,8 +415,12 @@
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<PreBuildEvent>
<Command>print_compile_time.bat</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<Text Include="compile_time.txt" />
<Text Include="ReadMe.txt" />
<Text Include="res\Acknowledgement.txt" />
<Text Include="res\Acknowledgement_en.txt" />
Expand Down
4 changes: 4 additions & 0 deletions TrafficMonitor/TrafficMonitor.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
<Filter>资源文件</Filter>
</Text>
<Text Include="res\Acknowledgement_en.txt" />
<Text Include="compile_time.txt" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="targetver.h">
Expand Down Expand Up @@ -534,6 +535,9 @@
<Filter>资源文件</Filter>
</None>
<None Include="..\LICENSE_CN" />
<None Include="res\menu_icon\text1.bin">
<Filter>资源文件</Filter>
</None>
</ItemGroup>
<ItemGroup>
<Image Include="res\TrafficMonitor.ico">
Expand Down
4 changes: 4 additions & 0 deletions TrafficMonitor/print_compile_time.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
REM 输出当前日期和时间,并保存到compile_time.txt文件中
del /F /Q compile_time.txt
echo %date:~0,10% >> compile_time.txt
echo %time:~0,8% >> compile_time.txt
Binary file modified TrafficMonitor/resource.h
Binary file not shown.

0 comments on commit a827eee

Please sign in to comment.