forked from M-Labs/thermostat
Move host selection into menu too
This commit is contained in:
parent
9fc38d4614
commit
a1a94a9c99
|
@ -195,9 +195,31 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
|
||||||
self.connect_btn.click()
|
self.connect_btn.click()
|
||||||
|
|
||||||
def _set_up_context_menu(self):
|
def _set_up_context_menu(self):
|
||||||
|
_translate = QtCore.QCoreApplication.translate
|
||||||
|
|
||||||
self.menu = QtWidgets.QMenu()
|
self.menu = QtWidgets.QMenu()
|
||||||
self.menu.setTitle('Thermostat settings')
|
self.menu.setTitle('Thermostat settings')
|
||||||
|
|
||||||
|
self.ip_set_line = QtWidgets.QLineEdit()
|
||||||
|
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Expanding)
|
||||||
|
sizePolicy.setHorizontalStretch(0)
|
||||||
|
sizePolicy.setVerticalStretch(0)
|
||||||
|
sizePolicy.setHeightForWidth(self.ip_set_line.sizePolicy().hasHeightForWidth())
|
||||||
|
self.ip_set_line.setSizePolicy(sizePolicy)
|
||||||
|
self.ip_set_line.setMinimumSize(QtCore.QSize(160, 0))
|
||||||
|
self.ip_set_line.setMaximumSize(QtCore.QSize(160, 16777215))
|
||||||
|
self.ip_set_line.setMaxLength(15)
|
||||||
|
self.ip_set_line.setClearButtonEnabled(True)
|
||||||
|
self.ip_set_line.setObjectName("ip_set_line")
|
||||||
|
|
||||||
|
self.ip_set_line.setText(_translate("MainWindow", "192.168.1.26"))
|
||||||
|
self.ip_set_line.setPlaceholderText(_translate("MainWindow", "IP:port for the Thermostat"))
|
||||||
|
|
||||||
|
host = QtWidgets.QWidgetAction(self.menu)
|
||||||
|
host.setDefaultWidget(self.ip_set_line)
|
||||||
|
self.menu.addAction(host)
|
||||||
|
self.menu.host = host
|
||||||
|
|
||||||
self.port_set_spin = QtWidgets.QSpinBox()
|
self.port_set_spin = QtWidgets.QSpinBox()
|
||||||
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed)
|
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Fixed)
|
||||||
sizePolicy.setHorizontalStretch(0)
|
sizePolicy.setHorizontalStretch(0)
|
||||||
|
@ -268,7 +290,6 @@ class MainWindow(QtWidgets.QMainWindow, Ui_MainWindow):
|
||||||
self.gan_layout.addWidget(self.fan_pwm_warning)
|
self.gan_layout.addWidget(self.fan_pwm_warning)
|
||||||
self.horizontalLayout_6.addLayout(self.gan_layout)
|
self.horizontalLayout_6.addLayout(self.gan_layout)
|
||||||
|
|
||||||
_translate = QtCore.QCoreApplication.translate
|
|
||||||
self.fan_lbl.setToolTip(_translate("MainWindow", "Adjust the fan"))
|
self.fan_lbl.setToolTip(_translate("MainWindow", "Adjust the fan"))
|
||||||
self.fan_lbl.setText(_translate("MainWindow", "Fan:"))
|
self.fan_lbl.setText(_translate("MainWindow", "Fan:"))
|
||||||
self.fan_auto_box.setText(_translate("MainWindow", "Auto"))
|
self.fan_auto_box.setText(_translate("MainWindow", "Auto"))
|
||||||
|
|
|
@ -178,40 +178,6 @@
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="settings_layout">
|
<layout class="QHBoxLayout" name="settings_layout">
|
||||||
<item>
|
|
||||||
<widget class="QLineEdit" name="ip_set_line">
|
|
||||||
<property name="sizePolicy">
|
|
||||||
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
|
|
||||||
<horstretch>0</horstretch>
|
|
||||||
<verstretch>0</verstretch>
|
|
||||||
</sizepolicy>
|
|
||||||
</property>
|
|
||||||
<property name="minimumSize">
|
|
||||||
<size>
|
|
||||||
<width>160</width>
|
|
||||||
<height>0</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="maximumSize">
|
|
||||||
<size>
|
|
||||||
<width>160</width>
|
|
||||||
<height>16777215</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>192.168.1.26</string>
|
|
||||||
</property>
|
|
||||||
<property name="maxLength">
|
|
||||||
<number>15</number>
|
|
||||||
</property>
|
|
||||||
<property name="placeholderText">
|
|
||||||
<string>IP:port for the Thermostat</string>
|
|
||||||
</property>
|
|
||||||
<property name="clearButtonEnabled">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
<item>
|
||||||
<widget class="QPushButton" name="connect_btn">
|
<widget class="QPushButton" name="connect_btn">
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
|
|
|
@ -92,18 +92,6 @@ class Ui_MainWindow(object):
|
||||||
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
|
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
|
||||||
self.settings_layout = QtWidgets.QHBoxLayout()
|
self.settings_layout = QtWidgets.QHBoxLayout()
|
||||||
self.settings_layout.setObjectName("settings_layout")
|
self.settings_layout.setObjectName("settings_layout")
|
||||||
self.ip_set_line = QtWidgets.QLineEdit(parent=self.bottom_settings_group)
|
|
||||||
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Expanding)
|
|
||||||
sizePolicy.setHorizontalStretch(0)
|
|
||||||
sizePolicy.setVerticalStretch(0)
|
|
||||||
sizePolicy.setHeightForWidth(self.ip_set_line.sizePolicy().hasHeightForWidth())
|
|
||||||
self.ip_set_line.setSizePolicy(sizePolicy)
|
|
||||||
self.ip_set_line.setMinimumSize(QtCore.QSize(160, 0))
|
|
||||||
self.ip_set_line.setMaximumSize(QtCore.QSize(160, 16777215))
|
|
||||||
self.ip_set_line.setMaxLength(15)
|
|
||||||
self.ip_set_line.setClearButtonEnabled(True)
|
|
||||||
self.ip_set_line.setObjectName("ip_set_line")
|
|
||||||
self.settings_layout.addWidget(self.ip_set_line)
|
|
||||||
self.connect_btn = QtWidgets.QPushButton(parent=self.bottom_settings_group)
|
self.connect_btn = QtWidgets.QPushButton(parent=self.bottom_settings_group)
|
||||||
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Expanding)
|
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Policy.Fixed, QtWidgets.QSizePolicy.Policy.Expanding)
|
||||||
sizePolicy.setHorizontalStretch(0)
|
sizePolicy.setHorizontalStretch(0)
|
||||||
|
@ -216,8 +204,6 @@ class Ui_MainWindow(object):
|
||||||
self.ch0_t_graph.setTitle(_translate("MainWindow", "Channel 0 Temperature"))
|
self.ch0_t_graph.setTitle(_translate("MainWindow", "Channel 0 Temperature"))
|
||||||
self.ch0_i_graph.setTitle(_translate("MainWindow", "Channel 0 Current"))
|
self.ch0_i_graph.setTitle(_translate("MainWindow", "Channel 0 Current"))
|
||||||
self.ch1_i_graph.setTitle(_translate("MainWindow", "Channel 1 Current"))
|
self.ch1_i_graph.setTitle(_translate("MainWindow", "Channel 1 Current"))
|
||||||
self.ip_set_line.setText(_translate("MainWindow", "192.168.1.26"))
|
|
||||||
self.ip_set_line.setPlaceholderText(_translate("MainWindow", "IP:port for the Thermostat"))
|
|
||||||
self.connect_btn.setText(_translate("MainWindow", "Connect"))
|
self.connect_btn.setText(_translate("MainWindow", "Connect"))
|
||||||
self.status_lbl.setText(_translate("MainWindow", "Disconnected"))
|
self.status_lbl.setText(_translate("MainWindow", "Disconnected"))
|
||||||
self.toolButton_2.setText(_translate("MainWindow", "..."))
|
self.toolButton_2.setText(_translate("MainWindow", "..."))
|
||||||
|
|
Loading…
Reference in New Issue