[Companion][Firmware] Make Option struct a member; Add/use typedefs for options group and list; Use accessor functions for languages and options; Re-arrange fw options a little for better layout in UI; Remove dead code, cosmetics.

This commit is contained in:
Max Paperno
2018-09-19 06:47:36 -04:00
parent 13b156402f
commit b4d992f490
4 changed files with 130 additions and 146 deletions
+16 -22
View File
@@ -142,25 +142,13 @@ Firmware * Firmware::getFirmwareForId(const QString & id)
return defaultVariant;
}
void Firmware::addOption(const char *option, QString tooltip, uint32_t variant)
{
Option options[] = { { option, tooltip, variant }, { NULL } };
addOptions(options);
}
void Firmware::addOption(const Option & option)
{
Option options[] = { option, { NULL } };
addOptions(options);
}
unsigned int Firmware::getVariantNumber()
{
unsigned int result = 0;
const Firmware * base = getFirmwareBase();
QStringList options = id.mid(base->getId().length()+1).split("-", QString::SkipEmptyParts);
foreach(QString option, options) {
foreach(QList<Option> group, base->opts) {
foreach(OptionsGroup group, base->opts) {
foreach(Option opt, group) {
if (opt.name == option) {
result += opt.variant;
@@ -171,21 +159,27 @@ unsigned int Firmware::getVariantNumber()
return result;
}
void Firmware::addLanguage(const char *lang)
void Firmware::addLanguage(const char * lang)
{
languages.push_back(lang);
}
void Firmware::addTTSLanguage(const char *lang)
//void Firmware::addTTSLanguage(const char * lang)
//{
// ttslanguages.push_back(lang);
//}
void Firmware::addOption(const char * option, const QString & tooltip, unsigned variant)
{
ttslanguages.push_back(lang);
addOption(Option(option, tooltip, variant));
}
void Firmware::addOptions(Option options[])
void Firmware::addOption(const Option & option)
{
QList<Option> opts;
for (int i=0; options[i].name; i++) {
opts.push_back(options[i]);
}
this->opts.push_back(opts);
addOptionsGroup({option});
}
void Firmware::addOptionsGroup(const OptionsGroup & options)
{
this->opts.append(options);
}