Compare commits

..

No commits in common. "master" and "zeroconf" have entirely different histories.

2 changed files with 4 additions and 10 deletions

View File

@ -27,11 +27,10 @@ To install python and cygwin dependencies and build everything use
`deploy\windows-build.bat` batch script. `deploy\windows-build.bat` batch script.
### MacOS ### MacOS
Currently MacOS builds require *Python 3.6*, `dmgbuild` tool (`pip3 install Currently MacOS builds require *Python 3.6* and Qt SDK installed (just the "Qt >
dmgbuild`) and Qt SDK installed (just the "Qt >
5... > macOS" part in installer) with following added to $PATH: 5... > macOS" part in installer) with following added to $PATH:
export PATH="$HOME/Qt/5.11.1/clang_64/bin:/Library/Frameworks/Python.framework/Versions/3.6/bin:$PATH" export PATH="$HOME/Qt/5.11.1/clang_64/bin:$PATH"
Then just install dependencies and build everything using: Then just install dependencies and build everything using:

View File

@ -52,7 +52,6 @@ class MainWindow(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
self.statusbar.showMessage(self.tr("Loading firmware list...")) self.statusbar.showMessage(self.tr("Loading firmware list..."))
self.versionBox.clear()
self.firmware_list = FirmwareListThread() self.firmware_list = FirmwareListThread()
self.firmware_list.listLoaded.connect(self.populate_versions) self.firmware_list.listLoaded.connect(self.populate_versions)
self.firmware_list.error.connect(self.on_work_error) self.firmware_list.error.connect(self.on_work_error)
@ -201,12 +200,8 @@ class MainWindow(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
self.statusbar.showMessage(self.tr("No version selected.")) self.statusbar.showMessage(self.tr("No version selected."))
return return
sel = self.versionBox.model().item( orig_version = self.versionBox.model().item(
self.versionBox.currentIndex()) self.versionBox.currentIndex()).text()
if sel:
orig_version = sel.text()
else:
orig_version = ''
if version == orig_version: if version == orig_version:
# Editable combobox has been unchanged # Editable combobox has been unchanged