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

Deletion confirm changed from filename to modelname(filename) (#4100)

Browse Source 
* Deletion confirm chnaged from filename to modelname(filename)

* Improvements based on Bsongis remarks

* Fix taranis confirm that was not displaying anything

* Got carried away, back to a simpler requirement

* Cosmetics

* Bertrand's feedbacks, take 2 :)

* Use reusable buffer
This commit is contained in:
3djc
2016-12-15 20:14:33 +01:00
committed by Bertrand Songis
parent 6e7eb99763
commit e2a18d3fdc
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/212x64/model_select.cpp
+6 -2
View File
@@ -50,8 +50,10 @@ void onModelSelectMenu(const char * result)
}
}
else if (result == STR_DELETE_MODEL) {
char * nametmp = reusableBuffer.modelsel.mainname;
strcat_modelname (nametmp, sub);
POPUP_CONFIRMATION(STR_DELETEMODEL);
SET_WARNING_INFO(modelHeaders[sub].name, sizeof(g_model.header.name), ZCHAR);
SET_WARNING_INFO(nametmp, sizeof(g_model.header.name), 0);
}
else {
// The user choosed a file on SD to restore
@@ -98,8 +100,10 @@ void menuModelSelect(event_t event)
case EVT_KEY_LONG(KEY_EXIT):
if (s_copyMode && s_copyTgtOfs == 0 && g_eeGeneral.currModel != sub && eeModelExists(sub)) {
char * nametmp = reusableBuffer.modelsel.mainname;
strcat_modelname (nametmp, sub);
POPUP_CONFIRMATION(STR_DELETEMODEL);
SET_WARNING_INFO(modelHeaders[sub].name, sizeof(g_model.header.name), ZCHAR);
SET_WARNING_INFO(nametmp, sizeof(g_model.header.name), 0);
killEvents(event);
break;
}