diff --git a/apps/settings/sub_menu/about_controller.cpp b/apps/settings/sub_menu/about_controller.cpp index 4a6a0d9a2..e5c816959 100644 --- a/apps/settings/sub_menu/about_controller.cpp +++ b/apps/settings/sub_menu/about_controller.cpp @@ -14,8 +14,8 @@ namespace Settings { AboutController::AboutController(Responder * parentResponder) : GenericSubController(parentResponder), m_contributorsController(this), - m_contributorsCell(KDFont::LargeFont, KDFont::SmallFont), - m_view(&m_selectableTableView) + m_contributorsCell(KDFont::LargeFont, KDFont::SmallFont) + //m_view(&m_selectableTableView) { for (int i = 0; i < k_totalNumberOfCell; i++) { m_cells[i].setMessageFont(KDFont::LargeFont); @@ -33,13 +33,13 @@ bool AboutController::handleEvent(Ion::Events::Event event) { return true; } 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; subController->setMessageTreeModel(m_messageTreeModel->children(selectedRow())); StackViewController * stack = stackController(); stack->push(subController); return true; - } */ + } if (!(event == Ion::Events::Right)) { if (childLabel == I18n::Message::SoftwareVersion) { MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)m_selectableTableView.selectedCell(); @@ -99,7 +99,7 @@ HighlightCell * AboutController::reusableCell(int index, int type) { return &m_cells[index]; } assert(index == 0); - return &m_contributorsCell; //E13HELP + return &m_contributorsCell; } int AboutController::typeAtLocation(int i, int j) { diff --git a/apps/settings/sub_menu/about_controller.h b/apps/settings/sub_menu/about_controller.h index d93633e73..920ce2ceb 100644 --- a/apps/settings/sub_menu/about_controller.h +++ b/apps/settings/sub_menu/about_controller.h @@ -11,7 +11,8 @@ namespace Settings { class AboutController : public GenericSubController { public: AboutController(Responder * parentResponder); - View * view() override { return &m_view; } + //View * view() override { return &m_view; } + View * view() override { return &m_selectableTableView; } void viewWillAppear() override; bool handleEvent(Ion::Events::Event event) override; HighlightCell * reusableCell(int index, int type) override; @@ -26,7 +27,7 @@ private: #endif ContributorsController m_contributorsController; MessageTableCellWithChevronAndMessage m_contributorsCell; - SelectableViewWithMessages m_view; + //SelectableViewWithMessages m_view; MessageTableCellWithBuffer m_cells[k_totalNumberOfCell]; HardwareTest::PopUpController m_hardwareTestPopUpController; }; diff --git a/apps/settings/sub_menu/about_controller_non_official.cpp b/apps/settings/sub_menu/about_controller_non_official.cpp index 84995e4a4..52e111eb5 100644 --- a/apps/settings/sub_menu/about_controller_non_official.cpp +++ b/apps/settings/sub_menu/about_controller_non_official.cpp @@ -5,9 +5,10 @@ namespace Settings { void AboutController::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 ---------------------- 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)); // -------------------------------------------------------------------------- }