Consistify icons for model setting, select, and category

This commit is contained in:
olliw42
2021-06-23 16:24:05 +02:00
parent 68cb9c2d92
commit 962592b2f7
7 changed files with 14 additions and 4 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 803 B

+2
View File
@@ -54,6 +54,8 @@ enum MenuIcons {
ICON_MODEL_SPECIAL_FUNCTIONS, ICON_MODEL_SPECIAL_FUNCTIONS,
ICON_MODEL_LUA_SCRIPTS, ICON_MODEL_LUA_SCRIPTS,
ICON_MODEL_TELEMETRY, ICON_MODEL_TELEMETRY,
ICON_MODEL_SELECT,
ICON_MODEL_SELECT_CATEGORY,
ICON_THEME, ICON_THEME,
ICON_THEME_SETUP, ICON_THEME_SETUP,
ICON_THEME_VIEW1, ICON_THEME_VIEW1,
+2 -2
View File
@@ -344,7 +344,7 @@ class ModelCategoryPage : public PageTab
{ {
public: public:
explicit ModelCategoryPage(ModelsCategory *category) : explicit ModelCategoryPage(ModelsCategory *category) :
PageTab(category->name, ICON_MODEL), category(category) PageTab(category->name, ICON_MODEL_SELECT_CATEGORY), category(category)
{ {
} }
@@ -360,7 +360,7 @@ class ModelCategoryPage : public PageTab
}; };
ModelSelectMenu::ModelSelectMenu(): ModelSelectMenu::ModelSelectMenu():
TabsGroup(ICON_MODEL) TabsGroup(ICON_MODEL_SELECT)
{ {
modelslist.load(); modelslist.load();
@@ -61,6 +61,12 @@ const uint8_t mask_model_special_functions[] = {
const uint8_t mask_model_telemetry[] = { const uint8_t mask_model_telemetry[] = {
#include "mask_model_telemetry.lbm" #include "mask_model_telemetry.lbm"
}; };
const uint8_t mask_menu_model_select[] = {
#include "mask_menu_model_select.lbm" //TODO: someone may want to make proper icon
};
const uint8_t mask_model_select_category[] = {
#include "mask_model_select_category.lbm" //TODO: someone should make proper icon
};
const uint8_t mask_monitor[] = { const uint8_t mask_monitor[] = {
#include "mask_monitor.lbm" #include "mask_monitor.lbm"
}; };
@@ -150,6 +150,8 @@ class Theme480: public OpenTxTheme
loadMenuIcon(ICON_MODEL_SPECIAL_FUNCTIONS, mask_model_special_functions); loadMenuIcon(ICON_MODEL_SPECIAL_FUNCTIONS, mask_model_special_functions);
loadMenuIcon(ICON_MODEL_LUA_SCRIPTS, mask_model_lua_scripts); loadMenuIcon(ICON_MODEL_LUA_SCRIPTS, mask_model_lua_scripts);
loadMenuIcon(ICON_MODEL_TELEMETRY, mask_model_telemetry); loadMenuIcon(ICON_MODEL_TELEMETRY, mask_model_telemetry);
loadMenuIcon(ICON_MODEL_SELECT, mask_menu_model_select);
loadMenuIcon(ICON_MODEL_SELECT_CATEGORY, mask_model_select_category);
loadMenuIcon(ICON_STATS, mask_menu_stats); loadMenuIcon(ICON_STATS, mask_menu_stats);
loadMenuIcon(ICON_STATS_THROTTLE_GRAPH, mask_stats_throttle_graph); loadMenuIcon(ICON_STATS_THROTTLE_GRAPH, mask_stats_throttle_graph);
loadMenuIcon(ICON_STATS_TIMERS, mask_stats_timers); loadMenuIcon(ICON_STATS_TIMERS, mask_stats_timers);
+2 -2
View File
@@ -51,7 +51,7 @@ ViewMainMenu::ViewMainMenu(Window* parent) :
// "Tasks", 0, FOCUS_COLOR | FONT(XL) | CENTERED); // "Tasks", 0, FOCUS_COLOR | FONT(XL) | CENTERED);
// pos += title->height() + PAGE_LINE_SPACING; // pos += title->height() + PAGE_LINE_SPACING;
carousel->addButton(ICON_MODEL, "Select\nModel", [=]() -> uint8_t { carousel->addButton(ICON_MODEL_SELECT, "Select\nModel", [=]() -> uint8_t {
deleteLater(); deleteLater();
new ModelSelectMenu(); new ModelSelectMenu();
return 0; return 0;
@@ -63,7 +63,7 @@ ViewMainMenu::ViewMainMenu(Window* parent) :
return 0; return 0;
}); });
carousel->addButton(ICON_RADIO_TOOLS, "Model\nSettings", [=]() -> uint8_t { carousel->addButton(ICON_MODEL, "Model\nSettings", [=]() -> uint8_t {
deleteLater(); deleteLater();
new ModelMenu(); new ModelMenu();
return 0; return 0;