From 05c297647e0d2d85e9d26407b0d96afb87ff5426 Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Wed, 5 Apr 2023 16:09:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96wine=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 ++ VM-source/buildvbox.cpp | 4 ++++ VM-source/buildvbox.h | 4 ++++ VM-source/command.cpp | 4 ++++ VM-source/command.h | 4 ++++ VM-source/main.cpp | 10 +++++++--- VM-source/mainwindow.cpp | 6 +++--- VM-source/mainwindow.h | 4 ++++ VM-source/qemu.cpp | 5 ++++- VM-source/qemu.h | 4 ++++ VM-source/vbox.cpp | 3 +++ VM-source/vbox.h | 4 ++++ wine/.qmake.stash | 24 ------------------------ wine/installwine | 24 +++++++++++++++++++----- 14 files changed, 66 insertions(+), 36 deletions(-) delete mode 100755 wine/.qmake.stash diff --git a/Makefile b/Makefile index 0453adb..d8e900d 100755 --- a/Makefile +++ b/Makefile @@ -3,6 +3,8 @@ build: clean: python3 RemovePycacheFile.py + cd VM-source ; make clean + rm VM-source/VirtualMachine package: #cd VM-source && qmake diff --git a/VM-source/buildvbox.cpp b/VM-source/buildvbox.cpp index f3e84bf..fc9a404 100644 --- a/VM-source/buildvbox.cpp +++ b/VM-source/buildvbox.cpp @@ -1,3 +1,7 @@ +/* + * gfdgd xi、为什么您不喜欢熊出没和阿布呢 + * 依照 GPLV3 开源 + */ #include "buildvbox.h" #include "vbox.h" #include diff --git a/VM-source/buildvbox.h b/VM-source/buildvbox.h index fd355b6..7762d09 100644 --- a/VM-source/buildvbox.h +++ b/VM-source/buildvbox.h @@ -1,3 +1,7 @@ +/* + * gfdgd xi、为什么您不喜欢熊出没和阿布呢 + * 依照 GPLV3 开源 + */ #ifndef BUILDVBOX_H #define BUILDVBOX_H #include diff --git a/VM-source/command.cpp b/VM-source/command.cpp index bf8e606..2d1aa5e 100644 --- a/VM-source/command.cpp +++ b/VM-source/command.cpp @@ -1,3 +1,7 @@ +/* + * gfdgd xi、为什么您不喜欢熊出没和阿布呢 + * 依照 GPLV3 开源 + */ #include "command.h" #include Command::Command() diff --git a/VM-source/command.h b/VM-source/command.h index 956ef41..1bfdaa0 100644 --- a/VM-source/command.h +++ b/VM-source/command.h @@ -1,3 +1,7 @@ +/* + * gfdgd xi、为什么您不喜欢熊出没和阿布呢 + * 依照 GPLV3 开源 + */ #ifndef COMMAND_H #define COMMAND_H #include diff --git a/VM-source/main.cpp b/VM-source/main.cpp index 52c4ea7..746895b 100755 --- a/VM-source/main.cpp +++ b/VM-source/main.cpp @@ -1,3 +1,7 @@ +/* + * gfdgd xi、为什么您不喜欢熊出没和阿布呢 + * 依照 GPLV3 开源 + */ #include "mainwindow.h" #include #include @@ -23,11 +27,11 @@ int main(int argc, char *argv[]) trans->load("virtualmachine-en_US.qm"); a.installTranslator(trans); - // 判断是否为 !amd64 - if(GetRunCommand("arch").replace(" ", "").replace("\n", "") != QString("x86_64")){ + // 判断是否为 !amd64（无需判断了） + /*if(GetRunCommand("arch").replace(" ", "").replace("\n", "") != QString("x86_64")){ QMessageBox::critical(NULL, "错误", "此程序不支持非 X86 架构，立即退出"); return 0; - } + }*/ MainWindow w; w.show(); diff --git a/VM-source/mainwindow.cpp b/VM-source/mainwindow.cpp index 2dd3fe6..c4b3cd2 100755 --- a/VM-source/mainwindow.cpp +++ b/VM-source/mainwindow.cpp @@ -28,12 +28,12 @@ MainWindow::MainWindow(QWidget *parent) : ui->tabWidget->setTabPosition(QTabWidget::West); // 标签靠左 // 允许输出 qDebug 信息 QLoggingCategory::defaultCategory()->setEnabled(QtDebugMsg, true); - // 判断是否安装 vbox - if(system("which VBoxManage")){ + // 判断是否安装 vbox（无需判断） + /*if(system("which VBoxManage")){ if(QMessageBox::question(this, "提示", "检测到您似乎没有安装 VirtualBox，立即安装？") == QMessageBox::Yes){ system("xdg-open https://www.virtualbox.org/wiki/Linux_Downloads"); } - } + }*/ // QTimer QTimer *cpuGet = new QTimer(this); connect(cpuGet, &QTimer::timeout, this, &MainWindow::ShowCPUMessage); diff --git a/VM-source/mainwindow.h b/VM-source/mainwindow.h index 70d9029..063c0c1 100755 --- a/VM-source/mainwindow.h +++ b/VM-source/mainwindow.h @@ -1,3 +1,7 @@ +/* + * gfdgd xi、为什么您不喜欢熊出没和阿布呢 + * 依照 GPLV3 开源 + */ #ifndef MAINWINDOW_H #define MAINWINDOW_H diff --git a/VM-source/qemu.cpp b/VM-source/qemu.cpp index 557eea9..2378951 100644 --- a/VM-source/qemu.cpp +++ b/VM-source/qemu.cpp @@ -1,3 +1,6 @@ +/* + * gfdgd xi、为什么您不喜欢熊出没和阿布呢 + */ #include "qemu.h" #include #include @@ -30,7 +33,7 @@ int qemu::CreateDisk(QString path, int size){ if(QFile::exists(path)){ return 0; } - return system(("qemu-img create '" + path + "' " + QString::number(size) + "M").toLatin1()); + return system(("qemu-img create -f qcow2 '" + path + "' " + QString::number(size) + "M").toLatin1()); } int qemu::CreateDiskControl(QString controlName){ return 0; diff --git a/VM-source/qemu.h b/VM-source/qemu.h index 3daa4c1..0d57c8a 100644 --- a/VM-source/qemu.h +++ b/VM-source/qemu.h @@ -1,3 +1,7 @@ +/* + * gfdgd xi、为什么您不喜欢熊出没和阿布呢 + * 依照 GPLV3 开源 + */ #ifndef QEMU_H #define QEMU_H #include diff --git a/VM-source/vbox.cpp b/VM-source/vbox.cpp index 009bd7f..0d2c94c 100644 --- a/VM-source/vbox.cpp +++ b/VM-source/vbox.cpp @@ -1,3 +1,6 @@ +/* + * gfdgd xi、为什么您不喜欢熊出没和阿布呢 + */ #include "vbox.h" #include "command.h" #include diff --git a/VM-source/vbox.h b/VM-source/vbox.h index 64af5e2..fd94599 100644 --- a/VM-source/vbox.h +++ b/VM-source/vbox.h @@ -1,3 +1,7 @@ +/* + * gfdgd xi、为什么您不喜欢熊出没和阿布呢 + * 依照 GPLV3 开源 + */ #ifndef VBOX_H #define VBOX_H #include diff --git a/wine/.qmake.stash b/wine/.qmake.stash deleted file mode 100755 index 6cab99c..0000000 --- a/wine/.qmake.stash +++ /dev/null @@ -1,24 +0,0 @@ -QMAKE_CXX.QT_COMPILER_STDCXX = 201402L -QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 8 -QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 3 -QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0 -QMAKE_CXX.COMPILER_MACROS = \ - QT_COMPILER_STDCXX \ - QMAKE_GCC_MAJOR_VERSION \ - QMAKE_GCC_MINOR_VERSION \ - QMAKE_GCC_PATCH_VERSION -QMAKE_CXX.INCDIRS = \ - /usr/include/c++/8 \ - /usr/include/x86_64-linux-gnu/c++/8 \ - /usr/include/c++/8/backward \ - /usr/lib/gcc/x86_64-linux-gnu/8/include \ - /usr/local/include \ - /usr/lib/gcc/x86_64-linux-gnu/8/include-fixed \ - /usr/include/x86_64-linux-gnu \ - /usr/include -QMAKE_CXX.LIBDIRS = \ - /usr/lib/gcc/x86_64-linux-gnu/8 \ - /usr/lib/x86_64-linux-gnu \ - /usr/lib \ - /lib/x86_64-linux-gnu \ - /lib diff --git a/wine/installwine b/wine/installwine index 82f8bd0..5025205 100755 --- a/wine/installwine +++ b/wine/installwine @@ -78,17 +78,24 @@ class Ui_MainWindow(object): self.menu = MainWindow.menuBar() self.changeSources = self.menu.addMenu(_translate("MainWindow", "更换源")) self.gitlinkAction = QtWidgets.QAction(_translate("MainWindow", "Gitlink 源（推荐）")) - self.ipv6Action = QtWidgets.QAction(_translate("MainWindow", "备用源（只支持 IPv6 用户）")) + self.kgithubAction = QtWidgets.QAction(_translate("MainWindow", "KGithub 源")) + self.ipv6Action = QtWidgets.QAction(_translate("MainWindow", "Github 源1（国内访问不稳定）")) + self.githubAction = QtWidgets.QAction(_translate("MainWindow", "Github 源2（国内访问不稳定）")) + self.localAction = QtWidgets.QAction(_translate("MainWindow", "本地测试源（127.0.0.1）")) self.changeSources.addAction(self.gitlinkAction) + self.changeSources.addAction(self.kgithubAction) self.changeSources.addAction(self.ipv6Action) + self.changeSources.addAction(self.githubAction) self.changeSources.addAction(self.localAction) - for i in [self.gitlinkAction, self.ipv6Action, self.localAction]: + for i in [self.gitlinkAction, self.ipv6Action, self.localAction, self.kgithubAction, self.githubAction]: i.setCheckable(True) self.gitlinkAction.setChecked(True) self.changeSourcesGroup = QtWidgets.QActionGroup(MainWindow) self.changeSourcesGroup.addAction(self.gitlinkAction) + self.changeSourcesGroup.addAction(self.kgithubAction) self.changeSourcesGroup.addAction(self.ipv6Action) + self.changeSourcesGroup.addAction(self.githubAction) self.changeSourcesGroup.addAction(self.localAction) self.retranslateUi(MainWindow) @@ -153,7 +160,7 @@ def InstallOtherWine(): def ChangeSources(): global urlSources global internetWineSource - sources = [ui.gitlinkAction, ui.ipv6Action, ui.localAction] + sources = [ui.gitlinkAction, ui.kgithubAction, ui.ipv6Action, ui.githubAction, ui.localAction] for i in range(0, len(sources)): if sources[i].isChecked(): urlSources = internetWineSourceList[i] @@ -171,6 +178,7 @@ def ReadInternetInformation(): try: internetJsonList = json.loads(requests.get(f"{internetWineSource}/information.json").text) except: + traceback.print_exc() QtWidgets.QMessageBox.critical(window, "错误", "无法连接服务器！") return nmodel = QtGui.QStandardItemModel(window) @@ -292,7 +300,11 @@ def on_addButton_clicked(): if(ui.deleteZip.isChecked() + ui.unzip.isChecked() == 2): ui.deleteZip.setChecked(False) ui.unzip.setChecked(False) - downloadUrl = internetWineSource + downloadName + #downloadUrl = internetWineSource + downloadName + if "://" in downloadName: + downloadUrl = downloadName + else: + downloadUrl = internetWineSource + downloadName dialog = QtWidgets.QProgressDialog() cancel = QtWidgets.QPushButton("取消") cancel.setDisabled(True) @@ -346,7 +358,9 @@ if __name__ == "__main__": internetJsonList = [] internetWineSourceList = [ "https://code.gitlink.org.cn/gfdgd_xi/wine-mirrors/raw/branch/master/", - "http://gfdgdxi.msns.cn/wine-mirrors/", # 备用源，纯 IPv6 源 + "https://kgithub.com/gfdgd-xi/wine-mirrors-websize/raw/master/", + "http://wine.wine-runner.gfdgdxi.top/", + "https://github.com/gfdgd-xi/wine-mirrors-websize/raw/master/", "http://127.0.0.1/wine-mirrors/" # 本地测试源 ] internetWineSource = internetWineSourceList[0]