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

[escher] Rework of timers and bigger text in toolboxes

Browse Source
This commit is contained in:
Laury
2022-06-24 22:35:36 +02:00
parent 391fd5e243
commit 0b2a581177
74 changed files with 407 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/shared/color_cell.h
View File

@@ -6,7 +6,7 @@
namespace Shared {
class MessageTableCellWithColor : public MessageTableCell {
class MessageTableCellWithColor : public MessageTableCell<> {
public:
MessageTableCellWithColor();
View * accessoryView() const override;

2
apps/shared/function_curve_parameter_controller.h
View File

@@ -16,7 +16,7 @@ public:
void setRecord(Ion::Storage::Record record) { m_record = record; }
protected:
bool handleGotoSelection();
MessageTableCellWithChevron m_goToCell;
MessageTableCellWithChevron<> m_goToCell;
SelectableTableView m_selectableTableView;
Ion::Storage::Record m_record;
private:

2
apps/shared/list_parameter_controller.h
View File

@@ -41,7 +41,7 @@ protected:
private:
MessageTableCellWithChevronAndMessage m_colorCell;
MessageTableCellWithSwitch m_enableCell;
MessageTableCell m_deleteCell;
MessageTableCell<> m_deleteCell;
ColorParameterController m_colorParameterController;
};

4
apps/shared/localization_controller.cpp
View File

@@ -191,10 +191,10 @@ bool LocalizationController::handleEvent(Ion::Events::Event event) {
void LocalizationController::willDisplayCellForIndex(HighlightCell * cell, int index) {
if (mode() == Mode::Language) {
static_cast<MessageTableCell *>(cell)->setMessage(I18n::LanguageNames[index]);
static_cast<MessageTableCell<> *>(cell)->setMessage(I18n::LanguageNames[index]);
return;
}
assert(mode() == Mode::Country);
static_cast<MessageTableCell *>(cell)->setMessage(I18n::CountryNames[static_cast<uint8_t>(CountryAtIndex(index))]);
static_cast<MessageTableCell<> *>(cell)->setMessage(I18n::CountryNames[static_cast<uint8_t>(CountryAtIndex(index))]);
}
}

2
apps/shared/localization_controller.h
View File

@@ -71,7 +71,7 @@ protected:
private:
static constexpr int k_numberOfCells = I18n::NumberOfLanguages > I18n::NumberOfCountries ? I18n::NumberOfLanguages : I18n::NumberOfCountries;
MessageTableCell m_cells[k_numberOfCells];
MessageTableCell<> m_cells[k_numberOfCells];
Mode m_mode;
};

2
apps/shared/store_parameter_controller.h
View File

@@ -41,7 +41,7 @@ protected:
private:
virtual I18n::Message sortMessage() { return m_xColumnSelected ? I18n::Message::SortValues : I18n::Message::SortSizes; }
constexpr static int k_totalNumberOfCell = 3;
MessageTableCell m_cells[k_totalNumberOfCell];
MessageTableCell<> m_cells[k_totalNumberOfCell];
StoreController * m_storeController;
bool m_xColumnSelected;
};

2
apps/shared/values_function_parameter_controller.h
View File

@@ -29,7 +29,7 @@ public:
int reusableCellCount() const override { return 1; }
void setRecord(Ion::Storage::Record record) { m_record = record; }
protected:
MessageTableCellWithChevron m_copyColumn;
MessageTableCellWithChevron<> m_copyColumn;
SelectableTableView m_selectableTableView;
Ion::Storage::Record m_record;
private:

2
apps/shared/values_parameter_controller.cpp
View File

@@ -24,7 +24,7 @@ View * ValuesParameterController::view() {
}
void ValuesParameterController::willDisplayCellForIndex(HighlightCell * cell, int index) {
MessageTableCell * myCell = (MessageTableCell *)cell;
MessageTableCell<> * myCell = (MessageTableCell<> *)cell;
#if COPY_COLUMN
I18n::Message labels[k_totalNumberOfCell] = {I18n::Message::ClearColumn, I18n::Message::CopyColumnInList, I18n::Message::IntervalSet};
#else

6
apps/shared/values_parameter_controller.h
View File

@@ -21,13 +21,13 @@ public:
private:
#if COPY_COLUMN
constexpr static int k_totalNumberOfCell = 3;
MessageTableCellWithChevron m_copyColumn;
MessageTableCellWithChevron<> m_copyColumn;
#else
constexpr static int k_totalNumberOfCell = 2;
#endif
I18n::Message m_pageTitle;
MessageTableCell m_deleteColumn;
MessageTableCellWithChevron m_setInterval;
MessageTableCell<> m_deleteColumn;
MessageTableCellWithChevron<> m_setInterval;
SelectableTableView m_selectableTableView;
};