feat(color): Quick Model Select, keep active model in view when changing labels (#2895)

* Fix rebase merge issue.

* Incorporate solution from @ParkerEde in PR #2626

* Fix selection logic for models.

* Select model on first press.

* Fix quick model selection when using scroll wheel & enter button.
Add setting to enable quick model selection.

* German translation.

* Fix behaviour when 'model quick select' is off to work like existing 2.8 logic.

* Add translations.

* Prioritise active model as selected model when the set of visible models changes.

* Fix selection ordering when using scroll wheel.
Minor code cleanup.
This commit is contained in:
philmoz
2022-12-23 09:58:49 +10:00
committed by GitHub
parent c099a74da4
commit 3f08af6120
28 changed files with 218 additions and 57 deletions
+102 -51
View File
@@ -240,9 +240,11 @@ class ButtonHolder : public FormWindow
class ModelButton : public Button
{
public:
ModelButton(FormGroup *parent, const rect_t &rect, ModelCell *modelCell) :
ModelButton(FormGroup *parent, const rect_t &rect, ModelCell *modelCell, std::function<void()> setSelected) :
Button(parent, rect), modelCell(modelCell)
{
m_setSelected = std::move(setSelected);
lv_obj_clear_flag(lvobj, LV_OBJ_FLAG_CLICK_FOCUSABLE);
setWidth(MODEL_SELECT_CELL_WIDTH);
setHeight(MODEL_SELECT_CELL_HEIGHT);
@@ -300,39 +302,38 @@ class ModelButton : public Button
if (modelCell == modelslist.getCurrentModel()) {
dc->drawSolidFilledRect(0, 0, width(), 20, COLOR_THEME_ACTIVE);
dc->drawSizedText(width() / 2, 2, modelCell->modelName, LEN_MODEL_NAME,
COLOR_THEME_SECONDARY1 | CENTERED);
} else {
LcdFlags textColor;
dc->drawFilledRect(0, 0, width(), 20, SOLID, COLOR_THEME_PRIMARY2);
textColor = COLOR_THEME_SECONDARY1;
dc->drawSizedText(width() / 2, 2, modelCell->modelName, LEN_MODEL_NAME,
textColor | CENTERED);
}
dc->drawSizedText(width() / 2, 2, modelCell->modelName, LEN_MODEL_NAME,
COLOR_THEME_SECONDARY1 | CENTERED);
if (!hasFocus()) {
dc->drawSolidRect(0, 0, width(), height(), 1, COLOR_THEME_SECONDARY2);
} else {
dc->drawSolidRect(0, 0, width(), height(), 2, COLOR_THEME_FOCUS);
if (m_setSelected) m_setSelected();
}
}
const char *modelFilename() { return modelCell->modelFilename; }
ModelCell *getModelCell() const { return modelCell; }
void setFocused() {
if (!lv_obj_has_state(lvobj, LV_STATE_FOCUSED)) {
lv_group_focus_obj(lvobj);
}
}
protected:
bool loaded = false;
ModelCell *modelCell;
BitmapBuffer *buffer = nullptr;
std::function<void()> m_setSelected = nullptr;
void onClicked() override {
if (!lv_obj_has_state(lvobj, LV_STATE_FOCUSED)) {
lv_group_focus_obj(lvobj);
} else {
Button::onClicked();
}
setFocused();
Button::onClicked();
}
};
@@ -366,23 +367,25 @@ ModelsPageBody::ModelsPageBody(Window *parent, const rect_t &rect) :
{
setFlexLayout(LV_FLEX_FLOW_ROW_WRAP, MODEL_CELL_PADDING);
padRow(MODEL_CELL_PADDING);
update();
}
void ModelsPageBody::selectModel(ModelCell *model)
{
bool modelConnected =
TELEMETRY_STREAMING() && !g_eeGeneral.disableRssiPoweroffAlarm;
if (modelConnected) {
AUDIO_ERROR_MESSAGE(AU_MODEL_STILL_POWERED);
if (!confirmationDialog(STR_MODEL_STILL_POWERED, nullptr, false, []() {
tmr10ms_t startTime = getTicks();
while (!TELEMETRY_STREAMING()) {
if (getTicks() - startTime > TELEMETRY_CHECK_DELAY10ms) break;
}
return !TELEMETRY_STREAMING() || g_eeGeneral.disableRssiPoweroffAlarm;
})) {
return; // stop if connected but not confirmed
// Don't need to check connection to receiver if re-selecting the active model
if (model != modelslist.getCurrentModel()) {
bool modelConnected =
TELEMETRY_STREAMING() && !g_eeGeneral.disableRssiPoweroffAlarm;
if (modelConnected) {
AUDIO_ERROR_MESSAGE(AU_MODEL_STILL_POWERED);
if (!confirmationDialog(STR_MODEL_STILL_POWERED, nullptr, false, []() {
tmr10ms_t startTime = getTicks();
while (!TELEMETRY_STREAMING()) {
if (getTicks() - startTime > TELEMETRY_CHECK_DELAY10ms) break;
}
return !TELEMETRY_STREAMING() || g_eeGeneral.disableRssiPoweroffAlarm;
})) {
return; // stop if connected but not confirmed
}
}
}
@@ -390,17 +393,20 @@ void ModelsPageBody::selectModel(ModelCell *model)
auto w = Layer::back();
if (w) w->onCancel();
// store changes (if any) and load selected model
storageFlushCurrentModel();
storageCheck(true);
memcpy(g_eeGeneral.currModelFilename, model->modelFilename,
LEN_MODEL_FILENAME);
// Skip reloading model if re-selecting the active model
if (model != modelslist.getCurrentModel()) {
// store changes (if any) and load selected model
storageFlushCurrentModel();
storageCheck(true);
memcpy(g_eeGeneral.currModelFilename, model->modelFilename,
LEN_MODEL_FILENAME);
loadModel(g_eeGeneral.currModelFilename, true);
modelslist.setCurrentModel(model);
loadModel(g_eeGeneral.currModelFilename, true);
modelslist.setCurrentModel(model);
storageDirty(EE_GENERAL);
storageCheck(true);
storageDirty(EE_GENERAL);
storageCheck(true);
}
}
void ModelsPageBody::duplicateModel(ModelCell* model)
@@ -491,7 +497,22 @@ void ModelsPageBody::editLabels(ModelCell* model)
}
}
void ModelsPageBody::update(int selected)
void ModelsPageBody::openMenu()
{
Menu *menu = new Menu(this);
menu->setTitle(focusedModel->modelName);
if (g_eeGeneral.modelQuickSelect || focusedModel != modelslist.getCurrentModel()) {
menu->addLine(STR_SELECT_MODEL, [=]() { selectModel(focusedModel); });
}
menu->addLine(STR_DUPLICATE_MODEL, [=]() { duplicateModel(focusedModel); });
menu->addLine(STR_EDIT_LABELS, [=]() { editLabels(focusedModel); });
menu->addLine(STR_SAVE_TEMPLATE, [=]() { saveAsTemplate(focusedModel);});
if (focusedModel != modelslist.getCurrentModel()) {
menu->addLine(STR_DELETE_MODEL, [=]() { deleteModel(focusedModel); });
}
}
void ModelsPageBody::update()
{
clear();
@@ -502,24 +523,54 @@ void ModelsPageBody::update(int selected)
models = modelslabels.getAllModels();
}
for (auto &model : models) {
auto button = new ModelButton(this, rect_t{}, model);
// Used to work out which button to set focus to.
// Priority -
// current active model
// previously selected model
// first model in the list
ModelButton* firstButton = nullptr;
ModelButton* focusedButton = nullptr;
// Long Press Handler for Models
for (auto &model : models) {
auto button = new ModelButton(this, rect_t{}, model, [=]() {
focusedModel = model;
});
if (!firstButton)
firstButton = button;
if (model == modelslist.getCurrentModel())
focusedButton = button;
if (model == focusedModel && !focusedButton)
focusedButton = button;
// Press Handler for Models
button->setPressHandler([=]() -> uint8_t {
Menu *menu = new Menu(this);
menu->setTitle(model->modelName);
if (model != modelslist.getCurrentModel()) {
menu->addLine(STR_SELECT_MODEL, [=]() { selectModel(model); });
if (model == focusedModel) {
if (g_eeGeneral.modelQuickSelect)
selectModel(model);
else
openMenu();
} else {
focusedModel = model;
}
menu->addLine(STR_DUPLICATE_MODEL, [=]() { duplicateModel(model); });
if (model != modelslist.getCurrentModel()) {
menu->addLine(STR_DELETE_MODEL, [=]() { deleteModel(model); });
}
menu->addLine(STR_EDIT_LABELS, [=]() { editLabels(model); });
menu->addLine(STR_SAVE_TEMPLATE, [=]() { saveAsTemplate(model);});
return 0;
});
// Long Press Handler for Models
button->setLongPressHandler([=]() -> uint8_t {
if (model == focusedModel) {
openMenu();
}
return 0;
});
}
if (!focusedButton)
focusedButton = firstButton;
if (focusedButton) {
focusedButton->setFocused();
focusedModel = focusedButton->getModelCell();
}
}
@@ -580,8 +631,8 @@ class LabelDialog : public Dialog
ModelLabelsWindow::ModelLabelsWindow() : Page(ICON_MODEL)
{
buildBody(&body);
buildHead(&header);
buildBody(&body);
// find the first label of the current model and make that label active
auto currentModel = modelslist.getCurrentModel();
+4 -1
View File
@@ -37,12 +37,13 @@ class ModelsPageBody : public FormWindow
public:
ModelsPageBody(Window *parent, const rect_t &rect);
void update();
void setLabels(LabelsVector labels)
{
selectedLabels = labels;
update();
}
void update(int selected = -1);
inline void setSortOrder(ModelsSortBy sortOrder)
{
@@ -61,8 +62,10 @@ class ModelsPageBody : public FormWindow
bool refresh = false;
std::string selectedLabel;
LabelsVector selectedLabels;
ModelCell *focusedModel = nullptr;
std::function<void()> refreshLabels = nullptr;
void openMenu();
void selectModel(ModelCell* model);
void duplicateModel(ModelCell* model);
void deleteModel(ModelCell* model);
+6
View File
@@ -765,4 +765,10 @@ void RadioSetupPage::build(FormWindow * window)
std::string(
&getSourceString(MIXSRC_Rud + modn12x3[4 * value + 1])[1]);
});
grid.setColSpan(1);
// Model quick select
line = window->newLine(&grid);
new StaticText(line, rect_t{}, STR_MODEL_QUICK_SELECT, 0, COLOR_THEME_PRIMARY1);
new CheckBox(line, rect_t{}, GET_SET_DEFAULT(g_eeGeneral.modelQuickSelect));
}