piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Added topbar widget settings

Browse Source
This commit is contained in:
Raphael Coeffic
2021-04-18 07:58:28 +02:00
parent aab6d7eab1
commit 3c4047bb8d
9 changed files with 158 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/layout.cpp
+3
View File
@@ -126,6 +126,9 @@ void loadCustomScreens()
i++;
}
auto topbar = viewMain->getTopbar();
topbar->load();
viewMain->setCurrentMainView(0);
viewMain->updateTopbarVisibility();
}
radio/src/gui/colorlcd/menu_screen.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ void ScreenMenu::updateTabs()
{
removeAllTabs();
addTab(new ScreenUserInterfacePage());
addTab(new ScreenUserInterfacePage(this));
for (int index = 0; index < MAX_CUSTOM_SCREENS; index++) {
if (customScreens[index]) {
radio/src/gui/colorlcd/screen_setup.cpp
+43 -39
View File
@@ -23,6 +23,7 @@
#include "opentx.h"
#include "view_main.h"
#include "widget_settings.h"
#include "topbar.h"
#include "libopenui.h"
#define SET_DIRTY() storageDirty(EE_MODEL)
@@ -107,55 +108,50 @@ class LayoutChoice: public FormField
std::function<void(const LayoutFactory *)> setValue;
};
class SetupWidgetsPageSlot: public Button
SetupWidgetsPageSlot::SetupWidgetsPageSlot(FormGroup * parent, const rect_t & rect, WidgetsContainerInterface* container, uint8_t slotIndex):
Button(parent, rect)
{
public:
SetupWidgetsPageSlot(FormGroup * parent, const rect_t & rect, Layout* screen, uint8_t slotIndex):
Button(parent, rect)
{
//auto parent = (Window*)this;
setPressHandler([parent, screen, slotIndex]() -> uint8_t {
setPressHandler([parent, container, slotIndex]() -> uint8_t {
Menu * menu = new Menu(parent);
menu->addLine(TR_SELECT_WIDGET, [=]() {
Menu * menu = new Menu(parent);
menu->addLine(TR_SELECT_WIDGET, [=]() {
Menu * menu = new Menu(parent);
for (auto factory: getRegisteredWidgets()) {
menu->addLine(factory->getName(), [=]() {
screen->createWidget(slotIndex, factory);
});
}
});
if (screen->getWidget(slotIndex)) {
menu->addLine(TR_WIDGET_SETTINGS, [=]() {
auto widget = screen->getWidget(slotIndex);
new WidgetSettings(parent, widget);
});
menu->addLine(STR_REMOVE_WIDGET, [=]() {
screen->removeWidget(slotIndex);
for (auto factory: getRegisteredWidgets()) {
menu->addLine(factory->getName(), [=]() {
container->createWidget(slotIndex, factory);
});
}
return 0;
});
}
void paint(BitmapBuffer * dc) override
{
if (hasFocus()) {
dc->drawRect(0, 0, width()-1, height()-1, 2, STASHED, CHECKBOX_COLOR);
if (container->getWidget(slotIndex)) {
menu->addLine(TR_WIDGET_SETTINGS, [=]() {
auto widget = container->getWidget(slotIndex);
new WidgetSettings(parent, widget);
});
menu->addLine(STR_REMOVE_WIDGET, [=]() {
container->removeWidget(slotIndex);
});
}
else {
dc->drawSolidRect(0, 0, width()-1, height()-1, 2, LINE_COLOR);
}
}
};
return 0;
});
}
void SetupWidgetsPageSlot::paint(BitmapBuffer * dc)
{
if (hasFocus()) {
dc->drawRect(0, 0, width()-1, height()-1, 2, STASHED, CHECKBOX_COLOR);
}
else {
dc->drawSolidRect(0, 0, width()-1, height()-1, 2, LINE_COLOR);
}
}
class SetupWidgetsPage: public FormWindow
{
public:
SetupWidgetsPage(ScreenMenu* menu, uint8_t customScreenIdx):
FormWindow(ViewMain::instance(), {0, 0, 0, 0}, FORM_FORWARD_FOCUS),
SetupWidgetsPage(ScreenMenu* menu, uint8_t customScreenIdx):
FormWindow(ViewMain::instance(), {0, 0, 0, 0}, FORM_FORWARD_FOCUS),
menu(menu),
customScreenIdx(customScreenIdx)
{
@@ -242,8 +238,9 @@ class SetupWidgetsPage: public FormWindow
// }
};
ScreenUserInterfacePage::ScreenUserInterfacePage():
PageTab(STR_USER_INTERFACE, ICON_THEME_SETUP)
ScreenUserInterfacePage::ScreenUserInterfacePage(ScreenMenu* menu):
PageTab(STR_USER_INTERFACE, ICON_THEME_SETUP),
menu(menu)
{
}
@@ -262,6 +259,13 @@ void ScreenUserInterfacePage::build(FormWindow * window)
new StaticText(window, grid.getLabelSlot(), STR_TOP_BAR, 0, 0);
// TODO: enable settings topbar widgets
grid.nextLine();
auto menu = this->menu;
auto setupTopbarWidgets = new TextButton(window, grid.getFieldSlot(), STR_SETUP_WIDGETS);
setupTopbarWidgets->setPressHandler([menu]() -> uint8_t {
new SetupTopBarWidgetsPage(menu);
return 0;
});
}
ScreenAddPage::ScreenAddPage(ScreenMenu * menu, uint8_t pageIndex):
radio/src/gui/colorlcd/screen_setup.h
+10 -1
View File
@@ -24,11 +24,12 @@
class ScreenUserInterfacePage: public PageTab {
public:
ScreenUserInterfacePage();
ScreenUserInterfacePage(ScreenMenu* menu);
void build(FormWindow * window) override;
protected:
ScreenMenu * menu;
};
class ScreenAddPage: public PageTab {
@@ -53,3 +54,11 @@ class ScreenSetupPage: public PageTab {
unsigned pageIndex;
unsigned customScreenIndex;
};
class SetupWidgetsPageSlot: public Button
{
public:
SetupWidgetsPageSlot(FormGroup * parent, const rect_t & rect, WidgetsContainerInterface* container, uint8_t slotIndex);
void paint(BitmapBuffer * dc) override;
};
radio/src/gui/colorlcd/topbar.cpp
+56
View File
@@ -19,6 +19,10 @@
*/
#include "opentx.h"
#include "layer.h"
#include "view_main.h"
#include "screen_setup.h"
#include "storage/storage.h"
constexpr uint32_t TOPBAR_REFRESH = 1000 / 2; // 2 Hz
@@ -193,3 +197,55 @@ void TopBar::checkEvents()
invalidate();
}
}
SetupTopBarWidgetsPage::SetupTopBarWidgetsPage(ScreenMenu* menu):
FormWindow(ViewMain::instance(), {0, 0, 0, 0}, FORM_FORWARD_FOCUS),
menu(menu)
{
// remember focus
Layer::push(this);
auto viewMain = ViewMain::instance();
// save current view & switch to 1st one
savedView = viewMain->getCurrentMainView();
viewMain->setCurrentMainView(0);
viewMain->bringToTop();
//TODO: force the topbar to be visible?
// adopt the dimensions of the main view
setRect(viewMain->getRect());
auto topbar = viewMain->getTopbar();
for (unsigned i = 0; i < topbar->getZonesCount(); i++) {
auto rect = topbar->getZone(i);
auto widget = new SetupWidgetsPageSlot(this, rect, topbar, i);
if (i == 0) widget->setFocus();
}
}
void SetupTopBarWidgetsPage::deleteLater(bool detach, bool trash)
{
// restore screen setting tab on top
menu->bringToTop();
Layer::pop(this);
// and continue async deletion...
FormWindow::deleteLater(detach, trash);
storageDirty(EE_MODEL);
}
#if defined(HARDWARE_KEYS)
void SetupTopBarWidgetsPage::onEvent(event_t event)
{
switch (event) {
case EVT_KEY_BREAK(KEY_EXIT):
killEvents(event);
deleteLater();
break;
}
}
#endif
radio/src/gui/colorlcd/topbar.h
+25
View File
@@ -56,4 +56,29 @@ class TopBar: public WidgetsContainer<MAX_TOPBAR_ZONES, MAX_TOPBAR_OPTIONS>
uint32_t lastRefresh = 0;
};
class ScreenMenu;
class SetupTopBarWidgetsPage: public FormWindow
{
public:
explicit SetupTopBarWidgetsPage(ScreenMenu* menu);
#if defined(DEBUG_WINDOWS)
std::string getName() const override
{
return "SetupTopBarWidgetsPage";
}
#endif
void deleteLater(bool detach = true, bool trash = true) override;
#if defined(HARDWARE_KEYS)
void onEvent(event_t event) override;
#endif
protected:
ScreenMenu* menu;
unsigned savedView = 0;
};
#endif // _TOPBAR_H_
radio/src/gui/colorlcd/view_main.cpp
+2 -9
View File
@@ -34,7 +34,8 @@
ViewMain * ViewMain::_instance = nullptr;
ViewMain::ViewMain():
Window(MainWindow::instance(), MainWindow::instance()->getRect())
Window(MainWindow::instance(), MainWindow::instance()->getRect()),
topbar(new TopBar(this))
{
#if defined(HARDWARE_TOUCH) && !defined(HARDWARE_KEYS)
new FabButton(this, 50, 100, ICON_MODEL,
@@ -62,9 +63,7 @@ ViewMain::ViewMain():
}, NO_FOCUS);
#endif
createTopbar();
setPageWidth(getParent()->width());
focusWindow = this;
}
@@ -341,9 +340,3 @@ void ViewMain::paint(BitmapBuffer * dc)
g_model.view = 0;
}
}
void ViewMain::createTopbar()
{
topbar = new TopBar(this);
topbar->load();
}
radio/src/gui/colorlcd/view_main.h
+8 -1
View File
@@ -26,6 +26,7 @@
class TopBar;
class SetupWidgetsPage;
class SetupTopBarWidgetsPage;
class ViewMain: public Window
{
@@ -67,13 +68,20 @@ class ViewMain: public Window
void nextMainView();
void previousMainView();
TopBar* getTopbar() const
{
return topbar;
}
protected:
static ViewMain * _instance;
unsigned views = 0;
TopBar* topbar = nullptr;
// Widget setup requires special permissions ;-)
friend class SetupWidgetsPage;
friend class SetupTopBarWidgetsPage;
// Set topbar visibility [0.0 -> 1.0]
void setTopbarVisible(float visible);
@@ -94,7 +102,6 @@ class ViewMain: public Window
void paint(BitmapBuffer * dc) override;
void openMenu();
void createTopbar();
};
#endif // _VIEW_MAIN_H_
radio/src/gui/colorlcd/widgets_container.h
+10 -5
View File
@@ -32,6 +32,7 @@ class WidgetsContainerInterface
virtual rect_t getZone(unsigned int index) const = 0;
virtual Widget * createWidget(unsigned int index, const WidgetFactory * factory) = 0;
virtual Widget * getWidget(unsigned int index) = 0;
virtual void removeWidget(unsigned int index) = 0;
};
#define WIDGET_NAME_LEN 10
@@ -77,7 +78,7 @@ class WidgetsContainer: public FormGroup, public WidgetsContainerInterface
return widget;
}
void removeWidget(unsigned int index)
void removeWidget(unsigned int index) override
{
if (index >= N)
return;
@@ -107,16 +108,20 @@ class WidgetsContainer: public FormGroup, public WidgetsContainerInterface
{
unsigned int count = getZonesCount();
for (unsigned int i = 0; i < count; i++) {
delete widgets[i];
// remove old widget
if (widgets[i]) {
widgets[i]->deleteLater();
widgets[i] = nullptr;
}
// and load new one if required
if (persistentData->zones[i].widgetName[0]) {
char name[WIDGET_NAME_LEN + 1];
memset(name, 0, sizeof(name));
strncpy(name, persistentData->zones[i].widgetName, WIDGET_NAME_LEN);
widgets[i] = loadWidget(name, this, getZone(i), &persistentData->zones[i].widgetData);
}
else {
widgets[i] = nullptr;
}
}
}