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

3djc/horus wizard plane (#4082)

Browse Source 
* Introduce plane Wizard

* Simplify code
This commit is contained in:
3djc
2016-11-30 11:51:23 +01:00
committed by Bertrand Songis
parent 781ce1ea34
commit 9f0f79469a
20 changed files with 443 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/480x272/bitmaps.cpp
+1
View File
@@ -190,6 +190,7 @@ BitmapBuffer * modelselModelQtyBitmap = NULL;
BitmapBuffer * modelselModelNameBitmap = NULL;
BitmapBuffer * modelselModelMoveBackground = NULL;
BitmapBuffer * modelselModelMoveIcon = NULL;
BitmapBuffer * modelselWizardBackground = NULL;
BitmapBuffer * chanMonLockedBitmap = NULL;
BitmapBuffer * chanMonInvertedBitmap = NULL;
BitmapBuffer * mixerSetupMixerBitmap = NULL;
radio/src/gui/480x272/bitmaps.h
+1
View File
@@ -77,6 +77,7 @@ extern BitmapBuffer * modelselModelQtyBitmap;
extern BitmapBuffer * modelselModelNameBitmap;
extern BitmapBuffer * modelselModelMoveBackground;
extern BitmapBuffer * modelselModelMoveIcon;
extern BitmapBuffer * modelselWizardBackground;
// calibration bitmaps
extern BitmapBuffer * calibStick;
radio/src/gui/480x272/model_select.cpp
+1 -1
View File
@@ -177,7 +177,7 @@ bool menuModelWizard(event_t event)
strncpy(wizpath, WIZARD_PATH, sizeof(WIZARD_PATH));
strcpy(&wizpath[sizeof(WIZARD_PATH)-1], "/");
lcdDrawSolidFilledRect(0, 0, LCD_W, LCD_H, TEXT_BGCOLOR);
lcd->drawBitmap(0, 0, BitmapBuffer::load(getThemePath("wizard/background.png")));
lcd->drawBitmap(0, 0,modelselWizardBackground);
FRESULT res = f_opendir(&dir, WIZARD_PATH);
if (res == FR_OK) {
for (uint8_t wizidx=0;;wizidx++) {
radio/src/gui/480x272/themes/darkblue.cpp
+28
View File
@@ -140,6 +140,34 @@ class DarkblueTheme: public Theme
delete chanMonInvertedBitmap;
chanMonInvertedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_inver.png", TEXT_COLOR, TEXT_BGCOLOR);
// Model Selection screen
delete modelselIconBitmap;
modelselIconBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_iconback.png", TITLE_BGCOLOR, TEXT_BGCOLOR);
if (modelselIconBitmap) {
BitmapBuffer * bitmap = BitmapBuffer::load(getThemePath("modelsel/icon_default.png"));
modelselIconBitmap->drawBitmap(25, 8, bitmap);
delete bitmap;
}
delete modelselSdFreeBitmap;
modelselSdFreeBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_sdfree.png", TEXT_COLOR, TEXT_BGCOLOR);
delete modelselModelQtyBitmap;
modelselModelQtyBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelqty.png", TEXT_COLOR, TEXT_BGCOLOR);
delete modelselModelNameBitmap;
modelselModelNameBitmap = BitmapBuffer::loadMaskOnBackground("modelsel/mask_modelname.png", TEXT_COLOR, TEXT_BGCOLOR);
delete modelselModelMoveBackground;
modelselModelMoveBackground = BitmapBuffer::loadMask(getThemePath("modelsel/mask_moveback.png"));
delete modelselModelMoveIcon;
modelselModelMoveIcon = BitmapBuffer::loadMask(getThemePath("modelsel/mask_moveico.png"));
delete modelselWizardBackground;
modelselWizardBackground = BitmapBuffer::load(getThemePath("wizard/background.png"));
// Mixer setup screen
delete mixerSetupMixerBitmap;
mixerSetupMixerBitmap = BitmapBuffer::loadMaskOnBackground("mask_sbar_mixer.png", MENU_TITLE_COLOR, HEADER_BGCOLOR);
radio/src/gui/480x272/themes/default.cpp
+3
View File
@@ -191,6 +191,9 @@ class DefaultTheme: public Theme
delete modelselModelMoveIcon;
modelselModelMoveIcon = BitmapBuffer::loadMask(getThemePath("modelsel/mask_moveico.png"));
delete modelselWizardBackground;
modelselWizardBackground = BitmapBuffer::load(getThemePath("wizard/background.png"));
// Channels monitor screen
delete chanMonLockedBitmap;
chanMonLockedBitmap = BitmapBuffer::loadMaskOnBackground("mask_monitor_lockch.png", TEXT_COLOR, TEXT_BGCOLOR);