Add a setting button

Author: CX330Blake

settings.json

@@ -29,5 +29,8 @@
     "/System/Volumes/Data/Users/CX330/Working/Share/x64asm/shell.asm",
     "/System/Volumes/Data/Users/CX330/Working/Share/x64asm/shell.bin"
   ],
-  "last_open_dir": "/Users/CX330/Working/Share/MplabProjects/lab4.X"
+  "last_open_dir": "/Users/CX330/Working/Share/MplabProjects/lab4.X",
+  "opt_rule_push_zero": true,
+  "opt_rule_mov_imm8": true,
+  "syscalls_style_default": "Commented"
 }

ui/main_window.py

@@ -62,6 +62,7 @@
 from ..backends.validator import BadPatternManager, validate_all
 from ..utils.config import load_config, save_config
 from .patterns_dialog import PatternsDialog
+from .settings_dialog import SettingsDialog
 from .patterns_panel import PatternsPanel
 from .highlighters import (
     create_disassembly_highlighter,
@@ -183,12 +184,25 @@ def _is_null_pat(p) -> bool:
         tb.addSeparator()
         tb.addWidget(QLabel("Arch:"))
         tb.addWidget(self.arch_combo)
-        tb.addSeparator()
         # Labels are always allowed (block assembly mode enabled)
         # Checkbox removed; always assemble with labels preserved.
         tb.addSeparator()
         tb.addAction(self.act_assemble)
         tb.addAction(self.act_disassemble)
+        # Push Settings button to the far right within the same title bar
+        try:
+            self._toolbar_right_spacer = QWidget()
+            self._toolbar_right_spacer.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
+            tb.addWidget(self._toolbar_right_spacer)
+        except Exception:
+            self._toolbar_right_spacer = None
+        try:
+            self.btn_settings = QPushButton("Settings")
+            self.btn_settings.setToolTip("Open Settings")
+            tb.addWidget(self.btn_settings)
+            self.btn_settings.clicked.connect(self.on_open_settings)
+        except Exception:
+            self.btn_settings = None
 
         # Central layout
         splitter = QSplitter()
@@ -372,6 +386,13 @@ def _copy_disasm():
             parent=self,
         )
         self.output_tabs.addTab(self.optimize_widget, "Optimize")
+        # Apply optimize defaults from config
+        try:
+            cfg = load_config()
+            self.optimize_widget.chk_rule1.setChecked(bool(cfg.get("opt_rule_push_zero", True)))
+            self.optimize_widget.chk_rule2.setChecked(bool(cfg.get("opt_rule_mov_imm8", True)))
+        except Exception:
+            pass
 
         # Formats view (Shellcode output pane)
         fmt_widget = QWidget()
@@ -411,6 +432,14 @@ def _copy_disasm():
             self.hll_lang_combo.addItems(["C", "Python", "Zig", "Rust", "Go"])  # supported generators
         except Exception:
             pass
+        # Load default HLL language from config
+        try:
+            cfg = load_config()
+            def_lang = (cfg.get("default_hll_lang") or "C")
+            idx = max(0, self.hll_lang_combo.findText(def_lang))
+            self.hll_lang_combo.setCurrentIndex(idx)
+        except Exception:
+            pass
         try:
             # Prevent Enter/Return from leaking to the Assembly editor when changing selection
             self.hll_lang_combo.installEventFilter(self)
@@ -521,6 +550,14 @@ def _insert_snippet(snippet: str) -> None:
             parent=self,
         )
         self.output_tabs.addTab(self.syscalls_widget, "Syscalls")
+        # Apply Syscalls default style from config
+        try:
+            cfg = load_config()
+            def_style = (cfg.get("syscalls_style_default") or "Commented")
+            idx = max(0, self.syscalls_widget.style_combo.findText(def_style))
+            self.syscalls_widget.style_combo.setCurrentIndex(idx)
+        except Exception:
+            pass
         # Now that Syscalls tab exists, sync Shellcode pane and editors padding to match it
         try:
             self._sync_shellcode_padding_to_syscalls()
@@ -565,6 +602,15 @@ def _insert_asm_text(s: str) -> None:
             parent=self,
         )
         self.output_tabs.addTab(self.shellstorm_widget, "Shell-Storm")
+        # Apply Shell-Storm default preview language
+        try:
+            cfg = load_config()
+            def_ss_lang = (cfg.get("shellstorm_default_lang") or "C")
+            if getattr(self.shellstorm_widget, 'lang_combo', None) is not None:
+                idx = max(0, self.shellstorm_widget.lang_combo.findText(def_ss_lang))
+                self.shellstorm_widget.lang_combo.setCurrentIndex(idx)
+        except Exception:
+            pass
 
         # Validation tab (container with a button bar and text)
         val_container = QWidget()
@@ -2180,3 +2226,61 @@ def closeEvent(self, event):
         cfg["bad_patterns"] = self.bpm.serialize()
         save_config(cfg)
         super().closeEvent(event)
