Skip to content

Improves menu separator parsing with validity/visibility node parsing #142

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

Merged
end2endzone merged 2 commits into from
Dec 28, 2023
Merged

Improves menu separator parsing with validity/visibility node parsing #142

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3ba816
Improves menu separator parsing with validity/visibility node parsing
GasDauMin Dec 23, 2023
d60e694
Merge branch 'end2endzone:master' into master
GasDauMin Dec 26, 2023
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
45 changes: 41 additions & 4 deletions src/core/ObjectFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,31 +382,70 @@ namespace shellanything
//at this step the <menu> is valid
Menu* menu = new Menu();

ElementPtrList elements; //temporary xml element containers

//parse separator
std::string menu_separator;
bool have_separator = ParseAttribute(element, "separator", true, true, menu_separator, error);
bool separator_parsed = false;
if (have_separator)
{
bool is_valid_separator = false;

//try to parse this menu separator as a boolean
bool is_horizontal_separator = false;
separator_parsed = ra::strings::Parse(menu_separator, is_horizontal_separator);
if (separator_parsed && is_horizontal_separator)
{
menu->SetSeparator(true);
return menu;
is_valid_separator = true;
}

//try to parse as a string
menu_separator = ra::strings::Lowercase(menu_separator);
if (menu_separator == "horizontal")
{
menu->SetSeparator(true);
return menu;
is_valid_separator = true;
}
else if (menu_separator == "vertical" || menu_separator == "column")
{
menu->SetColumnSeparator(true);
is_valid_separator = true;
}

//find <validity> node under <menu>
elements = GetChildNodes(element, NODE_VALIDITY);
for (size_t i = 0; i < elements.size(); i++)
{
Validator* validator = ObjectFactory::GetInstance().ParseValidator(elements[i], error);
if (validator == NULL)
{
delete menu;
return NULL;
}

//add the new validator
menu->AddValidity(validator);
}

//find <visibility> node under <menu>
elements = GetChildNodes(element, NODE_VISIBILITY);
for (size_t i = 0; i < elements.size(); i++)
{
Validator* validator = ObjectFactory::GetInstance().ParseValidator(elements[i], error);
if (validator == NULL)
{
delete menu;
return NULL;
}

//add the new validator
menu->AddVisibility(validator);
}

if (is_valid_separator)
{
return menu;
}
}
Expand Down Expand Up @@ -447,8 +486,6 @@ namespace shellanything
}
}

ElementPtrList elements; //temporary xml element containers

//find <validity> node under <menu>
elements = GetChildNodes(element, NODE_VALIDITY);
for (size_t i = 0; i < elements.size(); i++)
Expand Down