UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[WIP] Fix settings

Browse Source
This commit is contained in:
Quentin Guidée
2020-02-16 13:47:28 +01:00
parent 9de231ba64
commit 1a35ca891e
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/settings/sub_menu/about_controller.cpp
View File

@@ -14,8 +14,8 @@ namespace Settings {
AboutController::AboutController(Responder * parentResponder) : AboutController::AboutController(Responder * parentResponder) :
GenericSubController(parentResponder), GenericSubController(parentResponder),
m_contributorsController(this), m_contributorsController(this),
m_contributorsCell(KDFont::LargeFont, KDFont::SmallFont), m_contributorsCell(KDFont::LargeFont, KDFont::SmallFont)
m_view(&m_selectableTableView) //m_view(&m_selectableTableView)
{ {
for (int i = 0; i < k_totalNumberOfCell; i++) { for (int i = 0; i < k_totalNumberOfCell; i++) {
m_cells[i].setMessageFont(KDFont::LargeFont); m_cells[i].setMessageFont(KDFont::LargeFont);
@@ -33,13 +33,13 @@ bool AboutController::handleEvent(Ion::Events::Event event) {
return true; return true;
} }
if (event == Ion::Events::OK || event == Ion::Events::EXE || event == Ion::Events::Right) { if (event == Ion::Events::OK || event == Ion::Events::EXE || event == Ion::Events::Right) {
/* if (childLabel == I18n::Message::Contributors) { if (childLabel == I18n::Message::Contributors) {
GenericSubController * subController = &m_contributorsController; GenericSubController * subController = &m_contributorsController;
subController->setMessageTreeModel(m_messageTreeModel->children(selectedRow())); subController->setMessageTreeModel(m_messageTreeModel->children(selectedRow()));
StackViewController * stack = stackController(); StackViewController * stack = stackController();
stack->push(subController); stack->push(subController);
return true; return true;
} */ }
if (!(event == Ion::Events::Right)) { if (!(event == Ion::Events::Right)) {
if (childLabel == I18n::Message::SoftwareVersion) { if (childLabel == I18n::Message::SoftwareVersion) {
MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)m_selectableTableView.selectedCell(); MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)m_selectableTableView.selectedCell();
@@ -99,7 +99,7 @@ HighlightCell * AboutController::reusableCell(int index, int type) {
return &m_cells[index]; return &m_cells[index];
} }
assert(index == 0); assert(index == 0);
return &m_contributorsCell; //E13HELP return &m_contributorsCell;
} }
int AboutController::typeAtLocation(int i, int j) { int AboutController::typeAtLocation(int i, int j) {

5
apps/settings/sub_menu/about_controller.h
View File

@@ -11,7 +11,8 @@ namespace Settings {
class AboutController : public GenericSubController { class AboutController : public GenericSubController {
public: public:
AboutController(Responder * parentResponder); AboutController(Responder * parentResponder);
View * view() override { return &m_view; } //View * view() override { return &m_view; }
View * view() override { return &m_selectableTableView; }
void viewWillAppear() override; void viewWillAppear() override;
bool handleEvent(Ion::Events::Event event) override; bool handleEvent(Ion::Events::Event event) override;
HighlightCell * reusableCell(int index, int type) override; HighlightCell * reusableCell(int index, int type) override;
@@ -26,7 +27,7 @@ private:
#endif #endif
ContributorsController m_contributorsController; ContributorsController m_contributorsController;
MessageTableCellWithChevronAndMessage m_contributorsCell; MessageTableCellWithChevronAndMessage m_contributorsCell;
SelectableViewWithMessages m_view; //SelectableViewWithMessages m_view;
MessageTableCellWithBuffer m_cells[k_totalNumberOfCell]; MessageTableCellWithBuffer m_cells[k_totalNumberOfCell];
HardwareTest::PopUpController m_hardwareTestPopUpController; HardwareTest::PopUpController m_hardwareTestPopUpController;
}; };

3
apps/settings/sub_menu/about_controller_non_official.cpp
View File

@@ -5,9 +5,10 @@ namespace Settings {
void AboutController::viewWillAppear() { void AboutController::viewWillAppear() {
GenericSubController::viewWillAppear(); GenericSubController::viewWillAppear();
// IN OMEGA, THE FOLLOWING LINES ARE ADDED IN A SUBMENU "LEGAL INFORMATION", BECAUSE MESSAGES DELETE THE SCROLLBAR.
// --------------------- Please don't edit these lines ---------------------- // --------------------- Please don't edit these lines ----------------------
I18n::Message cautionMessages[] = {I18n::Message::AboutWarning1, I18n::Message::AboutWarning2, I18n::Message::AboutWarning3, I18n::Message::AboutWarning4}; I18n::Message cautionMessages[] = {I18n::Message::AboutWarning1, I18n::Message::AboutWarning2, I18n::Message::AboutWarning3, I18n::Message::AboutWarning4};
m_view.setMessages(cautionMessages, sizeof(cautionMessages)/sizeof(I18n::Message)); // m_view.setMessages(cautionMessages, sizeof(cautionMessages)/sizeof(I18n::Message));
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
} }