UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Fix] Conflicts

Browse Source
This commit is contained in:
Joachim LF
2020-04-09 13:52:28 +02:00
committed by Quentin
parent e383c3429f
commit a4af2942e6
8 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
apps/code/script_parameter_controller.cpp
View File

@@ -1,5 +1,6 @@
#include "script_parameter_controller.h"
#include "menu_controller.h"
#include <poincare/integer.h>
namespace Code {
@@ -11,6 +12,7 @@ ScriptParameterController::ScriptParameterController(Responder * parentResponder
m_autoImportScript(I18n::Message::AutoImportScript),
m_deleteScript(I18n::Message::DeleteScript),
m_duplicateScript(I18n::Message::DuplicateScript),
m_size(I18n::Message::ScriptSize),
m_selectableTableView(this),
m_script(Ion::Storage::Record()),
m_menuController(menuController)
@@ -48,16 +50,22 @@ bool ScriptParameterController::handleEvent(Ion::Events::Event event) {
m_menuController->reloadConsole();
Container::activeApp()->setFirstResponder(&m_selectableTableView);
return true;
case 3:
dismissScriptParameterController();
m_menuController->deleteScript(s);
m_menuController->reloadConsole();
case 3:{
MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)m_selectableTableView.selectedCell();
m_sizedisplaypercent = !m_sizedisplaypercent;
GetScriptSize(myCell);
return true;
}
case 4:
dismissScriptParameterController();
m_menuController->duplicateScript(s);
m_menuController->reloadConsole();
return true;
case 5:
dismissScriptParameterController();
m_menuController->deleteScript(s);
m_menuController->reloadConsole();
return true;
default:
assert(false);
return false;
@@ -80,7 +88,7 @@ void ScriptParameterController::didBecomeFirstResponder() {
HighlightCell * ScriptParameterController::reusableCell(int index) {
assert(index >= 0);
assert(index < k_totalNumberOfCell);
HighlightCell * cells[] = {&m_executeScript, &m_renameScript, &m_autoImportScript, &m_deleteScript, &m_duplicateScript};
HighlightCell * cells[] = {&m_executeScript, &m_renameScript, &m_autoImportScript, &m_size, &m_duplicateScript, &m_deleteScript};
return cells[index];
}
@@ -88,6 +96,35 @@ void ScriptParameterController::willDisplayCellForIndex(HighlightCell * cell, in
if (cell == &m_autoImportScript) {
SwitchView * switchView = (SwitchView *)m_autoImportScript.accessoryView();
switchView->setState(m_script.importationStatus());
} else if (cell == &m_size) {
MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)cell;
GetScriptSize(myCell);
myCell->setAccessoryFont(KDFont::SmallFont);
myCell->setAccessoryTextColor(Palette::GreyDark);
}
}
void ScriptParameterController::GetScriptSize(MessageTableCellWithBuffer* myCell){
if(m_sizedisplaypercent){
char size[18];
int sizelen = Poincare::Integer((int)m_script.value().size).serialize(size, 6);
size[sizelen] = ' ';
size[sizelen+1] = 'o';
size[sizelen+2] = ' ';
size[sizelen+3] = '/';
size[sizelen+4] = ' ';
int sizelen2 = Poincare::Integer((int)Ion::Storage::k_storageSize).serialize(size+sizelen+5, 6) + sizelen + 5;
size[sizelen2] = ' ';
size[sizelen2+1] = 'o';
size[sizelen2+2] = '\0';
myCell->setAccessoryText(size);
}else{
char size[18];
int sizelen = Poincare::Integer((int)(((float)((int)m_script.value().size)/((int)Ion::Storage::k_storageSize)) * 100.f)).serialize(size, 3);
size[sizelen] = ' ';
size[sizelen+1] = '%';
size[sizelen+2] = '\0';
myCell->setAccessoryText(size);
}
}