mirror of https://gitlab.com/pamhyr/pamhyr2
Merge branch 'scenarios' of gitlab.com:pamhyr/pamhyr2 into scenarios.
commit
1eb925f3dd
|
|
@ -205,7 +205,7 @@ class Data(SQLSubModel):
|
||||||
owner_scenario=owner_scenario
|
owner_scenario=owner_scenario
|
||||||
)
|
)
|
||||||
if deleted:
|
if deleted:
|
||||||
nd.set_as_deleted()
|
d.set_as_deleted()
|
||||||
|
|
||||||
loaded.add(pid)
|
loaded.add(pid)
|
||||||
new.append(d)
|
new.append(d)
|
||||||
|
|
|
||||||
|
|
@ -62,10 +62,9 @@ class EditREPLineWindow(PamhyrDialog):
|
||||||
self.set_line_edit_text("lineEdit_name", self._rep_line.name)
|
self.set_line_edit_text("lineEdit_name", self._rep_line.name)
|
||||||
self.set_line_edit_text("lineEdit_line", self._rep_line.line)
|
self.set_line_edit_text("lineEdit_line", self._rep_line.line)
|
||||||
|
|
||||||
if self._study.is_editable():
|
self.set_check_box_enable("checkBox_enabled", self._study.is_editable())
|
||||||
self.set_check_box_enable("checkBox_enabled", False)
|
self.set_line_edit_enable("lineEdit_name", self._study.is_editable())
|
||||||
self.set_line_edit_enable("lineEdit_name", False)
|
self.set_line_edit_enable("lineEdit_line", self._study.is_editable())
|
||||||
self.set_line_edit_enable("lineEdit_line", False)
|
|
||||||
|
|
||||||
def accept(self):
|
def accept(self):
|
||||||
if self._study.is_editable():
|
if self._study.is_editable():
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,9 @@ class REPLineListWindow(PamhyrWindow):
|
||||||
|
|
||||||
def delete(self):
|
def delete(self):
|
||||||
rows = self.selected_rows()
|
rows = self.selected_rows()
|
||||||
if len(rows) < 0:
|
if len(rows) <= 0:
|
||||||
|
return
|
||||||
|
if self._list.rowCount() <= 0:
|
||||||
return
|
return
|
||||||
|
|
||||||
self._list.delete(rows[0])
|
self._list.delete(rows[0])
|
||||||
|
|
|
||||||
Binary file not shown.
Loading…
Reference in New Issue