Merge pull request #320 from olliw42/owpr-modelselection2

Consistify icons for model setting, select, and category

radio/src/gui/colorlcd/menus.h

@@ -54,6 +54,8 @@ enum MenuIcons {
   ICON_MODEL_SPECIAL_FUNCTIONS,
   ICON_MODEL_LUA_SCRIPTS,
   ICON_MODEL_TELEMETRY,
+  ICON_MODEL_SELECT,
+  ICON_MODEL_SELECT_CATEGORY,
   ICON_THEME,
   ICON_THEME_SETUP,
   ICON_THEME_VIEW1,

radio/src/gui/colorlcd/model_select.cpp

@@ -354,7 +354,7 @@ class ModelCategoryPage : public PageTab
 {
  public:
   explicit ModelCategoryPage(ModelsCategory *category) :
-      PageTab(category->name, ICON_MODEL), category(category)
+      PageTab(category->name, ICON_MODEL_SELECT_CATEGORY), category(category)
   {
   }
 
@@ -370,7 +370,7 @@ class ModelCategoryPage : public PageTab
 };
 
 ModelSelectMenu::ModelSelectMenu():
-  TabsGroup(ICON_MODEL)
+  TabsGroup(ICON_MODEL_SELECT)
 {
   modelslist.load();
 

radio/src/gui/colorlcd/themes/480_bitmaps.h

@@ -61,6 +61,12 @@ const uint8_t mask_model_special_functions[] = {
 const uint8_t mask_model_telemetry[] = {
 #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[] = {
 #include "mask_monitor.lbm"
 };

radio/src/gui/colorlcd/themes/480_default.cpp

@@ -150,6 +150,8 @@ class Theme480: public OpenTxTheme
       loadMenuIcon(ICON_MODEL_SPECIAL_FUNCTIONS, mask_model_special_functions);
       loadMenuIcon(ICON_MODEL_LUA_SCRIPTS, mask_model_lua_scripts);
       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_THROTTLE_GRAPH, mask_stats_throttle_graph);
       loadMenuIcon(ICON_STATS_TIMERS, mask_stats_timers);

radio/src/gui/colorlcd/view_main_menu.cpp

@@ -52,7 +52,7 @@ ViewMainMenu::ViewMainMenu(Window* parent) :
   //                "Tasks", 0, FOCUS_COLOR | FONT(XL) | CENTERED);
   // pos += title->height() + PAGE_LINE_SPACING;
 
-  carousel->addButton(ICON_MODEL, "Select\nModel", [=]() -> uint8_t {
+  carousel->addButton(ICON_MODEL_SELECT, "Select\nModel", [=]() -> uint8_t {
     deleteLater();
     new ModelSelectMenu();
     return 0;
@@ -64,7 +64,7 @@ ViewMainMenu::ViewMainMenu(Window* parent) :
     return 0;
   });
 
-  carousel->addButton(ICON_RADIO_TOOLS, "Model\nSettings", [=]() -> uint8_t {
+  carousel->addButton(ICON_MODEL, "Model\nSettings", [=]() -> uint8_t {
     deleteLater();
     new ModelMenu();
     return 0;