+
+    def on_open_settings(self):
+        """Open Settings dialog and apply changes live on accept."""
+        try:
+            dlg = SettingsDialog(self)
+        except Exception:
+            return
+        try:
+            res = dlg.exec()
+        except Exception:
+            res = dlg.exec_()
+        if not res:
+            return
+        vals = dlg.values()
+        # Apply: Bad-chars highlight only if value provided
+        if "bad_highlight_enabled" in vals:
+            try:
+                self.on_badchars_toggled(bool(vals.get("bad_highlight_enabled")))
+                if hasattr(self, 'patterns_widget') and hasattr(self.patterns_widget, 'chk_enabled'):
+                    self.patterns_widget.chk_enabled.setChecked(bool(vals.get("bad_highlight_enabled")))
+            except Exception:
+                pass
+        # Apply: Optimize rules (present in Settings)
+        try:
+            if "opt_rule_push_zero" in vals:
+                self.optimize_widget.chk_rule1.setChecked(bool(vals.get("opt_rule_push_zero")))
+            if "opt_rule_mov_imm8" in vals:
+                self.optimize_widget.chk_rule2.setChecked(bool(vals.get("opt_rule_mov_imm8")))
+            self.optimize_widget.on_preview()
+        except Exception:
+            pass
+        # Apply: Formats default language only if present
+        if "default_hll_lang" in vals:
+            try:
+                def_lang = vals.get("default_hll_lang")
+                if def_lang:
+                    idx = max(0, self.hll_lang_combo.findText(def_lang))
+                    self.hll_lang_combo.setCurrentIndex(idx)
+            except Exception:
+                pass
+        # Apply: Syscalls snippet style (present in Settings)
+        try:
+            if "syscalls_style_default" in vals:
+                def_style = vals.get("syscalls_style_default")
+                if def_style:
+                    idx = max(0, self.syscalls_widget.style_combo.findText(def_style))
+                    self.syscalls_widget.style_combo.setCurrentIndex(idx)
+        except Exception:
+            pass
+        # Apply: Shell-Storm preview syntax only if present
+        if "shellstorm_default_lang" in vals:
+            try:
+                def_ss = vals.get("shellstorm_default_lang")
+                if def_ss and getattr(self.shellstorm_widget, 'lang_combo', None) is not None:
+                    idx = max(0, self.shellstorm_widget.lang_combo.findText(def_ss))
+                    self.shellstorm_widget.lang_combo.setCurrentIndex(idx)
+            except Exception:
+                pass

ui/settings_dialog.py

@@ -0,0 +1,95 @@
+from __future__ import annotations
+
+from typing import Optional
+
+try:
+    from PySide6.QtCore import Qt  # type: ignore
+    from PySide6.QtWidgets import (  # type: ignore
+        QDialog, QDialogButtonBox, QVBoxLayout, QHBoxLayout, QWidget,
+        QLabel, QCheckBox, QPushButton, QComboBox, QTabWidget
+    )
+except Exception:
+    from PySide2.QtCore import Qt  # type: ignore
+    from PySide2.QtWidgets import (  # type: ignore
+        QDialog, QDialogButtonBox, QVBoxLayout, QHBoxLayout, QWidget,
+        QLabel, QCheckBox, QPushButton, QComboBox, QTabWidget
+    )
+
+from ..utils.config import load_config, save_config
+# Patterns management is no longer exposed in Settings
+
+
+class SettingsDialog(QDialog):
+    """Aggregated Settings dialog for Shellcode IDE.
+
+    Tabs include per-feature preferences mirrored from the main UI:
+    - Bad Chars (highlight toggle + manage patterns)
+    - Optimize (rule toggles)
+    - Formats (default language)
+    - Syscalls (snippet style)
+    - Shell-Storm (preview syntax)
+    """
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
+        self.setWindowTitle("Settings")
+        self.resize(520, 360)
+
+        cfg = load_config()
+
+        lay = QVBoxLayout(self)
+        self.tabs = QTabWidget()
+        lay.addWidget(self.tabs)
+
+        # Optimize tab
+        opt = QWidget(); opt_l = QVBoxLayout(opt)
+        self.chk_opt_rule1 = QCheckBox("Push 0 -> xor; push reg")
+        self.chk_opt_rule2 = QCheckBox("mov reg, imm -> mov reg8/16/32, imm (risky)")
+        self.chk_opt_rule1.setChecked(bool(cfg.get("opt_rule_push_zero", True)))
+        self.chk_opt_rule2.setChecked(bool(cfg.get("opt_rule_mov_imm8", True)))
+        opt_l.addWidget(self.chk_opt_rule1)
+        opt_l.addWidget(self.chk_opt_rule2)
+        opt_l.addStretch(1)
+        self.tabs.addTab(opt, "Optimize")
+
+        # Syscalls tab
+        sc = QWidget(); sc_l = QVBoxLayout(sc)
+        r2 = QHBoxLayout()
+        r2.addWidget(QLabel("Default snippet style:"))
+        self.combo_sys_style = QComboBox(); self.combo_sys_style.addItems(["Commented", "Minimal"])
+        try:
+            def_style = (cfg.get("syscalls_style_default") or "Commented")
+            idx = max(0, self.combo_sys_style.findText(def_style))
+            self.combo_sys_style.setCurrentIndex(idx)
+        except Exception:
+            pass
+        r2.addWidget(self.combo_sys_style)
+        r2.addStretch(1)
+        sc_l.addLayout(r2)
+        sc_l.addStretch(1)
+        self.tabs.addTab(sc, "Syscalls")
+
+        # Buttons
+        self.buttons = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+        lay.addWidget(self.buttons)
+
+        # Events
+        self.buttons.accepted.connect(self._on_accept)
+        self.buttons.rejected.connect(self.reject)
+
+    # Expose results to caller
+    def values(self) -> dict:
+        return {
+            "opt_rule_push_zero": bool(self.chk_opt_rule1.isChecked()),
+            "opt_rule_mov_imm8": bool(self.chk_opt_rule2.isChecked()),
+            "syscalls_style_default": self.combo_sys_style.currentText() or "Commented",
+        }
+
+    # Hooks
+    def _on_accept(self):
+        # Persist to config; the main window will apply live
+        cfg = load_config()
+        vals = self.values()
+        cfg.update(vals)
+        save_config(cfg)
+        self.accept()