fly/flightgear
1
0
Fork 0
Code Activity

Graphics presets: Add order-num parameter to allow more intuitive ordering

Browse source
This commit is contained in:
Fernando García Liñán 2021-04-02 03:11:42 +02:00
parent 0294db919f
commit a5443b77e0
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Viewer/GraphicsPresets.cxx
View file

@ -332,6 +332,14 @@ auto GraphicsPresets::listPresets() -> GraphicsPresetVec
} }
} // of Video/ data dirs iteration } // of Video/ data dirs iteration
// Sort the resulting list by the order number or alphabetically if some
// presets have the same order number
sort(result.begin(), result.end(), [](auto &a, auto &b) {
if (a.orderNum != b.orderNum)
return a.orderNum < b.orderNum;
return a.name < b.name;
});
return result; return result;
} }
@ -444,6 +452,7 @@ bool GraphicsPresets::loadPresetXML(const SGPath& p, GraphicsPresetInfo& info)
const string id = props->getStringValue("id"); const string id = props->getStringValue("id");
const string rawName = props->getStringValue("name"); const string rawName = props->getStringValue("name");
const string rawDesc = props->getStringValue("description"); const string rawDesc = props->getStringValue("description");
int orderNum = props->getIntValue("order-num", 99);
if (id.empty() || rawName.empty() || rawDesc.empty()) { if (id.empty() || rawName.empty() || rawDesc.empty()) {
SG_LOG(SG_IO, SG_ALERT, "Missing preset info loading: " << p.str()); SG_LOG(SG_IO, SG_ALERT, "Missing preset info loading: " << p.str());
@ -453,6 +462,7 @@ bool GraphicsPresets::loadPresetXML(const SGPath& p, GraphicsPresetInfo& info)
info.id = id; info.id = id;
info.name = globals->get_locale()->getLocalizedString(rawName, "graphics-presets"); info.name = globals->get_locale()->getLocalizedString(rawName, "graphics-presets");
info.description = globals->get_locale()->getLocalizedString(rawDesc, "graphics-presets"); info.description = globals->get_locale()->getLocalizedString(rawDesc, "graphics-presets");
info.orderNum = orderNum;
if (info.name.empty()) if (info.name.empty())
info.name = rawName; // no translation defined info.name = rawName; // no translation defined

1
src/Viewer/GraphicsPresets.hxx
View file

@ -24,6 +24,7 @@ public:
std::string id; std::string id;
std::string name; // localized std::string name; // localized
std::string description; // localized std::string description; // localized
int orderNum;
string_list devices; string_list devices;
SGPropertyNode_ptr properties; SGPropertyNode_ptr properties;