From 37f55472c10e67bb6187df18995da58e63a836fa Mon Sep 17 00:00:00 2001 From: Daniel Seiller Date: Sat, 28 Sep 2019 19:31:04 +0200 Subject: [PATCH] feat(UI): made dropdowns non-editable --- ed_lrr_gui/gui/ed_lrr.py | 90 +++++++++++++-------------- ed_lrr_gui/gui/ed_lrr.ui | 127 ++++++++++++++++++--------------------- 2 files changed, 103 insertions(+), 114 deletions(-) diff --git a/ed_lrr_gui/gui/ed_lrr.py b/ed_lrr_gui/gui/ed_lrr.py index 0ce8074..4992efc 100644 --- a/ed_lrr_gui/gui/ed_lrr.py +++ b/ed_lrr_gui/gui/ed_lrr.py @@ -71,7 +71,7 @@ class Ui_ED_LRR(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.inp_bodies_dest_dl.sizePolicy().hasHeightForWidth()) self.inp_bodies_dest_dl.setSizePolicy(sizePolicy) - self.inp_bodies_dest_dl.setEditable(True) + self.inp_bodies_dest_dl.setEditable(False) self.inp_bodies_dest_dl.setInsertPolicy(QtWidgets.QComboBox.InsertAtTop) self.inp_bodies_dest_dl.setObjectName("inp_bodies_dest_dl") self.gridLayout.addWidget(self.inp_bodies_dest_dl, 0, 0, 1, 1) @@ -90,7 +90,7 @@ class Ui_ED_LRR(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.inp_systems_dest_dl.sizePolicy().hasHeightForWidth()) self.inp_systems_dest_dl.setSizePolicy(sizePolicy) - self.inp_systems_dest_dl.setEditable(True) + self.inp_systems_dest_dl.setEditable(False) self.inp_systems_dest_dl.setInsertPolicy(QtWidgets.QComboBox.InsertAtTop) self.inp_systems_dest_dl.setObjectName("inp_systems_dest_dl") self.gridLayout_2.addWidget(self.inp_systems_dest_dl, 0, 0, 1, 1) @@ -123,7 +123,7 @@ class Ui_ED_LRR(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.inp_bodies_pp.sizePolicy().hasHeightForWidth()) self.inp_bodies_pp.setSizePolicy(sizePolicy) - self.inp_bodies_pp.setEditable(True) + self.inp_bodies_pp.setEditable(False) self.inp_bodies_pp.setInsertPolicy(QtWidgets.QComboBox.InsertAtTop) self.inp_bodies_pp.setObjectName("inp_bodies_pp") self.gr_bodies_pp.addWidget(self.inp_bodies_pp, 0, 0, 1, 1) @@ -142,7 +142,7 @@ class Ui_ED_LRR(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.inp_systems_pp.sizePolicy().hasHeightForWidth()) self.inp_systems_pp.setSizePolicy(sizePolicy) - self.inp_systems_pp.setEditable(True) + self.inp_systems_pp.setEditable(False) self.inp_systems_pp.setInsertPolicy(QtWidgets.QComboBox.InsertAtTop) self.inp_systems_pp.setObjectName("inp_systems_pp") self.gr_systems_pp.addWidget(self.inp_systems_pp, 0, 0, 1, 1) @@ -166,7 +166,7 @@ class Ui_ED_LRR(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.inp_out_pp.sizePolicy().hasHeightForWidth()) self.inp_out_pp.setSizePolicy(sizePolicy) - self.inp_out_pp.setEditable(True) + self.inp_out_pp.setEditable(False) self.inp_out_pp.setInsertPolicy(QtWidgets.QComboBox.InsertAtTop) self.inp_out_pp.setObjectName("inp_out_pp") self.gr_out_grid_pp.addWidget(self.inp_out_pp, 0, 0, 1, 1) @@ -193,7 +193,7 @@ class Ui_ED_LRR(object): sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth(self.inp_sys_lst.sizePolicy().hasHeightForWidth()) self.inp_sys_lst.setSizePolicy(sizePolicy) - self.inp_sys_lst.setEditable(True) + self.inp_sys_lst.setEditable(False) self.inp_sys_lst.setInsertPolicy(QtWidgets.QComboBox.InsertAtTop) self.inp_sys_lst.setFrame(True) self.inp_sys_lst.setModelColumn(0) @@ -219,6 +219,32 @@ class Ui_ED_LRR(object): self.rd_precomp.setObjectName("rd_precomp") self.gr_mode.addWidget(self.rd_precomp, 0, 2, 1, 1) self.formLayout_2.setLayout(3, QtWidgets.QFormLayout.FieldRole, self.gr_mode) + self.chk_permute = QtWidgets.QCheckBox(self.tab_route) + self.chk_permute.setObjectName("chk_permute") + self.formLayout_2.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.chk_permute) + self.gridLayout_4 = QtWidgets.QGridLayout() + self.gridLayout_4.setObjectName("gridLayout_4") + self.chk_permute_keep_last = QtWidgets.QCheckBox(self.tab_route) + self.chk_permute_keep_last.setObjectName("chk_permute_keep_last") + self.gridLayout_4.addWidget(self.chk_permute_keep_last, 0, 3, 1, 1) + self.chk_permute_keep_first = QtWidgets.QCheckBox(self.tab_route) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.chk_permute_keep_first.sizePolicy().hasHeightForWidth()) + self.chk_permute_keep_first.setSizePolicy(sizePolicy) + self.chk_permute_keep_first.setTristate(False) + self.chk_permute_keep_first.setObjectName("chk_permute_keep_first") + self.gridLayout_4.addWidget(self.chk_permute_keep_first, 0, 2, 1, 1) + self.lbl_keep = QtWidgets.QLabel(self.tab_route) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lbl_keep.sizePolicy().hasHeightForWidth()) + self.lbl_keep.setSizePolicy(sizePolicy) + self.lbl_keep.setObjectName("lbl_keep") + self.gridLayout_4.addWidget(self.lbl_keep, 0, 1, 1, 1) + self.formLayout_2.setLayout(4, QtWidgets.QFormLayout.FieldRole, self.gridLayout_4) self.lst_sys = QtWidgets.QTreeWidget(self.tab_route) sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) @@ -233,17 +259,17 @@ class Ui_ED_LRR(object): self.lst_sys.setAlternatingRowColors(True) self.lst_sys.setSelectionMode(QtWidgets.QAbstractItemView.ExtendedSelection) self.lst_sys.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows) - self.lst_sys.setHeaderHidden(False) + self.lst_sys.setHeaderHidden(True) self.lst_sys.setObjectName("lst_sys") self.lst_sys.headerItem().setText(0, "Name") self.lst_sys.header().setVisible(False) self.formLayout_2.setWidget(7, QtWidgets.QFormLayout.SpanningRole, self.lst_sys) - self.sb_range = QtWidgets.QDoubleSpinBox(self.tab_route) - self.sb_range.setObjectName("sb_range") - self.formLayout_2.setWidget(9, QtWidgets.QFormLayout.FieldRole, self.sb_range) self.lbl_range = QtWidgets.QLabel(self.tab_route) self.lbl_range.setObjectName("lbl_range") - self.formLayout_2.setWidget(9, QtWidgets.QFormLayout.LabelRole, self.lbl_range) + self.formLayout_2.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.lbl_range) + self.sb_range = QtWidgets.QDoubleSpinBox(self.tab_route) + self.sb_range.setObjectName("sb_range") + self.formLayout_2.setWidget(8, QtWidgets.QFormLayout.FieldRole, self.sb_range) self.gr_opts = QtWidgets.QGridLayout() self.gr_opts.setObjectName("gr_opts") self.cmb_mode = QtWidgets.QComboBox(self.tab_route) @@ -271,40 +297,11 @@ class Ui_ED_LRR(object): self.lbl_mode = QtWidgets.QLabel(self.tab_route) self.lbl_mode.setObjectName("lbl_mode") self.gr_opts.addWidget(self.lbl_mode, 0, 1, 1, 1) - self.formLayout_2.setLayout(10, QtWidgets.QFormLayout.SpanningRole, self.gr_opts) + self.formLayout_2.setLayout(9, QtWidgets.QFormLayout.SpanningRole, self.gr_opts) self.btn_go = QtWidgets.QPushButton(self.tab_route) self.btn_go.setFlat(False) self.btn_go.setObjectName("btn_go") - self.formLayout_2.setWidget(11, QtWidgets.QFormLayout.LabelRole, self.btn_go) - self.gridLayout_4 = QtWidgets.QGridLayout() - self.gridLayout_4.setObjectName("gridLayout_4") - self.chk_permute_keep_last = QtWidgets.QCheckBox(self.tab_route) - self.chk_permute_keep_last.setObjectName("chk_permute_keep_last") - self.gridLayout_4.addWidget(self.chk_permute_keep_last, 0, 3, 1, 1) - self.chk_permute_keep_first = QtWidgets.QCheckBox(self.tab_route) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.chk_permute_keep_first.sizePolicy().hasHeightForWidth()) - self.chk_permute_keep_first.setSizePolicy(sizePolicy) - self.chk_permute_keep_first.setTristate(False) - self.chk_permute_keep_first.setObjectName("chk_permute_keep_first") - self.gridLayout_4.addWidget(self.chk_permute_keep_first, 0, 2, 1, 1) - self.lbl_keep = QtWidgets.QLabel(self.tab_route) - sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(0) - sizePolicy.setVerticalStretch(0) - sizePolicy.setHeightForWidth(self.lbl_keep.sizePolicy().hasHeightForWidth()) - self.lbl_keep.setSizePolicy(sizePolicy) - self.lbl_keep.setObjectName("lbl_keep") - self.gridLayout_4.addWidget(self.lbl_keep, 0, 1, 1, 1) - self.formLayout_2.setLayout(4, QtWidgets.QFormLayout.FieldRole, self.gridLayout_4) - self.chk_permute = QtWidgets.QCheckBox(self.tab_route) - self.chk_permute.setObjectName("chk_permute") - self.formLayout_2.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.chk_permute) - self.btn_search = QtWidgets.QPushButton(self.tab_route) - self.btn_search.setObjectName("btn_search") - self.formLayout_2.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.btn_search) + self.formLayout_2.setWidget(10, QtWidgets.QFormLayout.LabelRole, self.btn_go) self.tabs.addTab(self.tab_route, "") self.tab_log = QtWidgets.QWidget() self.tab_log.setObjectName("tab_log") @@ -382,6 +379,10 @@ class Ui_ED_LRR(object): self.btn_rm.setText(_translate("ED_LRR", "Remove")) self.rd_comp.setText(_translate("ED_LRR", "Compute Route")) self.rd_precomp.setText(_translate("ED_LRR", "Precompute Graph")) + self.chk_permute.setText(_translate("ED_LRR", "Permute")) + self.chk_permute_keep_last.setText(_translate("ED_LRR", "Last")) + self.chk_permute_keep_first.setText(_translate("ED_LRR", "First")) + self.lbl_keep.setText(_translate("ED_LRR", "Keep Endpoints:")) self.lst_sys.headerItem().setText(1, _translate("ED_LRR", "Type")) self.lbl_range.setText(_translate("ED_LRR", "Jump Range (Ly)")) self.cmb_mode.setCurrentText(_translate("ED_LRR", "Breadth-First Search")) @@ -392,11 +393,6 @@ class Ui_ED_LRR(object): self.chk_primary.setText(_translate("ED_LRR", "Primary Stars Only")) self.lbl_mode.setText(_translate("ED_LRR", "Mode")) self.btn_go.setText(_translate("ED_LRR", "GO!")) - self.chk_permute_keep_last.setText(_translate("ED_LRR", "Last")) - self.chk_permute_keep_first.setText(_translate("ED_LRR", "First")) - self.lbl_keep.setText(_translate("ED_LRR", "Keep Endpoints:")) - self.chk_permute.setText(_translate("ED_LRR", "Permute")) - self.btn_search.setText(_translate("ED_LRR", "Search All")) self.tabs.setTabText(self.tabs.indexOf(self.tab_route), _translate("ED_LRR", "Route")) self.tabs.setTabText(self.tabs.indexOf(self.tab_log), _translate("ED_LRR", "Log")) self.menu_file.setTitle(_translate("ED_LRR", "File")) diff --git a/ed_lrr_gui/gui/ed_lrr.ui b/ed_lrr_gui/gui/ed_lrr.ui index 9872cd0..04cf78d 100644 --- a/ed_lrr_gui/gui/ed_lrr.ui +++ b/ed_lrr_gui/gui/ed_lrr.ui @@ -133,7 +133,7 @@ - true + false QComboBox::InsertAtTop @@ -167,7 +167,7 @@ - true + false QComboBox::InsertAtTop @@ -229,7 +229,7 @@ - true + false QComboBox::InsertAtTop @@ -263,7 +263,7 @@ - true + false QComboBox::InsertAtTop @@ -303,7 +303,7 @@ - true + false QComboBox::InsertAtTop @@ -351,7 +351,7 @@ - true + false QComboBox::InsertAtTop @@ -408,6 +408,53 @@ + + + + Permute + + + + + + + + + Last + + + + + + + + 0 + 0 + + + + First + + + false + + + + + + + + 0 + 0 + + + + Keep Endpoints: + + + + + @@ -444,7 +491,7 @@ QAbstractItemView::SelectRows - false + true false @@ -461,17 +508,17 @@ - - - - + Jump Range (Ly) - + + + + @@ -543,7 +590,7 @@ - + GO! @@ -553,60 +600,6 @@ - - - - - - Last - - - - - - - - 0 - 0 - - - - First - - - false - - - - - - - - 0 - 0 - - - - Keep Endpoints: - - - - - - - - - Permute - - - - - - - Search All - - -