feat(color): Single select option for model labels. label AND/OR filtering logic (#4532)
This commit is contained in:
@@ -102,9 +102,9 @@ void ListBase::setLineHeight(uint8_t height)
|
||||
lv_obj_set_style_max_height(lvobj, height, LV_PART_ITEMS);
|
||||
}
|
||||
|
||||
void ListBase::setSelected(int selected)
|
||||
void ListBase::setSelected(int selected, bool force)
|
||||
{
|
||||
select(selected, 0);
|
||||
select(selected, 0, force);
|
||||
}
|
||||
|
||||
void ListBase::setSelected(std::set<uint32_t> selected)
|
||||
@@ -127,6 +127,11 @@ int ListBase::getSelected() const
|
||||
return -1;
|
||||
}
|
||||
|
||||
bool ListBase::isRowSelected(uint16_t row)
|
||||
{
|
||||
return lv_table_has_cell_ctrl(lvobj, row, 0, LV_TABLE_CELL_CTRL_CUSTOM_1);
|
||||
}
|
||||
|
||||
std::set<uint32_t> ListBase::getSelection()
|
||||
{
|
||||
if(!multiSelect) return std::set<uint32_t>();
|
||||
@@ -212,9 +217,13 @@ void ListBase::onDrawEnd(uint16_t row, uint16_t col, lv_obj_draw_part_dsc_t* dsc
|
||||
lv_coord_t font_h = getFontHeight(FONT(STD));
|
||||
|
||||
coords.x1 = dsc->draw_area->x2 - cell_right - font_h;
|
||||
coords.x2 = coords.x1 + font_h;
|
||||
coords.x2 = coords.x1 + 36;
|
||||
coords.y1 = dsc->draw_area->y1 + (area_h - font_h) / 2;
|
||||
coords.y2 = coords.y1 + font_h - 1;
|
||||
|
||||
lv_draw_label(dsc->draw_ctx, dsc->label_dsc, &coords, LV_SYMBOL_OK, nullptr);
|
||||
const char* sym = LV_SYMBOL_OK;
|
||||
if (getSelectedSymbol)
|
||||
sym = getSelectedSymbol(row);
|
||||
|
||||
lv_draw_label(dsc->draw_ctx, dsc->label_dsc, &coords, sym, nullptr);
|
||||
}
|
||||
|
||||
@@ -36,6 +36,7 @@ class ListBase : public TableField
|
||||
std::function<void()> longPressHandler = nullptr;
|
||||
std::function<void()> pressHandler = nullptr;
|
||||
std::function<void(std::set<uint32_t>, std::set<uint32_t>)> _multiSelectHandler = nullptr;
|
||||
std::function<const char*(uint16_t row)> getSelectedSymbol = nullptr;
|
||||
bool autoEdit = false;
|
||||
|
||||
public:
|
||||
@@ -49,10 +50,11 @@ class ListBase : public TableField
|
||||
void setNames(const std::vector<std::string>& names);
|
||||
void setLineHeight(uint8_t height);
|
||||
|
||||
virtual void setSelected(int selected);
|
||||
virtual void setSelected(int selected, bool force = false);
|
||||
virtual void setSelected(std::set<uint32_t> selected);
|
||||
|
||||
int getSelected() const;
|
||||
bool isRowSelected(uint16_t row);
|
||||
std::set<uint32_t> getSelection();
|
||||
|
||||
void setMultiSelect(bool mode) {
|
||||
@@ -67,6 +69,11 @@ class ListBase : public TableField
|
||||
_multiSelectHandler = std::move(handler);
|
||||
}
|
||||
|
||||
void setGetSelectedSymbol(std::function<const char*(uint16_t)> handler)
|
||||
{
|
||||
getSelectedSymbol = std::move(handler);
|
||||
}
|
||||
|
||||
void setLongPressHandler(std::function<void()> handler)
|
||||
{
|
||||
longPressHandler = std::move(handler);
|
||||
|
||||
@@ -604,26 +604,38 @@ void ModelLabelsWindow::onLongPressTELE()
|
||||
}
|
||||
void ModelLabelsWindow::onPressPG(bool isNext)
|
||||
{
|
||||
std::set<uint32_t> curSel = lblselector->getSelection();
|
||||
std::set<uint32_t> sellist;
|
||||
int select = 0;
|
||||
int rowcount = lblselector->getRowCount();
|
||||
std::set<uint32_t> sellist;
|
||||
int select = -1;
|
||||
|
||||
if (isNext) {
|
||||
if (curSel.size()) select = (*curSel.rbegin() + 1) % rowcount;
|
||||
if (g_eeGeneral.labelSingleSelect) {
|
||||
select = lblselector->getActiveItem();
|
||||
} else {
|
||||
if (curSel.size()) {
|
||||
select = (int)*curSel.begin() - 1;
|
||||
if (select < 0) select += rowcount;
|
||||
} else {
|
||||
select = rowcount - 1;
|
||||
std::set<uint32_t> sel = lblselector->getSelection();
|
||||
if (sel.size()) {
|
||||
if (isNext)
|
||||
select = *sel.rbegin();
|
||||
else
|
||||
select = *sel.begin();
|
||||
}
|
||||
}
|
||||
|
||||
sellist.insert(select);
|
||||
if (isNext) {
|
||||
select = (select + 1) % rowcount;
|
||||
} else {
|
||||
select = select - 1;
|
||||
if (select < 0)
|
||||
select = rowcount - 1;
|
||||
}
|
||||
|
||||
if (g_eeGeneral.labelSingleSelect)
|
||||
lblselector->setActiveItem(select);
|
||||
|
||||
if (select >= 0)
|
||||
sellist.insert(select);
|
||||
lblselector->setSelected(sellist); // Check the items
|
||||
lblselector->setSelected(-1); // Force update
|
||||
lblselector->setSelected(select); // Causes the list to scroll
|
||||
lblselector->setSelected(select, true); // Causes the list to scroll
|
||||
|
||||
updateFilteredLabels(sellist); // Update the models
|
||||
}
|
||||
void ModelLabelsWindow::onPressPGUP() { onPressPG(false); }
|
||||
@@ -789,32 +801,73 @@ void ModelLabelsWindow::buildBody(FormWindow *window)
|
||||
lv_obj_update_layout(mdl_obj);
|
||||
lblselector->setColumnWidth(0, lv_obj_get_content_width(lbl_obj));
|
||||
|
||||
lblselector->setMultiSelect(true);
|
||||
lblselector->setSelected(modelslabels.filteredLabels());
|
||||
updateFilteredLabels(modelslabels.filteredLabels(), false);
|
||||
lv_obj_set_scrollbar_mode(lbl_obj, LV_SCROLLBAR_MODE_AUTO);
|
||||
lv_obj_set_scrollbar_mode(mdl_obj, LV_SCROLLBAR_MODE_AUTO);
|
||||
|
||||
lblselector->setMultiSelectHandler([=](std::set<uint32_t> selected,
|
||||
std::set<uint32_t> oldselection) {
|
||||
if (modelslabels.getUnlabeledModels().size() != 0) {
|
||||
// Special case for mutually exclusive Unsorted
|
||||
bool unsrt_is_selected =
|
||||
selected.find(lblselector->getRowCount() - 1) != selected.end();
|
||||
bool unsrt_was_selected = oldselection.find(lblselector->getRowCount() -
|
||||
1) != oldselection.end();
|
||||
std::set<uint32_t> filteredLabels = modelslabels.filteredLabels();
|
||||
|
||||
// Unsorted was just picked
|
||||
if (unsrt_is_selected && !unsrt_was_selected) {
|
||||
selected.clear();
|
||||
selected.insert(lblselector->getRowCount() - 1);
|
||||
} else if (unsrt_is_selected && unsrt_was_selected) {
|
||||
selected.erase(selected.find(lblselector->getRowCount() - 1));
|
||||
if (g_eeGeneral.labelSingleSelect == 0) {
|
||||
lblselector->setMultiSelect(true);
|
||||
lblselector->setSelected(filteredLabels);
|
||||
lblselector->setMultiSelectHandler([=](std::set<uint32_t> selected,
|
||||
std::set<uint32_t> oldselection) {
|
||||
if (modelslabels.getUnlabeledModels().size() != 0) {
|
||||
// Special case for mutually exclusive Unsorted
|
||||
bool unsrt_is_selected =
|
||||
selected.find(lblselector->getRowCount() - 1) != selected.end();
|
||||
bool unsrt_was_selected = oldselection.find(lblselector->getRowCount() -
|
||||
1) != oldselection.end();
|
||||
|
||||
// Unsorted was just picked
|
||||
if (unsrt_is_selected && !unsrt_was_selected) {
|
||||
selected.clear();
|
||||
selected.insert(lblselector->getRowCount() - 1);
|
||||
} else if (unsrt_is_selected && unsrt_was_selected) {
|
||||
selected.erase(selected.find(lblselector->getRowCount() - 1));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
lblselector->setSelected(selected);
|
||||
updateFilteredLabels(selected);
|
||||
lblselector->setSelected(selected);
|
||||
updateFilteredLabels(selected);
|
||||
});
|
||||
} else {
|
||||
if (filteredLabels.size() > 0)
|
||||
lblselector->setActiveItem(*filteredLabels.begin());
|
||||
lblselector->setPressHandler([=]() {
|
||||
int item = lblselector->getActiveItem();
|
||||
int selected = lblselector->getSelected();
|
||||
std::set<uint32_t> newset;
|
||||
// Clicking active label unselects it and selects all models
|
||||
if (selected == item) {
|
||||
lblselector->setActiveItem(-1);
|
||||
} else {
|
||||
lblselector->setActiveItem(selected);
|
||||
newset.insert(selected);
|
||||
}
|
||||
updateFilteredLabels(newset);
|
||||
});
|
||||
}
|
||||
|
||||
updateFilteredLabels(filteredLabels, false);
|
||||
|
||||
lblselector->setGetSelectedSymbol([=](uint16_t row) {
|
||||
if (g_eeGeneral.labelSingleSelect)
|
||||
return LV_SYMBOL_OK;
|
||||
if (lblselector->getSelection().size() == 1)
|
||||
return LV_SYMBOL_OK;
|
||||
bool hasMoreSelections = false;
|
||||
for (uint16_t i = row + 1; i < lblselector->getRowCount(); i += 1)
|
||||
if (lblselector->isRowSelected(i)) {
|
||||
hasMoreSelections = true;
|
||||
break;
|
||||
}
|
||||
if (!hasMoreSelections)
|
||||
return LV_SYMBOL_OK;
|
||||
if (row == 0 && (g_eeGeneral.labelMultiMode == 0 || g_eeGeneral.favMultiMode == 0))
|
||||
return STR_VCSWFUNC[7]; // AND
|
||||
if (g_eeGeneral.labelMultiMode == 0)
|
||||
return STR_VCSWFUNC[7]; // AND
|
||||
return STR_VCSWFUNC[8]; // OR
|
||||
});
|
||||
|
||||
lblselector->setLongPressHandler([=]() {
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
#include "opentx.h"
|
||||
#include "libopenui.h"
|
||||
#include "input_mapping.h"
|
||||
#include "storage/modelslist.h"
|
||||
|
||||
#include "tasks/mixer_task.h"
|
||||
#include "hal/adc_driver.h"
|
||||
@@ -677,6 +678,71 @@ class ViewOptionsPage : public SubPage
|
||||
}
|
||||
};
|
||||
|
||||
class ManageModelsSetupPage : public SubPage
|
||||
{
|
||||
public:
|
||||
ManageModelsSetupPage() : SubPage(ICON_MODEL, STR_MANAGE_MODELS, false)
|
||||
{
|
||||
FlexGridLayout grid(col_two_dsc, row_dsc, 2);
|
||||
|
||||
auto form = new FormWindow(&body, rect_t{});
|
||||
form->setFlexLayout();
|
||||
form->padAll(0);
|
||||
|
||||
// Model quick select
|
||||
auto line = form->newLine(&grid);
|
||||
new StaticText(line, rect_t{}, STR_MODEL_QUICK_SELECT, 0,
|
||||
COLOR_THEME_PRIMARY1);
|
||||
new ToggleSwitch(line, rect_t{},
|
||||
GET_SET_DEFAULT(g_eeGeneral.modelQuickSelect));
|
||||
|
||||
// Label single/multi select
|
||||
line = form->newLine(&grid);
|
||||
new StaticText(line, rect_t{}, STR_LABELS_SELECT, 0, COLOR_THEME_PRIMARY1);
|
||||
new Choice(line, rect_t{}, STR_LABELS_SELECT_MODE, 0, 1,
|
||||
GET_DEFAULT(g_eeGeneral.labelSingleSelect),
|
||||
[=](int newValue) {
|
||||
g_eeGeneral.labelSingleSelect = newValue;
|
||||
modelslabels.clearFilter();
|
||||
SET_DIRTY();
|
||||
});
|
||||
|
||||
// Label multi select matching mode
|
||||
multiSelectMatch = form->newLine(&grid);
|
||||
new StaticText(multiSelectMatch, rect_t{}, STR_LABELS_MATCH, 0,
|
||||
COLOR_THEME_PRIMARY1);
|
||||
new Choice(multiSelectMatch, rect_t{}, STR_LABELS_MATCH_MODE, 0, 1,
|
||||
GET_SET_DEFAULT(g_eeGeneral.labelMultiMode));
|
||||
|
||||
// Favorites multi select matching mode
|
||||
favSelectMatch = form->newLine(&grid);
|
||||
new StaticText(favSelectMatch, rect_t{}, STR_FAV_MATCH, 0,
|
||||
COLOR_THEME_PRIMARY1);
|
||||
new Choice(favSelectMatch, rect_t{}, STR_FAV_MATCH_MODE, 0, 1,
|
||||
GET_SET_DEFAULT(g_eeGeneral.favMultiMode));
|
||||
|
||||
checkEvents();
|
||||
}
|
||||
|
||||
void checkEvents() override
|
||||
{
|
||||
if (g_eeGeneral.labelSingleSelect) {
|
||||
lv_obj_add_flag(multiSelectMatch->getLvObj(), LV_OBJ_FLAG_HIDDEN);
|
||||
lv_obj_add_flag(favSelectMatch->getLvObj(), LV_OBJ_FLAG_HIDDEN);
|
||||
} else {
|
||||
lv_obj_clear_flag(multiSelectMatch->getLvObj(), LV_OBJ_FLAG_HIDDEN);
|
||||
if (g_eeGeneral.labelMultiMode == 0)
|
||||
lv_obj_add_flag(favSelectMatch->getLvObj(), LV_OBJ_FLAG_HIDDEN);
|
||||
else
|
||||
lv_obj_clear_flag(favSelectMatch->getLvObj(), LV_OBJ_FLAG_HIDDEN);
|
||||
}
|
||||
}
|
||||
|
||||
protected:
|
||||
Window* multiSelectMatch = nullptr;
|
||||
Window* favSelectMatch = nullptr;
|
||||
};
|
||||
|
||||
RadioSetupPage::RadioSetupPage():
|
||||
PageTab(STR_RADIO_SETUP, ICON_RADIO_SETUP)
|
||||
{
|
||||
@@ -690,6 +756,10 @@ void RadioSetupPage::build(FormWindow * window)
|
||||
// Date & time picker including labels
|
||||
new DateTimeWindow(window, rect_t{});
|
||||
|
||||
// TODO: sort out all caps title strings VS quick menu strings
|
||||
std::string manageModelsTitle(STR_MAIN_MENU_MANAGE_MODELS);
|
||||
std::replace(manageModelsTitle.begin(), manageModelsTitle.end(), '\n', ' ');
|
||||
|
||||
// Sub-pages
|
||||
new WindowButtonGroup(window, rect_t{}, {
|
||||
{STR_SOUND_LABEL, []() { new SoundPage(); }},
|
||||
@@ -703,6 +773,7 @@ void RadioSetupPage::build(FormWindow * window)
|
||||
{STR_BACKLIGHT_LABEL, []() { new BacklightPage(); }},
|
||||
{STR_GPS, [](){new GpsPage();}},
|
||||
{STR_ENABLED_FEATURES, [](){new ViewOptionsPage();}},
|
||||
{manageModelsTitle.c_str(), []() { new ManageModelsSetupPage(); }},
|
||||
});
|
||||
|
||||
// Splash screen
|
||||
@@ -867,9 +938,4 @@ void RadioSetupPage::build(FormWindow * window)
|
||||
std::string(getMainControlLabel(stick0)) + "+" +
|
||||
std::string(getMainControlLabel(stick1));
|
||||
});
|
||||
|
||||
// Model quick select
|
||||
line = window->newLine(&grid);
|
||||
new StaticText(line, rect_t{}, STR_MODEL_QUICK_SELECT, 0, COLOR_THEME_PRIMARY1);
|
||||
new ToggleSwitch(line, rect_t{}, GET_SET_DEFAULT(g_eeGeneral.modelQuickSelect));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user