Merge branch 'old'

# Conflicts:
#	.gitignore
#	.run/compile_ui.run.xml
#	.vscode/launch.json
#	README.md
#	compile_ui.py
#	makefile.py
#	requirements.txt
#	src/common.py
#	src/editors/assetgroup_maker/dialog.py
#	src/editors/assetgroup_maker/main.py
#	src/editors/assetgroup_maker/objects.py
#	src/editors/assetgroup_maker/property/ui_frame_group.py
#	src/editors/hotkey_editor/main.py
#	src/editors/hotkey_editor/objects.py
#	src/editors/loading_editor/main.py
#	src/editors/loading_editor/main.ui
#	src/editors/loading_editor/ui_main.py
#	src/editors/loading_editor/viewport.py
#	src/editors/smartprop_editor/_common.py
#	src/editors/smartprop_editor/actions/bulk_model_importer.py
#	src/editors/smartprop_editor/choices.py
#	src/editors/smartprop_editor/commands.py
#	src/editors/smartprop_editor/document.py
#	src/editors/smartprop_editor/document.ui
#	src/editors/smartprop_editor/main.py
#	src/editors/smartprop_editor/main.ui
#	src/editors/smartprop_editor/objects.py
#	src/editors/smartprop_editor/properties_group_frame.py
#	src/editors/smartprop_editor/property/bool.py
#	src/editors/smartprop_editor/property/color.py
#	src/editors/smartprop_editor/property/colormatch.py
#	src/editors/smartprop_editor/property/combobox.py
#	src/editors/smartprop_editor/property/comment.py
#	src/editors/smartprop_editor/property/comment.ui
#	src/editors/smartprop_editor/property/comparison.py
#	src/editors/smartprop_editor/property/filtersurface.py
#	src/editors/smartprop_editor/property/float.py
#	src/editors/smartprop_editor/property/legacy.py
#	src/editors/smartprop_editor/property/set_variable.py
#	src/editors/smartprop_editor/property/set_variable.ui
#	src/editors/smartprop_editor/property/string.py
#	src/editors/smartprop_editor/property/ui_comment.py
#	src/editors/smartprop_editor/property/ui_set_variable.py
#	src/editors/smartprop_editor/property/variable.py
#	src/editors/smartprop_editor/property/vector3d.py
#	src/editors/smartprop_editor/property_frame.py
#	src/editors/smartprop_editor/property_frame.ui
#	src/editors/smartprop_editor/ui_document.py
#	src/editors/smartprop_editor/ui_property_frame.py
#	src/editors/smartprop_editor/ui_variable_frame.py
#	src/editors/smartprop_editor/variable_frame.py
#	src/editors/smartprop_editor/variable_frame.ui
#	src/editors/smartprop_editor/vsmart.py
#	src/editors/soundevent_editor/audio_player.py
#	src/editors/soundevent_editor/commands.py
#	src/editors/soundevent_editor/internal_explorer.py
#	src/editors/soundevent_editor/main.py
#	src/editors/soundevent_editor/main.ui
#	src/editors/soundevent_editor/objects.py
#	src/editors/soundevent_editor/preset_manager.py
#	src/editors/soundevent_editor/properties_window.py
#	src/editors/soundevent_editor/properties_window.ui
#	src/editors/soundevent_editor/property/common.py
#	src/editors/soundevent_editor/property/curve/main.py
#	src/editors/soundevent_editor/property/frame.py
#	src/editors/soundevent_editor/ui_main.py
#	src/forms/about/main.ui
#	src/forms/about/ui_main.py
#	src/icons/assettypes/vsmart_sm.png
#	src/main.py
#	src/main.ui
#	src/other/addon_functions.py
#	src/other/ncm_setup.py
#	src/other/steam_restart.py
#	src/property/methods.py
#	src/resources.qrc
#	src/settings/common.py
#	src/settings/main.py
#	src/styles/common.py
#	src/styles/qt_global_stylesheet.py
#	src/ui_main.py
#	src/updater/check.py

Author: dertwist

.run/Build Final.run.xml

@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="build final" type="PythonConfigurationType" factoryName="Python">
+    <module name="Hammer5Tools" />
+    <option name="ENV_FILES" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="SDK_NAME" value="Python desktop" />
+    <option name="WORKING_DIRECTORY" value="" />
+    <option name="IS_MODULE_SDK" value="false" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/dev/build.py" />
+    <option name="PARAMETERS" value="--build-all --archive" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="false" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

