[code] The interface is a list with a button at the bottom to

start the console.

Change-Id: I4a4a432db2d4cdc72e9a0ad7aa5904c1ded3c0e1
This commit is contained in:
Léa Saviot
2017-10-13 17:44:31 +02:00
committed by Romain Goyet
parent c57f9cf8b1
commit adabf95b59
12 changed files with 93 additions and 31 deletions

View File

@@ -4,12 +4,23 @@
namespace Code {
MenuController::MenuController(Responder * parentResponder, Program * program) :
MenuController::MenuController(Responder * parentResponder, Program * program, ButtonRowController * footer) :
ViewController(parentResponder),
m_selectableTableView(this, this, 0, 1, Metric::CommonTopMargin, Metric::CommonRightMargin, Metric::CommonBottomMargin, Metric::CommonLeftMargin, this),
ButtonRowDelegate(nullptr, footer),
m_addNewProgramCell(I18n::Message::AddScript),
m_editorController(program),
m_consoleController(parentResponder)
m_consoleController(parentResponder),
m_selectableTableView(this, this, 0, 1, Metric::CommonTopMargin, Metric::CommonRightMargin, Metric::CommonBottomMargin, Metric::CommonLeftMargin, this),
m_consoleButton(this, I18n::Message::Console, Invocation([](void * context, void * sender) {
MenuController * menu = (MenuController *)context;
menu->app()->displayModalViewController(menu->consoleController(), 0.5f, 0.5f);
}, this))
{
m_stackViewController = (StackViewController *) (parentResponder->parentResponder()); // TODO: Dirty?
}
ConsoleController * MenuController::consoleController() {
return &m_consoleController;
}
View * MenuController::view() {
@@ -22,6 +33,16 @@ void MenuController::didBecomeFirstResponder() {
}
bool MenuController::handleEvent(Ion::Events::Event event) {
if (event == Ion::Events::Down) {
m_selectableTableView.deselectTable();
footer()->setSelectedButton(0);
return true;
} else if (event == Ion::Events::Up) {
footer()->setSelectedButton(-1);
m_selectableTableView.selectCellAtLocation(0, numberOfRows()-1);
app()->setFirstResponder(&m_selectableTableView);
return true;
}
ViewController * vc[2] = {&m_editorController, &m_consoleController};
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
app()->displayModalViewController(vc[selectedRow()], 0.5f, 0.5f);
@@ -31,29 +52,42 @@ bool MenuController::handleEvent(Ion::Events::Event event) {
}
int MenuController::numberOfRows() {
return k_totalNumberOfCells;
return k_totalNumberOfCells + 1;
};
HighlightCell * MenuController::reusableCell(int index) {
assert(index >= 0);
assert(index < k_totalNumberOfCells);
return &m_cells[index];
}
int MenuController::reusableCellCount() {
return k_totalNumberOfCells;
}
KDCoordinate MenuController::cellHeight() {
return Metric::ParameterCellHeight;
}
HighlightCell * MenuController::reusableCell(int index) {
assert(index >= 0);
if (index < k_totalNumberOfCells) {
return &m_cells[index];
}
assert(index == k_totalNumberOfCells);
return &m_addNewProgramCell;
}
int MenuController::reusableCellCount() {
return k_totalNumberOfCells + 1;
}
void MenuController::willDisplayCellForIndex(HighlightCell * cell, int index) {
MessageTableCell * myCell = (MessageTableCell *)cell;
I18n::Message titles[k_totalNumberOfCells] = {I18n::Message::EditProgram, I18n::Message::Console};
// TODO: translate Console in the .i18n
myCell->setMessage(titles[index]);
if (index < k_totalNumberOfCells) {
MessageTableCell * myCell = (MessageTableCell *)cell;
I18n::Message titles[k_totalNumberOfCells] = {I18n::Message::EditProgram, I18n::Message::Console};
// TODO: translate Console in the .i18n
myCell->setMessage(titles[index]);
}
}
int MenuController::numberOfButtons(ButtonRowController::Position position) const {
return 1;
}
Button * MenuController::buttonAtIndex(int index, ButtonRowController::Position position) const {
assert(index == 0);
return (Button *) (&m_consoleButton);
}
}