From eb8207b5b96e0758a902f0bd8a0130a72960f533 Mon Sep 17 00:00:00 2001 From: sqzw-x Date: Wed, 7 Feb 2024 12:07:57 +0800 Subject: [PATCH] =?UTF-8?q?UI:=20=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=BD=91?= =?UTF-8?q?=E7=AB=99;=20=E7=A7=BB=E9=99=A4=20hdouban?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/main_window/main_window.py | 1 - src/models/config/config_manual.py | 1 - src/views/MDCx.py | 80 ++++++++++++---------- src/views/MDCx.ui | 32 ++++++--- 4 files changed, 63 insertions(+), 51 deletions(-) diff --git a/src/controllers/main_window/main_window.py b/src/controllers/main_window/main_window.py index 3b3676b..160041f 100644 --- a/src/controllers/main_window/main_window.py +++ b/src/controllers/main_window/main_window.py @@ -2057,7 +2057,6 @@ def _netResult(self): 'avsox': [get_avsox_domain(), ''], 'xcity': ['https://xcity.jp', ''], '7mmtv': ['https://7mmtv.tv', ''], - 'hdouban': ['https://ormtgu.com', ''], 'mdtv': ['https://www.mdpjzip.xyz', ''], 'madouqu': ['https://madouqu.com', ''], 'cnmdb': ['https://cnmdb.net', ''], diff --git a/src/models/config/config_manual.py b/src/models/config/config_manual.py index f50d2a7..ac9e32f 100644 --- a/src/models/config/config_manual.py +++ b/src/models/config/config_manual.py @@ -56,7 +56,6 @@ class ManualConfig: 'freejavbt', 'getchu', 'giga', - 'hdouban', 'iqqtv', 'jav321', 'javbus', diff --git a/src/views/MDCx.py b/src/views/MDCx.py index 9567e57..dedce30 100644 --- a/src/views/MDCx.py +++ b/src/views/MDCx.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file '.\MDCx.ui' +# Form implementation generated from reading ui file 'MDCx.ui' # # Created by: PyQt5 UI code generator 5.15.6 # @@ -463,7 +463,7 @@ def setupUi(self, MDCx): self.pushButton_show_hide_logs.setMouseTracking(True) self.pushButton_show_hide_logs.setText("") icon = QtGui.QIcon() - icon.addPixmap(QtGui.QPixmap(".\\../../MDCx-py-20220407/edit.png"), QtGui.QIcon.Normal, QtGui.QIcon.On) + icon.addPixmap(QtGui.QPixmap("../../MDCx-py-20220407/edit.png"), QtGui.QIcon.Normal, QtGui.QIcon.On) self.pushButton_show_hide_logs.setIcon(icon) self.pushButton_show_hide_logs.setIconSize(QtCore.QSize(30, 30)) self.pushButton_show_hide_logs.setCheckable(False) @@ -583,6 +583,7 @@ def setupUi(self, MDCx): self.comboBox_website.addItem("") self.comboBox_website.addItem("") self.comboBox_website.addItem("") + self.comboBox_website.addItem("") self.label_2 = QtWidgets.QLabel(self.groupBox_7) self.label_2.setGeometry(QtCore.QRect(60, 80, 80, 30)) self.label_2.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) @@ -3857,6 +3858,7 @@ def setupUi(self, MDCx): self.comboBox_website_all.addItem("") self.comboBox_website_all.addItem("") self.comboBox_website_all.addItem("") + self.comboBox_website_all.addItem("") self.gridLayout_28.addWidget(self.comboBox_website_all, 3, 1, 1, 1) self.label_315 = QtWidgets.QLabel(self.layoutWidget2) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed) @@ -10962,21 +10964,22 @@ def retranslateUi(self, MDCx): self.comboBox_website.setItemText(16, _translate("MDCx", "avsox")) self.comboBox_website.setItemText(17, _translate("MDCx", "xcity")) self.comboBox_website.setItemText(18, _translate("MDCx", "7mmtv")) - self.comboBox_website.setItemText(19, _translate("MDCx", "hdouban")) - self.comboBox_website.setItemText(20, _translate("MDCx", "mdtv")) - self.comboBox_website.setItemText(21, _translate("MDCx", "madouqu")) - self.comboBox_website.setItemText(22, _translate("MDCx", "cnmdb")) - self.comboBox_website.setItemText(23, _translate("MDCx", "lulubar")) - self.comboBox_website.setItemText(24, _translate("MDCx", "love6")) - self.comboBox_website.setItemText(25, _translate("MDCx", "fc2")) - self.comboBox_website.setItemText(26, _translate("MDCx", "fc2club")) - self.comboBox_website.setItemText(27, _translate("MDCx", "fc2hub")) - self.comboBox_website.setItemText(28, _translate("MDCx", "mywife")) - self.comboBox_website.setItemText(29, _translate("MDCx", "giga")) - self.comboBox_website.setItemText(30, _translate("MDCx", "fantastica")) - self.comboBox_website.setItemText(31, _translate("MDCx", "faleno")) - self.comboBox_website.setItemText(32, _translate("MDCx", "dahlia")) - self.comboBox_website.setItemText(33, _translate("MDCx", "prestige")) + self.comboBox_website.setItemText(19, _translate("MDCx", "mdtv")) + self.comboBox_website.setItemText(20, _translate("MDCx", "hscangku")) + self.comboBox_website.setItemText(21, _translate("MDCx", "cableav")) + self.comboBox_website.setItemText(22, _translate("MDCx", "madouqu")) + self.comboBox_website.setItemText(23, _translate("MDCx", "cnmdb")) + self.comboBox_website.setItemText(24, _translate("MDCx", "lulubar")) + self.comboBox_website.setItemText(25, _translate("MDCx", "love6")) + self.comboBox_website.setItemText(26, _translate("MDCx", "fc2")) + self.comboBox_website.setItemText(27, _translate("MDCx", "fc2club")) + self.comboBox_website.setItemText(28, _translate("MDCx", "fc2hub")) + self.comboBox_website.setItemText(29, _translate("MDCx", "mywife")) + self.comboBox_website.setItemText(30, _translate("MDCx", "giga")) + self.comboBox_website.setItemText(31, _translate("MDCx", "fantastica")) + self.comboBox_website.setItemText(32, _translate("MDCx", "faleno")) + self.comboBox_website.setItemText(33, _translate("MDCx", "dahlia")) + self.comboBox_website.setItemText(34, _translate("MDCx", "prestige")) self.label_2.setText(_translate("MDCx", "*刮削网站：")) self.label_10.setText(_translate("MDCx", "*番号网址：")) self.pushButton_start_single_file.setText(_translate("MDCx", "刮削")) @@ -11221,22 +11224,22 @@ def retranslateUi(self, MDCx): self.comboBox_website_all.setItemText(0, _translate("MDCx", "airav_cc")) self.comboBox_website_all.setItemText(1, _translate("MDCx", "airav")) self.comboBox_website_all.setItemText(2, _translate("MDCx", "avsex")) - self.comboBox_website_all.setItemText(3, _translate("MDCx", "iqqtv")) + self.comboBox_website_all.setItemText(3, _translate("MDCx", "avsox")) self.comboBox_website_all.setItemText(4, _translate("MDCx", "freejavbt")) - self.comboBox_website_all.setItemText(5, _translate("MDCx", "javdb")) - self.comboBox_website_all.setItemText(6, _translate("MDCx", "javbus")) - self.comboBox_website_all.setItemText(7, _translate("MDCx", "jav321")) - self.comboBox_website_all.setItemText(8, _translate("MDCx", "javlibrary")) - self.comboBox_website_all.setItemText(9, _translate("MDCx", "dmm")) - self.comboBox_website_all.setItemText(10, _translate("MDCx", "mgstage")) - self.comboBox_website_all.setItemText(11, _translate("MDCx", "getchu_dmm")) - self.comboBox_website_all.setItemText(12, _translate("MDCx", "getchu")) - self.comboBox_website_all.setItemText(13, _translate("MDCx", "theporndb")) - self.comboBox_website_all.setItemText(14, _translate("MDCx", "kin8")) - self.comboBox_website_all.setItemText(15, _translate("MDCx", "avsox")) - self.comboBox_website_all.setItemText(16, _translate("MDCx", "xcity")) - self.comboBox_website_all.setItemText(17, _translate("MDCx", "7mmtv")) - self.comboBox_website_all.setItemText(18, _translate("MDCx", "hdouban")) + self.comboBox_website_all.setItemText(5, _translate("MDCx", "iqqtv")) + self.comboBox_website_all.setItemText(6, _translate("MDCx", "javdb")) + self.comboBox_website_all.setItemText(7, _translate("MDCx", "javbus")) + self.comboBox_website_all.setItemText(8, _translate("MDCx", "jav321")) + self.comboBox_website_all.setItemText(9, _translate("MDCx", "javlibrary")) + self.comboBox_website_all.setItemText(10, _translate("MDCx", "dmm")) + self.comboBox_website_all.setItemText(11, _translate("MDCx", "mgstage")) + self.comboBox_website_all.setItemText(12, _translate("MDCx", "getchu_dmm")) + self.comboBox_website_all.setItemText(13, _translate("MDCx", "getchu")) + self.comboBox_website_all.setItemText(14, _translate("MDCx", "hscangku")) + self.comboBox_website_all.setItemText(15, _translate("MDCx", "theporndb")) + self.comboBox_website_all.setItemText(16, _translate("MDCx", "kin8")) + self.comboBox_website_all.setItemText(17, _translate("MDCx", "xcity")) + self.comboBox_website_all.setItemText(18, _translate("MDCx", "7mmtv")) self.comboBox_website_all.setItemText(19, _translate("MDCx", "mdtv")) self.comboBox_website_all.setItemText(20, _translate("MDCx", "madouqu")) self.comboBox_website_all.setItemText(21, _translate("MDCx", "cnmdb")) @@ -11245,12 +11248,13 @@ def retranslateUi(self, MDCx): self.comboBox_website_all.setItemText(24, _translate("MDCx", "fc2")) self.comboBox_website_all.setItemText(25, _translate("MDCx", "fc2club")) self.comboBox_website_all.setItemText(26, _translate("MDCx", "fc2hub")) - self.comboBox_website_all.setItemText(27, _translate("MDCx", "mywife")) - self.comboBox_website_all.setItemText(28, _translate("MDCx", "giga")) - self.comboBox_website_all.setItemText(29, _translate("MDCx", "fantastica")) - self.comboBox_website_all.setItemText(30, _translate("MDCx", "faleno")) - self.comboBox_website_all.setItemText(31, _translate("MDCx", "dahlia")) - self.comboBox_website_all.setItemText(32, _translate("MDCx", "prestige")) + self.comboBox_website_all.setItemText(27, _translate("MDCx", "cableav")) + self.comboBox_website_all.setItemText(28, _translate("MDCx", "mywife")) + self.comboBox_website_all.setItemText(29, _translate("MDCx", "giga")) + self.comboBox_website_all.setItemText(30, _translate("MDCx", "fantastica")) + self.comboBox_website_all.setItemText(31, _translate("MDCx", "faleno")) + self.comboBox_website_all.setItemText(32, _translate("MDCx", "dahlia")) + self.comboBox_website_all.setItemText(33, _translate("MDCx", "prestige")) self.label_315.setText(_translate("MDCx", "⚠️ 下载剧照、预告片，请选择「字段优先」或「指定网站」！「速度优先」信息不全！")) self.pushButton_scrape_note.setText(_translate("MDCx", "刮削不到？看这里！")) self.groupBox_54.setTitle(_translate("MDCx", "封面图")) diff --git a/src/views/MDCx.ui b/src/views/MDCx.ui index 448ee2c..29d79a9 100644 --- a/src/views/MDCx.ui +++ b/src/views/MDCx.ui @@ -1709,12 +1709,17 @@ li.checked::marker { content: "\2612"; } - hdouban + mdtv - mdtv + hscangku + + + + + cableav @@ -9082,7 +9087,7 @@ QPushButton:pressed{ background-color: rgba(255, 255, 255, 10);} - iqqtv + avsox @@ -9090,6 +9095,11 @@ QPushButton:pressed{ background-color: rgba(255, 255, 255, 10);} freejavbt + + + iqqtv + + javdb @@ -9132,17 +9142,17 @@ QPushButton:pressed{ background-color: rgba(255, 255, 255, 10);} - theporndb + hscangku - kin8 + theporndb - avsox + kin8 @@ -9155,11 +9165,6 @@ QPushButton:pressed{ background-color: rgba(255, 255, 255, 10);} 7mmtv - - - hdouban - - mdtv @@ -9200,6 +9205,11 @@ QPushButton:pressed{ background-color: rgba(255, 255, 255, 10);} fc2hub + + + cableav + + mywife