dev/custom_curve/CurveWidget.py

@@ -0,0 +1,132 @@
+import sys
+from PySide6.QtWidgets import QApplication, QDialog, QVBoxLayout, QGraphicsView, QGraphicsScene, QGraphicsEllipseItem, QGraphicsLineItem
+from PySide6.QtGui import QPainter, QPen, QColor, QFont, QMouseEvent
+from PySide6.QtCore import Qt, QPointF
+
+class Curve:
+    def __init__(self):
+        self.dots = [QPointF(0.0, 0.0), QPointF(1.0, 1.0), QPointF(0.25, 0.75), QPointF(0.75, 0.25)]
+
+    def evaluate(self, t):
+        a, b, p1, p2 = self.dots
+        return (
+            (1 - t)**3 * a +
+            3 * (1 - t)**2 * t * p1 +
+            3 * (1 - t) * t**2 * p2 +
+            t**3 * b
+        )
+
+class CurveWidget(QGraphicsView):
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.scene = QGraphicsScene(self)
+        self.setScene(self.scene)
+
+        self.curve = Curve()
+        self.setRenderHint(QPainter.Antialiasing)
+        self.setViewportUpdateMode(QGraphicsView.FullViewportUpdate)
+
+        self.debug_text = self.scene.addText("")
+        self.debug_text.setDefaultTextColor(QColor(0, 0, 255))  # Blue debug text
+        font = QFont()
+        font.setPointSize(8)
+        self.debug_text.setFont(font)
+
+        self.selected_dot_index = None
+
+        # Disable scrolling
+        self.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+        self.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+
+    def setCurve(self, curve):
+        self.curve = curve
+        self.update_scene()
+
+    def update_scene(self):
+        self.scene.clear()
+        width = self.width()
+        height = self.height()
+
+        # Calculate margins
+        margin_x = width * 0.04
+        margin_y = height * 0.04
+
+        pen = QPen(QColor(150, 150, 150))
+        for i in range(0, 1001):
+            t = i / 1000.0
+            point = self.curve.evaluate(t)
+            x = margin_x + point.x() * (width - 2 * margin_x)
+            y = margin_y + (1 - point.y()) * (height - 2 * margin_y)
+            if 0 <= x <= width and 0 <= y <= height:
+                self.scene.addLine(x - 1, y, x + 1, y, pen)
+
+        dot_radius = 6
+        pen = QPen(QColor(150, 150, 40), 2)
+        for i, dot in enumerate(self.curve.dots):
+            x = margin_x + dot.x() * (width - 2 * margin_x)
+            y = margin_y + (1 - dot.y()) * (height - 2 * margin_y)
+            ellipse = QGraphicsEllipseItem(x - dot_radius, y - dot_radius, 2 * dot_radius, 2 * dot_radius)
+            ellipse.setBrush(QColor(255, 100, 100))
+            self.scene.addItem(ellipse)
+
+            if i == 2 or i == 3:
+                anchor_x = margin_x + self.curve.dots[i - 2].x() * (width - 2 * margin_x)
+                anchor_y = margin_y + (1 - self.curve.dots[i - 2].y()) * (height - 2 * margin_y)
+                line = QGraphicsLineItem(anchor_x, anchor_y, x, y)
+                line.setPen(pen)
+                self.scene.addItem(line)
+
+    def resizeEvent(self, event):
+        super().resizeEvent(event)
+        self.update_scene()
+
+    def mousePressEvent(self, event: QMouseEvent):
+        pos = event.position()
+        width = self.width()
+        height = self.height()
+        margin_x = width * 0.04
+        margin_y = height * 0.04
+        bounding_box_size = 16
+        for i, dot in enumerate(self.curve.dots):
+            x = margin_x + dot.x() * (width - 2 * margin_x)
+            y = margin_y + (1 - dot.y()) * (height - 2 * margin_y)
+            if (x - bounding_box_size <= pos.x() <= x + bounding_box_size) and (y - bounding_box_size <= pos.y() <= y + bounding_box_size):
+                self.selected_dot_index = i
+                break
+
+    def mouseMoveEvent(self, event: QMouseEvent):
+        if self.selected_dot_index is not None:
+            pos = event.position()
+            width = self.width()
+            height = self.height()
+            margin_x = width * 0.02
+            margin_y = height * 0.02
+            x = (pos.x() - margin_x) / (width - 2 * margin_x)
+            y = 1 - ((pos.y() - margin_y) / (height - 2 * margin_y))
+            self.curve.dots[self.selected_dot_index] = QPointF(x, y)
+            self.update_scene()
+
+    def mouseReleaseEvent(self, event: QMouseEvent):
+        self.selected_dot_index = None
+
+class CurveWidgetDialog(QDialog):
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.setWindowTitle("Curve Widget Dialog")
+        self.resize(800, 600)
+
+        layout = QVBoxLayout()
+        self.curve_widget = CurveWidget(self)
+        layout.addWidget(self.curve_widget)
+        self.setLayout(layout)
+
+        self.curve_widget.setCurve(Curve())
+
+def main():
+    app = QApplication(sys.argv)
+    main_window = CurveWidgetDialog()
+    main_window.show()
+    sys.exit(app.exec())
+
+if __name__ == "__main__":
+    main()

