variables widget bugfixes

Author: leon-thomm

ryvencore_qt/src/widgets/VariablesListWidget.py

@@ -67,8 +67,8 @@ def recreate_list(self):
         self.widgets.clear()
         # self.data_type_line_edits.clear()
 
-        for v in self.vars_addon.flow_variables[self.flow]:
-            new_widget = VarsList_VarWidget(self, self.vars_addon, self.flow, v)
+        for var_name, var_info in self.vars_addon.flow_variables[self.flow].items():
+            new_widget = VarsList_VarWidget(self, self.vars_addon, self.flow, var_info['var'])
             # new_widget.name_LE_editing_finished.connect(self.name_line_edit_editing_finished)
             self.widgets.append(new_widget)
 
@@ -85,11 +85,12 @@ def rebuild_list(self):
 
     def new_var_LE_return_pressed(self):
         name = self.new_var_name_lineedit.text()
-
         if not self.vars_addon.var_name_valid(self.flow, name=name):
             return
-
-        self.vars_addon.create_var(self.flow, name=name)
+        v = self.vars_addon.create_var(self.flow, name=name)
+        if v is None:
+            return
+        self.add_new_var(v)
 
 
     def add_new_var(self, var):

ryvencore_qt/src/widgets/VarsList_VarWidget.py

@@ -19,7 +19,7 @@ def __init__(self, vars_list_widget, vars_addon: VarsAddon, flow, var):
 
         self.vars_addon = vars_addon
         self.flow = flow
-        self.var = vars_addon.var(flow, var)
+        self.var = var
         self.vars_list_widget = vars_list_widget
         self.previous_var_name = ''  # for editing
 
@@ -43,7 +43,7 @@ def __init__(self, vars_list_widget, vars_addon: VarsAddon, flow, var):
 
         #   name line edit
 
-        self.name_line_edit = ListWidget_NameLineEdit(var.name, self)
+        self.name_line_edit = ListWidget_NameLineEdit(self.var.name, self)
         self.name_line_edit.setPlaceholderText('name')
         self.name_line_edit.setEnabled(False)
         self.name_line_edit.editingFinished.connect(self.name_line_edit_editing_finished)
@@ -109,7 +109,8 @@ def action_edit_val_triggered(self):
         edit_var_val_dialog = EditVal_Dialog(self, self.var.get())
         accepted = edit_var_val_dialog.exec_()
         if accepted:
-            self.vars_addon.create_var(self.flow, self.var.name, edit_var_val_dialog.get_val())
+            self.var.set(edit_var_val_dialog.get_val())
+            # self.vars_addon.create_var(self.flow, self.var.name, edit_var_val_dialog.get_val())
 
 
     def name_line_edit_double_clicked(self):