Icons and icon tool update

This commit is contained in:
furrtek
2017-02-03 08:21:12 +00:00
parent c352458114
commit f9dd3f5a96
51 changed files with 891 additions and 800 deletions
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -71,7 +71,7 @@ private:
{ 8, 0, 232, 16 }
};
std::array<Button, 40> buttons;
std::array<Button, 40> buttons { };
Button button_lowercase {
{ 21 * 8, 270, 32, 24 },
+1 -1
View File
@@ -98,7 +98,7 @@ private:
};
Image bmp_speaker {
{ 204, 8, 16, 16 },
&bitmap_speaker,
&bitmap_icon_speaker,
ui::Color::white(),
ui::Color::black()
};
+6 -6
View File
@@ -88,9 +88,9 @@ SystemStatusView::SystemStatusView() {
title.set_style(&style_systemstatus);
if (!portapack::persistent_memory::ui_config_textentry())
button_textentry.set_bitmap(&bitmap_keyboard);
button_textentry.set_bitmap(&bitmap_icon_keyboard);
else
button_textentry.set_bitmap(&bitmap_unistroke);
button_textentry.set_bitmap(&bitmap_icon_unistroke);
if (portapack::persistent_memory::stealth_mode())
button_stealth.set_foreground(ui::Color::green());
@@ -152,9 +152,9 @@ void SystemStatusView::on_textentry() {
portapack::persistent_memory::set_config_textentry(cfg ^ 1);
if (!cfg)
button_textentry.set_bitmap(&bitmap_unistroke);
button_textentry.set_bitmap(&bitmap_icon_unistroke);
else
button_textentry.set_bitmap(&bitmap_keyboard);
button_textentry.set_bitmap(&bitmap_icon_keyboard);
}
void SystemStatusView::on_camera() {
@@ -292,7 +292,7 @@ ReceiverMenuView::ReceiverMenuView(NavigationView& nav) {
{ "CCIR", ui::Color::grey(), nullptr, [&nav](){ nav.push<NotImplementedView>(); } },
{ "Nordic/BTLE", ui::Color::grey(), &bitmap_icon_nordic, [&nav](){ nav.push<NotImplementedView>(); } },
{ "POCSAG", ui::Color::cyan(), nullptr, [&nav](){ nav.push<POCSAGAppView>(); } },
{ "SIGFOX", ui::Color::grey(), &bitmap_icon_foxhunt, [&nav](){ nav.push<NotImplementedView>(); } }, // SIGFRXView
{ "SIGFOX", ui::Color::grey(), &bitmap_icon_fox, [&nav](){ nav.push<NotImplementedView>(); } }, // SIGFRXView
{ "Transponders", ui::Color::green(), nullptr, [&nav](){ nav.push<TranspondersMenuView>(); } },
} });
on_left = [&nav](){ nav.pop(); };
@@ -351,7 +351,7 @@ void SystemMenuView::hackrf_mode(NavigationView& nav) {
SystemMenuView::SystemMenuView(NavigationView& nav) {
add_items<12>({ {
{ "Play dead", ui::Color::red(), &bitmap_icon_playdead, [&nav](){ nav.push<PlayDeadView>(); } },
{ "Receivers", ui::Color::cyan(), &bitmap_icon_receiver, [&nav](){ nav.push<ReceiverMenuView>(); } },
{ "Receivers", ui::Color::cyan(), &bitmap_icon_receivers, [&nav](){ nav.push<ReceiverMenuView>(); } },
{ "Capture", ui::Color::cyan(), &bitmap_icon_capture, [&nav](){ nav.push<CaptureAppView>(); } }, //CaptureAppView
{ "Replay", ui::Color::grey(), &bitmap_icon_replay, [&nav](){ nav.push<NotImplementedView>(); } },
{ "Code transmitters", ui::Color::green(), &bitmap_icon_codetx, [&nav](){ nav.push<TransmitterCodedMenuView>(); } },
+5 -5
View File
@@ -72,7 +72,7 @@ private:
ImageButton button_back {
{ 2, 0 * 16, 16, 16 },
&bitmap_previous,
&bitmap_icon_previous,
Color::white(),
Color::dark_grey()
};
@@ -84,28 +84,28 @@ private:
ImageButton button_stealth {
{ 152, 0, 2 * 8, 1 * 16 },
&bitmap_stealth,
&bitmap_icon_stealth,
Color::light_grey(),
Color::dark_grey()
};
ImageButton button_textentry {
{ 170, 0, 2 * 8, 1 * 16 },
&bitmap_unistroke,
&bitmap_icon_unistroke,
Color::white(),
Color::dark_grey()
};
ImageButton button_camera {
{ 188, 0, 2 * 8, 1 * 16 },
&bitmap_camera,
&bitmap_icon_camera,
Color::white(),
Color::dark_grey()
};
ImageButton button_sleep {
{ 206, 0, 2 * 8, 1 * 16 },
&bitmap_sleep,
&bitmap_icon_sleep,
Color::white(),
Color::dark_grey()
};