Skip to content

GitLab

Commit 14b150ad authored by Tong Zhang's avatar Tong Zhang
Browse files

UI: Update UI.

parent f7bfbef5
Expand all Hide whitespace changes
Inline Side-by-side
src/myApp/ui/resources_rc.py
View file @ 14b150ad
This diff is collapsed.
src/myApp/ui/ui_app.py
View file @ 14b150ad
......@@ -59,29 +59,15 @@ class Ui_MainWindow(object):
self.field_name_cbb = QtWidgets.QComboBox(self.centralwidget)
self.field_name_cbb.setObjectName("field_name_cbb")
self.horizontalLayout.addWidget(self.field_name_cbb)
self.label_12 = QtWidgets.QLabel(self.centralwidget)
self.label_12.setObjectName("label_12")
self.horizontalLayout.addWidget(self.label_12)
self.live_cset_lineEdit = QtWidgets.QLineEdit(self.centralwidget)
self.live_cset_lineEdit.setReadOnly(True)
self.live_cset_lineEdit.setObjectName("live_cset_lineEdit")
self.horizontalLayout.addWidget(self.live_cset_lineEdit)
self.label_13 = QtWidgets.QLabel(self.centralwidget)
self.label_13.setObjectName("label_13")
self.horizontalLayout.addWidget(self.label_13)
self.live_rd_lineEdit = QtWidgets.QLineEdit(self.centralwidget)
self.live_rd_lineEdit.setReadOnly(True)
self.live_rd_lineEdit.setObjectName("live_rd_lineEdit")
self.horizontalLayout.addWidget(self.live_rd_lineEdit)
self.elem_info_btn = QtWidgets.QToolButton(self.centralwidget)
self.elem_probe_btn = QtWidgets.QToolButton(self.centralwidget)
icon1 = QtGui.QIcon()
icon1.addPixmap(QtGui.QPixmap(":/icons/info.png"), QtGui.QIcon.Normal,
QtGui.QIcon.Off)
self.elem_info_btn.setIcon(icon1)
self.elem_info_btn.setIconSize(QtCore.QSize(30, 30))
self.elem_info_btn.setAutoRaise(True)
self.elem_info_btn.setObjectName("elem_info_btn")
self.horizontalLayout.addWidget(self.elem_info_btn)
self.elem_probe_btn.setIcon(icon1)
self.elem_probe_btn.setIconSize(QtCore.QSize(30, 30))
self.elem_probe_btn.setAutoRaise(True)
self.elem_probe_btn.setObjectName("elem_probe_btn")
self.horizontalLayout.addWidget(self.elem_probe_btn)
spacerItem = QtWidgets.QSpacerItem(40, 20,
QtWidgets.QSizePolicy.Expanding,
QtWidgets.QSizePolicy.Minimum)
......@@ -129,12 +115,12 @@ class Ui_MainWindow(object):
self.elemlist_cbb.setFont(font)
self.elemlist_cbb.setObjectName("elemlist_cbb")
self.horizontalLayout_2.addWidget(self.elemlist_cbb)
self.target_elem_info_btn = QtWidgets.QToolButton(self.ellipse_tab)
self.target_elem_info_btn.setIcon(icon1)
self.target_elem_info_btn.setIconSize(QtCore.QSize(30, 30))
self.target_elem_info_btn.setAutoRaise(True)
self.target_elem_info_btn.setObjectName("target_elem_info_btn")
self.horizontalLayout_2.addWidget(self.target_elem_info_btn)
self.target_elem_probe_btn = QtWidgets.QToolButton(self.ellipse_tab)
self.target_elem_probe_btn.setIcon(icon1)
self.target_elem_probe_btn.setIconSize(QtCore.QSize(30, 30))
self.target_elem_probe_btn.setAutoRaise(True)
self.target_elem_probe_btn.setObjectName("target_elem_probe_btn")
self.horizontalLayout_2.addWidget(self.target_elem_probe_btn)
self.pos_lineEdit = QtWidgets.QLineEdit(self.ellipse_tab)
self.pos_lineEdit.setReadOnly(True)
self.pos_lineEdit.setObjectName("pos_lineEdit")
......@@ -482,18 +468,16 @@ class Ui_MainWindow(object):
self.label_15.setText(_translate("MainWindow", "Device Type"))
self.label.setText(_translate("MainWindow", "Name List"))
self.label_14.setText(_translate("MainWindow", "Field"))
self.label_12.setText(_translate("MainWindow", "Current Setting"))
self.label_13.setText(_translate("MainWindow", "Readback"))
self.elem_info_btn.setToolTip(
self.elem_probe_btn.setToolTip(
_translate("MainWindow",
"Click to see the details of selected device."))
self.elem_info_btn.setText(_translate("MainWindow", "info"))
self.elem_probe_btn.setText(_translate("MainWindow", "info"))
self.label_2.setText(_translate("MainWindow", "Proposed Setting"))
self.label_3.setText(_translate("MainWindow", "Show results after"))
self.target_elem_info_btn.setToolTip(
self.target_elem_probe_btn.setToolTip(
_translate("MainWindow",
"Click to see the details of selected device."))
self.target_elem_info_btn.setText(_translate("MainWindow", "info"))
self.target_elem_probe_btn.setText(_translate("MainWindow", "info"))
self.x_ellipse_plot.setFigureXlabel(_translate("MainWindow", "X (mm)"))
self.x_ellipse_plot.setFigureYlabel(
_translate("MainWindow", "X\' (mrad)"))
......
src/myApp/ui/ui_app.ui
View file @ 14b150ad
......@@ -76,35 +76,7 @@
<widget class="QComboBox" name="field_name_cbb"/>
</item>
<item>
<widget class="QLabel" name="label_12">
<property name="text">
<string>Current Setting</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="live_cset_lineEdit">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label_13">
<property name="text">
<string>Readback</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="live_rd_lineEdit">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="elem_info_btn">
<widget class="QToolButton" name="elem_probe_btn">
<property name="toolTip">
<string>Click to see the details of selected device.</string>
</property>
......@@ -208,7 +180,7 @@
</widget>
</item>
<item>
<widget class="QToolButton" name="target_elem_info_btn">
<widget class="QToolButton" name="target_elem_probe_btn">
<property name="toolTip">
<string>Click to see the details of selected device.</string>
</property>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment