diff --git a/src/gui/ALConfigWidget.py b/src/gui/ALConfigWidget.py index b0768ea..97f190e 100644 --- a/src/gui/ALConfigWidget.py +++ b/src/gui/ALConfigWidget.py @@ -29,6 +29,7 @@ from gui.resources.ui.Ui_ALConfigWidget import Ui_ALConfigWidget from gui.ALSeatMapSelectDialog import ALSeatMapSelectDialog from gui.ALSeatMapTable import ALSeatMapTable from gui.ALUserTreeWidget import ALUserTreeWidget, ALUserTreeItemType +from gui.ALWebDriverDownloadDialog import ALWebDriverDownloadDialog class ALConfigWidget(QWidget, Ui_ALConfigWidget): @@ -80,6 +81,7 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget): self.AddUserButton.clicked.connect(self.onAddUserButtonClicked) self.DelUserButton.clicked.connect(self.onDelUserButtonClicked) self.BrowseBrowserDriverButton.clicked.connect(self.onBrowseBrowserDriverButtonClicked) + self.AutoDownloadWebDriverButton.clicked.connect(self.onAutoDownloadWebDriverButtonClicked) self.BrowseCurrentRunConfigButton.clicked.connect(self.onBrowseCurrentRunConfigButtonClicked) self.BrowseCurrentUserConfigButton.clicked.connect(self.onBrowseCurrentUserConfigButtonClicked) self.BrowseExportRunConfigButton.clicked.connect(self.onBrowseExportRunConfigButtonClicked) @@ -948,6 +950,21 @@ class ALConfigWidget(QWidget, Ui_ALConfigWidget): if browser_driver_path: self.BrowseBrowserDriverEdit.setText(QDir.toNativeSeparators(browser_driver_path)) + + @Slot() + def onAutoDownloadWebDriverButtonClicked( + self + ): + + dialog = ALWebDriverDownloadDialog(self) + dialog.show() + dialog.exec_() + selected_driver_info = dialog.getSelectedDriverInfo() + if selected_driver_info and selected_driver_info.driver_path: + self.BrowserTypeComboBox.setCurrentText(selected_driver_info.driver_type.value) + self.BrowseBrowserDriverEdit.setText(QDir.toNativeSeparators(str(selected_driver_info.driver_path))) + + @Slot() def onBrowseCurrentRunConfigButtonClicked( self diff --git a/src/gui/resources/ui/ALConfigWidget.ui b/src/gui/resources/ui/ALConfigWidget.ui index ea41727..a272576 100644 --- a/src/gui/resources/ui/ALConfigWidget.ui +++ b/src/gui/resources/ui/ALConfigWidget.ui @@ -1233,12 +1233,31 @@ - - - - 浏览器设置 + + + + + 0 + 270 + - + + QFrame::Shape::NoFrame + + + QFrame::Shadow::Plain + + + 0 + + + + + + + 运行模式 + + 5 @@ -1255,162 +1274,59 @@ 3 - + - 80 + 100 25 - 80 + 100 25 - 浏览器类型: + 自动预约 - + - 80 + 100 25 - 80 - 25 - - - - <html><head/><body><p>脚本运行使用的浏览器类型</p></body></html> - - - <html><head/><body><p><br/></p></body></html> - - - edge - - - 0 - - - 3 - - - 3 - - - - edge - - - - - chrome - - - - - firefox - - - - - - - - - 80 - 25 - - - - - 80 + 100 25 - 驱动路径: + 自动签到 - - - 5 - - - - - - 250 - 25 - - - - - 300 - 25 - - - - <html><head/><body><p>详情请参阅 <a href="https://www.autolibrary.kenanzhu.com/manuals"><span style=" text-decoration: underline; color:#69fcff;">用户手册</span></a></p></body></html> - - - <html><head/><body><p><br/></p></body></html> - - - - - - - - 35 - 25 - - - - - 35 - 25 - - - - ... - - - - - - - + - 0 + 100 25 - 16777215 + 100 25 - - <html><head/><body><p>运行时不显示浏览器</p></body></html> - - - <html><head/><body><p><br/></p></body></html> - - 无头模式 + 自动续约 @@ -1529,15 +1445,12 @@ - - + + - 运行模式 + 浏览器设置 - - - 5 - + 3 @@ -1550,85 +1463,203 @@ 3 - - + + 5 + + + - 100 + 80 25 - 100 + 80 25 - 自动预约 + 浏览器类型: - - + + - 100 + 80 25 - 100 + 80 + 25 + + + + <html><head/><body><p>脚本运行使用的浏览器类型</p></body></html> + + + <html><head/><body><p><br/></p></body></html> + + + edge + + + 0 + + + 3 + + + 3 + + + + edge + + + + + chrome + + + + + firefox + + + + + + + + + 175 + 25 + + + + + 175 25 - 自动签到 + 驱动路径: - - + + + + 5 + + + + + + 250 + 25 + + + + + 300 + 25 + + + + <html><head/><body><p>详情请参阅 <a href="https://www.autolibrary.kenanzhu.com/manuals"><span style=" text-decoration: underline; color:#69fcff;">用户手册</span></a></p></body></html> + + + <html><head/><body><p><br/></p></body></html> + + + + + + + + 35 + 25 + + + + + 35 + 25 + + + + ... + + + + + + + - 100 + 0 25 - 100 + 16777215 25 + + <html><head/><body><p>运行时不显示浏览器</p></body></html> + + + <html><head/><body><p><br/></p></body></html> + - 自动续约 + 无头模式 + + + + + + + + 0 + 0 + + + + + 120 + 25 + + + + + 120 + 25 + + + + Qt::LayoutDirection::LeftToRight + + + 自动下载驱动 + + + - - - - - 0 - 270 - - - - QFrame::Shape::NoFrame - - - QFrame::Shadow::Plain - - - 0 - - -