Skip to content

Commit 8adc29d

Browse files
authored
v0.20.1
version 0.20.1
2 parents b21a401 + 9fec3c4 commit 8adc29d

15 files changed

+275
-258
lines changed

pyobs_gui/mainwindow.py

+8-1
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,16 @@ async def _check_warnings(self) -> None:
312312
"""Checks, whether we got an autonomous module."""
313313
# get all autonomous modules
314314
autonomous_clients = await self.comm.clients_with_interface(IAutonomous)
315+
self.mastermind_running = False
316+
for auto_client in autonomous_clients:
317+
proxy = await self.comm.safe_proxy(
318+
auto_client, IAutonomous
319+
)
320+
if await proxy.is_running():
321+
self.mastermind_running = True
322+
break
315323

316324
# got any?
317-
self.mastermind_running = len(autonomous_clients) > 0
318325
self.labelAutonomousWarning.setVisible(self.mastermind_running)
319326

320327
# get weather modules

pyobs_gui/qt/camerawidget.ui

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
16-
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,0">
16+
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,1,0">
1717
<item>
1818
<widget class="QScrollArea" name="scrollArea">
1919
<property name="sizePolicy">
@@ -33,7 +33,7 @@
3333
<rect>
3434
<x>0</x>
3535
<y>0</y>
36-
<width>406</width>
36+
<width>238</width>
3737
<height>748</height>
3838
</rect>
3939
</property>
@@ -1247,7 +1247,7 @@
12471247
</widget>
12481248
</item>
12491249
<item>
1250-
<widget class="DataDisplayWidget" name="datadisplay"/>
1250+
<widget class="DataDisplayWidget" name="datadisplay" native="true"/>
12511251
</item>
12521252
<item>
12531253
<widget class="QWidget" name="widgetSidebar" native="true"/>

pyobs_gui/qt/camerawidget_ui.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Form implementation generated from ..reading ui file 'camerawidget.ui'
44
#
5-
# Created by: PyQt5 UI code generator 5.15.6
5+
# Created by: PyQt5 UI code generator 5.15.7
66
#
77
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
88
# run again. Do not edit this file unless you know what you are doing.
@@ -27,7 +27,7 @@ def setupUi(self, CameraWidget):
2727
self.scrollArea.setWidgetResizable(True)
2828
self.scrollArea.setObjectName("scrollArea")
2929
self.scrollAreaWidgetContents = QtWidgets.QWidget()
30-
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 406, 748))
30+
self.scrollAreaWidgetContents.setGeometry(QtCore.QRect(0, 0, 238, 748))
3131
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
3232
sizePolicy.setHorizontalStretch(0)
3333
sizePolicy.setVerticalStretch(0)
@@ -489,6 +489,7 @@ def setupUi(self, CameraWidget):
489489
self.widgetSidebar = QtWidgets.QWidget(CameraWidget)
490490
self.widgetSidebar.setObjectName("widgetSidebar")
491491
self.horizontalLayout_2.addWidget(self.widgetSidebar)
492+
self.horizontalLayout_2.setStretch(1, 1)
492493

493494
self.retranslateUi(CameraWidget)
494495
QtCore.QMetaObject.connectSlotsByName(CameraWidget)

pyobs_gui/qt/mainwindow.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Form implementation generated from reading ui file 'mainwindow.ui'
44
#
5-
# Created by: PyQt5 UI code generator 5.15.6
5+
# Created by: PyQt5 UI code generator 5.15.7
66
#
77
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
88
# run again. Do not edit this file unless you know what you are doing.
@@ -117,9 +117,10 @@ def setupUi(self, MainWindow):
117117
sizePolicy.setVerticalStretch(0)
118118
sizePolicy.setHeightForWidth(self.listPages.sizePolicy().hasHeightForWidth())
119119
self.listPages.setSizePolicy(sizePolicy)
120-
self.listPages.setMinimumSize(QtCore.QSize(84, 84))
121-
self.listPages.setMaximumSize(QtCore.QSize(84, 16777215))
120+
self.listPages.setMinimumSize(QtCore.QSize(90, 90))
121+
self.listPages.setMaximumSize(QtCore.QSize(90, 16777215))
122122
self.listPages.setFrameShape(QtWidgets.QFrame.NoFrame)
123+
self.listPages.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOn)
123124
self.listPages.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
124125
self.listPages.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
125126
self.listPages.setProperty("showDropIndicator", False)

pyobs_gui/qt/mainwindow.ui

+6-3
Original file line numberDiff line numberDiff line change
@@ -278,19 +278,22 @@
278278
</property>
279279
<property name="minimumSize">
280280
<size>
281-
<width>84</width>
282-
<height>84</height>
281+
<width>90</width>
282+
<height>90</height>
283283
</size>
284284
</property>
285285
<property name="maximumSize">
286286
<size>
287-
<width>84</width>
287+
<width>90</width>
288288
<height>16777215</height>
289289
</size>
290290
</property>
291291
<property name="frameShape">
292292
<enum>QFrame::NoFrame</enum>
293293
</property>
294+
<property name="verticalScrollBarPolicy">
295+
<enum>Qt::ScrollBarAlwaysOn</enum>
296+
</property>
294297
<property name="horizontalScrollBarPolicy">
295298
<enum>Qt::ScrollBarAlwaysOff</enum>
296299
</property>
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)