forked from M-Labs/thermostat
fixup! Rearrange MainWindow.__init__
This commit is contained in:
parent
e3ea0f970e
commit
9531e7063a
@ -107,17 +107,10 @@ class MainWindow(QtWidgets.QMainWindow):
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
# Bottom bar
|
# Bottom bar menus
|
||||||
self.conn_menu = ConnMenu(self.thermostat, self.connect_btn)
|
self.conn_menu = ConnMenu(self.thermostat, self.connect_btn)
|
||||||
self.connect_btn.setMenu(self.conn_menu)
|
self.connect_btn.setMenu(self.conn_menu)
|
||||||
|
|
||||||
self.zero_limits_warning = ZeroLimitsWarningView(
|
|
||||||
self.style(), self.limits_warning
|
|
||||||
)
|
|
||||||
self.ctrl_panel_view.set_zero_limits_warning_sig.connect(
|
|
||||||
self.zero_limits_warning.set_limits_warning
|
|
||||||
)
|
|
||||||
|
|
||||||
self.thermostat_ctrl_menu = ThermostatCtrlMenu(
|
self.thermostat_ctrl_menu = ThermostatCtrlMenu(
|
||||||
self.thermostat, self.info_box, self.style()
|
self.thermostat, self.info_box, self.style()
|
||||||
)
|
)
|
||||||
@ -126,6 +119,14 @@ class MainWindow(QtWidgets.QMainWindow):
|
|||||||
self.plot_options_menu = PlotOptionsMenu(self.channel_graphs)
|
self.plot_options_menu = PlotOptionsMenu(self.channel_graphs)
|
||||||
self.plot_settings.setMenu(self.plot_options_menu)
|
self.plot_settings.setMenu(self.plot_options_menu)
|
||||||
|
|
||||||
|
# Status line
|
||||||
|
self.zero_limits_warning = ZeroLimitsWarningView(
|
||||||
|
self.style(), self.limits_warning
|
||||||
|
)
|
||||||
|
self.ctrl_panel_view.set_zero_limits_warning_sig.connect(
|
||||||
|
self.zero_limits_warning.set_limits_warning
|
||||||
|
)
|
||||||
|
|
||||||
self.loading_spinner.hide()
|
self.loading_spinner.hide()
|
||||||
|
|
||||||
self.report_apply_btn.clicked.connect(
|
self.report_apply_btn.clicked.connect(
|
||||||
|
Loading…
Reference in New Issue
Block a user