diff --git a/RecordTrayIcon.py b/RecordTrayIcon.py index 6bccd66..dfd7c94 100644 --- a/RecordTrayIcon.py +++ b/RecordTrayIcon.py @@ -5,6 +5,7 @@ from PyQt5.QtCore import * from PyQt5.QtGui import * import RecordType from RecordType import * +import resource class RecordTrayIcon(QSystemTrayIcon): def __init__(self, parent=None): @@ -56,17 +57,21 @@ class RecordTrayIcon(QSystemTrayIcon): if recording: if record_type == RecordType.Camera: - self.setIcon(self.get_icon('camera_recording_colorful.png')) + # self.setIcon(self.get_icon('camera_recording_colorful.png')) + self.setIcon(QIcon(':/resource/camera_recording_colorful.png')) self.setToolTip('正在录制摄像头...') elif record_type == RecordType.Screen: - self.setIcon(self.get_icon('screen_recording.png')) + # self.setIcon(self.get_icon('screen_recording.png')) + self.setIcon(QIcon(':/resource/screen_recording.png')) self.setToolTip('正在录制屏幕...') else: - self.setIcon(self.get_icon('stop.png')) + # self.setIcon(self.get_icon('stop.png')) + # self.setIcon(QIcon(':/resource/stop.png')) self.setToolTip('软件缩小在这里.') else: - self.setIcon(self.get_icon('start.png')) + # self.setIcon(self.get_icon('start.png')) + self.setIcon(QIcon(':/resource/start.png')) self.setToolTip('软件缩小在这里.') diff --git a/csetup.py b/csetup.py index f865b64..cf76694 100644 --- a/csetup.py +++ b/csetup.py @@ -2,7 +2,7 @@ import sys from cx_Freeze import setup, Executable # Dependencies are automatically detected, but it might need fine tuning. -build_exe_options = { 'include_files':['resource','ffmpeg-shared'], 'build_exe' : 'd:/dev/record/record-win'} +build_exe_options = { 'include_files':['ffmpeg-shared'], 'build_exe' : 'd:/dev/record/record-win'} install_exe_options = { 'install_dir' : 'd:/dev/record/record-win', 'build_dir':'build', 'install_exe':'d:\\record-camera-and-screen'} # GUI applications require a different base on Windows (the default is for a diff --git a/resource/gutin.ico b/resource/gutin.ico index 859fe8c..fcbbf88 100644 Binary files a/resource/gutin.ico and b/resource/gutin.ico differ diff --git a/setup.iss b/setup.iss index 41aecf4..9049f37 100644 --- a/setup.iss +++ b/setup.iss @@ -34,6 +34,7 @@ Name: "startupicon"; Description: " [Files] Source: "D:\dev\record\record-win\RecordWindow.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "D:\dev\record\record-win\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs + ; ע: ҪκιϵͳļʹáFlags: ignoreversion [Icons] @@ -42,6 +43,7 @@ Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}" Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon +Name: "{userstartup}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: startupicon [Run] Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent diff --git a/stop_process_by_pid.py b/stop_process_by_pid.py deleted file mode 100644 index ebf9af8..0000000 --- a/stop_process_by_pid.py +++ /dev/null @@ -1,5 +0,0 @@ -import os,signal - -pid = input('输入进程id:') - -print(os.kill(int(pid) , signal.CTRL_C_EVENT)) \ No newline at end of file diff --git a/test/help.html b/test/help.html new file mode 100644 index 0000000..c8e6ede --- /dev/null +++ b/test/help.html @@ -0,0 +1,79 @@ + + + + + + + + + + + +
+
+ +
+
+

ϵͳ-

+

+

Ҫ¼ͷ¼Ļз¼״̬¼ͷ¼Ļ״̬Ҫͼı仯֣
+
+
    +
  • +
    • ¼״̬
  • +
    • ¼ͷ
  • +
    • ¼Ļ
  • +
+
+

+
+ + +
+ + diff --git a/test_RecordVideo.py b/test_RecordVideo.py deleted file mode 100644 index 5da8e26..0000000 --- a/test_RecordVideo.py +++ /dev/null @@ -1,8 +0,0 @@ -import RecordVideo -from RecordVideo import * - -rv=RecordVideo() -rv.record_camera() -# rv.record() -# rv.kill_process(process_name='ffmpeg') -# rv.play() diff --git a/tsetup.py b/tsetup.py deleted file mode 100644 index b3da2fe..0000000 --- a/tsetup.py +++ /dev/null @@ -1,4 +0,0 @@ -from distutils.core import setup -import py2exe - -setup(console = ["RecordWindow.py"]) \ No newline at end of file