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

Fixed some conflicts

Browse Source
This commit is contained in:
Quentin Guidée
2020-02-12 18:24:13 +01:00
parent ab8f731515
commit 31cdd5bcc8
12 changed files with 27 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,12 +13,9 @@ namespace Settings {
AboutController::AboutController(Responder * parentResponder) :
GenericSubController(parentResponder),
<<<<<<< HEAD
m_contributorsController(this),
m_contributorsCell(KDFont::LargeFont, KDFont::SmallFont)
=======
//m_contributorsController(this),
//m_contributorsCell(KDFont::LargeFont, KDFont::SmallFont),
m_view(&m_selectableTableView)
>>>>>>> upstream/master
{
for (int i = 0; i < k_totalNumberOfCell; i++) {
m_cells[i].setMessageFont(KDFont::LargeFont);
@@ -36,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();