add basic properties editor and fix minor problems and syntax

Author: DevGeniusCode

readme.md

@@ -50,7 +50,7 @@ WNDEdit/
 
 7. **window/line_iterator.py**: Allows line-by-line iteration through the WND file, including a line counter and filename.
 
-8. **window/window.py**: Processes a single window structure from the WND file, creating objects with window properties (Config).
+8. **window/window.py**: Processes a single window structure from the WND file, creating objects with window properties (WindowProperties).
 
 9. **window/wnd_parser.py**: A processing file that parses a WND file and returns an object representing the window hierarchy.
 
@@ -62,11 +62,11 @@ A WND file is a simple text file containing UI settings for the game. Here's an
 WINDOW
   WINDOWTYPE = USER
   NAME = "dummy"
-  ... rest of window options
+  ... rest of window properties
   CHILD
   WINDOW ; child
     WINDOWTYPE = CHECKBOX
-    ... rest of window child options
+    ... rest of window child properties
   END
   ENDALLCHILDREN
 END
@@ -87,25 +87,25 @@ parser = {
     'windows': [
         Window(
             key=uuid1,  # Random UUID for each window
-            options={'OPTION1': 'value1', 'OPTION2': 'value2'},
+            properties={'OPTION1': 'value1', 'OPTION2': 'value2'},
             children=[
                 Window(
                     key=uuid2,
-                    options={'OPTION1': 'value1', 'OPTION2': 'value2'},
+                    properties={'OPTION1': 'value1', 'OPTION2': 'value2'},
                     children=[]
                 ),
                 Window(
                     key=uuid3,
-                    options={'OPTION3': 'value3'},
+                    properties={'OPTION3': 'value3'},
                     children=[]
                 ),
                 Window(
                     key=uuid4,
-                    options={'OPTION4': 'value4'},
+                    properties={'OPTION4': 'value4'},
                     children=[
                         Window(
                             key=uuid5,
-                            options={'OPTION5': 'value5'},
+                            properties={'OPTION5': 'value5'},
                             children=[]
                         )
                     ]

resources/hierarchy.txt

@@ -1,11 +1,11 @@
 WINDOW
   WINDOWTYPE = USER
   NAME = "dummy"
-	... rest of window options
+	... rest of window properties
   CHILD
   WINDOW ; child
     WINDOWTYPE = CHEAKBOX;
-	... rest of window child options
+	... rest of window child properties
   END
   ENDALLCHILDREN
 END
@@ -21,33 +21,60 @@ NAME
 
 
 
-Window Key: uud
-Options: {'OPTION1': 'value1', 'OPTION2': 'value2'}
-Children: [
-    Window Key: uud
-    Options: {'OPTION1': 'value1', 'OPTION2': 'value2'}
-    Children: []
-
-    Window Key: uud
-    Options: {'OPTION3': 'value3'}
-    Children: []
-
-    Window Key: uud
-    Options: {'OPTION4': 'value4'}
-    Children: [
-        Window Key: uud
-        Options: {'OPTION5': 'value5'}
-        Children: []
+parser = {
+    'file_metadata': {
+        'FILE_VERSION': 'num',
+        'LAYOUTBLOCK': {
+            'LAYOUTINIT': 'value',
+            'LAYOUTSHUTDOWN': 'value',
+            'LAYOUTUPDATE': 'value'
+        }
+    },
+    'windows': [
+        Window(
+            KEY=uuid1,
+            properties=WindowProperties(
+                WINDOWTYPE="BUTTON",
+                SCREENRECT={"x": 100, "y": 150, "width": 200, "height": 50},
+                NAME="Button1",
+                STATUS=["ENABLED"],
+                STYLE=["MOUSETRACK"],
+                SYSTEMCALLBACK="OnClick",
+                INPUTCALLBACK="OnKeyPress",
+                TOOLTIPCALLBACK="OnTooltip",
+                DRAWCALLBACK="OnDraw",
+                FONT={"name": "Arial", "size": 12, "bold": 1},
+                HEADERTEMPLATE="Header1",
+                TOOLTIPTEXT="Click me",
+                TOOLTIPDELAY=1000,
+                TEXT="Click me",
+                TEXTCOLOR={"r": 255, "g": 255, "b": 255},
+                ENABLEDDRAWDATA=["data1", "data2"],
+                DISABLEDDRAWDATA=["data3", "data4"],
+                HILITEDRAWDATA={"color": "red"},
+                properties_fields={}
+            ),
+            CHILDREN=[
+                Window(
+                    KEY=uuid2,
+                    properties=WindowProperties(
+                        WINDOWTYPE="TEXTBOX",
+                        SCREENRECT={"x": 120, "y": 200, "width": 300, "height": 40},
+                        # rest of properties
+                    ),
+                    CHILDREN=[]
+                )
+            ]
+        )
     ]
-]
 
 
     # # Example usage:
     # # Assuming 'parser' is an instance of ConfigParser
-    # # and has already parsed your config string
+    # # and has already parsed your window_properties string
     # # Example usage:
     # # Assuming 'parser' is an instance of ConfigParser
-    # # and has already parsed your config string
+    # # and has already parsed your window_properties string
     # config_string = """
     # WINDOW
     #   WINDOWTYPE = USER
@@ -71,12 +98,12 @@ Children: [
     # WINDOW
     #   WINDOWTYPE = USER
     #   NAME = "dummy"
-    #     ... rest of window options
+    #     ... rest of window properties
     #   CHILD
     #   WINDOW ; child
     #     WINDOWTYPE = CHEAKBOX;
     #     NAME = "checkbox2"
-    #     ... rest of window child options
+    #     ... rest of window child properties
     #   END
     #   ENDALLCHILDREN
     # END
@@ -85,33 +112,52 @@ Children: [
     # config_string_3 = """
     # WINDOW
     #   NAME = "root"
-    #   Options: {'OPTION1': 'value1', 'OPTION2': 'value2'}
+    #   properties: {'OPTION1': 'value1', 'OPTION2': 'value2'}
     #   CHILD
     #     WINDOW
     #     NAME = "child1"
-    #     Options: {'OPTION1': 'value1', 'OPTION2': 'value2'}
+    #     properties: {'OPTION1': 'value1', 'OPTION2': 'value2'}
     #     CHILD
     #     WINDOW
     #       NAME = "child1child1"
-    #       Options: {'OPTION5': 'value5'}
+    #       properties: {'OPTION5': 'value5'}
     #     END
     #     ENDALLCHILDREN
     #
     #     WINDOW
     #     NAME = "child2"
-    #     Options: {'OPTION3': 'value3'}
+    #     properties: {'OPTION3': 'value3'}
     #   END
     #     CHILD
     #       WINDOW
     #        NAME = "child3"
-    #       Options: {'OPTION4': 'value4'}
+    #       properties: {'OPTION4': 'value4'}
     #       CHILD
     #         WINDOW
     #         NAME = "child3child1"
-    #         Options: {'OPTION5': 'value5'}
+    #         properties: {'OPTION5': 'value5'}
     #         END
     #     END
     #   ENDALLCHILDREN
     # END
     # """
 
+
+מבנה תיקיות וקבצים 
+ 
+WNDEdit\logs\log_current.log 
+WNDEdit\logs\log_current_old.log 
+WNDEdit\resources\window_properties.py 
+WNDEdit\resources\example.wnd 
+WNDEdit\resources\styles.qss 
+WNDEdit\src\error_handler.py 
+WNDEdit\src\file_tree.py 
+WNDEdit\src\log_manager.py 
+WNDEdit\src\main.py 
+WNDEdit\src\object_tree.py 
+WNDEdit\src\property_editor.py 
+WNDEdit\src\window\line_iterator.py 
+WNDEdit\src\window\window.py 
+WNDEdit\src\window\wnd_parser.py 
+
+

src/main.py

@@ -8,6 +8,7 @@
 
 from object_tree import ObjectTree
 from file_tree import FileTree
+from property_editor import PropertyEditor
 from src.window.wnd_parser import WndParser
 from log_manager import LogManager
 
@@ -79,8 +80,8 @@ def __init__(self):
         # Connect the object selected signal to the update function
         self.object_tree.object_selected_signal.connect(self.select_object)
 
-        # Property Editor (for window details)
-        self.property_editor = QTableView()
+        # Property Editor (for object details)
+        self.property_editor = PropertyEditor(self)
         self.property_editor.setMinimumWidth(300)
 
         # Toggle Buttons for object tree and property editor
@@ -124,18 +125,19 @@ def __init__(self):
 
         # Enable drag and drop
         self.setAcceptDrops(True)
-    def select_object(self, obj_name):
+    def select_object(self, window_object):
         """Handles selection of an object from the object tree"""
-        self.selected_object = obj_name
+        self.selected_object = window_object
         self.update_status_bar()  # Update status bar with selected object
-
+        self.load_object_property()
         # Log the selected object
-        self.log_manager.log(f"Object selected: {obj_name}", level="INFO")
+        if self.selected_object:
+            self.log_manager.log(f"Object selected: {window_object.properties.get('WINDOWTYPE')} - {window_object.properties.get('NAME', 'Unnamed')}", level="INFO")
 
     def select_file(self, file_path):
         """Handles selection of a file from the file tree"""
         self.selected_file = file_path
-        self.selected_object = None  # Reset the selected object when a new file is selected
+        # self.selected_object = None  # Reset the selected object when a new file is selected
         self.update_status_bar()  # Update status bar with selected file
 
         # Log the selected file
@@ -204,8 +206,11 @@ def update_status_bar(self):
             file_name = "Folder selected"
 
         if hasattr(self, 'selected_object') and self.selected_object:
-            object_name = f"Object: {self.selected_object}"
-
+            # Show the name of the selected object in the status bar
+            try:
+                object_name = f"Object: {self.selected_object.properties.get('WINDOWTYPE')} - {self.selected_object.properties.get('NAME', 'Unnamed')}"
+            except AttributeError:
+                object_name = f"{str(self.selected_object)}"
         # Combine all information
         status_text = f"{root_path_info} | {file_name} | {object_name}"
 
@@ -271,9 +276,22 @@ def load_wnd_file(self, file_path):
             error_message = f"Error loading file: {e}"
             self.log_manager.log(error_message, level="ERROR")
             self.object_tree.display_error(error_message)
+            self.selected_object = error_message
+            self.update_status_bar()
 
 
+    def load_object_property(self):
+        """Loads and parses the WND file, and displays the object tree."""
+        if self.selected_object:
+            try:
+                # Load the windows into the object tree
+                self.property_editor.load_property(self.selected_object.properties)
+                self.log_manager.log(f"Loaded properties from object {self.selected_object.properties.get('WINDOWTYPE')} - {self.selected_object.properties.get('NAME', 'Unnamed')}", level="INFO")
 
+            except ValueError as e:
+                error_message = f"Error loading object: {e}"
+                self.log_manager.log(error_message, level="ERROR")
+                self.property_editor.display_error(error_message)
 
     def open_folder(self):
         """Handle opening a folder"""
@@ -283,6 +301,7 @@ def open_folder(self):
             self.file_tree.set_root_path(folder)
             self.selected_file = None  # Reset the selected file when a folder is selected
             self.selected_object = None  # Reset the selected object as well
+            self.property_editor.property_model.clear()
             self.update_status_bar()  # Update status bar
 
     def handle_exception(self, exc_type, exc_value, exc_tb):

src/object_tree.py

@@ -5,8 +5,8 @@
 
 
 class ObjectTree(QTreeView):
-    # Define a new signal to notify MainWindow when an object is selected
-    object_selected_signal = pyqtSignal(str)
+    # Signal to notify when an object is selected
+    object_selected_signal = pyqtSignal(object)
 
     def __init__(self, parent=None):
         super().__init__(parent)
@@ -18,10 +18,7 @@ def __init__(self, parent=None):
         self.selectionModel().selectionChanged.connect(self.on_item_selected)
 
     def load_objects(self, windows):
-        """
-        Load windows into the tree view.
-        :param windows: List of Window objects to display in the tree.
-        """
+        """Load the windows into the tree view."""
         self.model.clear()
         self._populate_tree(windows, self.model)
 
@@ -32,7 +29,8 @@ def _populate_tree(self, windows, parent_item):
         :param parent_item: Parent item in the tree to append items
         """
         for window in windows:
-            item = QStandardItem(f"{window.options.get('WINDOWTYPE')} - {window.options.get('NAME', 'Unnamed')}")
+            item = QStandardItem(f"{window.properties.get('WINDOWTYPE')} - {window.properties.get('NAME', 'Unnamed')}")
+            item.setData(window)
             parent_item.appendRow(item)
             if window.children:
                 self._populate_tree(window.children, item)
@@ -43,12 +41,10 @@ def on_item_selected(self, selected, deselected):
         """
         selected_indexes = self.selectedIndexes()
         if selected_indexes:
-            # Get the selected item and extract its text
+            # Get the selected item
             selected_item = self.model.itemFromIndex(selected_indexes[0])
-            selected_object_name = selected_item.text()
-
-            # Emit the signal to notify MainWindow of the selected object
-            self.object_selected_signal.emit(selected_object_name)
+            selected_object = selected_item.data()
+            self.object_selected_signal.emit(selected_object)
 
     def display_error(self, error_message):
         """