From 9cca4f2def3bc3fb164fb11d3e296b443cbd1c71 Mon Sep 17 00:00:00 2001 From: gfdgd_xi <3025613752@qq.com> Date: Sat, 22 Oct 2022 20:03:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BF=AB=E6=8D=B7=E9=94=AE?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- UI/KeyAddGui.py | 8 +- UI/KeyAddGui.ui | 4 +- UI/__pycache__/KeyAddGui.cpython-37.pyc | Bin 2881 -> 3123 bytes key/UI/AutoConfig.py | 76 ---------- key/UI/AutoConfig.ui | 110 --------------- key/UI/KeyAddGui.py | 85 ------------ key/UI/KeyAddGui.ui | 127 ----------------- key/UI/KeyAddKeyboardGui.py | 86 ------------ key/UI/KeyAddKeyboardGui.ui | 130 ------------------ key/UI/__pycache__/AutoConfig.cpython-310.pyc | Bin 2603 -> 0 bytes key/UI/__pycache__/AutoConfig.cpython-37.pyc | Bin 2536 -> 0 bytes key/UI/__pycache__/KeyAddGui.cpython-37.pyc | Bin 3118 -> 0 bytes .../KeyAddKeyboardGui.cpython-37.pyc | Bin 2690 -> 0 bytes key/key-add-gui.py | 63 +++++++-- key/keyboard-add-gui.py | 2 +- key/list/KeyList.json | 2 +- mainwindow.py | 9 +- package-script.zip | Bin 300918 -> 300918 bytes 18 files changed, 69 insertions(+), 633 deletions(-) delete mode 100755 key/UI/AutoConfig.py delete mode 100755 key/UI/AutoConfig.ui delete mode 100755 key/UI/KeyAddGui.py delete mode 100755 key/UI/KeyAddGui.ui delete mode 100755 key/UI/KeyAddKeyboardGui.py delete mode 100755 key/UI/KeyAddKeyboardGui.ui delete mode 100755 key/UI/__pycache__/AutoConfig.cpython-310.pyc delete mode 100755 key/UI/__pycache__/AutoConfig.cpython-37.pyc delete mode 100755 key/UI/__pycache__/KeyAddGui.cpython-37.pyc delete mode 100755 key/UI/__pycache__/KeyAddKeyboardGui.cpython-37.pyc diff --git a/UI/KeyAddGui.py b/UI/KeyAddGui.py index 171ad00..45e7d8c 100644 --- a/UI/KeyAddGui.py +++ b/UI/KeyAddGui.py @@ -32,9 +32,9 @@ class Ui_MainWindow(object): self.editButton = QtWidgets.QPushButton(self.centralwidget) self.editButton.setObjectName("editButton") self.horizontalLayout.addWidget(self.editButton) - self.saveButton = QtWidgets.QPushButton(self.centralwidget) - self.saveButton.setObjectName("saveButton") - self.horizontalLayout.addWidget(self.saveButton) + self.delectButton = QtWidgets.QPushButton(self.centralwidget) + self.delectButton.setObjectName("delectButton") + self.horizontalLayout.addWidget(self.delectButton) self.verticalLayout.addLayout(self.horizontalLayout) MainWindow.setCentralWidget(self.centralwidget) self.menuBar = QtWidgets.QMenuBar(MainWindow) @@ -74,7 +74,7 @@ class Ui_MainWindow(object): self.tips.setText(_translate("MainWindow", "

此工具可以用于设置快捷键到 Wine 容器的映射，以便 Wine 程序可以正常的使用快捷键
Deepin/UOS将会使用默认的快捷键服务，其它发行版将使用此运行器提供的快捷键服务
Deepin/UOS将只会提供快捷键添加功能，请在控制中心进行快捷键的修改管理

")) self.addButton.setText(_translate("MainWindow", "添加")) self.editButton.setText(_translate("MainWindow", "编辑")) - self.saveButton.setText(_translate("MainWindow", "保存")) + self.delectButton.setText(_translate("MainWindow", "删除")) self.menu.setTitle(_translate("MainWindow", "设置快捷键服务")) self.action.setText(_translate("MainWindow", "关于")) self.serverTips.setText(_translate("MainWindow", "此内容只支持非Deepin/UOS发行版")) diff --git a/UI/KeyAddGui.ui b/UI/KeyAddGui.ui index c024da2..a0869ec 100644 --- a/UI/KeyAddGui.ui +++ b/UI/KeyAddGui.ui @@ -55,9 +55,9 @@ - + - 保存 + 删除 diff --git a/UI/__pycache__/KeyAddGui.cpython-37.pyc b/UI/__pycache__/KeyAddGui.cpython-37.pyc index 03b5fff5d7d520ec5af8548d8d4ae397e96cb935..ca1368915a2c0701e7557c0f37a8589c8da53517 100644 GIT binary patch delta 1015 zcmZ8fOHUI~6rMZut*wQY(ic>o7C~!Fj0-1?5)BJu3_(p~fhpWkilwc?G{&R}3k*R5 z0=dLQF!44qYBZw6C>W8d;UBm|SEkdJh0(1$&%J#ZoynYh=li~M?wm98$@SW8>#&wY{w9|5ipv3j0XVXjNohp)mn7b{x!kq| zxEAo#mCGx9EAXwf4Lf)(!vc0zJmjO;;Hfw}z}W#R9|c~xnfwx+Z1##F2!=t(M1030MQb@cw{IhW5vbT1{T~bc*tkHiu~lbp${d=9m6rQ zVYrUIlQ!cehdwQ0gbkBoc_K5lkU8U3_CwfdNwk(kK820^Hu}7ABnZ-oIu;8{BXR_X z!qQLz-wI2~Fmam{m|(^fpOA)>@M&32M&qH2=liu+Q`-Eq+~#tAej&HDqGg}w=hkGTkPqm%(ghOQoH%W+}zUU6%YLv5Pw-hV`F=Eta(yfL43+u3^fc1^I| z3sE&D^Oce{z0<6CK<%tieB_9w-s5Lh9vT_)Lg5Lp6n!s~q?v?_^VLk!w6P!4aYn1I1O*W+b|D2p6c^o;>Pw~LID?stAOsZr z1@(e-BfM<7b0K!=2V%E{g1c@MQFQN0km7xrWW*-qaPK+i9_}Tt?GILA(KK~}&)%cU zcfJ-k3%hjZ)u(y-I3jJ8TZm>%DTyerVJ(X~l(-$ym_}sPLC)b5q01+kiLb;8apFmM z!j7f>DbXhr9#$SFtSA&rJw8;D)af*J2Dz&`~LxL(HBN4#*&kGlU|jS(+gC(_PIl0AMh zCPRjw5@+JUZhL{B#yXD;BR5FPhMnBqlJ2vOaB&cZz3zeDUwi1o1-V1dz_z>#J*7!Y zu%*;#8Qv;Rqk=y!s3NTBeLr04uHEkVEEpH8C7>q2hCfP3U3j2gr)~JCo`XZxr~AOh zZdLM;#3)mrO6j&bS72{!T}}2eVOewKFPH&Ov;cl-U2C9X_v6j;pYJx4^4t3t-(POQ z@BB6`0@s%-Wz<(RT;}FR*zp6gAROwB+{y(LFl~%GE;2y^lcI7EuHe_V;hN#XJ!9$Y rRK^c&M+OvB4KW}iXjD57pN)m)Khr4sK)ZOq#|9n$QeN04gsSux8L7FM diff --git a/key/UI/AutoConfig.py b/key/UI/AutoConfig.py deleted file mode 100755 index 1418666..0000000 --- a/key/UI/AutoConfig.py +++ /dev/null @@ -1,76 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'AutoConfig.ui' -# -# Created by: PyQt5 UI code generator 5.11.3 -# -# WARNING! All changes made in this file will be lost! - -from PyQt5 import QtCore, QtGui, QtWidgets - -class Ui_MainWindow(object): - def setupUi(self, MainWindow): - MainWindow.setObjectName("MainWindow") - MainWindow.resize(800, 600) - self.centralwidget = QtWidgets.QWidget(MainWindow) - self.centralwidget.setObjectName("centralwidget") - self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.centralwidget) - self.verticalLayout_3.setObjectName("verticalLayout_3") - self.horizontalLayout = QtWidgets.QHBoxLayout() - self.horizontalLayout.setObjectName("horizontalLayout") - self.searchTips = QtWidgets.QLabel(self.centralwidget) - self.searchTips.setObjectName("searchTips") - self.horizontalLayout.addWidget(self.searchTips) - self.searchThings = QtWidgets.QLineEdit(self.centralwidget) - self.searchThings.setObjectName("searchThings") - self.horizontalLayout.addWidget(self.searchThings) - self.saerchBotton = QtWidgets.QPushButton(self.centralwidget) - self.saerchBotton.setObjectName("saerchBotton") - self.horizontalLayout.addWidget(self.saerchBotton) - self.verticalLayout_3.addLayout(self.horizontalLayout) - self.searchList = QtWidgets.QListView(self.centralwidget) - self.searchList.setObjectName("searchList") - self.verticalLayout_3.addWidget(self.searchList) - self.horizontalLayout_2 = QtWidgets.QHBoxLayout() - self.horizontalLayout_2.setObjectName("horizontalLayout_2") - spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_2.addItem(spacerItem) - self.runBotton = QtWidgets.QPushButton(self.centralwidget) - self.runBotton.setObjectName("runBotton") - self.horizontalLayout_2.addWidget(self.runBotton) - self.verticalLayout_3.addLayout(self.horizontalLayout_2) - MainWindow.setCentralWidget(self.centralwidget) - self.menubar = QtWidgets.QMenuBar(MainWindow) - self.menubar.setGeometry(QtCore.QRect(0, 0, 800, 36)) - self.menubar.setObjectName("menubar") - self.menu = QtWidgets.QMenu(self.menubar) - self.menu.setObjectName("menu") - MainWindow.setMenuBar(self.menubar) - self.about = QtWidgets.QAction(MainWindow) - self.about.setObjectName("about") - self.exitProgram = QtWidgets.QAction(MainWindow) - self.exitProgram.setObjectName("exitProgram") - self.help = QtWidgets.QAction(MainWindow) - self.help.setObjectName("help") - self.openFile = QtWidgets.QAction(MainWindow) - self.openFile.setObjectName("openFile") - self.menu.addAction(self.openFile) - self.menu.addSeparator() - self.menu.addAction(self.exitProgram) - self.menubar.addAction(self.menu.menuAction()) - - self.retranslateUi(MainWindow) - QtCore.QMetaObject.connectSlotsByName(MainWindow) - - def retranslateUi(self, MainWindow): - _translate = QtCore.QCoreApplication.translate - MainWindow.setWindowTitle(_translate("MainWindow", "自动部署脚本")) - self.searchTips.setText(_translate("MainWindow", "搜索内容（为空代表显示所有内容）：")) - self.saerchBotton.setText(_translate("MainWindow", "搜索")) - self.runBotton.setText(_translate("MainWindow", "部署此方案")) - self.menu.setTitle(_translate("MainWindow", "程序")) - self.about.setText(_translate("MainWindow", "关于")) - self.exitProgram.setText(_translate("MainWindow", "退出程序")) - self.help.setText(_translate("MainWindow", "帮助")) - self.openFile.setText(_translate("MainWindow", "打开本地部署脚本")) - diff --git a/key/UI/AutoConfig.ui b/key/UI/AutoConfig.ui deleted file mode 100755 index 7b0ae10..0000000 --- a/key/UI/AutoConfig.ui +++ /dev/null @@ -1,110 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 800 - 600 - - - - 自动部署脚本 - - - - - - - - - 搜索内容（为空代表显示所有内容）： - - - - - - - - - - 搜索 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 部署此方案 - - - - - - - - - - - 0 - 0 - 800 - 36 - - - - - 程序 - - - - - - - - - - 关于 - - - - - 退出程序 - - - - - 帮助 - - - - - 打开本地部署脚本 - - - - - - diff --git a/key/UI/KeyAddGui.py b/key/UI/KeyAddGui.py deleted file mode 100755 index 171ad00..0000000 --- a/key/UI/KeyAddGui.py +++ /dev/null @@ -1,85 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'KeyAddGui.ui' -# -# Created by: PyQt5 UI code generator 5.11.3 -# -# WARNING! All changes made in this file will be lost! - -from PyQt5 import QtCore, QtGui, QtWidgets - -class Ui_MainWindow(object): - def setupUi(self, MainWindow): - MainWindow.setObjectName("MainWindow") - MainWindow.resize(692, 314) - self.centralwidget = QtWidgets.QWidget(MainWindow) - self.centralwidget.setObjectName("centralwidget") - self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget) - self.verticalLayout.setObjectName("verticalLayout") - self.tips = QtWidgets.QLabel(self.centralwidget) - self.tips.setObjectName("tips") - self.verticalLayout.addWidget(self.tips) - self.keyBoardList = QtWidgets.QListView(self.centralwidget) - self.keyBoardList.setObjectName("keyBoardList") - self.verticalLayout.addWidget(self.keyBoardList) - self.horizontalLayout = QtWidgets.QHBoxLayout() - self.horizontalLayout.setObjectName("horizontalLayout") - spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout.addItem(spacerItem) - self.addButton = QtWidgets.QPushButton(self.centralwidget) - self.addButton.setObjectName("addButton") - self.horizontalLayout.addWidget(self.addButton) - self.editButton = QtWidgets.QPushButton(self.centralwidget) - self.editButton.setObjectName("editButton") - self.horizontalLayout.addWidget(self.editButton) - self.saveButton = QtWidgets.QPushButton(self.centralwidget) - self.saveButton.setObjectName("saveButton") - self.horizontalLayout.addWidget(self.saveButton) - self.verticalLayout.addLayout(self.horizontalLayout) - MainWindow.setCentralWidget(self.centralwidget) - self.menuBar = QtWidgets.QMenuBar(MainWindow) - self.menuBar.setGeometry(QtCore.QRect(0, 0, 692, 33)) - self.menuBar.setObjectName("menuBar") - self.menu = QtWidgets.QMenu(self.menuBar) - self.menu.setObjectName("menu") - MainWindow.setMenuBar(self.menuBar) - self.action = QtWidgets.QAction(MainWindow) - self.action.setObjectName("action") - self.serverTips = QtWidgets.QAction(MainWindow) - self.serverTips.setEnabled(False) - self.serverTips.setObjectName("serverTips") - self.startServer = QtWidgets.QAction(MainWindow) - self.startServer.setObjectName("startServer") - self.stopServer = QtWidgets.QAction(MainWindow) - self.stopServer.setObjectName("stopServer") - self.setAutoStart = QtWidgets.QAction(MainWindow) - self.setAutoStart.setObjectName("setAutoStart") - self.setUnautoStart = QtWidgets.QAction(MainWindow) - self.setUnautoStart.setObjectName("setUnautoStart") - self.menu.addAction(self.serverTips) - self.menu.addSeparator() - self.menu.addAction(self.startServer) - self.menu.addAction(self.stopServer) - self.menu.addSeparator() - self.menu.addAction(self.setAutoStart) - self.menu.addAction(self.setUnautoStart) - self.menuBar.addAction(self.menu.menuAction()) - - self.retranslateUi(MainWindow) - QtCore.QMetaObject.connectSlotsByName(MainWindow) - - def retranslateUi(self, MainWindow): - _translate = QtCore.QCoreApplication.translate - MainWindow.setWindowTitle(_translate("MainWindow", "编辑快捷键")) - self.tips.setText(_translate("MainWindow", "

此工具可以用于设置快捷键到 Wine 容器的映射，以便 Wine 程序可以正常的使用快捷键
Deepin/UOS将会使用默认的快捷键服务，其它发行版将使用此运行器提供的快捷键服务
Deepin/UOS将只会提供快捷键添加功能，请在控制中心进行快捷键的修改管理

")) - self.addButton.setText(_translate("MainWindow", "添加")) - self.editButton.setText(_translate("MainWindow", "编辑")) - self.saveButton.setText(_translate("MainWindow", "保存")) - self.menu.setTitle(_translate("MainWindow", "设置快捷键服务")) - self.action.setText(_translate("MainWindow", "关于")) - self.serverTips.setText(_translate("MainWindow", "此内容只支持非Deepin/UOS发行版")) - self.startServer.setText(_translate("MainWindow", "启动服务")) - self.stopServer.setText(_translate("MainWindow", "停止服务")) - self.setAutoStart.setText(_translate("MainWindow", "设置开机自启")) - self.setUnautoStart.setText(_translate("MainWindow", "关闭开机自启动")) - diff --git a/key/UI/KeyAddGui.ui b/key/UI/KeyAddGui.ui deleted file mode 100755 index c024da2..0000000 --- a/key/UI/KeyAddGui.ui +++ /dev/null @@ -1,127 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 692 - 314 - - - - 编辑快捷键 - - - - - - - <html><head/><body><p>此工具可以用于设置快捷键到 Wine 容器的映射，以便 Wine 程序可以正常的使用快捷键<br/>Deepin/UOS将会使用默认的快捷键服务，其它发行版将使用此运行器提供的快捷键服务<br>Deepin/UOS将只会提供快捷键添加功能，请在控制中心进行快捷键的修改管理</p></body></html> - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 添加 - - - - - - - 编辑 - - - - - - - 保存 - - - - - - - - - - - 0 - 0 - 692 - 33 - - - - - 设置快捷键服务 - - - - - - - - - - - - - - 关于 - - - - - false - - - 此内容只支持非Deepin/UOS发行版 - - - - - 启动服务 - - - - - 停止服务 - - - - - 设置开机自启 - - - - - 关闭开机自启动 - - - - - - diff --git a/key/UI/KeyAddKeyboardGui.py b/key/UI/KeyAddKeyboardGui.py deleted file mode 100755 index 46041e3..0000000 --- a/key/UI/KeyAddKeyboardGui.py +++ /dev/null @@ -1,86 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'KeyAddKeyboardGui.ui' -# -# Created by: PyQt5 UI code generator 5.11.3 -# -# WARNING! All changes made in this file will be lost! - -from PyQt5 import QtCore, QtGui, QtWidgets - -class Ui_MainWindow(object): - def setupUi(self, MainWindow): - MainWindow.setObjectName("MainWindow") - MainWindow.resize(800, 195) - icon = QtGui.QIcon.fromTheme("..") - MainWindow.setWindowIcon(icon) - self.centralwidget = QtWidgets.QWidget(MainWindow) - self.centralwidget.setObjectName("centralwidget") - self.verticalLayout = QtWidgets.QVBoxLayout(self.centralwidget) - self.verticalLayout.setObjectName("verticalLayout") - self.addTips = QtWidgets.QLabel(self.centralwidget) - self.addTips.setObjectName("addTips") - self.verticalLayout.addWidget(self.addTips) - self.horizontalLayout_3 = QtWidgets.QHBoxLayout() - self.horizontalLayout_3.setObjectName("horizontalLayout_3") - self.exeNameTips = QtWidgets.QLabel(self.centralwidget) - self.exeNameTips.setObjectName("exeNameTips") - self.horizontalLayout_3.addWidget(self.exeNameTips) - self.exeName = QtWidgets.QLineEdit(self.centralwidget) - self.exeName.setObjectName("exeName") - self.horizontalLayout_3.addWidget(self.exeName) - self.verticalLayout.addLayout(self.horizontalLayout_3) - self.horizontalLayout = QtWidgets.QHBoxLayout() - self.horizontalLayout.setObjectName("horizontalLayout") - self.localTips = QtWidgets.QLabel(self.centralwidget) - self.localTips.setObjectName("localTips") - self.horizontalLayout.addWidget(self.localTips) - self.localKeyboardChoose = QtWidgets.QComboBox(self.centralwidget) - self.localKeyboardChoose.setObjectName("localKeyboardChoose") - self.horizontalLayout.addWidget(self.localKeyboardChoose) - self.addTips_2 = QtWidgets.QLabel(self.centralwidget) - self.addTips_2.setObjectName("addTips_2") - self.horizontalLayout.addWidget(self.addTips_2) - self.localKey = QtWidgets.QLineEdit(self.centralwidget) - self.localKey.setObjectName("localKey") - self.horizontalLayout.addWidget(self.localKey) - self.wineTips = QtWidgets.QLabel(self.centralwidget) - self.wineTips.setObjectName("wineTips") - self.horizontalLayout.addWidget(self.wineTips) - self.wineKeyboardChoose = QtWidgets.QComboBox(self.centralwidget) - self.wineKeyboardChoose.setObjectName("wineKeyboardChoose") - self.horizontalLayout.addWidget(self.wineKeyboardChoose) - self.addTipsWine = QtWidgets.QLabel(self.centralwidget) - self.addTipsWine.setObjectName("addTipsWine") - self.horizontalLayout.addWidget(self.addTipsWine) - self.wineKey = QtWidgets.QLineEdit(self.centralwidget) - self.wineKey.setObjectName("wineKey") - self.horizontalLayout.addWidget(self.wineKey) - self.verticalLayout.addLayout(self.horizontalLayout) - spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) - self.verticalLayout.addItem(spacerItem) - self.horizontalLayout_2 = QtWidgets.QHBoxLayout() - self.horizontalLayout_2.setObjectName("horizontalLayout_2") - spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) - self.horizontalLayout_2.addItem(spacerItem1) - self.addButton = QtWidgets.QPushButton(self.centralwidget) - self.addButton.setObjectName("addButton") - self.horizontalLayout_2.addWidget(self.addButton) - self.verticalLayout.addLayout(self.horizontalLayout_2) - MainWindow.setCentralWidget(self.centralwidget) - - self.retranslateUi(MainWindow) - QtCore.QMetaObject.connectSlotsByName(MainWindow) - - def retranslateUi(self, MainWindow): - _translate = QtCore.QCoreApplication.translate - MainWindow.setWindowTitle(_translate("MainWindow", "添加快捷键")) - self.addTips.setText(_translate("MainWindow", "暂时只支持 Ctrl+Alt+? 和 Alt+? 的组合\n" -"文本框内的只能输入单字母")) - self.exeNameTips.setText(_translate("MainWindow", "可这执行文件名称：")) - self.localTips.setText(_translate("MainWindow", "本地映射：")) - self.addTips_2.setText(_translate("MainWindow", "+")) - self.wineTips.setText(_translate("MainWindow", "Wine 容器映射内容：")) - self.addTipsWine.setText(_translate("MainWindow", "+")) - self.addButton.setText(_translate("MainWindow", "添加快捷键")) - diff --git a/key/UI/KeyAddKeyboardGui.ui b/key/UI/KeyAddKeyboardGui.ui deleted file mode 100755 index 847a464..0000000 --- a/key/UI/KeyAddKeyboardGui.ui +++ /dev/null @@ -1,130 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 800 - 195 - - - - 添加快捷键 - - - - ../../../.designer/backup../../../.designer/backup - - - - - - - 暂时只支持 Ctrl+Alt+? 和 Alt+? 的组合 -文本框内的只能输入单字母 - - - - - - - - - 可这执行文件名称： - - - - - - - - - - - - - - 本地映射： - - - - - - - - - - + - - - - - - - - - - Wine 容器映射内容： - - - - - - - - - - + - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - 添加快捷键 - - - - - - - - - - - diff --git a/key/UI/__pycache__/AutoConfig.cpython-310.pyc b/key/UI/__pycache__/AutoConfig.cpython-310.pyc deleted file mode 100755 index bbf0dfbe8815d7bfbc44d02f5b412bd4f8cb7d9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2603 zcmZuzTW=dh6y9C0udy9Bx8BmyKyLxuR0$y@2w` zNR`^srbti;2~|}dZ0JLZN`-)jHWYryzEV5QQ{Q>woZ0opDP3#FXTI~zIcF~C%vz~b zLV_oJHdf5GOVU5sX?;}aoPpOq2@R2mT$0MNCYKdWDTlO>ES;B#LPFOi5~Aw0kQOHD zjMN|A2Da26aw9oDZZYbHbNswxxbYmnY>+w1?IIFd9|byR;I(_9p^_#ONmGbSlVjJmRKijr^o;n3oNcSc^p*+I&JF#NZu=*S-UqRk;dL*JK$bFh@c)MV7cy z4XpyYD&^HxX+Z^!iX6bh*cX}zNDVQ$gFUXN9M$zG0_vX+E zNGEXGe6))sNs22A-3vXU-CI+?QUqt;s^W8Y;@S_I{V+Q1N75-g?Du?m-AXYkgpt`9dH96Buiy}kZ%$JmLqo|iA z^kvK8`5`wmZ!u%VGI%E0keD(V{u846rEn+H#l1tR-)n43ig-k9UwbB9YvL zUZ5q0)k=%&gm?zDcy7Wl={aI>*5-|zcI^2v2dB-FO|oZOkZpd+po=U8Dwg&}%vAIu zWfwRtgX0+pa@r~x#bqsiZmFW11lCiFP8z0BcFI~5TqBe1!Lb>b#sAI?lqoUvfw?PWj^vk&fz!p|k-`WqWCsV|*R$^opDtwI8zv*! z(^P*~A1aI#h6W2e?6cJVoLiLvLTM$t2z!-<6J}C2FneKO)Zx~+WnMAnPF0rOC@h0h znKf|NYywR}PKsX|T9olW{Zi{;sNJ`VvD5c#w6!u^3rC_o}Uq6SFRN5TOTtH#BsNPr}KPBcK; zd?XeiNgs&^NXkbN9wO>Z+mzT^rvn0ie)H%0?Tzhg8(V+<_Wb(2#`;5N2;jz@^{qdC ztbcu@{^-ezr?;Lx-rRby`Rvc1p4T=ScmLkHzu8#3+E`y}64qWkz31R@@y0pu-5_~3 z8^7Fd{P3hvyCu|H8{gD7zY}8p#_!KIzjbhHx36BU-`s4~J$_Wb{lLK!-dOv-{uEq2 ztgrvt8fAalOP)*)za~a2706E=)5MJjXWdQ1-g#dH7Y$ybUa7!Cb&)P{Q42)UdN~(E zT+m*TX#F8}5Tfx@A|JRA3E?$|P=5fLQFv`kZ^G>E#?B l7E8zAnvq2Dbt9Ij%7XPOlWyz-FOm=O2C%VUcg4Dt{{Z|n$Tt80 diff --git a/key/UI/__pycache__/AutoConfig.cpython-37.pyc b/key/UI/__pycache__/AutoConfig.cpython-37.pyc deleted file mode 100755 index 8dc37e65cbb243f25e5b860ad25fc07f583f4d8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2536 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 N^yA5C;{nti`X4F|*qZsWSu@xxB&{;L3bsoe z5)641E~tcr;POE}q{xE+C#V!jIOLT4guNy!>{ITX(mgYhFea;-*`DsNyJvd4do&S` z#}s(}`g08{Jxg-Wu3?v~b>1athf$9WF7$qDP zM~=jGtpm^O22M9%z!vw{)=q#V0g|ZH?yjSDLgID+E&L~eN&+sn1(%eoSiJ}2-BL^V zOaUha8Xc0`_Sp-PUXbuTauoXPmAIWi3!l4y+6B0{^pfIx+qKPJAK>}`*R=)LCvojF z^aHLRaD1OY3w!_wf8p&vO&P@*y49^o4p~x4FRqhE#Y@a;@bNg z2HY^;vvTu)4FQ*-KJF zN9coQfMfR70uu8oti?Cj57d6p=27P;{8sxB2XC>beSD?XUjq)$u$oeT9Wxqo?LZ-2 zKPYITKne9tda-r^StC#@n}0ynENNq7UOZ3BF3S}!@+$SZKBCOE^10&a+@f7|y>O0@ zX{+LR$$6VuOLp09ip)2?4!S@mb0x|FVY%=UFCx8Y(FThg)x*hCbaB?sF_M|LZHIbM z>BKzjMVfLia?vUa%SohOQ0b5=&=jZ_mVnI^oN5#M)=Rc~n7f&%x~^SLj~a1@y6?{x zXx_yW7$HU-Yl$+5jba3|C-ZjMh@NM5X?mW57}4Mg`VUGN_DCa~6`hSmaMh9hV8UJy zQDaf$gtDh|v$V*t)f#w20SDxJZDa=sStmziPs3S`6U$}sriL`vg`jQ$%Gjk@8}wNM znLBWT4z92sobddt7pI*tfv2fTE>GD>mzHn=2Rv&Rt^A@9K4X=wQnh46k1temWnz`* z4E)rHWc@<-Y}J_;;bH^GNk9xTB3Z;qyf~wfI%TJrbLou5urq_3Gt|wA$QnrqRvAJ( zRkU4aVi6;q4tfEH7SA*6-A2H|K*yZtw%MlN_(5UAfO?i0pSMeNeC|A%Bj$oN{w{Sc zxOQcnP+B>J-~JG*f*&@1fi8~EoE(Q-IYvk`W8fMZt1Nn9*nYJ#V_~qJ1(*~yrgp+l z%w0fdLvl2M;jJYy$-iS2 zle6*YvHwNgfAUjf<!i#FV;+$IJeW&ti>lK5eYsZLDAQuU-Kz=xtp7ZR7W^{43x2D_{FR-)h`nsSbi&|N8xn zC$}4)-`QBd21@@te(2v=d3xu;zrU`Ey{z5!*B&&!t@{s_f%i-utzr&iw;1v7{o>#L zUdX@?ECG@36zQAD;=h+;l?s$e&b92a7j31u(beh#)0SJLys~*-P16OJS23?rQI)(P zc`c&nw9fFaj>!6$*|NzKTui%Bj)yx1!@;6f)QFl;lUh=3{+0%}=FXM^oP^qnm}VKO z%rw22X_jnKEh61%njcnkMIm8(z%qCAoO7%*#&>|Jhh53RCKpj7M;LM@(;*{xb}{R| h#pA^LByWRW$mU&?qh4mvi@YuN@eX!H2b)An`wtE5;E4bL diff --git a/key/key-add-gui.py b/key/key-add-gui.py index 2b71aab..6a13395 100755 --- a/key/key-add-gui.py +++ b/key/key-add-gui.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import os import sys +import traceback programPath = os.path.split(os.path.realpath(__file__))[0] # 返回 string sys.path.append(f"{programPath}/..") @@ -12,12 +13,15 @@ import threading from UI.KeyAddGui import * import PyQt5.QtWidgets as QtWidgets +keyListDebianMap = [[], ["shift"], ["ctrl"], ["alt"], ["ctrl", "alt"], ["ctrl", "shift"], ["alt", "shift"]] +keyList = ["无快捷键", "shift", "ctrl", "alt", "ctrl+alt", "ctrl+shift", "alt+shift"] + class Check: def VersionCheck(): try: bus = dbus.SessionBus() bus.get_object("com.deepin.daemon.Keybinding", "/com/deepin/daemon/Keybinding").List() - int("a") + #int("a") return True except: print("无法检测到 Deepin/UOS 快捷键服务") @@ -30,23 +34,60 @@ class Check: ui.setUnautoStart.setDisabled(True) ui.editButton.setDisabled(True) ui.keyBoardList.setDisabled(True) - ui.saveButton.setDisabled(True) + ui.delectButton.setDisabled(True) def Clear(): - ui.keyBoardList.model().removeRows(0, ui.keyBoardList.model().rowCount()) + #ui.keyBoardList.model().removeRows(0, ui.keyBoardList.model().rowCount()) + model = QtCore.QStringListModel(window) - with open(f"{programPath}/list/KeyList.json", "r") as file: - lists = [] - for i in json.loads(file.read()): - lists.append(f"{i[0]}（{'+'.join(i[1: -1])}），{i[-1]}") - model.setStringList(lists) - ui.keyBoardList.setModel(model) - + try: + with open(f"{programPath}/list/KeyList.json", "r") as file: + lists = [] + for i in json.loads(file.read()): + #lists.append(f"{i[0]}（{'+'.join(i[0: -1])}），{i[-1]}") + choice = i + #ui.localKeyboardChoose.setCurrentIndex(keyListDebianMap.index(choice[:-2])) + newList = [] + newList.append([keyListDebianMap.index(choice[:-2]), choice[-2]]) + # 解析命令 + command = choice[-1] + # 筛掉路径 + command = command[command[1:].index("'") + 2:].strip() + # 筛出其中一个快捷键 + newList.append([command[command.index(" ") - 1]]) + command = command[command.index(" ") + 2:] + # 读 exe + newList.insert(0, command[:command.index("'")]) + command = command[command.index("'") + 1: ].strip() + # 读最后的快捷键 + newList[2].insert(0, int(command)) + print(newList) + lists.append(f"{newList[0]}（{'+'.join(keyListDebianMap[newList[1][0]])}+{newList[1][1]}）=>（{'+'.join(keyListDebianMap[newList[2][0]])}+{newList[2][1]}）") + model.setStringList(lists) + ui.keyBoardList.setModel(model) + except: + traceback.print_exc() class Click: def AddButton(): os.system(f"'{programPath}/keyboard-add-gui.py'") + Clear() + def EditButton(): + os.system(f"'{programPath}/keyboard-add-gui.py' {ui.keyBoardList.currentIndex().row()}") + Clear() + + def DeleteButton(): + try: + with open(f"{programPath}/list/KeyList.json", "r") as file: + lists = json.loads(file.read()) + del lists[ui.keyBoardList.currentIndex().row()] + with open(f"{programPath}/list/KeyList.json", "w") as file: + file.write(json.dumps(lists)) + Clear() + except: + traceback.print_exc() + QtWidgets.QMessageBox.critical(window, "错误", traceback.format_exc()) if __name__ == "__main__": @@ -56,6 +97,8 @@ if __name__ == "__main__": ui.setupUi(window) # 连接槽 ui.addButton.clicked.connect(Click.AddButton) + ui.editButton.clicked.connect(Click.EditButton) + ui.delectButton.clicked.connect(Click.DeleteButton) ui.startServer.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"nohup '{programPath}/key-get.py' &"]).start()) ui.stopServer.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"'{programPath}/stop.sh'"]).start()) ui.setAutoStart.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"'{programPath}/start-auto-server.sh'"]).start()) diff --git a/key/keyboard-add-gui.py b/key/keyboard-add-gui.py index 2510a42..225ddf7 100755 --- a/key/keyboard-add-gui.py +++ b/key/keyboard-add-gui.py @@ -69,7 +69,7 @@ class Click: return print(keyboardList) addList = [] - addList = keyListDebianMap[ui.wineKeyboardChoose.currentIndex()][:] + addList = keyListDebianMap[ui.localKeyboardChoose.currentIndex()][:] print(keyListDebianMap) print(addList) addList.append(ui.localKey.text()[0]) diff --git a/key/list/KeyList.json b/key/list/KeyList.json index fe51488..0637a08 100755 --- a/key/list/KeyList.json +++ b/key/list/KeyList.json @@ -1 +1 @@ -[] +[] \ No newline at end of file diff --git a/mainwindow.py b/mainwindow.py index 806639a..eaa0204 100755 --- a/mainwindow.py +++ b/mainwindow.py @@ -1837,10 +1837,13 @@ exe路径\' 参数 \' N: 鉴于仓库 'https://community-packages.deepin.com/beige beige InRelease' 不支持 'i386' 体系结构，跳过配置文件 'main/binary-i386/Packages' 的获取。''' updateThingsString = '''※1、新增 VB Runtime 组件安装工具 ※2、优化自动配置容器搜索功能，搜索不区分大小写 +※3、新增 Wine 容器快捷键映射功能 +※4、修复在 arm 架构运行 Wine 时提示无法解压资源的问题 +※5、修复右键无法找到 Wine 运行器打开方式的问题 ''' for i in information["Thank"]: thankText += f"{i}\n" -updateTime = "2022年10月02日" +updateTime = "2022年10月22日" about = f'''

关于

一个能让Linux用户更加方便运行Windows应用的程序，内置了对wine图形化的支持和各种Wine工具和自制Wine程序打包器、运行库安装工具等等

同时也内置了基于VirtualBox制作的小白Windows虚拟机安装工具，可以做到只需要用户下载系统镜像并点击安装即可，无需顾及虚拟机安装、创建、虚拟机的分区等等

@@ -2092,6 +2095,7 @@ w2 = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "安装常见字 w3 = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "安装自定义字体")) w4 = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "删除选择的 Wine 容器")) cleanBottonUOS = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "清理 Wine 容器（基于 Wine 适配活动脚本）")) +wineKeyboardLnk = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "Wine 快捷键映射")) w5 = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "打包 wine 应用")) w6 = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "使用官方 Wine 适配活动的脚本进行打包")) getDllOnInternet = QtWidgets.QAction(QtCore.QCoreApplication.translate("U", "从互联网获取DLL")) @@ -2107,6 +2111,8 @@ wineOption.addSeparator() wineOption.addAction(w5) wineOption.addAction(w6) wineOption.addSeparator() +wineOption.addAction(wineKeyboardLnk) +wineOption.addSeparator() wineOption.addAction(getDllOnInternet) wineOption.addAction(w7) wineOption.addSeparator() @@ -2196,6 +2202,7 @@ w4.triggered.connect(DeleteWineBotton) cleanBottonUOS.triggered.connect(CleanWineBottonByUOS) w5.triggered.connect(BuildExeDeb) w6.triggered.connect(UOSPackageScript) +wineKeyboardLnk.triggered.connect(lambda: threading.Thread(target=os.system, args=[f"'{programPath}/key/key-add-gui.py'"]).start()) getDllOnInternet.triggered.connect(GetDllFromInternet) w7.triggered.connect(GetDllFromWindowsISO.ShowWindow) updateGeek.triggered.connect(lambda: os.system(f"'{programPath}/launch.sh' deepin-terminal -C '\"{programPath}/UpdateGeek.sh\"' --keep-open")) diff --git a/package-script.zip b/package-script.zip index 1e4ecdd59126d96fa95de7678f46ba8a638463b0..7147ce256e5ff66faefe4428218928019cb24c42 100755 GIT binary patch delta 149 zcmeyiPUzb@p$TRz-4lY6r%(LFD7?|vjSIn>=*!i-g=_m3F2)ZxP(-Ki>|){De)%z@ zEFX&acEL}KA#89V&Gtz@7`IRQ!6a4#7n7Wvz$GyKY6-I{Tu2ybPrGy}^LFV{mS`ma DClEV& delta 149 zcmeyiPUzb@p$TRzlbn5%r%(LFD7?|vjSIn>=*!i-g=_m3F2)ZxP(-Ki>|){De)%z@ zEFX&acEL}KA#89V&Gtz@7`IRQ!6a4#7n7Wvz$GyKY6-I{Tu2ybPrGy}^LFV{mS`ma DfjBvB