Skip to content

Fix allows slots with default values to be set to None #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xotmatrix wants to merge 1 commit into from
Closed

Fix allows slots with default values to be set to None #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions AmpleWin/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,10 +1180,6 @@ def update_options_ui(self, data):
self.refresh_ui()

def refresh_ui(self):
# 0. Re-initialize defaults for any newly appeared slots/devices
if self.current_machine_data:
self.initialize_default_slots(self.current_machine_data)

# 1. Clean the fixed layouts without destroying the frames themselves
self.clear_grid(self.slots_layout)
self.clear_grid(self.media_layout)
Expand Down Expand Up @@ -1304,8 +1300,12 @@ def add_slot_row(self, parent_layout, slot):
for opt in slot['options']:
opt_desc = opt.get('description') or opt['value'] or "—None—"
item = QStandardItem(opt_desc)
item.setData(opt['value'], Qt.UserRole)

if opt.get('default') == "false" or opt.get('default') is False:
item.setData("''", Qt.UserRole) # Explicitly set empty string to override default
else:
item.setData(opt['value'], Qt.UserRole)


# Check for disabled status in plist
# XML plist boolean is usually True/False in Python after loading
is_disabled = opt.get('disabled', False)
Expand Down