update flow list widgets (previously script list widgets)

Author: leon-thomm

ryvencore_qt/src/widgets/FlowsListWidget.py

@@ -5,19 +5,19 @@
 
 
 class FlowsListWidget(QWidget):
-    """Convenience class for a QWidget to easily manage the scripts of a session."""
+    """Convenience class for a QWidget to easily manage the flows of a session."""
 
-    def __init__(self, session):
+    def __init__(self, session_gui):
         super().__init__()
 
-        self.session = session
+        self.session_gui = session_gui
         self.list_widgets = []
         self.ignore_name_line_edit_signal = False  # because disabling causes firing twice otherwise
 
         self.setup_UI()
 
-        self.session.flow_view_created.connect(self.add_new_script)
-        self.session.flow_deleted.connect(self.recreate_list)
+        self.session_gui.core_sesssion.flow_view_created.connect(self.add_new_flow)
+        self.session_gui.core_sesssion.flow_deleted.connect(self.recreate_list)
 
 
     def setup_UI(self):
@@ -46,49 +46,49 @@ def setup_UI(self):
 
         # line edit
 
-        self.new_script_title_lineedit = QLineEdit()
-        self.new_script_title_lineedit.setPlaceholderText('new script\'s title')
-        self.new_script_title_lineedit.returnPressed.connect(self.create_flow)
+        self.new_flow_title_lineedit = QLineEdit()
+        self.new_flow_title_lineedit.setPlaceholderText('new flow\'s title')
+        self.new_flow_title_lineedit.returnPressed.connect(self.create_flow)
 
-        main_layout.addWidget(self.new_script_title_lineedit)
+        main_layout.addWidget(self.new_flow_title_lineedit)
 
 
         self.recreate_list()
 
 
     def recreate_list(self):
-        # remove script widgets
+        # remove flow widgets
         for i in reversed(range(self.list_layout.count())):
             self.list_layout.itemAt(i).widget().setParent(None)
 
         self.list_widgets.clear()
 
-        for s in self.session.flows:
-            new_widget = FlowsList_FlowWidget(self, self.session, s)
+        for s in self.session_gui.core_sesssion.flows:
+            new_widget = FlowsList_FlowWidget(self, self.session_gui, s)
             self.list_widgets.append(new_widget)
 
         for w in self.list_widgets:
             self.list_layout.addWidget(w)
 
     def create_flow(self):
-        title = self.new_script_title_lineedit.text()
+        title = self.new_flow_title_lineedit.text()
 
-        if self.session.flow_title_valid(title):
-            self.session.create_flow(title=title)
+        if self.session_gui.core_sesssion.flow_title_valid(title):
+            self.session_gui.core_sesssion.create_flow(title=title)
 
-    def add_new_script(self, script, flow_view):
+    def add_new_flow(self, flow, flow_view):
         self.recreate_list()
 
-    def del_script(self, script, script_widget):
-        msg_box = QMessageBox(QMessageBox.Warning, 'sure about deleting script?',
-                              'You are about to delete a script. This cannot be undone, all content will be lost. '
+    def del_flow(self, flow, flow_widget):
+        msg_box = QMessageBox(QMessageBox.Warning, 'sure about deleting flow?',
+                              'You are about to delete a flow. This cannot be undone, all content will be lost. '
                               'Do you want to continue?', QMessageBox.Cancel | QMessageBox.Yes, self)
         msg_box.setDefaultButton(QMessageBox.Cancel)
         ret = msg_box.exec_()
         if ret != QMessageBox.Yes:
             return
 
-        self.list_widgets.remove(script_widget)
-        script_widget.setParent(None)
-        self.session.delete_script(script)
+        self.list_widgets.remove(flow_widget)
+        flow_widget.setParent(None)
+        self.session_gui.core_sesssion.delete_flow(flow)
         # self.recreate_list()

ryvencore_qt/src/widgets/FlowsList_FlowWidget.py

@@ -7,16 +7,16 @@
 
 
 class FlowsList_FlowWidget(QWidget):
-    """A QWidget representing a single Script for the FlowsListWidget."""
+    """A QWidget representing a single Flow for the FlowsListWidget."""
 
-    def __init__(self, scripts_list_widget, session, script):
+    def __init__(self, flows_list_widget, session_gui, flow):
         super().__init__()
 
-        self.session = session
-        self.script = script
-        self.flow_view = self.session.flow_views[script]
-        self.scripts_list_widget = scripts_list_widget
-        self.previous_script_title = ''
+        self.session_gui = session_gui
+        self.flow = flow
+        self.flow_view = self.session_gui.core_session.flow_views[flow]
+        self.flows_list_widget = flows_list_widget
+        self.previous_flow_title = ''
         self._thumbnail_source = ''
         self.ignore_title_line_edit_signal = False
 
@@ -28,17 +28,18 @@ def __init__(self, scripts_list_widget, session, script):
 
         #   create icon
 
-        script_icon = QIcon(Location.PACKAGE_PATH + '/resources/pics/script_picture.png')
+        # TODO: change this icon
+        flow_icon = QIcon(Location.PACKAGE_PATH + '/resources/pics/script_picture.png')
 
         icon_label = QLabel()
         icon_label.setFixedSize(20, 20)
         icon_label.setStyleSheet('border:none;')
-        icon_label.setPixmap(script_icon.pixmap(20, 20))
+        icon_label.setPixmap(flow_icon.pixmap(20, 20))
         main_layout.addWidget(icon_label)
 
         #   title line edit
 
-        self.title_line_edit = ListWidget_NameLineEdit(script.title, self)
+        self.title_line_edit = ListWidget_NameLineEdit(flow.title, self)
         self.title_line_edit.setPlaceholderText('title')
         self.title_line_edit.setEnabled(False)
         self.title_line_edit.editingFinished.connect(self.title_line_edit_editing_finished)
@@ -89,15 +90,15 @@ def contextMenuEvent(self, event):
 
 
     def action_delete_triggered(self):
-        self.scripts_list_widget.del_script(self.script, self)
+        self.flows_list_widget.del_flow(self.flow, self)
 
 
     def title_line_edit_double_clicked(self):
         self.title_line_edit.setEnabled(True)
         self.title_line_edit.setFocus()
         self.title_line_edit.selectAll()
 
-        self.previous_script_title = self.title_line_edit.text()
+        self.previous_flow_title = self.title_line_edit.text()
 
 
     def title_line_edit_editing_finished(self):
@@ -108,10 +109,10 @@ def title_line_edit_editing_finished(self):
 
         self.ignore_title_line_edit_signal = True
 
-        if self.session.script_title_valid(title):
-            self.session.rename_script(script=self.script, title=title)
+        if self.session_gui.core_session.flow_title_valid(title):
+            self.session_gui.core_session.rename_flow(flow=self.flow, title=title)
         else:
-            self.title_line_edit.setText(self.previous_script_title)
+            self.title_line_edit.setText(self.previous_flow_title)
 
         self.title_line_edit.setEnabled(False)
         self.ignore_title_line_edit_signal = False