salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-24 11:11:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make exclusivity groups work in the GUI.

Browse Source
This commit is contained in:
dg
2023-03-31 22:11:40 +00:00
parent c04cbc631c
commit 241d4342e4
3 changed files with 94 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
lib/config.proto
View File

@@ -13,37 +13,44 @@ import "lib/common.proto";
import "lib/layout.proto";
// NEXT_TAG: 21
message ConfigProto {
optional string comment = 8;
optional bool is_extension = 13;
repeated string include = 19;
message ConfigProto
{
optional string comment = 8;
optional bool is_extension = 13;
repeated string include = 19;
optional LayoutProto layout = 18;
optional LayoutProto layout = 18;
optional ImageReaderProto image_reader = 12;
optional ImageWriterProto image_writer = 9;
optional FluxSourceProto flux_source = 10;
optional FluxSinkProto flux_sink = 11;
optional DriveProto drive = 15;
optional ImageReaderProto image_reader = 12;
optional ImageWriterProto image_writer = 9;
optional EncoderProto encoder = 3;
optional DecoderProto decoder = 4;
optional UsbProto usb = 5;
optional FluxSourceProto flux_source = 10;
optional FluxSinkProto flux_sink = 11;
optional DriveProto drive = 15;
optional RangeProto tracks = 6;
optional RangeProto heads = 7;
optional int32 tpi = 16 [ (help) = "TPI of image; if 0, use TPI of drive" ];
optional EncoderProto encoder = 3;
optional DecoderProto decoder = 4;
optional UsbProto usb = 5;
optional FilesystemProto filesystem = 17;
repeated OptionProto option = 20;
optional RangeProto tracks = 6;
optional RangeProto heads = 7;
optional int32 tpi = 16 [ (help) = "TPI of image; if 0, use TPI of drive" ];
optional FilesystemProto filesystem = 17;
repeated OptionProto option = 20;
}
message OptionProto {
optional string name = 1 [(help) = "Option name" ];
optional string comment = 2 [(help) = "Help text for option" ];
optional string message = 3 [(help) = "Message to display when option is in use" ];
optional ConfigProto config = 4 [(help) = "Option data", (recurse) = false ];
message OptionProto
{
optional string name = 1 [ (help) = "option name" ];
optional string comment = 2 [ (help) = "help text for option" ];
optional string message = 3
[ (help) = "message to display when option is in use" ];
optional string exclusivity_group = 5 [
(help) =
"options with the same group cannot be selected at the same time"
];
optional ConfigProto config = 4
[ (help) = "option data", (recurse) = false ];
}

3
src/formats/_apple2.textpb
View File

@@ -17,6 +17,7 @@ option {
name: "appledos"
comment: "use AppleDOS soft sector skew for filesystem access and images"
message: "compensating for AppleDOS soft sector skew"
exclusivity_group: "format"
config {
image_reader {
@@ -60,6 +61,7 @@ option {
name: "prodos"
comment: "use ProDOS soft sector skew for filesystem access and images"
message: "compensating for ProDOS soft sector skew"
exclusivity_group: "format"
config {
image_reader {
@@ -103,6 +105,7 @@ option {
name: "cpm"
comment: "use CP/M soft sector skew for filesystem access and images"
message: "compensating for CP/M soft sector skew"
exclusivity_group: "format"
config {
image_reader {

59
src/gui/mainwindow.cc
View File

@@ -1686,13 +1686,69 @@ public:
_formatNames[formatChoice->GetSelection()];
FlagGroup::parseConfigFile(formatName, formats);
std::set<std::string> exclusivityGroups;
for (auto& option : config.option())
{
if (option.has_exclusivity_group())
exclusivityGroups.insert(option.exclusivity_group());
}
if (config.option().empty())
sizer->Add(new wxStaticText(formatOptionsContainer,
wxID_ANY,
"(no options for this format)"));
else
{
/* Add grouped radiobuttons for anything in an exclusivity
* group. */
for (auto& group : exclusivityGroups)
{
bool first = true;
for (auto& option : config.option())
{
if (option.exclusivity_group() != group)
continue;
auto* rb = new wxRadioButton(formatOptionsContainer,
wxID_ANY,
option.comment());
auto key =
std::make_pair(formatName, option.name());
sizer->Add(rb);
rb->Bind(wxEVT_RADIOBUTTON,
[=](wxCommandEvent& e)
{
for (auto& option : config.option())
{
if (option.exclusivity_group() == group)
_formatOptions.erase(std::make_pair(
formatName, option.name()));
}
_formatOptions.insert(key);
OnControlsChanged(e);
});
if (_formatOptions.find(key) !=
_formatOptions.end())
rb->SetValue(true);
if (first)
rb->SetExtraStyle(wxRB_GROUP);
first = false;
}
}
/* Anything that's _not_ in a group gets a checkbox. */
for (auto& option : config.option())
{
if (option.has_exclusivity_group())
continue;
auto* choice = new wxCheckBox(
formatOptionsContainer, wxID_ANY, option.comment());
auto key = std::make_pair(formatName, option.name());
@@ -1702,7 +1758,7 @@ public:
choice->SetValue(true);
choice->Bind(wxEVT_CHECKBOX,
[this, choice, key](wxCommandEvent& e)
[=](wxCommandEvent& e)
{
if (choice->GetValue())
_formatOptions.insert(key);
@@ -1712,6 +1768,7 @@ public:
OnControlsChanged(e);
});
}
}
}
formatOptionsContainer->SetSizerAndFit(sizer);