diff --git a/README.md b/README.md index b0229ac..cbca5cc 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,14 @@ env WINEPREFIX=容器路径 wine(wine的路径) 可执行文件路径 让你可以简易方便的使用 wine 是使用 Python3 的 tkinter 构建的 (自己美术功底太差,图标只能在网络上找了) -(测试平台:deepin 20.6;UOS 家庭版 21;Ubuntu 22.04) -![image.png](https://storage.deepin.org/thread/202207101734379289_image.png) +(测试平台:deepin 20.6;UOS 家庭版 21.3;Ubuntu 22.04) +![image.png](https://storage.deepin.org/thread/202207190819153104_image.png) 而打包器可以方便的把您的 wine 容器打包成 deb 包供他人使用,程序创建的 deb 构建临时文件夹目录树如下: ```bash /XXX ├── DEBIAN │ └── control +│ └── postrm(可选) └── opt └── apps └── XXX @@ -51,6 +52,7 @@ exe路径\' 参数 \' ``` 即可(单引号需要输入) 5、wine 容器如果没有指定,则会默认为 ~/.wine +![image.png](https://storage.deepin.org/thread/202207190819153104_image.png) ### 打包器 1、deb 打包软件包名要求: 软件包名只能含有小写字母(a-z)、数字(0-9)、加号(+)和减号(-)、以及点号(.),软件包名最短长度两个字符;它必须以字母开头 @@ -58,8 +60,33 @@ exe路径\' 参数 \' 3、输入 wine 的容器路径时最后面请不要输入“/” 4、输入可执行文件的运行路径时是以“C:/XXX/XXX.exe”的格式进行输入,默认是以 C: 为开头,不用“\”做命令的分隔,而是用“/” 5、.desktop 的图标只支持 PNG 格式和 SVG 格式,其他格式无法显示图标 +![image.png](https://storage.deepin.org/thread/202207190820337719_image.png) +### 基于统信 Wine 生态适配脚本的打包器 +第一个文本框是应用程序中文名 +第二个文本框是应用程序英文名 +第三个文本框是最终生成的包的描述 +第四个选择框是desktop文件中的分类 +第五个输入框是程序在 Wine 容器的位置,以 c:\\XXX 的形式,盘符必须小写,用反斜杠,如果路径带用户名的话会自动替换为$USER +而 StartupWMClass 字段将会由程序自动生成,作用如下: +desktop文件中StartupWMClass字段。用于让桌面组件将窗口类名与desktop文件相对应。这个值为实际运行的主程序EXE的文件名,wine/crossover在程序运行后会将文件名设置为窗口类名 +第六个输入框是最终生成的包的包名,包名的命名规则以deepin开头,加官网域名(需要前后对调位置),如还不能区分再加上应用名 +最后一个是最终生成的包的版本号,版本号命名规则:应用版本号+deepin+数字 +![image.png](https://storage.deepin.org/thread/202207190822204627_image.png) ## 更新日志 +### 1.7.0(2022年07月19日) +※1、界面大改造,从使用 Tkinter 改为 Qt,参考了 @134******28 和 @sgb76 提供的设计方案和代码 + +**※2、添加了基于 UOS 生态适配活动打包脚本的打包器,以及基于 Virtualbox 的简易 Windows 镜像安装工具** +**※3、将 pip 由阿里源改为华为源,提升下载安装速度,并删除使用 pip 下载库的功能(已不需要,废弃)** +4、添加 @delsin 和 @神末shenmo 建议的 postrm 脚本 +5、优化多屏窗口居中问题 +6、修复 1.6.0 程序无法保存设置的问题 +7、修复 1.6.0 的更新程序无法正常更新的问题 +8、升级 Geek Uninstaller 版本 +![image.png](https://storage.deepin.org/thread/202207190819153104_image.png) + + ### 1.6.0(2022年07月10日) **※1、新增程序感谢、谢明以及程序的建议和问题反馈和内置更新程序** **※2、支持 winetricks 指定 Wine 打开** diff --git a/VM-source/Makefile b/VM-source/Makefile index 0b83f36..67b68fc 100644 --- a/VM-source/Makefile +++ b/VM-source/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: VirtualMachine -# Generated by qmake (3.1) (Qt 5.15.3) +# Generated by qmake (3.1) (Qt 5.11.3) # Project: VirtualMachine.pro # Template: app # Command: /usr/lib/qt5/bin/qmake -o Makefile VirtualMachine.pro @@ -8,16 +8,14 @@ MAKEFILE = Makefile -EQ = = - ####### Compiler, tools and options CC = gcc CXX = g++ DEFINES = -DQT_DEPRECATED_WARNINGS -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -CFLAGS = -pipe -O2 -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES) -CXXFLAGS = -pipe -O2 -std=gnu++11 -Wall -Wextra -D_REENTRANT -fPIC $(DEFINES) -INCPATH = -I. -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I. -I. -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ +CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT -fPIC $(DEFINES) +CXXFLAGS = -pipe -O2 -std=gnu++11 -Wall -W -D_REENTRANT -fPIC $(DEFINES) +INCPATH = -I. -isystem /usr/include/x86_64-linux-gnu/qt5 -isystem /usr/include/x86_64-linux-gnu/qt5/QtWidgets -isystem /usr/include/x86_64-linux-gnu/qt5/QtGui -isystem /usr/include/x86_64-linux-gnu/qt5/QtNetwork -isystem /usr/include/x86_64-linux-gnu/qt5/QtCore -I. -isystem /usr/include/libdrm -I. -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ QMAKE = /usr/lib/qt5/bin/qmake DEL_FILE = rm -f CHK_DIR_EXISTS= test -d @@ -37,10 +35,10 @@ MOVE = mv -f TAR = tar -cf COMPRESS = gzip -9f DISTNAME = VirtualMachine1.0.0 -DISTDIR = /home/gfdgd_xi/Desktop/deep-wine-runner/VM/.tmp/VirtualMachine1.0.0 +DISTDIR = /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/.tmp/VirtualMachine1.0.0 LINK = g++ LFLAGS = -Wl,-O1 -LIBS = $(SUBLIBS) /usr/lib/x86_64-linux-gnu/libQt5Widgets.so /usr/lib/x86_64-linux-gnu/libQt5Gui.so /usr/lib/x86_64-linux-gnu/libQt5Network.so /usr/lib/x86_64-linux-gnu/libQt5Core.so -lGL -lpthread +LIBS = $(SUBLIBS) -lQt5Widgets -lQt5Gui -lQt5Network -lQt5Core -lGL -lpthread AR = ar cqs RANLIB = SED = sed @@ -77,10 +75,6 @@ DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkcommon.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkcore.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkgui.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkwidget.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_edid_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_egl_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri \ @@ -94,9 +88,10 @@ DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \ @@ -106,14 +101,12 @@ DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_theme_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_x11extras.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \ @@ -122,6 +115,7 @@ DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \ + .qmake.stash \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/toolchain.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \ @@ -129,7 +123,6 @@ DIST = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources_functions.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \ @@ -151,7 +144,7 @@ TARGET = VirtualMachine first: all ####### Build rules -VirtualMachine: ui_mainwindow.h $(OBJECTS) +$(TARGET): ui_mainwindow.h $(OBJECTS) $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS) Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf \ @@ -172,10 +165,6 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkcommon.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkcore.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkgui.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkwidget.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_edid_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_egl_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri \ @@ -189,9 +178,10 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri \ + /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri \ @@ -201,14 +191,12 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_theme_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_x11extras.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri \ @@ -217,6 +205,7 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf \ + .qmake.stash \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/toolchain.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf \ @@ -224,7 +213,6 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf \ - /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources_functions.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf \ @@ -237,7 +225,11 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/yacc.prf \ /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf \ VirtualMachine.pro \ - 图标.qrc + 图标.qrc \ + /usr/lib/x86_64-linux-gnu/libQt5Widgets.prl \ + /usr/lib/x86_64-linux-gnu/libQt5Gui.prl \ + /usr/lib/x86_64-linux-gnu/libQt5Network.prl \ + /usr/lib/x86_64-linux-gnu/libQt5Core.prl $(QMAKE) -o Makefile VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_pre.prf: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/common/unix.conf: @@ -257,10 +249,6 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dbus_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_devicediscovery_support_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkcommon.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkcore.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkgui.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_dtkwidget.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_edid_support_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_egl_support_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_eglfs_kms_support_private.pri: @@ -274,9 +262,10 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_input_support_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_kms_support_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_linuxaccessibility_support_private.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimedia.pri: +/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_network_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_opengl_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri: @@ -286,14 +275,12 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_service_support_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_sql_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_svg.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_testlib_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_theme_support_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_vulkan_support_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_widgets_private.pri: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_x11extras.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xcb_qpa_lib_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xkbcommon_support_private.pri: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/modules/qt_lib_xml.pri: @@ -302,6 +289,7 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt_config.prf: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qmake.conf: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/spec_post.prf: +.qmake.stash: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/exclusive_builds.prf: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/toolchain.prf: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_pre.prf: @@ -309,7 +297,6 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/default_post.prf: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/warn_on.prf: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/qt.prf: -/usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources_functions.prf: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/resources.prf: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/moc.prf: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/unix/opengl.prf: @@ -323,13 +310,17 @@ Makefile: VirtualMachine.pro /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++/qma /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/lex.prf: VirtualMachine.pro: 图标.qrc: +/usr/lib/x86_64-linux-gnu/libQt5Widgets.prl: +/usr/lib/x86_64-linux-gnu/libQt5Gui.prl: +/usr/lib/x86_64-linux-gnu/libQt5Network.prl: +/usr/lib/x86_64-linux-gnu/libQt5Core.prl: qmake: FORCE @$(QMAKE) -o Makefile VirtualMachine.pro qmake_all: FORCE -all: Makefile VirtualMachine +all: Makefile $(TARGET) dist: distdir FORCE (cd `dirname $(DISTDIR)` && $(TAR) $(DISTNAME).tar $(DISTNAME) && $(COMPRESS) $(DISTNAME).tar) && $(MOVE) `dirname $(DISTDIR)`/$(DISTNAME).tar.gz . && $(DEL_FILE) -r $(DISTDIR) @@ -370,27 +361,14 @@ compiler_rcc_clean: -$(DEL_FILE) qrc_图标.cpp qrc_图标.cpp: 图标.qrc \ /usr/lib/qt5/bin/rcc \ - icon.png \ - 截图_VirtualBox\ Machine_20220712142929.png \ - 截图/截图_VirtualBox\ Machine_20220712143018.png \ - 截图/截图_VirtualBox\ Machine_20220712192850.png \ - 截图/截图_VirtualBox\ Machine_20220712143044.png \ - 截图/截图_VirtualBox\ Manager_20220712223602.png \ - 截图/截图_VirtualBox\ Machine_20220712143103.png \ - 截图/截图_VirtualBox\ Machine_20220712143029.png \ - 截图/截图_选择区域_20220712224639.png \ - 截图/截图_VirtualBox\ Machine_20220712193527.png \ - 截图/截图_VirtualBox\ Machine_20220712143037.png \ - 截图/截图_VirtualBox_20220712223705.png \ - 截图/截图_VirtualBox\ Machine_20220712143006.png \ - 截图/截图_VirtualBox\ Machine_20220712191756.png + icon.png /usr/lib/qt5/bin/rcc -name 图标 图标.qrc -o qrc_图标.cpp compiler_moc_predefs_make_all: moc_predefs.h compiler_moc_predefs_clean: -$(DEL_FILE) moc_predefs.h moc_predefs.h: /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/data/dummy.cpp - g++ -pipe -O2 -std=gnu++11 -Wall -Wextra -dM -E -o moc_predefs.h /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/data/dummy.cpp + g++ -pipe -O2 -std=gnu++11 -Wall -W -dM -E -o moc_predefs.h /usr/lib/x86_64-linux-gnu/qt5/mkspecs/features/data/dummy.cpp compiler_moc_header_make_all: moc_mainwindow.cpp compiler_moc_header_clean: @@ -398,7 +376,7 @@ compiler_moc_header_clean: moc_mainwindow.cpp: mainwindow.h \ moc_predefs.h \ /usr/lib/qt5/bin/moc - /usr/lib/qt5/bin/moc $(DEFINES) --include /home/gfdgd_xi/Desktop/deep-wine-runner/VM/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/gfdgd_xi/Desktop/deep-wine-runner/VM -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/8 -I/usr/include/x86_64-linux-gnu/c++/8 -I/usr/include/c++/8/backward -I/usr/lib/gcc/x86_64-linux-gnu/8/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/8/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include mainwindow.h -o moc_mainwindow.cpp + /usr/lib/qt5/bin/moc $(DEFINES) --include /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/moc_predefs.h -I/usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++ -I/home/gfdgd_xi/Desktop/deep-wine-runner/VM-source -I/usr/include/x86_64-linux-gnu/qt5 -I/usr/include/x86_64-linux-gnu/qt5/QtWidgets -I/usr/include/x86_64-linux-gnu/qt5/QtGui -I/usr/include/x86_64-linux-gnu/qt5/QtNetwork -I/usr/include/x86_64-linux-gnu/qt5/QtCore -I/usr/include/c++/8 -I/usr/include/x86_64-linux-gnu/c++/8 -I/usr/include/c++/8/backward -I/usr/lib/gcc/x86_64-linux-gnu/8/include -I/usr/local/include -I/usr/lib/gcc/x86_64-linux-gnu/8/include-fixed -I/usr/include/x86_64-linux-gnu -I/usr/include mainwindow.h -o moc_mainwindow.cpp compiler_moc_objc_header_make_all: compiler_moc_objc_header_clean: @@ -438,7 +416,7 @@ moc_mainwindow.o: moc_mainwindow.cpp install_target: first FORCE @test -d $(INSTALL_ROOT)/opt/VirtualMachine/bin || mkdir -p $(INSTALL_ROOT)/opt/VirtualMachine/bin - $(QINSTALL_PROGRAM) $(QMAKE_TARGET) $(INSTALL_ROOT)/opt/VirtualMachine/bin/$(QMAKE_TARGET) + -$(QINSTALL_PROGRAM) $(QMAKE_TARGET) $(INSTALL_ROOT)/opt/VirtualMachine/bin/$(QMAKE_TARGET) -$(STRIP) $(INSTALL_ROOT)/opt/VirtualMachine/bin/$(QMAKE_TARGET) uninstall_target: FORCE diff --git a/VM-source/VirtualMachine b/VM-source/VirtualMachine index 4414c0c..8a2f722 100755 Binary files a/VM-source/VirtualMachine and b/VM-source/VirtualMachine differ diff --git a/VM-source/main.o b/VM-source/main.o index b3f5b6b..20f17ea 100644 Binary files a/VM-source/main.o and b/VM-source/main.o differ diff --git a/VM-source/mainwindow.o b/VM-source/mainwindow.o index df5f826..a29c528 100644 Binary files a/VM-source/mainwindow.o and b/VM-source/mainwindow.o differ diff --git a/VM-source/moc_mainwindow.cpp b/VM-source/moc_mainwindow.cpp index 565a991..c326d21 100644 --- a/VM-source/moc_mainwindow.cpp +++ b/VM-source/moc_mainwindow.cpp @@ -1,19 +1,18 @@ /**************************************************************************** ** Meta object code from reading C++ file 'mainwindow.h' ** -** Created by: The Qt Meta Object Compiler version 67 (Qt 5.15.3) +** Created by: The Qt Meta Object Compiler version 67 (Qt 5.11.3) ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ -#include #include "mainwindow.h" #include #include #if !defined(Q_MOC_OUTPUT_REVISION) #error "The header file 'mainwindow.h' doesn't include ." #elif Q_MOC_OUTPUT_REVISION != 67 -#error "This file was generated using the moc from 5.15.3. It" +#error "This file was generated using the moc from 5.11.3. It" #error "cannot be used with the include files from this version of Qt." #error "(The moc has changed too much.)" #endif @@ -46,7 +45,7 @@ QT_MOC_LITERAL(3, 31, 18) // "on_install_clicked" static const uint qt_meta_data_MainWindow[] = { // content: - 8, // revision + 7, // revision 0, // classname 0, 0, // classinfo 2, 14, // methods @@ -70,25 +69,21 @@ static const uint qt_meta_data_MainWindow[] = { void MainWindow::qt_static_metacall(QObject *_o, QMetaObject::Call _c, int _id, void **_a) { if (_c == QMetaObject::InvokeMetaMethod) { - auto *_t = static_cast(_o); - (void)_t; + MainWindow *_t = static_cast(_o); + Q_UNUSED(_t) switch (_id) { case 0: _t->on_browser_clicked(); break; case 1: _t->on_install_clicked(); break; default: ; } } - (void)_a; + Q_UNUSED(_a); } -QT_INIT_METAOBJECT const QMetaObject MainWindow::staticMetaObject = { { - QMetaObject::SuperData::link(), - qt_meta_stringdata_MainWindow.data, - qt_meta_data_MainWindow, - qt_static_metacall, - nullptr, - nullptr -} }; +QT_INIT_METAOBJECT const QMetaObject MainWindow::staticMetaObject = { + { &QMainWindow::staticMetaObject, qt_meta_stringdata_MainWindow.data, + qt_meta_data_MainWindow, qt_static_metacall, nullptr, nullptr} +}; const QMetaObject *MainWindow::metaObject() const diff --git a/VM-source/moc_mainwindow.o b/VM-source/moc_mainwindow.o index 0c5bf07..bedd00a 100644 Binary files a/VM-source/moc_mainwindow.o and b/VM-source/moc_mainwindow.o differ diff --git a/VM-source/qrc_图标.cpp b/VM-source/qrc_图标.cpp index 4904370..00d502e 100644 --- a/VM-source/qrc_图标.cpp +++ b/VM-source/qrc_图标.cpp @@ -1,13 +1,13 @@ /**************************************************************************** ** Resource object code ** -** Created by: The Resource Compiler for Qt version 5.15.3 +** Created by: The Resource Compiler for Qt version 5.11.3 ** ** WARNING! All changes made in this file will be lost! *****************************************************************************/ static const unsigned char qt_resource_data[] = { - // /home/gfdgd_xi/Desktop/deep-wine-runner/VM/icon.png + // /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/icon.png 0x0,0x0,0x8d,0xaf, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -2277,7 +2277,7 @@ static const unsigned char qt_resource_data[] = { 0xc2,0x87,0xb7,0xf8,0xb7,0xda,0xe7,0xb0,0xff,0xdc,0xb2,0xf7,0xfa,0x89,0x80,0x80, 0xa7,0x66,0x26,0x15,0x60,0xf8,0x2d,0xb7,0xff,0x1f,0xbd,0x47,0xbf,0x87,0x42,0x18, 0x72,0x53,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // /home/gfdgd_xi/Desktop/deep-wine-runner/VM/截图_VirtualBox Machine_20220712142929.png + // /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/截图_VirtualBox Machine_20220712142929.png 0x0,0x6,0xb0,0x79, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -29680,7 +29680,7 @@ static const unsigned char qt_resource_data[] = { 0x4b,0x2,0x16,0xfd,0xf4,0x7,0x3c,0x13,0xc,0xc3,0x30,0xc,0xc3,0x30,0xc,0xc3, 0xfe,0xff,0xf8,0x3f,0xb2,0x1f,0x52,0x8c,0x1a,0xd4,0x57,0x6d,0x0,0x0,0x0,0x0, 0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // /home/gfdgd_xi/Desktop/deep-wine-runner/VM/截图/截图_VirtualBox Machine_20220712143018.png + // /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/截图/截图_VirtualBox Machine_20220712143018.png 0x0,0x2,0x72,0x6d, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -39706,7 +39706,7 @@ static const unsigned char qt_resource_data[] = { 0xab,0xd4,0xc6,0xcf,0xe4,0x5f,0x12,0x58,0xf7,0xc9,0x77,0xb0,0x27,0x8,0x21,0x84, 0x10,0x42,0x8,0xa1,0x3f,0x1c,0xff,0x1f,0xe4,0x65,0x44,0x3e,0x6e,0x8c,0x42,0x76, 0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // /home/gfdgd_xi/Desktop/deep-wine-runner/VM/截图/截图_VirtualBox Machine_20220712192850.png + // /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/截图/截图_VirtualBox Machine_20220712192850.png 0x0,0x1,0xe6,0x45, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -47490,7 +47490,7 @@ static const unsigned char qt_resource_data[] = { 0x73,0x67,0x91,0x12,0x9,0x9,0x9,0x9,0x9,0x9,0x9,0x89,0xff,0x3c,0xf8,0xff, 0x7,0xbc,0xb9,0x44,0xad,0x86,0x35,0x51,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44, 0xae,0x42,0x60,0x82, - // /home/gfdgd_xi/Desktop/deep-wine-runner/VM/截图/截图_VirtualBox Machine_20220712143044.png + // /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/截图/截图_VirtualBox Machine_20220712143044.png 0x0,0x2,0xf8,0xca, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -59666,7 +59666,7 @@ static const unsigned char qt_resource_data[] = { 0xf8,0x4b,0x4,0xcb,0xbf,0xf0,0x11,0xf6,0x44,0x10,0x4,0x41,0x10,0x4,0x41,0x10, 0x84,0x3f,0x1e,0xff,0x1f,0xfb,0x8b,0xf6,0x1b,0x26,0xd5,0x95,0xc5,0x0,0x0,0x0, 0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // /home/gfdgd_xi/Desktop/deep-wine-runner/VM/截图/截图_VirtualBox Manager_20220712223602.png + // /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/截图/截图_VirtualBox Manager_20220712223602.png 0x0,0x1,0xac,0x3b, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -66521,7 +66521,7 @@ static const unsigned char qt_resource_data[] = { 0x8,0xa1,0xbb,0xcc,0x96,0x6f,0x4d,0x1e,0x12,0xa8,0x7f,0x7a,0x9,0x7b,0x82,0x10, 0x42,0x8,0x21,0x84,0xfe,0x1f,0xef,0x97,0x2c,0x40,0xcb,0xcc,0x57,0x45,0x0,0x0, 0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // /home/gfdgd_xi/Desktop/deep-wine-runner/VM/截图/截图_VirtualBox Machine_20220712143103.png + // /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/截图/截图_VirtualBox Machine_20220712143103.png 0x0,0x3,0xab,0x6f, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -81555,7 +81555,7 @@ static const unsigned char qt_resource_data[] = { 0x84,0x10,0x5a,0xa4,0x9a,0xbe,0x1e,0x7b,0x49,0x60,0xf5,0x43,0x9f,0x61,0x4b,0x10, 0x42,0x8,0x21,0x84,0x10,0x42,0xff,0x7d,0xfc,0x17,0xf5,0xe3,0xe1,0x1b,0x9c,0x77, 0x81,0x43,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // /home/gfdgd_xi/Desktop/deep-wine-runner/VM/截图/截图_VirtualBox Machine_20220712143029.png + // /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/截图/截图_VirtualBox Machine_20220712143029.png 0x0,0x3,0xd8,0xe4, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -97317,7 +97317,7 @@ static const unsigned char qt_resource_data[] = { 0xf3,0xbf,0xc1,0x9e,0x20,0x84,0x10,0x42,0x8,0x21,0x84,0x7e,0x77,0xfc,0x7f,0xaf, 0xf0,0xea,0xe0,0x68,0xdb,0x6a,0x10,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae, 0x42,0x60,0x82, - // /home/gfdgd_xi/Desktop/deep-wine-runner/VM/截图/截图_选择区域_20220712224639.png + // /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/截图/截图_选择区域_20220712224639.png 0x0,0xf,0xb7,0xd3, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -161702,7 +161702,7 @@ static const unsigned char qt_resource_data[] = { 0x7d,0xc7,0x5b,0xda,0x96,0xd6,0x6b,0x39,0x1c,0xd6,0x4a,0xb9,0xfd,0x3f,0x73,0x3, 0xe6,0x67,0x1e,0x2f,0xcd,0x71,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42, 0x60,0x82, - // /home/gfdgd_xi/Desktop/deep-wine-runner/VM/截图/截图_VirtualBox Machine_20220712193527.png + // /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/截图/截图_VirtualBox Machine_20220712193527.png 0x0,0x3,0x6b,0x7c, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -175713,7 +175713,7 @@ static const unsigned char qt_resource_data[] = { 0x79,0x6a,0xd5,0x57,0x12,0x2f,0x11,0xac,0x78,0xf8,0x63,0xbc,0x12,0x8a,0xa2,0x28, 0x8a,0xa2,0xa8,0xbf,0x1e,0xff,0x7,0x21,0xf4,0x20,0x72,0xe7,0xbb,0x63,0x18,0x0, 0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // /home/gfdgd_xi/Desktop/deep-wine-runner/VM/截图/截图_VirtualBox Machine_20220712143037.png + // /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/截图/截图_VirtualBox Machine_20220712143037.png 0x0,0x2,0xf4,0xe7, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -187827,7 +187827,7 @@ static const unsigned char qt_resource_data[] = { 0x12,0x58,0xf1,0xd9,0xdf,0x62,0x4f,0x10,0x42,0x8,0x21,0x84,0x10,0x42,0xbf,0x3f, 0xfe,0x3f,0x79,0x92,0x5c,0xe4,0xec,0xa7,0x2c,0x12,0x0,0x0,0x0,0x0,0x49,0x45, 0x4e,0x44,0xae,0x42,0x60,0x82, - // /home/gfdgd_xi/Desktop/deep-wine-runner/VM/截图/截图_VirtualBox_20220712223705.png + // /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/截图/截图_VirtualBox_20220712223705.png 0x0,0x0,0xbd,0x50, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -190859,7 +190859,7 @@ static const unsigned char qt_resource_data[] = { 0xf9,0x72,0xc,0x3,0x0,0x0,0x0,0x2d,0x1a,0xf9,0xbd,0x53,0x7f,0xd4,0x64,0xd8, 0xfc,0xcb,0x38,0x12,0x0,0x0,0x0,0x9c,0xaf,0xff,0xf,0x55,0x6e,0x4c,0x90,0x69, 0x85,0x4a,0xad,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // /home/gfdgd_xi/Desktop/deep-wine-runner/VM/截图/截图_VirtualBox Machine_20220712143006.png + // /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/截图/截图_VirtualBox Machine_20220712143006.png 0x0,0x3,0x19,0x16, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -203552,7 +203552,7 @@ static const unsigned char qt_resource_data[] = { 0x4f,0xfc,0x5,0xcf,0x44,0x92,0x24,0x49,0x92,0x24,0x49,0x92,0xa4,0xbf,0x1d,0xff, 0x1f,0x4c,0x89,0x9,0x51,0xbd,0xb1,0x31,0x8d,0x0,0x0,0x0,0x0,0x49,0x45,0x4e, 0x44,0xae,0x42,0x60,0x82, - // /home/gfdgd_xi/Desktop/deep-wine-runner/VM/截图/截图_VirtualBox Machine_20220712191756.png + // /home/gfdgd_xi/Desktop/deep-wine-runner/VM-source/截图/截图_VirtualBox Machine_20220712191756.png 0x0,0x2,0xf8,0x3c, 0x89, 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, @@ -215839,49 +215839,49 @@ static const unsigned char qt_resource_struct[] = { 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, // :/icon.png 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, -0x0,0x0,0x1,0x81,0xf1,0xd,0x50,0x82, +0x0,0x0,0x1,0x81,0xf1,0xd,0x4e,0x30, // :/picture/截图 0x0,0x0,0x0,0x2a,0x0,0x2,0x0,0x0,0x0,0xc,0x0,0x0,0x0,0x5, 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0, // :/picture/截图_VirtualBox Machine_20220712142929.png 0x0,0x0,0x0,0x34,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x8d,0xb3, -0x0,0x0,0x1,0x81,0xf1,0x1b,0x72,0x96, +0x0,0x0,0x1,0x81,0xf1,0x1b,0x6f,0x60, // :/picture/截图/截图_选择区域_20220712224639.png 0x0,0x0,0x2,0x8e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x17,0xc0,0x52, -0x0,0x0,0x1,0x81,0xf2,0xe0,0xae,0xaf, +0x0,0x0,0x1,0x81,0xf2,0xe0,0xae,0xa0, // :/picture/截图/截图_VirtualBox Manager_20220712223602.png 0x0,0x0,0x1,0x8c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0xe,0x8f,0xb8, -0x0,0x0,0x1,0x81,0xf2,0xd8,0x57,0x18, +0x0,0x0,0x1,0x81,0xf2,0xd8,0x55,0xe8, // :/picture/截图/截图_VirtualBox Machine_20220712143103.png 0x0,0x0,0x1,0xe2,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x10,0x3b,0xf7, -0x0,0x0,0x1,0x81,0xf1,0x1b,0xa1,0x1e, +0x0,0x0,0x1,0x81,0xf1,0x1b,0x9e,0x40, // :/picture/截图/截图_VirtualBox Machine_20220712143006.png 0x0,0x0,0x3,0xba,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2e,0x95,0xe8, -0x0,0x0,0x1,0x81,0xf1,0x1b,0xea,0x4a, +0x0,0x0,0x1,0x81,0xf1,0x1b,0xe8,0x78, // :/picture/截图/截图_VirtualBox Machine_20220712143018.png 0x0,0x0,0x0,0x8a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x7,0x3e,0x30, -0x0,0x0,0x1,0x81,0xf1,0x1b,0xd8,0xce, +0x0,0x0,0x1,0x81,0xf1,0x1b,0xd4,0xf0, // :/picture/截图/截图_VirtualBox Machine_20220712143029.png 0x0,0x0,0x2,0x38,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x13,0xe7,0x6a, -0x0,0x0,0x1,0x81,0xf1,0x1b,0xc9,0x82, +0x0,0x0,0x1,0x81,0xf1,0x1b,0xc9,0x38, // :/picture/截图/截图_VirtualBox Machine_20220712143037.png 0x0,0x0,0x3,0x1e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2a,0xe3,0xa9, -0x0,0x0,0x1,0x81,0xf1,0x1b,0xbc,0x7e, +0x0,0x0,0x1,0x81,0xf1,0x1b,0xb9,0x98, // :/picture/截图/截图_VirtualBox Machine_20220712143044.png 0x0,0x0,0x1,0x36,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0xb,0x96,0xea, -0x0,0x0,0x1,0x81,0xf1,0x1b,0xae,0x92, +0x0,0x0,0x1,0x81,0xf1,0x1b,0xad,0xe0, // :/picture/截图/截图_VirtualBox_20220712223705.png 0x0,0x0,0x3,0x74,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x2d,0xd8,0x94, -0x0,0x0,0x1,0x81,0xf2,0xd8,0x68,0xf0, +0x0,0x0,0x1,0x81,0xf2,0xd8,0x65,0x88, // :/picture/截图/截图_VirtualBox Machine_20220712192850.png 0x0,0x0,0x0,0xe0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x9,0xb0,0xa1, -0x0,0x0,0x1,0x81,0xf2,0x2c,0x6,0x5, +0x0,0x0,0x1,0x81,0xf2,0x2c,0x4,0xa0, // :/picture/截图/截图_VirtualBox Machine_20220712191756.png 0x0,0x0,0x4,0x10,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x31,0xaf,0x2, -0x0,0x0,0x1,0x81,0xf2,0x21,0xd9,0x2e, +0x0,0x0,0x1,0x81,0xf2,0x21,0xd7,0x28, // :/picture/截图/截图_VirtualBox Machine_20220712193527.png 0x0,0x0,0x2,0xc8,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x27,0x78,0x29, -0x0,0x0,0x1,0x81,0xf2,0x32,0x2f,0xb9, +0x0,0x0,0x1,0x81,0xf2,0x32,0x2e,0xc0, }; @@ -215902,6 +215902,7 @@ namespace QT_NAMESPACE { #endif bool qRegisterResourceData(int, const unsigned char *, const unsigned char *, const unsigned char *); + bool qUnregisterResourceData(int, const unsigned char *, const unsigned char *, const unsigned char *); #ifdef QT_NAMESPACE @@ -215911,18 +215912,16 @@ bool qUnregisterResourceData(int, const unsigned char *, const unsigned char *, int QT_RCC_MANGLE_NAMESPACE(qInitResources___)(); int QT_RCC_MANGLE_NAMESPACE(qInitResources___)() { - int version = 3; QT_RCC_PREPEND_NAMESPACE(qRegisterResourceData) - (version, qt_resource_struct, qt_resource_name, qt_resource_data); + (0x2, qt_resource_struct, qt_resource_name, qt_resource_data); return 1; } int QT_RCC_MANGLE_NAMESPACE(qCleanupResources___)(); int QT_RCC_MANGLE_NAMESPACE(qCleanupResources___)() { - int version = 3; QT_RCC_PREPEND_NAMESPACE(qUnregisterResourceData) - (version, qt_resource_struct, qt_resource_name, qt_resource_data); + (0x2, qt_resource_struct, qt_resource_name, qt_resource_data); return 1; } diff --git a/VM-source/qrc_图标.o b/VM-source/qrc_图标.o index 33326e6..2894b66 100644 Binary files a/VM-source/qrc_图标.o and b/VM-source/qrc_图标.o differ diff --git a/VM-source/ui_mainwindow.h b/VM-source/ui_mainwindow.h index 1dada91..5451506 100644 --- a/VM-source/ui_mainwindow.h +++ b/VM-source/ui_mainwindow.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'mainwindow.ui' ** -** Created by: Qt User Interface Compiler version 5.15.3 +** Created by: Qt User Interface Compiler version 5.11.3 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ @@ -61,45 +61,45 @@ public: void setupUi(QMainWindow *MainWindow) { if (MainWindow->objectName().isEmpty()) - MainWindow->setObjectName(QString::fromUtf8("MainWindow")); + MainWindow->setObjectName(QStringLiteral("MainWindow")); MainWindow->resize(807, 429); QIcon icon; - icon.addFile(QString::fromUtf8(":/icon.png"), QSize(), QIcon::Normal, QIcon::Off); + icon.addFile(QStringLiteral(":/icon.png"), QSize(), QIcon::Normal, QIcon::Off); MainWindow->setWindowIcon(icon); action = new QAction(MainWindow); - action->setObjectName(QString::fromUtf8("action")); + action->setObjectName(QStringLiteral("action")); action_2 = new QAction(MainWindow); - action_2->setObjectName(QString::fromUtf8("action_2")); + action_2->setObjectName(QStringLiteral("action_2")); centralWidget = new QWidget(MainWindow); - centralWidget->setObjectName(QString::fromUtf8("centralWidget")); + centralWidget->setObjectName(QStringLiteral("centralWidget")); horizontalLayout = new QHBoxLayout(centralWidget); horizontalLayout->setSpacing(6); horizontalLayout->setContentsMargins(11, 11, 11, 11); - horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); + horizontalLayout->setObjectName(QStringLiteral("horizontalLayout")); tabWidget = new QTabWidget(centralWidget); - tabWidget->setObjectName(QString::fromUtf8("tabWidget")); + tabWidget->setObjectName(QStringLiteral("tabWidget")); tabWidget->setTabShape(QTabWidget::Rounded); tab = new QWidget(); - tab->setObjectName(QString::fromUtf8("tab")); + tab->setObjectName(QStringLiteral("tab")); verticalLayout = new QVBoxLayout(tab); verticalLayout->setSpacing(6); verticalLayout->setContentsMargins(11, 11, 11, 11); - verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); + verticalLayout->setObjectName(QStringLiteral("verticalLayout")); horizontalLayout_2 = new QHBoxLayout(); horizontalLayout_2->setSpacing(6); - horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2")); + horizontalLayout_2->setObjectName(QStringLiteral("horizontalLayout_2")); label = new QLabel(tab); - label->setObjectName(QString::fromUtf8("label")); + label->setObjectName(QStringLiteral("label")); horizontalLayout_2->addWidget(label); isoPath = new QLineEdit(tab); - isoPath->setObjectName(QString::fromUtf8("isoPath")); + isoPath->setObjectName(QStringLiteral("isoPath")); horizontalLayout_2->addWidget(isoPath); browser = new QPushButton(tab); - browser->setObjectName(QString::fromUtf8("browser")); + browser->setObjectName(QStringLiteral("browser")); horizontalLayout_2->addWidget(browser); @@ -108,9 +108,9 @@ public: horizontalLayout_3 = new QHBoxLayout(); horizontalLayout_3->setSpacing(6); - horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3")); + horizontalLayout_3->setObjectName(QStringLiteral("horizontalLayout_3")); label_2 = new QLabel(tab); - label_2->setObjectName(QString::fromUtf8("label_2")); + label_2->setObjectName(QStringLiteral("label_2")); horizontalLayout_3->addWidget(label_2); @@ -118,7 +118,7 @@ public: systemVersion->addItem(QString()); systemVersion->addItem(QString()); systemVersion->addItem(QString()); - systemVersion->setObjectName(QString::fromUtf8("systemVersion")); + systemVersion->setObjectName(QStringLiteral("systemVersion")); horizontalLayout_3->addWidget(systemVersion); @@ -128,13 +128,13 @@ public: horizontalLayout_4 = new QHBoxLayout(); horizontalLayout_4->setSpacing(6); - horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4")); + horizontalLayout_4->setObjectName(QStringLiteral("horizontalLayout_4")); horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); horizontalLayout_4->addItem(horizontalSpacer); install = new QPushButton(tab); - install->setObjectName(QString::fromUtf8("install")); + install->setObjectName(QStringLiteral("install")); horizontalLayout_4->addWidget(install); @@ -142,26 +142,26 @@ public: verticalLayout->addLayout(horizontalLayout_4); textBrowser_3 = new QTextBrowser(tab); - textBrowser_3->setObjectName(QString::fromUtf8("textBrowser_3")); + textBrowser_3->setObjectName(QStringLiteral("textBrowser_3")); verticalLayout->addWidget(textBrowser_3); tabWidget->addTab(tab, QString()); tab_3 = new QWidget(); - tab_3->setObjectName(QString::fromUtf8("tab_3")); + tab_3->setObjectName(QStringLiteral("tab_3")); horizontalLayout_5 = new QHBoxLayout(tab_3); horizontalLayout_5->setSpacing(6); horizontalLayout_5->setContentsMargins(11, 11, 11, 11); - horizontalLayout_5->setObjectName(QString::fromUtf8("horizontalLayout_5")); + horizontalLayout_5->setObjectName(QStringLiteral("horizontalLayout_5")); textBrowser = new QTextBrowser(tab_3); - textBrowser->setObjectName(QString::fromUtf8("textBrowser")); + textBrowser->setObjectName(QStringLiteral("textBrowser")); textBrowser->setUndoRedoEnabled(false); horizontalLayout_5->addWidget(textBrowser); tabWidget->addTab(tab_3, QString()); tab_2 = new QWidget(); - tab_2->setObjectName(QString::fromUtf8("tab_2")); + tab_2->setObjectName(QStringLiteral("tab_2")); QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred); sizePolicy.setHorizontalStretch(0); sizePolicy.setVerticalStretch(0); @@ -170,12 +170,12 @@ public: horizontalLayout_6 = new QHBoxLayout(tab_2); horizontalLayout_6->setSpacing(6); horizontalLayout_6->setContentsMargins(11, 11, 11, 11); - horizontalLayout_6->setObjectName(QString::fromUtf8("horizontalLayout_6")); + horizontalLayout_6->setObjectName(QStringLiteral("horizontalLayout_6")); verticalLayout_3 = new QVBoxLayout(); verticalLayout_3->setSpacing(6); - verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3")); + verticalLayout_3->setObjectName(QStringLiteral("verticalLayout_3")); label_3 = new QLabel(tab_2); - label_3->setObjectName(QString::fromUtf8("label_3")); + label_3->setObjectName(QStringLiteral("label_3")); QSizePolicy sizePolicy1(QSizePolicy::Maximum, QSizePolicy::Maximum); sizePolicy1.setHorizontalStretch(0); sizePolicy1.setVerticalStretch(0); @@ -183,7 +183,7 @@ public: label_3->setSizePolicy(sizePolicy1); label_3->setMinimumSize(QSize(200, 313)); label_3->setMaximumSize(QSize(200, 313)); - label_3->setStyleSheet(QString::fromUtf8("border-image: url(:/icon.png);")); + label_3->setStyleSheet(QStringLiteral("border-image: url(:/icon.png);")); verticalLayout_3->addWidget(label_3); @@ -195,7 +195,7 @@ public: horizontalLayout_6->addLayout(verticalLayout_3); textBrowser_2 = new QTextBrowser(tab_2); - textBrowser_2->setObjectName(QString::fromUtf8("textBrowser_2")); + textBrowser_2->setObjectName(QStringLiteral("textBrowser_2")); QSizePolicy sizePolicy2(QSizePolicy::Minimum, QSizePolicy::Expanding); sizePolicy2.setHorizontalStretch(0); sizePolicy2.setVerticalStretch(0); @@ -220,21 +220,21 @@ public: void retranslateUi(QMainWindow *MainWindow) { - MainWindow->setWindowTitle(QCoreApplication::translate("MainWindow", "Windows \345\272\224\347\224\250\351\200\202\351\205\215\345\267\245\345\205\267", nullptr)); - action->setText(QCoreApplication::translate("MainWindow", "\351\200\200\345\207\272", nullptr)); - action_2->setText(QCoreApplication::translate("MainWindow", "\345\205\263\344\272\216", nullptr)); - label->setText(QCoreApplication::translate("MainWindow", "\351\225\234\345\203\217\350\267\257\345\276\204\357\274\232", nullptr)); - isoPath->setPlaceholderText(QCoreApplication::translate("MainWindow", "\350\257\267\351\200\211\346\213\251\347\263\273\347\273\237\351\225\234\345\203\217", nullptr)); - browser->setText(QCoreApplication::translate("MainWindow", "\346\265\217\350\247\210\342\200\246\342\200\246", nullptr)); - label_2->setText(QCoreApplication::translate("MainWindow", "\347\263\273\347\273\237\347\211\210\346\234\254\357\274\232", nullptr)); - systemVersion->setItemText(0, QCoreApplication::translate("MainWindow", "Windows 7 32 \344\275\215\357\274\210\346\224\257\346\214\201\350\207\252\345\212\250\345\256\211\350\243\205\357\274\211", nullptr)); - systemVersion->setItemText(1, QCoreApplication::translate("MainWindow", "Windows 7 64 \344\275\215\357\274\210\346\224\257\346\214\201\350\207\252\345\212\250\345\256\211\350\243\205\357\274\211", nullptr)); - systemVersion->setItemText(2, QCoreApplication::translate("MainWindow", "\345\205\266\345\256\203 Windows \347\263\273\347\273\237\357\274\210\344\270\215\346\224\257\346\214\201\350\207\252\345\212\250\345\256\211\350\243\205\357\274\211", nullptr)); + MainWindow->setWindowTitle(QApplication::translate("MainWindow", "Windows \345\272\224\347\224\250\351\200\202\351\205\215\345\267\245\345\205\267", nullptr)); + action->setText(QApplication::translate("MainWindow", "\351\200\200\345\207\272", nullptr)); + action_2->setText(QApplication::translate("MainWindow", "\345\205\263\344\272\216", nullptr)); + label->setText(QApplication::translate("MainWindow", "\351\225\234\345\203\217\350\267\257\345\276\204\357\274\232", nullptr)); + isoPath->setPlaceholderText(QApplication::translate("MainWindow", "\350\257\267\351\200\211\346\213\251\347\263\273\347\273\237\351\225\234\345\203\217", nullptr)); + browser->setText(QApplication::translate("MainWindow", "\346\265\217\350\247\210\342\200\246\342\200\246", nullptr)); + label_2->setText(QApplication::translate("MainWindow", "\347\263\273\347\273\237\347\211\210\346\234\254\357\274\232", nullptr)); + systemVersion->setItemText(0, QApplication::translate("MainWindow", "Windows 7 32 \344\275\215\357\274\210\346\224\257\346\214\201\350\207\252\345\212\250\345\256\211\350\243\205\357\274\211", nullptr)); + systemVersion->setItemText(1, QApplication::translate("MainWindow", "Windows 7 64 \344\275\215\357\274\210\346\224\257\346\214\201\350\207\252\345\212\250\345\256\211\350\243\205\357\274\211", nullptr)); + systemVersion->setItemText(2, QApplication::translate("MainWindow", "\345\205\266\345\256\203 Windows \347\263\273\347\273\237\357\274\210\344\270\215\346\224\257\346\214\201\350\207\252\345\212\250\345\256\211\350\243\205\357\274\211", nullptr)); systemVersion->setCurrentText(QString()); - systemVersion->setPlaceholderText(QCoreApplication::translate("MainWindow", "\350\257\267\351\200\211\346\213\251\347\263\273\347\273\237\347\261\273\345\236\213\357\274\210\345\246\202\346\236\234\350\257\206\345\210\253\344\270\215\344\272\206\350\257\267\350\207\252\350\241\214\351\200\211\346\213\251\357\274\214\345\246\202\346\236\234\351\200\211\346\213\251\351\224\231\350\257\257\346\210\226\344\270\215\346\224\257\346\214\201\345\260\206\346\227\240\346\263\225\350\277\233\350\241\214\350\207\252\345\212\250\345\256\211\350\243\205\357\274\211", nullptr)); - install->setText(QCoreApplication::translate("MainWindow", "\345\256\211\350\243\205", nullptr)); - textBrowser_3->setHtml(QCoreApplication::translate("MainWindow", "\n" + //systemVersion->setPlaceholderText(QApplication::translate("MainWindow", "\350\257\267\351\200\211\346\213\251\347\263\273\347\273\237\347\261\273\345\236\213\357\274\210\345\246\202\346\236\234\350\257\206\345\210\253\344\270\215\344\272\206\350\257\267\350\207\252\350\241\214\351\200\211\346\213\251\357\274\214\345\246\202\346\236\234\351\200\211\346\213\251\351\224\231\350\257\257\346\210\226\344\270\215\346\224\257\346\214\201\345\260\206\346\227\240\346\263\225\350\277\233\350\241\214\350\207\252\345\212\250\345\256\211\350\243\205\357\274\211", nullptr)); + install->setText(QApplication::translate("MainWindow", "\345\256\211\350\243\205", nullptr)); + textBrowser_3->setHtml(QApplication::translate("MainWindow", "\n" "\n" @@ -243,11 +243,9 @@ public: "\246\202\346\236\234\344\270\213\350\275\275\350\277\231\344\270\252\357\274\214\347\263\273\347\273\237\347\211\210\346\234\254\351\200\211\347\254\254\344\270\200\351\241\271\357\274\214\344\270\200\350\210\254\346\216\250\350\215\220\350\277\231\344\270\252\357\274\211ed2k://|file|cn_windows_7_ultimate_with_sp1_x86_dvd_u_677486.iso|2653276160|7503E4B9B8738DFCB95872445C72AEFB|/

\n" "

\357\274\210\345\246\202\346\236\234\344\270\213\350\275\275\350\277\231\344\270\252\357\274\214\347\263\273\347\273\237\347\211\210\346\234\254\351\200\211\347\254\254\344\272\214\351\241\271\357\274\211ed2k://|file|cn_windows_7_ultimate_with_sp1_x64_dvd_u_677408.iso|3420557312|B58548681854236C7939003B583A8078|/

\n" "
", nullptr)); - tabWidget->setTabText(tabWidget->indexOf(tab), QCoreApplication::translate("MainWindow", "\350\256\276\347\275\256", nullptr)); -#if QT_CONFIG(tooltip) - tabWidget->setTabToolTip(tabWidget->indexOf(tab), QCoreApplication::translate("MainWindow", "\350\256\276\347\275\256", nullptr)); -#endif // QT_CONFIG(tooltip) - textBrowser->setHtml(QCoreApplication::translate("MainWindow", "\n" + tabWidget->setTabText(tabWidget->indexOf(tab), QApplication::translate("MainWindow", "\350\256\276\347\275\256", nullptr)); + tabWidget->setTabToolTip(tabWidget->indexOf(tab), QApplication::translate("MainWindow", "\350\256\276\347\275\256", nullptr)); + textBrowser->setHtml(QApplication::translate("MainWindow", "\n" "\n" @@ -325,9 +323,9 @@ public: "

6\343\200\201\347\255\211\345\276\205\345\256\211\350\243\205\345\256\214\346\257\225\345\220\216\357\274\214\351\200\211\346\213\251\342\200\234Reboot now\342\200\235\347\204\266\345\220\216\347\202\271\345\207\273\342\200\234Finish\342\200\235\351\207\215\345\220\257\346\255\244\350\231\232\346\213\237\346\234\272\345\215\263\345\217\257\345\256\211\350\243\205\346\210\220\345\212\237\357\274\210\351\200\211\346\213\251\342\200\234Reboot now\342\200\235\345\271\266\347\202\271\342\200\234Finish\342\200\235\344\274\232\350\207\252\345\212\250\351\207\215\346\226\260\345\220\257\345\212\250\357\274\211

\n" "

", nullptr)); - tabWidget->setTabText(tabWidget->indexOf(tab_3), QCoreApplication::translate("MainWindow", "\345\256\211\350\243\205/\344\275\277\347\224\250\345\270\256\345\212\251", nullptr)); + tabWidget->setTabText(tabWidget->indexOf(tab_3), QApplication::translate("MainWindow", "\345\256\211\350\243\205/\344\275\277\347\224\250\345\270\256\345\212\251", nullptr)); label_3->setText(QString()); - textBrowser_2->setHtml(QCoreApplication::translate("MainWindow", "\n" + textBrowser_2->setHtml(QApplication::translate("MainWindow", "\n" "\n" @@ -348,7 +346,7 @@ public: "

\345\217\202\350\200\203\346\226\207\347\214\256\357\274\232

\n" "

https://juejin.cn/post/7080484519328874510

", nullptr)); - tabWidget->setTabText(tabWidget->indexOf(tab_2), QCoreApplication::translate("MainWindow", "\345\205\263\344\272\216", nullptr)); + tabWidget->setTabText(tabWidget->indexOf(tab_2), QApplication::translate("MainWindow", "\345\205\263\344\272\216", nullptr)); } // retranslateUi }; diff --git a/VM/VirtualMachine b/VM/VirtualMachine index 4414c0c..8a2f722 100755 Binary files a/VM/VirtualMachine and b/VM/VirtualMachine differ diff --git a/deb/opt/apps/deepin-wine-runner/VM/VirtualMachine b/deb/opt/apps/deepin-wine-runner/VM/VirtualMachine index 4414c0c..8a2f722 100755 Binary files a/deb/opt/apps/deepin-wine-runner/VM/VirtualMachine and b/deb/opt/apps/deepin-wine-runner/VM/VirtualMachine differ diff --git a/deb/opt/apps/deepin-wine-runner/deepin-wine-runner b/deb/opt/apps/deepin-wine-runner/deepin-wine-runner index 213dfa8..29c6ffb 100755 --- a/deb/opt/apps/deepin-wine-runner/deepin-wine-runner +++ b/deb/opt/apps/deepin-wine-runner/deepin-wine-runner @@ -455,7 +455,7 @@ def InstallOther(): DisableButton(False) def BuildExeDeb(): - if e1.get() == "": + if e1.currentText() == "": wineBottonPath = setting["DefultBotton"] else: wineBottonPath = e1.currentText() @@ -615,7 +615,7 @@ class GetDllFromWindowsISO: mountButton = None dllListModel = None def ShowWindow(): - DisableButton(True) + #DisableButton(True) GetDllFromWindowsISO.message = QtWidgets.QMainWindow() widget = QtWidgets.QWidget() widgetLayout = QtWidgets.QGridLayout() @@ -681,7 +681,7 @@ class GetDllFromWindowsISO: GetDllFromWindowsISO.dllList.setModel(GetDllFromWindowsISO.dllListModel) GetDllFromWindowsISO.isoPath.currentText() GetDllFromWindowsISO.message.setWindowTitle(f"Wine 运行器 {version}——从 ISO 提取 DLL") - GetDllFromWindowsISO.message.setWindowIcon(iconPath) + GetDllFromWindowsISO.message.setWindowIcon(QtGui.QIcon(iconPath)) GetDllFromWindowsISO.message.show() def DisbledUp(state): diff --git a/mainwindow.py b/mainwindow.py index 213dfa8..29c6ffb 100755 --- a/mainwindow.py +++ b/mainwindow.py @@ -455,7 +455,7 @@ def InstallOther(): DisableButton(False) def BuildExeDeb(): - if e1.get() == "": + if e1.currentText() == "": wineBottonPath = setting["DefultBotton"] else: wineBottonPath = e1.currentText() @@ -615,7 +615,7 @@ class GetDllFromWindowsISO: mountButton = None dllListModel = None def ShowWindow(): - DisableButton(True) + #DisableButton(True) GetDllFromWindowsISO.message = QtWidgets.QMainWindow() widget = QtWidgets.QWidget() widgetLayout = QtWidgets.QGridLayout() @@ -681,7 +681,7 @@ class GetDllFromWindowsISO: GetDllFromWindowsISO.dllList.setModel(GetDllFromWindowsISO.dllListModel) GetDllFromWindowsISO.isoPath.currentText() GetDllFromWindowsISO.message.setWindowTitle(f"Wine 运行器 {version}——从 ISO 提取 DLL") - GetDllFromWindowsISO.message.setWindowIcon(iconPath) + GetDllFromWindowsISO.message.setWindowIcon(QtGui.QIcon(iconPath)) GetDllFromWindowsISO.message.show() def DisbledUp(state):