From ff59df7453db451b24db5958ae3208a63f7209af Mon Sep 17 00:00:00 2001 From: Johannes Pohl Date: Mon, 13 Mar 2017 14:04:58 +0100 Subject: [PATCH] add connect for scan button --- src/urh/controller/OptionsController.py | 5 +++++ src/urh/ui/ui_options.py | 27 ++++++++++++++++--------- ui/options.ui | 2 +- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/urh/controller/OptionsController.py b/src/urh/controller/OptionsController.py index 9920a743..0af7f60d 100644 --- a/src/urh/controller/OptionsController.py +++ b/src/urh/controller/OptionsController.py @@ -126,6 +126,7 @@ class OptionsController(QDialog): self.ui.radioButtonPython2Interpreter.clicked.connect(self.on_radio_button_python2_interpreter_clicked) self.ui.radioButtonGnuradioDirectory.clicked.connect(self.on_radio_button_gnuradio_directory_clicked) self.ui.doubleSpinBoxRAMThreshold.valueChanged.connect(self.on_double_spinbox_ram_threshold_value_changed) + self.ui.btnScanNative.clicked.connect(self.on_btn_scan_native_clicked) self.ui.btnRebuildNative.clicked.connect(self.on_btn_rebuild_native_clicked) def show_gnuradio_infos(self): @@ -360,6 +361,10 @@ class OptionsController(QDialog): def on_gnuradio_install_dir_edited(self): self.set_gnuradio_status() + @pyqtSlot() + def on_btn_scan_native_clicked(self): + pass + @pyqtSlot() def on_btn_rebuild_native_clicked(self): pass diff --git a/src/urh/ui/ui_options.py b/src/urh/ui/ui_options.py index ca1a08a9..d2befc4c 100644 --- a/src/urh/ui/ui_options.py +++ b/src/urh/ui/ui_options.py @@ -290,11 +290,6 @@ class Ui_DialogOptions(object): self.label_9.setWordWrap(True) self.label_9.setObjectName("label_9") self.gridLayout_5.addWidget(self.label_9, 1, 0, 1, 2) - self.btnRebuildNative = QtWidgets.QPushButton(self.groupBox_2) - icon = QtGui.QIcon.fromTheme("view-refresh") - self.btnRebuildNative.setIcon(icon) - self.btnRebuildNative.setObjectName("btnRebuildNative") - self.gridLayout_5.addWidget(self.btnRebuildNative, 5, 0, 1, 2) self.lineEditIncludeDirs = QtWidgets.QLineEdit(self.groupBox_2) self.lineEditIncludeDirs.setObjectName("lineEditIncludeDirs") self.gridLayout_5.addWidget(self.lineEditIncludeDirs, 2, 1, 1, 1) @@ -305,6 +300,17 @@ class Ui_DialogOptions(object): self.labelWindowsError.setWordWrap(True) self.labelWindowsError.setObjectName("labelWindowsError") self.gridLayout_5.addWidget(self.labelWindowsError, 0, 0, 1, 2) + self.btnRebuildNative = QtWidgets.QPushButton(self.groupBox_2) + self.btnRebuildNative.setEnabled(False) + icon = QtGui.QIcon.fromTheme("view-refresh") + self.btnRebuildNative.setIcon(icon) + self.btnRebuildNative.setObjectName("btnRebuildNative") + self.gridLayout_5.addWidget(self.btnRebuildNative, 5, 1, 1, 1) + self.btnScanNative = QtWidgets.QPushButton(self.groupBox_2) + icon = QtGui.QIcon.fromTheme("scanner") + self.btnScanNative.setIcon(icon) + self.btnScanNative.setObjectName("btnScanNative") + self.gridLayout_5.addWidget(self.btnScanNative, 5, 0, 1, 1) self.verticalLayout_8.addWidget(self.groupBox_2) self.tabWidget.addTab(self.tabDevices, "") self.verticalLayout_6.addWidget(self.tabWidget) @@ -367,14 +373,17 @@ class Ui_DialogOptions(object): self.radioButtonGnuradioDirectory.setText(_translate("DialogOptions", "Gnuradio Directory")) self.groupBox_2.setTitle(_translate("DialogOptions", "Native options")) self.labenIncludeDirs.setText(_translate("DialogOptions", "Include directories:")) - self.lineEditLibraries.setPlaceholderText(_translate("DialogOptions", "Comma seperated list of libraries")) + self.lineEditLibraries.setPlaceholderText(_translate("DialogOptions", "Comma separated list of libraries")) self.labelLibDirs.setText(_translate("DialogOptions", "Library directories:")) self.labelLibraries.setText(_translate("DialogOptions", "Libraries:")) self.label_9.setText(_translate("DialogOptions", "You can rebuild the native device extensions here. This is useful, when you installed a device driver afterwards or your drivers are stored in an unusual location.")) - self.btnRebuildNative.setText(_translate("DialogOptions", "Rebuild")) - self.lineEditIncludeDirs.setPlaceholderText(_translate("DialogOptions", "Comma seperated list of additional include directories")) - self.lineEditLibDirs.setPlaceholderText(_translate("DialogOptions", "Comma seperated list of additional library directories")) + self.lineEditIncludeDirs.setPlaceholderText(_translate("DialogOptions", "Comma separated list of additional include directories")) + self.lineEditLibDirs.setPlaceholderText(_translate("DialogOptions", "Comma separated list of additional library directories")) self.labelWindowsError.setText(_translate("DialogOptions", "

Detected a 32 bit installation of python 3. Install 64 bit version to use native backends.

")) + self.btnRebuildNative.setToolTip(_translate("DialogOptions", "

Rebuild device extenions. This button will only be enabled after a successful scan.

")) + self.btnRebuildNative.setText(_translate("DialogOptions", "Rebuild")) + self.btnScanNative.setToolTip(_translate("DialogOptions", "

Scan if new device extensions can be built.

")) + self.btnScanNative.setText(_translate("DialogOptions", "Scan")) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tabDevices), _translate("DialogOptions", "Device")) from urh.ui.KillerDoubleSpinBox import KillerDoubleSpinBox diff --git a/ui/options.ui b/ui/options.ui index 940ef97b..44eb9019 100644 --- a/ui/options.ui +++ b/ui/options.ui @@ -674,7 +674,7 @@ - + <html><head/><body><p>Scan if new device extensions can be built.</p></body></html>