dev/main/json_steam/main.py

@@ -0,0 +1,32 @@
+import json
+import json_stream
+import time
+
+file_path = 'sounds.hbat'
+def read_with_json(file_path):
+    with open(file_path, 'r') as file:
+        data = json.load(file)
+        return data.get('process')
+
+def read_with_json_stream(file_path):
+    with open(file_path, 'r') as file:
+        data = json_stream.load(file)
+        for key, value in data.items():
+            if key == 'process':
+                # Access the process data directly
+                process_data = {k: v for k, v in value.items()}
+                return process_data
+
+# Measure time for json
+start_time = time.time()
+process_data_json = read_with_json(file_path)
+json_duration = time.time() - start_time
+print(f"Process data using json: {process_data_json}")
+print(f"Time taken with json: {json_duration:.6f} seconds")
+
+# Measure time for json_stream
+start_time = time.time()
+process_data_json_stream = read_with_json_stream(file_path)
+json_stream_duration = time.time() - start_time
+print(f"Process data using json_stream: {process_data_json_stream}")
+print(f"Time taken with json_stream: {json_stream_duration:.6f} seconds")

dev/main/json_steam/sounds.hbat

@@ -0,0 +1,76 @@
+import sys
+import time
+from PySide6.QtWidgets import QApplication, QMainWindow, QTextEdit, QVBoxLayout, QWidget, QMessageBox
+from PySide6.QtCore import QDir
+from watchdog.observers import Observer
+from watchdog.events import FileSystemEventHandler
+
+class FileWatcherExample(QMainWindow):
+    def __init__(self):
+        super().__init__()
+        self.setWindowTitle("File System Watcher Example")
+
+        self.central_widget = QWidget()
+        self.setCentralWidget(self.central_widget)
+        self.layout = QVBoxLayout(self.central_widget)
+
+        self.text_edit = QTextEdit()
+        self.text_edit.setReadOnly(True)
+        self.layout.addWidget(self.text_edit)
+
+        self.last_event_time = {}
+        self.debounce_time = 0.5  # 500 milliseconds
+
+        root_path = r"C:\Program Files (x86)\Steam\steamapps\common\Counter-Strike Global Offensive\content\csgo_addons\batch_creator"
+
+        if QDir(root_path).exists():
+            self.start_watching(root_path)
+        else:
+            QMessageBox.critical(self, "Error", f"The directory {root_path} does not exist.")
+            self.close()
+
+    def start_watching(self, path):
+        event_handler = FileSystemEventHandler()
+        event_handler.on_modified = self.on_modified
+        event_handler.on_created = self.on_created
+        event_handler.on_deleted = self.on_deleted
+        event_handler.on_moved = self.on_moved
+
+        self.observer = Observer()
+        self.observer.schedule(event_handler, path, recursive=True)
+        self.observer.start()
+
+    def should_process_event(self, event):
+        current_time = time.time()
+        last_time = self.last_event_time.get(event.src_path, 0)
+        if current_time - last_time > self.debounce_time:
+            self.last_event_time[event.src_path] = current_time
+            return True
+        return False
+
+    def on_modified(self, event):
+        if self.should_process_event(event):
+            self.text_edit.append(f"Modified: {event.src_path}")
+
+    def on_created(self, event):
+        if self.should_process_event(event):
+            self.text_edit.append(f"Created: {event.src_path}")
+
+    def on_deleted(self, event):
+        if self.should_process_event(event):
+            self.text_edit.append(f"Deleted: {event.src_path}")
+
+    def on_moved(self, event):
+        if self.should_process_event(event):
+            self.text_edit.append(f"Moved: from {event.src_path} to {event.dest_path}")
+
+    def closeEvent(self, event):
+        self.observer.stop()
+        self.observer.join()
+        event.accept()
+
+if __name__ == "__main__":
+    app = QApplication(sys.argv)
+    window = FileWatcherExample()
+    window.show()
+    sys.exit(app.exec())

dev/main/json_steam/sounds_light.hbat

@@ -0,0 +1,89 @@
+import pytest
+from PySide6.QtWidgets import QApplication, QTreeWidgetItem
+from PySide6.QtCore import Qt, QPointF
+from dev.widgets.tree_widget import CustomTreeWidget, MoveItemCommand
+
+@pytest.fixture(scope="session")
+def qapp():
+    import sys
+    from PySide6.QtWidgets import QApplication
+    app = QApplication.instance() or QApplication(sys.argv)
+    yield app
+
+def serialize_tree(tree):
+    def serialize_item(item):
+        return {
+            "text": item.text(0),
+            "children": [serialize_item(item.child(i)) for i in range(item.childCount())]
+        }
+    return [
+        serialize_item(tree.topLevelItem(i))
+        for i in range(tree.topLevelItemCount())
+    ]
+
+def setup_tree():
+    # Build the tree as described
+    tree = CustomTreeWidget(undo_stack=type("DummyStack", (), {"push": lambda self, cmd: cmd.redo()})())
+    parent1 = QTreeWidgetItem(["Parent1"])
+    child1 = QTreeWidgetItem(["child1"])
+    child2 = QTreeWidgetItem(["child2"])
+    child3 = QTreeWidgetItem(["child3"])
+    parent1.addChildren([child1, child2, child3])
+    parent2 = QTreeWidgetItem(["Parent2"])
+    child4 = QTreeWidgetItem(["child4"])
+    parent2.addChild(child4)
+    tree.addTopLevelItems([parent1, parent2])
+    return tree, parent1, child1, child2, child3, parent2, child4
+
+def test_drag_and_drop_and_undo(qapp):
+    # Use a real QUndoStack for undo/redo
+    from PySide6.QtGui import QUndoStack
+    tree = CustomTreeWidget(undo_stack=QUndoStack())
+    parent1 = QTreeWidgetItem(["Parent1"])
+    child1 = QTreeWidgetItem(["child1"])
+    child2 = QTreeWidgetItem(["child2"])
+    child3 = QTreeWidgetItem(["child3"])
+    parent1.addChildren([child1, child2, child3])
+    parent2 = QTreeWidgetItem(["Parent2"])
+    child4 = QTreeWidgetItem(["child4"])
+    parent2.addChild(child4)
+    tree.addTopLevelItems([parent1, parent2])
+
+    # Save initial state
+    initial_state = serialize_tree(tree)
+
+    # 1. Move child1 under child4
+    old_parent = parent1
+    old_index = old_parent.indexOfChild(child1)
+    new_parent = child4
+    new_index = child4.childCount()
+    tree.undo_stack.push(MoveItemCommand(tree, child1, old_parent, old_index, new_parent, new_index))
+
+    # 2. Move child2 to root (as first top-level item)
+    old_parent = parent1
+    old_index = old_parent.indexOfChild(child2)
+    new_parent = None
+    new_index = 0
+    tree.undo_stack.push(MoveItemCommand(tree, child2, old_parent, old_index, new_parent, new_index))
+
+    # 3. Move parent1 under child1
+    old_parent = None
+    old_index = tree.indexOfTopLevelItem(parent1)
+    new_parent = child1
+    new_index = child1.childCount()
+    tree.undo_stack.push(MoveItemCommand(tree, parent1, old_parent, old_index, new_parent, new_index))
+
+    # 4. Move parent2 under child2
+    old_parent = None
+    old_index = tree.indexOfTopLevelItem(parent2)
+    new_parent = child2
+    new_index = child2.childCount()
+    tree.undo_stack.push(MoveItemCommand(tree, parent2, old_parent, old_index, new_parent, new_index))
+
+    # Now undo all operations
+    for _ in range(tree.undo_stack.count()):
+        tree.undo_stack.undo()
+
+    # Compare state after undo to initial state
+    final_state = serialize_tree(tree)
+    assert final_state == initial_state, f"Tree structure after undo does not match initial structure.\nInitial: {initial_state}\nFinal: {final_state}"