From 1f212510110464bd5996328edb69cabaf67898e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Thu, 16 Mar 2017 09:42:22 +0100 Subject: [PATCH] [escher] Change name: pointer->message Change-Id: I0bd7a7d8da047b03342bec1ff31f29ad7efcc2f6 --- .../graph/curve_parameter_controller.cpp | 4 +- apps/graph/graph/curve_parameter_controller.h | 4 +- .../derivative_parameter_controller.cpp | 4 +- .../values/derivative_parameter_controller.h | 4 +- .../values/function_parameter_controller.cpp | 2 +- .../values/function_parameter_controller.h | 2 +- apps/graph/values/values_controller.cpp | 2 +- apps/home/app_cell.cpp | 2 +- apps/home/app_cell.h | 2 +- apps/math_toolbox.cpp | 4 +- apps/math_toolbox.h | 4 +- apps/probability/calculation_controller.cpp | 2 +- apps/probability/calculation_controller.h | 4 +- apps/probability/cell.cpp | 2 +- apps/probability/cell.h | 2 +- apps/probability/law_controller.cpp | 2 +- apps/probability/law_controller.h | 2 +- apps/probability/parameters_controller.cpp | 14 +++---- apps/probability/parameters_controller.h | 12 +++--- apps/regression/banner_view.cpp | 4 +- apps/regression/banner_view.h | 4 +- apps/regression/calculation_controller.cpp | 6 +-- apps/regression/calculation_controller.h | 2 +- .../regression/go_to_parameter_controller.cpp | 4 +- apps/regression/go_to_parameter_controller.h | 4 +- .../initialisation_parameter_controller.cpp | 2 +- .../initialisation_parameter_controller.h | 2 +- .../prediction_parameter_controller.cpp | 2 +- .../prediction_parameter_controller.h | 2 +- .../graph/curve_parameter_controller.cpp | 2 +- .../graph/curve_parameter_controller.h | 2 +- apps/sequence/graph/term_sum_controller.cpp | 2 +- apps/sequence/graph/term_sum_controller.h | 2 +- .../list/list_parameter_controller.cpp | 2 +- .../sequence/list/list_parameter_controller.h | 2 +- apps/sequence/values/values_controller.cpp | 2 +- apps/settings/main_controller.cpp | 12 +++--- apps/settings/main_controller.h | 4 +- apps/settings/sub_controller.cpp | 6 +-- apps/settings/sub_controller.h | 2 +- apps/shared/banner_view.cpp | 4 +- apps/shared/banner_view.h | 2 +- apps/shared/button_with_separator.cpp | 2 +- apps/shared/float_parameter_controller.cpp | 6 +-- .../function_curve_parameter_controller.cpp | 2 +- .../function_curve_parameter_controller.h | 2 +- apps/shared/go_to_parameter_controller.cpp | 2 +- apps/shared/go_to_parameter_controller.h | 4 +- .../initialisation_parameter_controller.cpp | 2 +- .../initialisation_parameter_controller.h | 2 +- apps/shared/interval_parameter_controller.cpp | 4 +- apps/shared/interval_parameter_controller.h | 4 +- apps/shared/list_parameter_controller.cpp | 6 +-- apps/shared/list_parameter_controller.h | 6 +-- apps/shared/new_function_cell.cpp | 8 ++-- apps/shared/new_function_cell.h | 2 +- apps/shared/range_parameter_controller.cpp | 12 +++--- apps/shared/range_parameter_controller.h | 6 +-- apps/shared/store_parameter_controller.cpp | 6 +-- apps/shared/store_parameter_controller.h | 6 +-- apps/shared/values_controller.cpp | 2 +- apps/shared/values_controller.h | 2 +- .../values_function_parameter_controller.cpp | 2 +- .../values_function_parameter_controller.h | 2 +- apps/shared/values_parameter_controller.cpp | 6 +-- apps/shared/values_parameter_controller.h | 6 +-- apps/shared/zoom_parameter_controller.cpp | 10 ++--- apps/shared/zoom_parameter_controller.h | 2 +- apps/statistics/box_banner_view.cpp | 4 +- apps/statistics/box_banner_view.h | 4 +- apps/statistics/calculation_controller.cpp | 6 +-- apps/statistics/calculation_controller.h | 2 +- apps/statistics/histogram_banner_view.cpp | 6 +-- apps/statistics/histogram_banner_view.h | 8 ++-- .../histogram_parameter_controller.cpp | 4 +- .../histogram_parameter_controller.h | 4 +- apps/statistics/store_controller.cpp | 4 +- apps/statistics/store_controller.h | 2 +- apps/title_bar_view.h | 2 +- apps/variable_box_controller.cpp | 2 +- apps/variable_box_controller.h | 2 +- escher/Makefile | 20 +++++----- escher/include/escher.h | 20 +++++----- .../escher/alternate_empty_view_controller.h | 4 +- escher/include/escher/button.h | 4 +- ...xt_cell.h => even_odd_message_text_cell.h} | 12 +++--- .../expression_table_cell_with_pointer.h | 4 +- ...nter_table_cell.h => message_table_cell.h} | 12 +++--- ...fer.h => message_table_cell_with_buffer.h} | 10 ++--- .../escher/message_table_cell_with_chevron.h | 15 +++++++ ..._table_cell_with_chevron_and_expression.h} | 10 ++--- ...sage_table_cell_with_chevron_and_message.h | 16 ++++++++ ...> message_table_cell_with_editable_text.h} | 10 ++--- ...er.h => message_table_cell_with_message.h} | 12 +++--- .../escher/message_table_cell_with_switch.h | 15 +++++++ ...ointer_text_view.h => message_text_view.h} | 8 ++-- .../escher/pointer_table_cell_with_chevron.h | 15 ------- ...nter_table_cell_with_chevron_and_pointer.h | 16 -------- .../escher/pointer_table_cell_with_switch.h | 15 ------- escher/include/escher/warning_controller.h | 4 +- .../src/alternate_empty_view_controller.cpp | 2 +- escher/src/button.cpp | 10 ++--- escher/src/even_odd_message_text_cell.cpp | 40 +++++++++++++++++++ escher/src/even_odd_pointer_text_cell.cpp | 40 ------------------- .../expression_table_cell_with_pointer.cpp | 2 +- escher/src/message_table_cell.cpp | 28 +++++++++++++ escher/src/message_table_cell_with_buffer.cpp | 32 +++++++++++++++ .../src/message_table_cell_with_chevron.cpp | 12 ++++++ ...able_cell_with_chevron_and_expression.cpp} | 14 +++---- ...ge_table_cell_with_chevron_and_message.cpp | 24 +++++++++++ ...message_table_cell_with_editable_text.cpp} | 24 +++++------ .../src/message_table_cell_with_message.cpp | 35 ++++++++++++++++ escher/src/message_table_cell_with_switch.cpp | 12 ++++++ ...er_text_view.cpp => message_text_view.cpp} | 12 +++--- escher/src/pointer_table_cell.cpp | 28 ------------- escher/src/pointer_table_cell_with_buffer.cpp | 32 --------------- .../src/pointer_table_cell_with_chevron.cpp | 12 ------ ...er_table_cell_with_chevron_and_pointer.cpp | 24 ----------- .../src/pointer_table_cell_with_pointer.cpp | 35 ---------------- escher/src/pointer_table_cell_with_switch.cpp | 12 ------ escher/src/warning_controller.cpp | 2 +- 121 files changed, 484 insertions(+), 484 deletions(-) rename escher/include/escher/{even_odd_pointer_text_cell.h => even_odd_message_text_cell.h} (62%) rename escher/include/escher/{pointer_table_cell.h => message_table_cell.h} (57%) rename escher/include/escher/{pointer_table_cell_with_buffer.h => message_table_cell_with_buffer.h} (55%) create mode 100644 escher/include/escher/message_table_cell_with_chevron.h rename escher/include/escher/{pointer_table_cell_with_chevron_and_expression.h => message_table_cell_with_chevron_and_expression.h} (53%) create mode 100644 escher/include/escher/message_table_cell_with_chevron_and_message.h rename escher/include/escher/{pointer_table_cell_with_editable_text.h => message_table_cell_with_editable_text.h} (68%) rename escher/include/escher/{pointer_table_cell_with_pointer.h => message_table_cell_with_message.h} (50%) create mode 100644 escher/include/escher/message_table_cell_with_switch.h rename escher/include/escher/{pointer_text_view.h => message_text_view.h} (73%) delete mode 100644 escher/include/escher/pointer_table_cell_with_chevron.h delete mode 100644 escher/include/escher/pointer_table_cell_with_chevron_and_pointer.h delete mode 100644 escher/include/escher/pointer_table_cell_with_switch.h create mode 100644 escher/src/even_odd_message_text_cell.cpp delete mode 100644 escher/src/even_odd_pointer_text_cell.cpp create mode 100644 escher/src/message_table_cell.cpp create mode 100644 escher/src/message_table_cell_with_buffer.cpp create mode 100644 escher/src/message_table_cell_with_chevron.cpp rename escher/src/{pointer_table_cell_with_chevron_and_expression.cpp => message_table_cell_with_chevron_and_expression.cpp} (53%) create mode 100644 escher/src/message_table_cell_with_chevron_and_message.cpp rename escher/src/{pointer_table_cell_with_editable_text.cpp => message_table_cell_with_editable_text.cpp} (51%) create mode 100644 escher/src/message_table_cell_with_message.cpp create mode 100644 escher/src/message_table_cell_with_switch.cpp rename escher/src/{pointer_text_view.cpp => message_text_view.cpp} (68%) delete mode 100644 escher/src/pointer_table_cell.cpp delete mode 100644 escher/src/pointer_table_cell_with_buffer.cpp delete mode 100644 escher/src/pointer_table_cell_with_chevron.cpp delete mode 100644 escher/src/pointer_table_cell_with_chevron_and_pointer.cpp delete mode 100644 escher/src/pointer_table_cell_with_pointer.cpp delete mode 100644 escher/src/pointer_table_cell_with_switch.cpp diff --git a/apps/graph/graph/curve_parameter_controller.cpp b/apps/graph/graph/curve_parameter_controller.cpp index 3ec69cb91..7e6ebecfc 100644 --- a/apps/graph/graph/curve_parameter_controller.cpp +++ b/apps/graph/graph/curve_parameter_controller.cpp @@ -8,8 +8,8 @@ namespace Graph { CurveParameterController::CurveParameterController(InteractiveCurveViewRange * graphRange, BannerView * bannerView, CurveViewCursor * cursor) : FunctionCurveParameterController(graphRange, cursor, I18n::Message::X), m_bannerView(bannerView), - m_calculationCell(PointerTableCellWithChevron(I18n::Message::Compute)), - m_derivativeCell(PointerTableCellWithSwitch(I18n::Message::DerivateNumber)) + m_calculationCell(MessageTableCellWithChevron(I18n::Message::Compute)), + m_derivativeCell(MessageTableCellWithSwitch(I18n::Message::DerivateNumber)) { } diff --git a/apps/graph/graph/curve_parameter_controller.h b/apps/graph/graph/curve_parameter_controller.h index 42bc983d1..b6255d20e 100644 --- a/apps/graph/graph/curve_parameter_controller.h +++ b/apps/graph/graph/curve_parameter_controller.h @@ -18,8 +18,8 @@ public: private: BannerView * m_bannerView; constexpr static int k_totalNumberOfCells = 3; - PointerTableCellWithChevron m_calculationCell; - PointerTableCellWithSwitch m_derivativeCell; + MessageTableCellWithChevron m_calculationCell; + MessageTableCellWithSwitch m_derivativeCell; }; } diff --git a/apps/graph/values/derivative_parameter_controller.cpp b/apps/graph/values/derivative_parameter_controller.cpp index 3120ef7a9..1dc4a8591 100644 --- a/apps/graph/values/derivative_parameter_controller.cpp +++ b/apps/graph/values/derivative_parameter_controller.cpp @@ -6,8 +6,8 @@ namespace Graph { DerivativeParameterController::DerivativeParameterController(ValuesController * valuesController) : ViewController(valuesController), - m_hideColumn(PointerTableCell(I18n::Message::HideDerivativeColumn)), - m_copyColumn(PointerTableCellWithChevron(I18n::Message::CopyColumnInList)), + m_hideColumn(MessageTableCell(I18n::Message::HideDerivativeColumn)), + m_copyColumn(MessageTableCellWithChevron(I18n::Message::CopyColumnInList)), m_selectableTableView(SelectableTableView(this, this, 1, Metric::CommonTopMargin, Metric::CommonRightMargin, Metric::CommonBottomMargin, Metric::CommonLeftMargin)), m_function(nullptr), diff --git a/apps/graph/values/derivative_parameter_controller.h b/apps/graph/values/derivative_parameter_controller.h index 2d940bd83..e29c4e473 100644 --- a/apps/graph/values/derivative_parameter_controller.h +++ b/apps/graph/values/derivative_parameter_controller.h @@ -26,8 +26,8 @@ private: constexpr static int k_totalNumberOfCell = 2; constexpr static int k_maxNumberOfCharsInTitle = 16; char m_pageTitle[k_maxNumberOfCharsInTitle]; - PointerTableCell m_hideColumn; - PointerTableCellWithChevron m_copyColumn; + MessageTableCell m_hideColumn; + MessageTableCellWithChevron m_copyColumn; SelectableTableView m_selectableTableView; CartesianFunction * m_function; ValuesController * m_valuesController; diff --git a/apps/graph/values/function_parameter_controller.cpp b/apps/graph/values/function_parameter_controller.cpp index b2794d9f4..7fcf38227 100644 --- a/apps/graph/values/function_parameter_controller.cpp +++ b/apps/graph/values/function_parameter_controller.cpp @@ -8,7 +8,7 @@ namespace Graph { FunctionParameterController::FunctionParameterController(ValuesController * valuesController) : ValuesFunctionParameterController('x'), - m_displayDerivativeColumn(PointerTableCellWithSwitch(I18n::Message::DerivativeFunctionColumn)), + m_displayDerivativeColumn(MessageTableCellWithSwitch(I18n::Message::DerivativeFunctionColumn)), m_cartesianFunction(nullptr), m_valuesController(valuesController) { diff --git a/apps/graph/values/function_parameter_controller.h b/apps/graph/values/function_parameter_controller.h index 93f597467..65cf043b4 100644 --- a/apps/graph/values/function_parameter_controller.h +++ b/apps/graph/values/function_parameter_controller.h @@ -19,7 +19,7 @@ public: void setFunction(Shared::Function * function) override; private: constexpr static int k_totalNumberOfCell = 2; - PointerTableCellWithSwitch m_displayDerivativeColumn; + MessageTableCellWithSwitch m_displayDerivativeColumn; CartesianFunction * m_cartesianFunction; ValuesController * m_valuesController; }; diff --git a/apps/graph/values/values_controller.cpp b/apps/graph/values/values_controller.cpp index 9d83fe7e0..31e99585a 100644 --- a/apps/graph/values/values_controller.cpp +++ b/apps/graph/values/values_controller.cpp @@ -38,7 +38,7 @@ void ValuesController::willDisplayCellAtLocation(HighlightCell * cell, int i, in Shared::ValuesController::willDisplayCellAtLocation(cell, i, j); // The cell is the abscissa title cell: if (j == 0 && i == 0) { - EvenOddPointerTextCell * mytitleCell = (EvenOddPointerTextCell *)cell; + EvenOddMessageTextCell * mytitleCell = (EvenOddMessageTextCell *)cell; mytitleCell->setMessage(I18n::Message::X); return; } diff --git a/apps/home/app_cell.cpp b/apps/home/app_cell.cpp index cee317bb9..e11e789f9 100644 --- a/apps/home/app_cell.cpp +++ b/apps/home/app_cell.cpp @@ -5,7 +5,7 @@ namespace Home { AppCell::AppCell() : HighlightCell(), - m_nameView(PointerTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, KDColorWhite)), + m_nameView(MessageTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, KDColorWhite)), m_visible(true) { } diff --git a/apps/home/app_cell.h b/apps/home/app_cell.h index 60322b6ba..39968871a 100644 --- a/apps/home/app_cell.h +++ b/apps/home/app_cell.h @@ -23,7 +23,7 @@ private: static constexpr KDCoordinate k_nameWidthMargin = 4; static constexpr KDCoordinate k_nameHeightMargin = 2; ImageView m_iconView; - PointerTextView m_nameView; + MessageTextView m_nameView; bool m_visible; }; diff --git a/apps/math_toolbox.cpp b/apps/math_toolbox.cpp index 3e8c88ddf..9ae60afd7 100644 --- a/apps/math_toolbox.cpp +++ b/apps/math_toolbox.cpp @@ -154,13 +154,13 @@ int MathToolbox::reusableCellCount(int type) { void MathToolbox::willDisplayCellForIndex(HighlightCell * cell, int index) { ToolboxNode * node = (ToolboxNode *)m_nodeModel->children(index); if (node->numberOfChildren() == 0) { - PointerTableCellWithPointer * myCell = (PointerTableCellWithPointer *)cell; + MessageTableCellWithMessage * myCell = (MessageTableCellWithMessage *)cell; myCell->setMessage(node->label()); myCell->setAccessoryMessage(node->text()); myCell->setAccessoryTextColor(Palette::GreyDark); return; } - PointerTableCell * myCell = (PointerTableCell *)cell; + MessageTableCell * myCell = (MessageTableCell *)cell; myCell->setMessage(node->label()); } diff --git a/apps/math_toolbox.h b/apps/math_toolbox.h index 6e244cf96..78c949634 100644 --- a/apps/math_toolbox.h +++ b/apps/math_toolbox.h @@ -71,8 +71,8 @@ private: bool selectSubMenu(ToolboxNode * selectedNode); bool returnToPreviousMenu(); Stack m_stack; - PointerTableCellWithPointer m_leafCells[k_maxNumberOfDisplayedRows]; - PointerTableCellWithChevron m_nodeCells[k_maxNumberOfDisplayedRows]; + MessageTableCellWithMessage m_leafCells[k_maxNumberOfDisplayedRows]; + MessageTableCellWithChevron m_nodeCells[k_maxNumberOfDisplayedRows]; ListController m_listController; ToolboxNode * m_nodeModel; }; diff --git a/apps/probability/calculation_controller.cpp b/apps/probability/calculation_controller.cpp index 8a64592fe..22c5bc0ad 100644 --- a/apps/probability/calculation_controller.cpp +++ b/apps/probability/calculation_controller.cpp @@ -12,7 +12,7 @@ using namespace Shared; namespace Probability { CalculationController::ContentView::ContentView(Responder * parentResponder, CalculationController * calculationController, Calculation * calculation) : - m_titleView(PointerTextView(KDText::FontSize::Small, I18n::Message::ComputeProbability, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen)), + m_titleView(MessageTextView(KDText::FontSize::Small, I18n::Message::ComputeProbability, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen)), m_lawCurveView(LawCurveView()), m_imageTableView(ImageTableView(parentResponder, calculation, calculationController)), m_calculationCell{EditableTextCell(parentResponder, calculationController, m_draftTextBuffer), diff --git a/apps/probability/calculation_controller.h b/apps/probability/calculation_controller.h index 04d15fac9..6a4c569a5 100644 --- a/apps/probability/calculation_controller.h +++ b/apps/probability/calculation_controller.h @@ -44,10 +44,10 @@ private: constexpr static KDCoordinate k_titleHeightMargin = 5; int numberOfSubviews() const override; View * subviewAtIndex(int index) override; - PointerTextView m_titleView; + MessageTextView m_titleView; LawCurveView m_lawCurveView; ImageTableView m_imageTableView; - PointerTextView m_text[k_maxNumberOfEditableFields]; + MessageTextView m_text[k_maxNumberOfEditableFields]; char m_draftTextBuffer[EditableTextCell::k_bufferLength]; EditableTextCell m_calculationCell[k_maxNumberOfEditableFields]; Calculation * m_calculation; diff --git a/apps/probability/cell.cpp b/apps/probability/cell.cpp index 88168c1c5..7d9f3205e 100644 --- a/apps/probability/cell.cpp +++ b/apps/probability/cell.cpp @@ -5,7 +5,7 @@ namespace Probability { Cell::Cell() : HighlightCell(), - m_labelView(PointerTextView(KDText::FontSize::Large, (I18n::Message)0, 0, 0.5, KDColorBlack, KDColorWhite)) + m_labelView(MessageTextView(KDText::FontSize::Large, (I18n::Message)0, 0, 0.5, KDColorBlack, KDColorWhite)) { } diff --git a/apps/probability/cell.h b/apps/probability/cell.h index bdf910e1d..e21d3e6ae 100644 --- a/apps/probability/cell.h +++ b/apps/probability/cell.h @@ -20,7 +20,7 @@ private: int numberOfSubviews() const override; View * subviewAtIndex(int index) override; void layoutSubviews() override; - PointerTextView m_labelView; + MessageTextView m_labelView; ImageView m_iconView; /* TODO: One day, we would rather store a mask (8bits/pixel) instead of two * images (16bits/pixels)*/ diff --git a/apps/probability/law_controller.cpp b/apps/probability/law_controller.cpp index 5435bfca3..d779e0657 100644 --- a/apps/probability/law_controller.cpp +++ b/apps/probability/law_controller.cpp @@ -20,7 +20,7 @@ namespace Probability { LawController::ContentView::ContentView(SelectableTableView * selectableTableView) : - m_titleView(PointerTextView(KDText::FontSize::Small, I18n::Message::ChooseLaw, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen)), + m_titleView(MessageTextView(KDText::FontSize::Small, I18n::Message::ChooseLaw, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen)), m_selectableTableView(selectableTableView) { } diff --git a/apps/probability/law_controller.h b/apps/probability/law_controller.h index c38b8e717..a5b3b15c4 100644 --- a/apps/probability/law_controller.h +++ b/apps/probability/law_controller.h @@ -29,7 +29,7 @@ private: int numberOfSubviews() const override; View * subviewAtIndex(int index) override; void layoutSubviews() override; - PointerTextView m_titleView;; + MessageTextView m_titleView;; SelectableTableView * m_selectableTableView; }; void setLawAccordingToIndex(int index); diff --git a/apps/probability/parameters_controller.cpp b/apps/probability/parameters_controller.cpp index bc52c4702..72b16cfd0 100644 --- a/apps/probability/parameters_controller.cpp +++ b/apps/probability/parameters_controller.cpp @@ -8,9 +8,9 @@ namespace Probability { ParametersController::ContentView::ContentView(Responder * parentResponder, SelectableTableView * selectableTableView) : m_numberOfParameters(1), - m_titleView(PointerTextView(KDText::FontSize::Small, I18n::Message::ChooseParameters, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen)), - m_firstParameterDefinition(PointerTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen)), - m_secondParameterDefinition(PointerTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen)), + m_titleView(MessageTextView(KDText::FontSize::Small, I18n::Message::ChooseParameters, 0.5f, 0.5f, Palette::GreyDark, Palette::WallScreen)), + m_firstParameterDefinition(MessageTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen)), + m_secondParameterDefinition(MessageTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen)), m_selectableTableView(selectableTableView) { } @@ -20,7 +20,7 @@ void ParametersController::ContentView::drawRect(KDContext * ctx, KDRect rect) c ctx->fillRect(KDRect(0, tableHeight, bounds().width(), bounds().height() - tableHeight), Palette::WallScreen); } -PointerTextView * ParametersController::ContentView::parameterDefinitionAtIndex(int index) { +MessageTextView * ParametersController::ContentView::parameterDefinitionAtIndex(int index) { assert(index >= 0 && index < 2); if (index == 0) { return &m_firstParameterDefinition; @@ -69,8 +69,8 @@ void ParametersController::ContentView::layoutSubviews() { ParametersController::ParametersController(Responder * parentResponder) : FloatParameterController(parentResponder, I18n::Message::Next), - m_menuListCell{PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer), - PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer)}, + m_menuListCell{MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer), + MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer)}, m_contentView(ContentView(this, &m_selectableTableView)), m_law(nullptr), m_calculationController(CalculationController(nullptr)) @@ -113,7 +113,7 @@ void ParametersController::willDisplayCellForIndex(HighlightCell * cell, int ind if (index == numberOfRows()-1) { return; } - PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *) cell; + MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *) cell; myCell->setMessage(m_law->parameterNameAtIndex(index)); FloatParameterController::willDisplayCellForIndex(cell, index); } diff --git a/apps/probability/parameters_controller.h b/apps/probability/parameters_controller.h index 2ef55c4f0..5964a9987 100644 --- a/apps/probability/parameters_controller.h +++ b/apps/probability/parameters_controller.h @@ -28,7 +28,7 @@ private: public: ContentView(Responder * parentResponder, SelectableTableView * selectableTableView); void drawRect(KDContext * ctx, KDRect rect) const override; - PointerTextView * parameterDefinitionAtIndex(int index); + MessageTextView * parameterDefinitionAtIndex(int index); void layoutSubviews() override; void setNumberOfParameters(int numberOfParameters); private: @@ -37,14 +37,14 @@ private: int numberOfSubviews() const override; View * subviewAtIndex(int index) override; int m_numberOfParameters; - PointerTextView m_titleView; - PointerTextView m_firstParameterDefinition; - PointerTextView m_secondParameterDefinition; + MessageTextView m_titleView; + MessageTextView m_firstParameterDefinition; + MessageTextView m_secondParameterDefinition; SelectableTableView * m_selectableTableView; }; constexpr static int k_maxNumberOfCells = 2; - char m_draftTextBuffer[PointerTableCellWithEditableText::k_bufferLength]; - PointerTableCellWithEditableText m_menuListCell[k_maxNumberOfCells]; + char m_draftTextBuffer[MessageTableCellWithEditableText::k_bufferLength]; + MessageTableCellWithEditableText m_menuListCell[k_maxNumberOfCells]; float m_previousParameters[k_maxNumberOfCells]; ContentView m_contentView; Law * m_law; diff --git a/apps/regression/banner_view.cpp b/apps/regression/banner_view.cpp index 93bea3f97..c95158e44 100644 --- a/apps/regression/banner_view.cpp +++ b/apps/regression/banner_view.cpp @@ -20,9 +20,9 @@ TextView * BannerView::textViewAtIndex(int i) const { return (TextView *)textViews[i]; } -PointerTextView * BannerView::pointerTextViewAtIndex(int i) const { +MessageTextView * BannerView::messageTextViewAtIndex(int i) const { if (i == 0) { - return (PointerTextView *)&m_regressionTypeView; + return (MessageTextView *)&m_regressionTypeView; } return nullptr; } diff --git a/apps/regression/banner_view.h b/apps/regression/banner_view.h index dcf58208c..a2cb0c355 100644 --- a/apps/regression/banner_view.h +++ b/apps/regression/banner_view.h @@ -12,8 +12,8 @@ public: private: int numberOfSubviews() const override; TextView * textViewAtIndex(int i) const override; - PointerTextView * pointerTextViewAtIndex(int i) const override; - PointerTextView m_regressionTypeView; + MessageTextView * messageTextViewAtIndex(int i) const override; + MessageTextView m_regressionTypeView; BufferTextView m_slopeView; BufferTextView m_yInterceptView; BufferTextView m_xView; diff --git a/apps/regression/calculation_controller.cpp b/apps/regression/calculation_controller.cpp index 3ff469f8e..0440a9953 100644 --- a/apps/regression/calculation_controller.cpp +++ b/apps/regression/calculation_controller.cpp @@ -14,8 +14,8 @@ namespace Regression { CalculationController::CalculationController(Responder * parentResponder, ButtonRowController * header, Store * store) : TabTableController(parentResponder, Metric::CommonTopMargin, Metric::CommonRightMargin, Metric::CommonBottomMargin, Metric::CommonLeftMargin, this, true), ButtonRowDelegate(header, nullptr), - m_titleCells{EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), - EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small)}, + m_titleCells{EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), + EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small)}, m_r2TitleCell(1.0f, 0.5f), m_columnTitleCell(EvenOddDoubleBufferTextCell(&m_selectableTableView)), m_calculationCells{EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small)}, @@ -131,7 +131,7 @@ void CalculationController::willDisplayCellAtLocation(HighlightCell * cell, int myCell->setExpression(m_r2Layout); return; } - EvenOddPointerTextCell * myCell = (EvenOddPointerTextCell *)cell; + EvenOddMessageTextCell * myCell = (EvenOddMessageTextCell *)cell; if (j == 0) { myCell->setMessage(I18n::Message::Default); return; diff --git a/apps/regression/calculation_controller.h b/apps/regression/calculation_controller.h index ed125ab25..70b370a12 100644 --- a/apps/regression/calculation_controller.h +++ b/apps/regression/calculation_controller.h @@ -37,7 +37,7 @@ private: constexpr static int k_maxNumberOfDisplayableRows = 10; static constexpr KDCoordinate k_cellHeight = 25; static constexpr KDCoordinate k_cellWidth = Ion::Display::Width/2 - Metric::CommonRightMargin/2 - Metric::CommonLeftMargin/2; - EvenOddPointerTextCell m_titleCells[k_maxNumberOfDisplayableRows]; + EvenOddMessageTextCell m_titleCells[k_maxNumberOfDisplayableRows]; EvenOddExpressionCell m_r2TitleCell; Poincare::ExpressionLayout * m_r2Layout; EvenOddDoubleBufferTextCell m_columnTitleCell; diff --git a/apps/regression/go_to_parameter_controller.cpp b/apps/regression/go_to_parameter_controller.cpp index cfab6107b..ab30e5910 100644 --- a/apps/regression/go_to_parameter_controller.cpp +++ b/apps/regression/go_to_parameter_controller.cpp @@ -9,7 +9,7 @@ namespace Regression { GoToParameterController::GoToParameterController(Responder * parentResponder, Store * store, CurveViewCursor * cursor) : FloatParameterController(parentResponder), - m_abscisseCell(PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer)), + m_abscisseCell(MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer)), m_store(store), m_cursor(cursor), m_xPrediction(true) @@ -75,7 +75,7 @@ void GoToParameterController::willDisplayCellForIndex(HighlightCell * cell, int if (index == numberOfRows()-1) { return; } - PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *) cell; + MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *) cell; if (m_xPrediction) { myCell->setMessage(I18n::Message::X); } else { diff --git a/apps/regression/go_to_parameter_controller.h b/apps/regression/go_to_parameter_controller.h index 6bb76c93a..96798b724 100644 --- a/apps/regression/go_to_parameter_controller.h +++ b/apps/regression/go_to_parameter_controller.h @@ -24,8 +24,8 @@ private: float parameterAtIndex(int index) override; void setParameterAtIndex(int parameterIndex, float f) override; void buttonAction() override; - char m_draftTextBuffer[PointerTableCellWithEditableText::k_bufferLength]; - PointerTableCellWithEditableText m_abscisseCell; + char m_draftTextBuffer[MessageTableCellWithEditableText::k_bufferLength]; + MessageTableCellWithEditableText m_abscisseCell; float m_previousParameter; Store * m_store; Shared::CurveViewCursor * m_cursor; diff --git a/apps/regression/initialisation_parameter_controller.cpp b/apps/regression/initialisation_parameter_controller.cpp index bfcda593f..78acdb2a7 100644 --- a/apps/regression/initialisation_parameter_controller.cpp +++ b/apps/regression/initialisation_parameter_controller.cpp @@ -59,7 +59,7 @@ KDCoordinate InitialisationParameterController::cellHeight() { } void InitialisationParameterController::willDisplayCellForIndex(HighlightCell * cell, int index) { - PointerTableCell * myCell = (PointerTableCell *)cell; + MessageTableCell * myCell = (MessageTableCell *)cell; I18n::Message titles[3] = {I18n::Message::RoundAbscissa, I18n::Message::Orthonormal, I18n::Message::DefaultSetting}; myCell->setMessage(titles[index]); } diff --git a/apps/regression/initialisation_parameter_controller.h b/apps/regression/initialisation_parameter_controller.h index e36940901..6e7e2cff1 100644 --- a/apps/regression/initialisation_parameter_controller.h +++ b/apps/regression/initialisation_parameter_controller.h @@ -21,7 +21,7 @@ public: void willDisplayCellForIndex(HighlightCell * cell, int index) override; private: constexpr static int k_totalNumberOfCells = 3; - PointerTableCell m_cells[k_totalNumberOfCells]; + MessageTableCell m_cells[k_totalNumberOfCells]; SelectableTableView m_selectableTableView; Store * m_store; }; diff --git a/apps/regression/prediction_parameter_controller.cpp b/apps/regression/prediction_parameter_controller.cpp index bfce066b3..ae8c812e2 100644 --- a/apps/regression/prediction_parameter_controller.cpp +++ b/apps/regression/prediction_parameter_controller.cpp @@ -55,7 +55,7 @@ KDCoordinate PredictionParameterController::cellHeight() { } void PredictionParameterController::willDisplayCellForIndex(HighlightCell * cell, int index) { - PointerTableCellWithChevron * myCell = (PointerTableCellWithChevron *)cell; + MessageTableCellWithChevron * myCell = (MessageTableCellWithChevron *)cell; I18n::Message titles[2] = {I18n::Message::XPrediction, I18n::Message::YPrediction}; myCell->setMessage(titles[index]); } diff --git a/apps/regression/prediction_parameter_controller.h b/apps/regression/prediction_parameter_controller.h index 229e0dd59..d0102a4be 100644 --- a/apps/regression/prediction_parameter_controller.h +++ b/apps/regression/prediction_parameter_controller.h @@ -22,7 +22,7 @@ public: void willDisplayCellForIndex(HighlightCell * cell, int index) override; private: constexpr static int k_totalNumberOfCells = 2; - PointerTableCellWithChevron m_cells[2]; + MessageTableCellWithChevron m_cells[2]; SelectableTableView m_selectableTableView; GoToParameterController m_goToParameterController; }; diff --git a/apps/sequence/graph/curve_parameter_controller.cpp b/apps/sequence/graph/curve_parameter_controller.cpp index 648d5c7d3..62790eff5 100644 --- a/apps/sequence/graph/curve_parameter_controller.cpp +++ b/apps/sequence/graph/curve_parameter_controller.cpp @@ -8,7 +8,7 @@ namespace Sequence { CurveParameterController::CurveParameterController(GraphController * graphController, InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor) : FunctionCurveParameterController(graphRange, cursor, I18n::Message::N), - m_sumCell(PointerTableCell(I18n::Message::TermSum)), + m_sumCell(MessageTableCell(I18n::Message::TermSum)), m_graphController(graphController) { } diff --git a/apps/sequence/graph/curve_parameter_controller.h b/apps/sequence/graph/curve_parameter_controller.h index 03203b367..da41f3cb5 100644 --- a/apps/sequence/graph/curve_parameter_controller.h +++ b/apps/sequence/graph/curve_parameter_controller.h @@ -18,7 +18,7 @@ public: int reusableCellCount() override; private: constexpr static int k_totalNumberOfCells = 2; - PointerTableCell m_sumCell; + MessageTableCell m_sumCell; GraphController * m_graphController; }; diff --git a/apps/sequence/graph/term_sum_controller.cpp b/apps/sequence/graph/term_sum_controller.cpp index f43d174eb..a78fc43e7 100644 --- a/apps/sequence/graph/term_sum_controller.cpp +++ b/apps/sequence/graph/term_sum_controller.cpp @@ -174,7 +174,7 @@ View * TermSumController::ContentView::subviewAtIndex(int index) { TermSumController::ContentView::LegendView::LegendView() : m_sum(ExpressionView(0.0f, 0.5f, KDColorBlack, Palette::GreyBright)), m_sumLayout(nullptr), - m_legend(PointerTextView(KDText::FontSize::Small, I18n::Message::Default, 0.0f, 0.5f, KDColorBlack, Palette::GreyBright)) + m_legend(MessageTextView(KDText::FontSize::Small, I18n::Message::Default, 0.0f, 0.5f, KDColorBlack, Palette::GreyBright)) { } diff --git a/apps/sequence/graph/term_sum_controller.h b/apps/sequence/graph/term_sum_controller.h index da2cd58ce..ce8df12dd 100644 --- a/apps/sequence/graph/term_sum_controller.h +++ b/apps/sequence/graph/term_sum_controller.h @@ -40,7 +40,7 @@ private: View * subviewAtIndex(int index) override; ExpressionView m_sum; Poincare::ExpressionLayout * m_sumLayout; - PointerTextView m_legend; + MessageTextView m_legend; }; ContentView(GraphView * graphView); void layoutSubviews() override; diff --git a/apps/sequence/list/list_parameter_controller.cpp b/apps/sequence/list/list_parameter_controller.cpp index b986e8916..aced0a2a4 100644 --- a/apps/sequence/list/list_parameter_controller.cpp +++ b/apps/sequence/list/list_parameter_controller.cpp @@ -8,7 +8,7 @@ namespace Sequence { ListParameterController::ListParameterController(ListController * listController, SequenceStore * sequenceStore) : Shared::ListParameterController(listController, sequenceStore, I18n::Message::SequenceColor, I18n::Message::DeleteSequence), - m_typeCell(PointerTableCellWithChevronAndExpression(I18n::Message::SequenceType)), + m_typeCell(MessageTableCellWithChevronAndExpression(I18n::Message::SequenceType)), m_typeParameterController(TypeParameterController(this, sequenceStore, listController, TableCell::Layout::Horizontal, Metric::CommonTopMargin, Metric::CommonRightMargin, Metric::CommonBottomMargin, Metric::CommonLeftMargin)) { diff --git a/apps/sequence/list/list_parameter_controller.h b/apps/sequence/list/list_parameter_controller.h index 97b38f0d2..ff479670a 100644 --- a/apps/sequence/list/list_parameter_controller.h +++ b/apps/sequence/list/list_parameter_controller.h @@ -22,7 +22,7 @@ public: void willDisplayCellForIndex(HighlightCell * cell, int index) override; private: constexpr static int k_totalNumberOfCell = 4; - PointerTableCellWithChevronAndExpression m_typeCell; + MessageTableCellWithChevronAndExpression m_typeCell; TypeParameterController m_typeParameterController; Sequence * m_sequence; }; diff --git a/apps/sequence/values/values_controller.cpp b/apps/sequence/values/values_controller.cpp index 94528b628..c0bc999fd 100644 --- a/apps/sequence/values/values_controller.cpp +++ b/apps/sequence/values/values_controller.cpp @@ -22,7 +22,7 @@ void ValuesController::willDisplayCellAtLocation(HighlightCell * cell, int i, in Shared::ValuesController::willDisplayCellAtLocation(cell, i, j); // The cell is the abscissa title cell: if (j == 0 && i == 0) { - EvenOddPointerTextCell * mytitleCell = (EvenOddPointerTextCell *)cell; + EvenOddMessageTextCell * mytitleCell = (EvenOddMessageTextCell *)cell; mytitleCell->setMessage(I18n::Message::N); return; } diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp index 6e6c56678..b955f965b 100644 --- a/apps/settings/main_controller.cpp +++ b/apps/settings/main_controller.cpp @@ -20,9 +20,9 @@ const SettingsNode model = SettingsNode(I18n::Message::SettingsApp, menu, 4); MainController::MainController(Responder * parentResponder) : ViewController(parentResponder), - m_cells{PointerTableCellWithChevronAndPointer(KDText::FontSize::Large, KDText::FontSize::Small), - PointerTableCellWithChevronAndPointer(KDText::FontSize::Large, KDText::FontSize::Small), PointerTableCellWithChevronAndPointer(KDText::FontSize::Large, KDText::FontSize::Small)}, - m_complexFormatCell(PointerTableCellWithChevronAndExpression(I18n::Message::Default, KDText::FontSize::Large)), + m_cells{MessageTableCellWithChevronAndMessage(KDText::FontSize::Large, KDText::FontSize::Small), + MessageTableCellWithChevronAndMessage(KDText::FontSize::Large, KDText::FontSize::Small), MessageTableCellWithChevronAndMessage(KDText::FontSize::Large, KDText::FontSize::Small)}, + m_complexFormatCell(MessageTableCellWithChevronAndExpression(I18n::Message::Default, KDText::FontSize::Large)), m_selectableTableView(SelectableTableView(this, this, 1, Metric::CommonTopMargin, Metric::CommonRightMargin, Metric::CommonBottomMargin, Metric::CommonLeftMargin)), m_nodeModel((Node *)&model), @@ -102,7 +102,7 @@ int MainController::typeAtLocation(int i, int j) { } void MainController::willDisplayCellForIndex(HighlightCell * cell, int index) { - PointerTableCell * myCell = (PointerTableCell *)cell; + MessageTableCell * myCell = (MessageTableCell *)cell; myCell->setMessage(m_nodeModel->children(index)->label()); if (index == 2) { @@ -118,11 +118,11 @@ void MainController::willDisplayCellForIndex(HighlightCell * cell, int index) { const char superscrit[4] = {Ion::Charset::IComplex, Ion::Charset::SmallTheta, ' ', 0}; m_complexFormatLayout = new BaselineRelativeLayout(new StringLayout(base, 4, KDText::FontSize::Small), new StringLayout(superscrit, 3, KDText::FontSize::Small), BaselineRelativeLayout::Type::Superscript); } - PointerTableCellWithChevronAndExpression * myExpCell = (PointerTableCellWithChevronAndExpression *)cell; + MessageTableCellWithChevronAndExpression * myExpCell = (MessageTableCellWithChevronAndExpression *)cell; myExpCell->setExpression(m_complexFormatLayout); return; } - PointerTableCellWithChevronAndPointer * myTextCell = (PointerTableCellWithChevronAndPointer *)cell; + MessageTableCellWithChevronAndMessage * myTextCell = (MessageTableCellWithChevronAndMessage *)cell; switch (index) { case 0: myTextCell->setSubtitle(m_nodeModel->children(index)->children((int)Preferences::sharedPreferences()->angleUnit())->label()); diff --git a/apps/settings/main_controller.h b/apps/settings/main_controller.h index 79163ddc8..89c9c192e 100644 --- a/apps/settings/main_controller.h +++ b/apps/settings/main_controller.h @@ -27,8 +27,8 @@ public: private: StackViewController * stackController() const; constexpr static int k_totalNumberOfCell = 4; - PointerTableCellWithChevronAndPointer m_cells[k_totalNumberOfCell-1]; - PointerTableCellWithChevronAndExpression m_complexFormatCell; + MessageTableCellWithChevronAndMessage m_cells[k_totalNumberOfCell-1]; + MessageTableCellWithChevronAndExpression m_complexFormatCell; Poincare::ExpressionLayout * m_complexFormatLayout; SelectableTableView m_selectableTableView; Node * m_nodeModel; diff --git a/apps/settings/sub_controller.cpp b/apps/settings/sub_controller.cpp index 85b6ba0db..52f94a12c 100644 --- a/apps/settings/sub_controller.cpp +++ b/apps/settings/sub_controller.cpp @@ -11,8 +11,8 @@ namespace Settings { SubController::SubController(Responder * parentResponder) : ViewController(parentResponder), - m_cells{PointerTableCell(I18n::Message::Default, KDText::FontSize::Large), PointerTableCell(I18n::Message::Default, KDText::FontSize::Large), - PointerTableCell(I18n::Message::Default, KDText::FontSize::Large)}, + m_cells{MessageTableCell(I18n::Message::Default, KDText::FontSize::Large), MessageTableCell(I18n::Message::Default, KDText::FontSize::Large), + MessageTableCell(I18n::Message::Default, KDText::FontSize::Large)}, m_selectableTableView(SelectableTableView(this, this, 1, Metric::CommonTopMargin, Metric::CommonRightMargin, Metric::CommonBottomMargin, Metric::CommonLeftMargin)), m_nodeModel(nullptr), @@ -96,7 +96,7 @@ void SubController::willDisplayCellForIndex(HighlightCell * cell, int index) { if (m_preferenceIndex == 2) { return; } - PointerTableCell * myCell = (PointerTableCell *)cell; + MessageTableCell * myCell = (MessageTableCell *)cell; myCell->setMessage(m_nodeModel->children(index)->label()); } diff --git a/apps/settings/sub_controller.h b/apps/settings/sub_controller.h index f33c1c80e..98dfabfed 100644 --- a/apps/settings/sub_controller.h +++ b/apps/settings/sub_controller.h @@ -27,7 +27,7 @@ private: void setPreferenceAtIndexWithValueIndex(int preferenceIndex, int valueIndex); int valueIndexAtPreferenceIndex(int preferenceIndex); constexpr static int k_totalNumberOfCell = 3; - PointerTableCell m_cells[k_totalNumberOfCell]; + MessageTableCell m_cells[k_totalNumberOfCell]; ExpressionTableCell m_complexFormatCells[2]; Poincare::ExpressionLayout * m_complexFormatLayout[2]; SelectableTableView m_selectableTableView; diff --git a/apps/shared/banner_view.cpp b/apps/shared/banner_view.cpp index 16671d17d..27ecd922d 100644 --- a/apps/shared/banner_view.cpp +++ b/apps/shared/banner_view.cpp @@ -16,7 +16,7 @@ void BannerView::setLegendAtIndex(char * text, int index) { } void BannerView::setMessageAtIndex(I18n::Message text, int index) { - PointerTextView * textView = pointerTextViewAtIndex(index); + MessageTextView * textView = messageTextViewAtIndex(index); textView->setMessage(text); layoutSubviews(); } @@ -92,7 +92,7 @@ int BannerView::numberOfLines() const { return lineNumber+1; } -PointerTextView * BannerView::pointerTextViewAtIndex(int i) const { +MessageTextView * BannerView::messageTextViewAtIndex(int i) const { return nullptr; } diff --git a/apps/shared/banner_view.h b/apps/shared/banner_view.h index b0b8d0aad..9ce4277b1 100644 --- a/apps/shared/banner_view.h +++ b/apps/shared/banner_view.h @@ -16,7 +16,7 @@ private: void layoutSubviews() override; int numberOfLines() const; virtual TextView * textViewAtIndex(int i) const = 0; - virtual PointerTextView * pointerTextViewAtIndex(int i) const; + virtual MessageTextView * messageTextViewAtIndex(int i) const; }; } diff --git a/apps/shared/button_with_separator.cpp b/apps/shared/button_with_separator.cpp index 6675a3642..cc9049b8a 100644 --- a/apps/shared/button_with_separator.cpp +++ b/apps/shared/button_with_separator.cpp @@ -23,5 +23,5 @@ void ButtonWithSeparator::drawRect(KDContext * ctx, KDRect rect) const { void ButtonWithSeparator::layoutSubviews() { KDCoordinate width = bounds().width(); KDCoordinate height = bounds().height(); - m_pointerTextView.setFrame(KDRect(k_lineThickness, k_margin + k_lineThickness, width-2*k_lineThickness, height - 4*k_lineThickness-k_margin)); + m_messageTextView.setFrame(KDRect(k_lineThickness, k_margin + k_lineThickness, width-2*k_lineThickness, height - 4*k_lineThickness-k_margin)); } diff --git a/apps/shared/float_parameter_controller.cpp b/apps/shared/float_parameter_controller.cpp index 194daeb90..921ef1c5f 100644 --- a/apps/shared/float_parameter_controller.cpp +++ b/apps/shared/float_parameter_controller.cpp @@ -89,7 +89,7 @@ void FloatParameterController::willDisplayCellForIndex(HighlightCell * cell, int if (index == numberOfRows()-1) { return; } - PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *) cell; + MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *) cell; char buffer[Complex::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits)]; Complex::convertFloatToText(parameterAtIndex(index), buffer, Complex::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits), Constant::LargeNumberOfSignificantDigits, Expression::FloatDisplayMode::Decimal); myCell->setAccessoryText(buffer); @@ -112,7 +112,7 @@ bool FloatParameterController::textFieldDidFinishEditing(TextField * textField, void FloatParameterController::tableViewDidChangeSelection(SelectableTableView * t, int previousSelectedCellX, int previousSelectedCellY) { if (previousSelectedCellY >= 0 && previousSelectedCellX < numberOfRows()-1) { - PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *)t->cellAtLocation(previousSelectedCellX, previousSelectedCellY); + MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *)t->cellAtLocation(previousSelectedCellX, previousSelectedCellY); myCell->setEditing(false); } if (t->selectedRow() == numberOfRows()-1) { @@ -121,7 +121,7 @@ void FloatParameterController::tableViewDidChangeSelection(SelectableTableView * return; } if (t->selectedRow() >= 0) { - PointerTableCellWithEditableText * myNewCell = (PointerTableCellWithEditableText *)t->cellAtLocation(t->selectedColumn(), t->selectedRow()); + MessageTableCellWithEditableText * myNewCell = (MessageTableCellWithEditableText *)t->cellAtLocation(t->selectedColumn(), t->selectedRow()); app()->setFirstResponder(myNewCell); } } diff --git a/apps/shared/function_curve_parameter_controller.cpp b/apps/shared/function_curve_parameter_controller.cpp index 3c0db182a..a865ce5d7 100644 --- a/apps/shared/function_curve_parameter_controller.cpp +++ b/apps/shared/function_curve_parameter_controller.cpp @@ -5,7 +5,7 @@ namespace Shared { FunctionCurveParameterController::FunctionCurveParameterController(InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor, I18n::Message symbol) : ViewController(nullptr), - m_goToCell(PointerTableCellWithChevron(I18n::Message::Goto)), + m_goToCell(MessageTableCellWithChevron(I18n::Message::Goto)), m_selectableTableView(SelectableTableView(this, this, 1, Metric::CommonTopMargin, Metric::CommonRightMargin, Metric::CommonBottomMargin, Metric::CommonLeftMargin)), m_goToParameterController(GoToParameterController(this, graphRange, cursor, symbol)), diff --git a/apps/shared/function_curve_parameter_controller.h b/apps/shared/function_curve_parameter_controller.h index cf94c5356..3c9318cf2 100644 --- a/apps/shared/function_curve_parameter_controller.h +++ b/apps/shared/function_curve_parameter_controller.h @@ -18,7 +18,7 @@ public: void setFunction(Function * function); protected: bool handleGotoSelection(); - PointerTableCellWithChevron m_goToCell; + MessageTableCellWithChevron m_goToCell; SelectableTableView m_selectableTableView; private: GoToParameterController m_goToParameterController; diff --git a/apps/shared/go_to_parameter_controller.cpp b/apps/shared/go_to_parameter_controller.cpp index ecf25e94a..5a7fff29a 100644 --- a/apps/shared/go_to_parameter_controller.cpp +++ b/apps/shared/go_to_parameter_controller.cpp @@ -6,7 +6,7 @@ namespace Shared { GoToParameterController::GoToParameterController(Responder * parentResponder, InteractiveCurveViewRange * graphRange, CurveViewCursor * cursor, I18n::Message symbol) : FloatParameterController(parentResponder), - m_abscisseCell(PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, symbol)), + m_abscisseCell(MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, symbol)), m_graphRange(graphRange), m_cursor(cursor), m_function(nullptr) diff --git a/apps/shared/go_to_parameter_controller.h b/apps/shared/go_to_parameter_controller.h index 4abbc7a58..e0f93b609 100644 --- a/apps/shared/go_to_parameter_controller.h +++ b/apps/shared/go_to_parameter_controller.h @@ -23,8 +23,8 @@ private: float previousParameterAtIndex(int index) override; float parameterAtIndex(int index) override; void setParameterAtIndex(int parameterIndex, float f) override; - char m_draftTextBuffer[PointerTableCellWithEditableText::k_bufferLength]; - PointerTableCellWithEditableText m_abscisseCell; + char m_draftTextBuffer[MessageTableCellWithEditableText::k_bufferLength]; + MessageTableCellWithEditableText m_abscisseCell; float m_previousParameter; InteractiveCurveViewRange * m_graphRange; CurveViewCursor * m_cursor; diff --git a/apps/shared/initialisation_parameter_controller.cpp b/apps/shared/initialisation_parameter_controller.cpp index f011d8a76..61924cd68 100644 --- a/apps/shared/initialisation_parameter_controller.cpp +++ b/apps/shared/initialisation_parameter_controller.cpp @@ -57,7 +57,7 @@ KDCoordinate InitialisationParameterController::cellHeight() { } void InitialisationParameterController::willDisplayCellForIndex(HighlightCell * cell, int index) { - PointerTableCell * myCell = (PointerTableCell *)cell; + MessageTableCell * myCell = (MessageTableCell *)cell; I18n::Message titles[4] = {I18n::Message::Trigonometric, I18n::Message::RoundAbscissa, I18n::Message::Orthonormal, I18n::Message::DefaultSetting}; myCell->setMessage(titles[index]); } diff --git a/apps/shared/initialisation_parameter_controller.h b/apps/shared/initialisation_parameter_controller.h index 9cb9bd00b..f2da898db 100644 --- a/apps/shared/initialisation_parameter_controller.h +++ b/apps/shared/initialisation_parameter_controller.h @@ -21,7 +21,7 @@ public: void willDisplayCellForIndex(HighlightCell * cell, int index) override; private: constexpr static int k_totalNumberOfCells = 4; - PointerTableCell m_cells[k_totalNumberOfCells]; + MessageTableCell m_cells[k_totalNumberOfCells]; SelectableTableView m_selectableTableView; InteractiveCurveViewRange * m_graphRange; }; diff --git a/apps/shared/interval_parameter_controller.cpp b/apps/shared/interval_parameter_controller.cpp index 8185a00f7..f049ff4bc 100644 --- a/apps/shared/interval_parameter_controller.cpp +++ b/apps/shared/interval_parameter_controller.cpp @@ -6,7 +6,7 @@ namespace Shared { IntervalParameterController::IntervalParameterController(Responder * parentResponder, Interval * interval) : FloatParameterController(parentResponder), m_interval(interval), - m_intervalCells{PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default)} + m_intervalCells{MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default)} { } @@ -29,7 +29,7 @@ void IntervalParameterController::willDisplayCellForIndex(HighlightCell * cell, if (index == numberOfRows()-1) { return; } - PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *)cell; + MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *)cell; I18n::Message labels[k_totalNumberOfCell] = {I18n::Message::XStart, I18n::Message::XEnd, I18n::Message::XStep}; myCell->setMessage(labels[index]); FloatParameterController::willDisplayCellForIndex(cell, index); diff --git a/apps/shared/interval_parameter_controller.h b/apps/shared/interval_parameter_controller.h index f6e107ecd..c4ca8bbc7 100644 --- a/apps/shared/interval_parameter_controller.h +++ b/apps/shared/interval_parameter_controller.h @@ -23,8 +23,8 @@ private: void setParameterAtIndex(int parameterIndex, float f) override; constexpr static int k_totalNumberOfCell = 3; Interval * m_interval; - char m_draftTextBuffer[PointerTableCellWithEditableText::k_bufferLength]; - PointerTableCellWithEditableText m_intervalCells[k_totalNumberOfCell]; + char m_draftTextBuffer[MessageTableCellWithEditableText::k_bufferLength]; + MessageTableCellWithEditableText m_intervalCells[k_totalNumberOfCell]; float m_previousParameters[k_totalNumberOfCell]; }; diff --git a/apps/shared/list_parameter_controller.cpp b/apps/shared/list_parameter_controller.cpp index 8dc9318ec..ef444a665 100644 --- a/apps/shared/list_parameter_controller.cpp +++ b/apps/shared/list_parameter_controller.cpp @@ -8,9 +8,9 @@ ListParameterController::ListParameterController(Responder * parentResponder, Fu m_selectableTableView(SelectableTableView(this, this, 1, Metric::CommonTopMargin, Metric::CommonRightMargin, Metric::CommonBottomMargin, Metric::CommonLeftMargin)), m_functionStore(functionStore), - m_colorCell(PointerTableCellWithChevron(functionColorMessage)), - m_enableCell(PointerTableCellWithSwitch(I18n::Message::ActivateDesactivate)), - m_deleteCell(PointerTableCell(deleteFunctionMessage)) + m_colorCell(MessageTableCellWithChevron(functionColorMessage)), + m_enableCell(MessageTableCellWithSwitch(I18n::Message::ActivateDesactivate)), + m_deleteCell(MessageTableCell(deleteFunctionMessage)) { } diff --git a/apps/shared/list_parameter_controller.h b/apps/shared/list_parameter_controller.h index b1680451c..236838718 100644 --- a/apps/shared/list_parameter_controller.h +++ b/apps/shared/list_parameter_controller.h @@ -29,9 +29,9 @@ protected: Function * m_function; private: constexpr static int k_totalNumberOfCell = 3; - PointerTableCellWithChevron m_colorCell; - PointerTableCellWithSwitch m_enableCell; - PointerTableCell m_deleteCell; + MessageTableCellWithChevron m_colorCell; + MessageTableCellWithSwitch m_enableCell; + MessageTableCell m_deleteCell; }; } diff --git a/apps/shared/new_function_cell.cpp b/apps/shared/new_function_cell.cpp index f684c37b5..a4a71ce1d 100644 --- a/apps/shared/new_function_cell.cpp +++ b/apps/shared/new_function_cell.cpp @@ -5,13 +5,13 @@ namespace Shared { NewFunctionCell::NewFunctionCell(I18n::Message text) : EvenOddCell(), - m_pointerTextView(PointerTextView(KDText::FontSize::Large, text, 0.5f, 0.5f)) + m_messageTextView(MessageTextView(KDText::FontSize::Large, text, 0.5f, 0.5f)) { } void NewFunctionCell::reloadCell() { EvenOddCell::reloadCell(); - m_pointerTextView.setBackgroundColor(backgroundColor()); + m_messageTextView.setBackgroundColor(backgroundColor()); } int NewFunctionCell::numberOfSubviews() const { @@ -20,11 +20,11 @@ int NewFunctionCell::numberOfSubviews() const { View * NewFunctionCell::subviewAtIndex(int index) { assert(index == 0); - return &m_pointerTextView; + return &m_messageTextView; } void NewFunctionCell::layoutSubviews() { - m_pointerTextView.setFrame(bounds()); + m_messageTextView.setFrame(bounds()); } } diff --git a/apps/shared/new_function_cell.h b/apps/shared/new_function_cell.h index b58fd0c23..06dbd6a46 100644 --- a/apps/shared/new_function_cell.h +++ b/apps/shared/new_function_cell.h @@ -13,7 +13,7 @@ public: View * subviewAtIndex(int index) override; void layoutSubviews() override; private: - PointerTextView m_pointerTextView; + MessageTextView m_messageTextView; }; } diff --git a/apps/shared/range_parameter_controller.cpp b/apps/shared/range_parameter_controller.cpp index 553add6fe..d57c87d00 100644 --- a/apps/shared/range_parameter_controller.cpp +++ b/apps/shared/range_parameter_controller.cpp @@ -10,9 +10,9 @@ namespace Shared { RangeParameterController::RangeParameterController(Responder * parentResponder, InteractiveCurveViewRange * interactiveRange) : FloatParameterController(parentResponder), m_interactiveRange(interactiveRange), - m_rangeCells{PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), - PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default)}, - m_yAutoCell(PointerTableCellWithSwitch(I18n::Message::YAuto)) + m_rangeCells{MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), + MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default)}, + m_yAutoCell(MessageTableCellWithSwitch(I18n::Message::YAuto)) { } @@ -52,7 +52,7 @@ void RangeParameterController::willDisplayCellForIndex(HighlightCell * cell, int switchView->setState(m_interactiveRange->yAuto()); return; } - PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *)cell; + MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *)cell; I18n::Message labels[k_numberOfTextCell+1] = {I18n::Message::XMin, I18n::Message::XMax, I18n::Message::Default, I18n::Message::YMin, I18n::Message::YMax}; myCell->setMessage(labels[index]); KDColor yColor = m_interactiveRange->yAuto() ? Palette::GreyDark : KDColorBlack; @@ -69,7 +69,7 @@ bool RangeParameterController::textFieldDidFinishEditing(TextField * textField, void RangeParameterController::tableViewDidChangeSelection(SelectableTableView * t, int previousSelectedCellX, int previousSelectedCellY) { if (previousSelectedCellX < numberOfRows()-1 && previousSelectedCellY >= 0 && previousSelectedCellY !=2) { - PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *)t->cellAtLocation(previousSelectedCellX, previousSelectedCellY); + MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *)t->cellAtLocation(previousSelectedCellX, previousSelectedCellY); myCell->setEditing(false); app()->setFirstResponder(t); } @@ -79,7 +79,7 @@ void RangeParameterController::tableViewDidChangeSelection(SelectableTableView * return; } if (t->selectedRow() >= 0 && t->selectedRow() !=2) { - PointerTableCellWithEditableText * myNewCell = (PointerTableCellWithEditableText *)t->cellAtLocation(t->selectedColumn(), t->selectedRow()); + MessageTableCellWithEditableText * myNewCell = (MessageTableCellWithEditableText *)t->cellAtLocation(t->selectedColumn(), t->selectedRow()); if ((t->selectedRow() == 0 || t->selectedRow() == 1) || !m_interactiveRange->yAuto()) { app()->setFirstResponder(myNewCell); } diff --git a/apps/shared/range_parameter_controller.h b/apps/shared/range_parameter_controller.h index 6007d4003..92e011ebe 100644 --- a/apps/shared/range_parameter_controller.h +++ b/apps/shared/range_parameter_controller.h @@ -26,9 +26,9 @@ private: void setParameterAtIndex(int parameterIndex, float f) override; constexpr static int k_numberOfTextCell = 4; InteractiveCurveViewRange * m_interactiveRange; - char m_draftTextBuffer[PointerTableCellWithEditableText::k_bufferLength]; - PointerTableCellWithEditableText m_rangeCells[k_numberOfTextCell]; - PointerTableCellWithSwitch m_yAutoCell; + char m_draftTextBuffer[MessageTableCellWithEditableText::k_bufferLength]; + MessageTableCellWithEditableText m_rangeCells[k_numberOfTextCell]; + MessageTableCellWithSwitch m_yAutoCell; float m_previousParameters[k_numberOfTextCell]; bool m_previousSwitchState; }; diff --git a/apps/shared/store_parameter_controller.cpp b/apps/shared/store_parameter_controller.cpp index b741a4d32..45d85af14 100644 --- a/apps/shared/store_parameter_controller.cpp +++ b/apps/shared/store_parameter_controller.cpp @@ -5,9 +5,9 @@ namespace Shared { StoreParameterController::StoreParameterController(Responder * parentResponder, FloatPairStore * store) : ViewController(parentResponder), - m_deleteColumn(PointerTableCell(I18n::Message::ClearColumn)), - m_copyColumn(PointerTableCellWithChevron(I18n::Message::CopyColumnInList)), - m_importList(PointerTableCellWithChevron(I18n::Message::ImportList)), + m_deleteColumn(MessageTableCell(I18n::Message::ClearColumn)), + m_copyColumn(MessageTableCellWithChevron(I18n::Message::CopyColumnInList)), + m_importList(MessageTableCellWithChevron(I18n::Message::ImportList)), m_selectableTableView(SelectableTableView(this, this, 1, Metric::CommonTopMargin, Metric::CommonRightMargin, Metric::CommonBottomMargin, Metric::CommonLeftMargin)), m_store(store), diff --git a/apps/shared/store_parameter_controller.h b/apps/shared/store_parameter_controller.h index 69bc36826..a60c33ed3 100644 --- a/apps/shared/store_parameter_controller.h +++ b/apps/shared/store_parameter_controller.h @@ -21,9 +21,9 @@ public: int reusableCellCount() override; private: constexpr static int k_totalNumberOfCell = 3; - PointerTableCell m_deleteColumn; - PointerTableCellWithChevron m_copyColumn; - PointerTableCellWithChevron m_importList; + MessageTableCell m_deleteColumn; + MessageTableCellWithChevron m_copyColumn; + MessageTableCellWithChevron m_importList; SelectableTableView m_selectableTableView; FloatPairStore * m_store; bool m_xColumnSelected; diff --git a/apps/shared/values_controller.cpp b/apps/shared/values_controller.cpp index 536e20949..c07e0b03a 100644 --- a/apps/shared/values_controller.cpp +++ b/apps/shared/values_controller.cpp @@ -11,7 +11,7 @@ namespace Shared { ValuesController::ValuesController(Responder * parentResponder, ButtonRowController * header, I18n::Message parameterTitle) : EditableCellTableViewController(parentResponder, k_topMargin, k_rightMargin, k_bottomMargin, k_leftMargin), ButtonRowDelegate(header, nullptr), - m_abscissaTitleCell(EvenOddPointerTextCell(KDText::FontSize::Small)), + m_abscissaTitleCell(EvenOddMessageTextCell(KDText::FontSize::Small)), m_abscissaCells{EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small), EvenOddEditableTextCell(&m_selectableTableView, this, m_draftTextBuffer, KDText::FontSize::Small)}, diff --git a/apps/shared/values_controller.h b/apps/shared/values_controller.h index b713f9744..c9a4f6632 100644 --- a/apps/shared/values_controller.h +++ b/apps/shared/values_controller.h @@ -54,7 +54,7 @@ private: constexpr static int k_maxNumberOfAbscissaCells = 10; virtual int maxNumberOfCells() = 0; virtual int maxNumberOfFunctions() = 0; - EvenOddPointerTextCell m_abscissaTitleCell; + EvenOddMessageTextCell m_abscissaTitleCell; virtual FunctionTitleCell * functionTitleCells(int j) = 0; virtual EvenOddBufferTextCell * floatCells(int j) = 0; char m_draftTextBuffer[EditableTextCell::k_bufferLength]; diff --git a/apps/shared/values_function_parameter_controller.cpp b/apps/shared/values_function_parameter_controller.cpp index 29fdbf100..f3dc58dde 100644 --- a/apps/shared/values_function_parameter_controller.cpp +++ b/apps/shared/values_function_parameter_controller.cpp @@ -5,7 +5,7 @@ namespace Shared { ValuesFunctionParameterController::ValuesFunctionParameterController(char symbol) : ViewController(nullptr), - m_copyColumn(PointerTableCellWithChevron(I18n::Message::CopyColumnInList)), + m_copyColumn(MessageTableCellWithChevron(I18n::Message::CopyColumnInList)), m_selectableTableView(SelectableTableView(this, this, 1, Metric::CommonTopMargin, Metric::CommonRightMargin, Metric::CommonBottomMargin, Metric::CommonLeftMargin)), m_function(nullptr), diff --git a/apps/shared/values_function_parameter_controller.h b/apps/shared/values_function_parameter_controller.h index 14e33566e..a69cd2ac0 100644 --- a/apps/shared/values_function_parameter_controller.h +++ b/apps/shared/values_function_parameter_controller.h @@ -20,7 +20,7 @@ public: virtual int reusableCellCount() override; virtual void setFunction(Function * function); protected: - PointerTableCellWithChevron m_copyColumn; + MessageTableCellWithChevron m_copyColumn; SelectableTableView m_selectableTableView; private: constexpr static int k_maxNumberOfCharsInTitle = 16; diff --git a/apps/shared/values_parameter_controller.cpp b/apps/shared/values_parameter_controller.cpp index 44f8362fb..326fd9481 100644 --- a/apps/shared/values_parameter_controller.cpp +++ b/apps/shared/values_parameter_controller.cpp @@ -6,9 +6,9 @@ namespace Shared { ValuesParameterController::ValuesParameterController(Responder * parentResponder, IntervalParameterController * intervalParameterController, I18n::Message title) : ViewController(parentResponder), m_pageTitle(title), - m_deleteColumn(PointerTableCell(I18n::Message::ClearColumn)), - m_copyColumn(PointerTableCellWithChevron(I18n::Message::CopyColumnInList)), - m_setInterval(PointerTableCellWithChevron(I18n::Message::IntervalSet)), + m_deleteColumn(MessageTableCell(I18n::Message::ClearColumn)), + m_copyColumn(MessageTableCellWithChevron(I18n::Message::CopyColumnInList)), + m_setInterval(MessageTableCellWithChevron(I18n::Message::IntervalSet)), m_selectableTableView(SelectableTableView(this, this, 1, Metric::CommonTopMargin, Metric::CommonRightMargin, Metric::CommonBottomMargin, Metric::CommonLeftMargin)), m_intervalParameterController(intervalParameterController) diff --git a/apps/shared/values_parameter_controller.h b/apps/shared/values_parameter_controller.h index c4087f1a9..4ed56916c 100644 --- a/apps/shared/values_parameter_controller.h +++ b/apps/shared/values_parameter_controller.h @@ -20,9 +20,9 @@ public: private: constexpr static int k_totalNumberOfCell = 3; I18n::Message m_pageTitle; - PointerTableCell m_deleteColumn; - PointerTableCellWithChevron m_copyColumn; - PointerTableCellWithChevron m_setInterval; + MessageTableCell m_deleteColumn; + MessageTableCellWithChevron m_copyColumn; + MessageTableCellWithChevron m_setInterval; SelectableTableView m_selectableTableView; IntervalParameterController * m_intervalParameterController; }; diff --git a/apps/shared/zoom_parameter_controller.cpp b/apps/shared/zoom_parameter_controller.cpp index d89681bce..01678133c 100644 --- a/apps/shared/zoom_parameter_controller.cpp +++ b/apps/shared/zoom_parameter_controller.cpp @@ -93,11 +93,11 @@ CurveView * ZoomParameterController::ContentView::curveView() { /* Legend View */ ZoomParameterController::ContentView::LegendView::LegendView() : - m_legends{PointerTextView(KDText::FontSize::Small, I18n::Message::TopCapital, 0.0f, 0.5f, KDColorBlack, Palette::GreyBright), - PointerTextView(KDText::FontSize::Small, I18n::Message::LeftCapital, 0.0f, 0.5f, KDColorBlack, Palette::GreyBright), - PointerTextView(KDText::FontSize::Small, I18n::Message::ZoomCapital, 0.5f, 0.5f, KDColorBlack, Palette::GreyBright), - PointerTextView(KDText::FontSize::Small, I18n::Message::BottomCapital, 1.0f, 0.5f, KDColorBlack, Palette::GreyBright), - PointerTextView(KDText::FontSize::Small, I18n::Message::RightCapital, 1.0f, 0.5f, KDColorBlack, Palette::GreyBright)}, + m_legends{MessageTextView(KDText::FontSize::Small, I18n::Message::TopCapital, 0.0f, 0.5f, KDColorBlack, Palette::GreyBright), + MessageTextView(KDText::FontSize::Small, I18n::Message::LeftCapital, 0.0f, 0.5f, KDColorBlack, Palette::GreyBright), + MessageTextView(KDText::FontSize::Small, I18n::Message::ZoomCapital, 0.5f, 0.5f, KDColorBlack, Palette::GreyBright), + MessageTextView(KDText::FontSize::Small, I18n::Message::BottomCapital, 1.0f, 0.5f, KDColorBlack, Palette::GreyBright), + MessageTextView(KDText::FontSize::Small, I18n::Message::RightCapital, 1.0f, 0.5f, KDColorBlack, Palette::GreyBright)}, m_legendPictograms{KeyView(KeyView::Type::Up), KeyView(KeyView::Type::Left), KeyView(KeyView::Type::Plus), KeyView(KeyView::Type::Minus), KeyView(KeyView::Type::Down), KeyView(KeyView::Type::Right)} diff --git a/apps/shared/zoom_parameter_controller.h b/apps/shared/zoom_parameter_controller.h index 19c949ea5..122913232 100644 --- a/apps/shared/zoom_parameter_controller.h +++ b/apps/shared/zoom_parameter_controller.h @@ -33,7 +33,7 @@ private: void layoutSubviews() override; int numberOfSubviews() const override; View * subviewAtIndex(int index) override; - PointerTextView m_legends[k_numberOfLegends-1]; + MessageTextView m_legends[k_numberOfLegends-1]; KeyView m_legendPictograms[k_numberOfLegends]; }; int numberOfSubviews() const override; diff --git a/apps/statistics/box_banner_view.cpp b/apps/statistics/box_banner_view.cpp index 257d151ee..67d426f40 100644 --- a/apps/statistics/box_banner_view.cpp +++ b/apps/statistics/box_banner_view.cpp @@ -17,9 +17,9 @@ TextView * BoxBannerView::textViewAtIndex(int index) const { return (TextView *)textViews[index]; } -PointerTextView * BoxBannerView::pointerTextViewAtIndex(int index) const { +MessageTextView * BoxBannerView::messageTextViewAtIndex(int index) const { if (index == 0) { - return (PointerTextView *)&m_calculationName; + return (MessageTextView *)&m_calculationName; } return nullptr; } diff --git a/apps/statistics/box_banner_view.h b/apps/statistics/box_banner_view.h index 4613e9cbf..c73dbddcf 100644 --- a/apps/statistics/box_banner_view.h +++ b/apps/statistics/box_banner_view.h @@ -13,8 +13,8 @@ public: private: int numberOfSubviews() const override; TextView * textViewAtIndex(int i) const override; - PointerTextView * pointerTextViewAtIndex(int i) const override; - PointerTextView m_calculationName; + MessageTextView * messageTextViewAtIndex(int i) const override; + MessageTextView m_calculationName; BufferTextView m_calculationValue; }; diff --git a/apps/statistics/calculation_controller.cpp b/apps/statistics/calculation_controller.cpp index 7ba2a32a5..523b4e10d 100644 --- a/apps/statistics/calculation_controller.cpp +++ b/apps/statistics/calculation_controller.cpp @@ -13,8 +13,8 @@ namespace Statistics { CalculationController::CalculationController(Responder * parentResponder, ButtonRowController * header, Store * store) : TabTableController(parentResponder, Metric::CommonTopMargin, Metric::CommonRightMargin, Metric::CommonBottomMargin, Metric::CommonLeftMargin, nullptr, true), ButtonRowDelegate(header, nullptr), - m_titleCells{EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), - EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small)}, + m_titleCells{EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), + EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small)}, m_calculationCells{EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small), EvenOddBufferTextCell(KDText::FontSize::Small)}, m_store(store) @@ -76,7 +76,7 @@ void CalculationController::willDisplayCellAtLocation(HighlightCell * cell, int myCell->setHighlighted(i == m_selectableTableView.selectedColumn() && j == m_selectableTableView.selectedRow()); if (i == 0) { I18n::Message titles[k_totalNumberOfRows] = {I18n::Message::TotalSize, I18n::Message::Minimum, I18n::Message::Maximum, I18n::Message::Range, I18n::Message::Mean, I18n::Message::StandardDeviation, I18n::Message::Deviation, I18n::Message::FirstQuartile, I18n::Message::ThirdQuartile, I18n::Message::Median, I18n::Message::InterquartileRange, I18n::Message::Sum, I18n::Message::SquareSum}; - EvenOddPointerTextCell * myCell = (EvenOddPointerTextCell *)cell; + EvenOddMessageTextCell * myCell = (EvenOddMessageTextCell *)cell; myCell->setMessage(titles[j]); } else { CalculPointer calculationMethods[k_totalNumberOfRows] = {&Store::sumOfOccurrences, &Store::minValue, diff --git a/apps/statistics/calculation_controller.h b/apps/statistics/calculation_controller.h index 4749149de..790be3b3c 100644 --- a/apps/statistics/calculation_controller.h +++ b/apps/statistics/calculation_controller.h @@ -34,7 +34,7 @@ private: constexpr static int k_maxNumberOfDisplayableRows = 11; static constexpr KDCoordinate k_cellHeight = 20; static constexpr KDCoordinate k_cellWidth = Ion::Display::Width/2 - Metric::CommonRightMargin/2 - Metric::CommonLeftMargin/2; - EvenOddPointerTextCell m_titleCells[k_maxNumberOfDisplayableRows]; + EvenOddMessageTextCell m_titleCells[k_maxNumberOfDisplayableRows]; EvenOddBufferTextCell m_calculationCells[k_maxNumberOfDisplayableRows]; Store * m_store; }; diff --git a/apps/statistics/histogram_banner_view.cpp b/apps/statistics/histogram_banner_view.cpp index 53c193246..44496b665 100644 --- a/apps/statistics/histogram_banner_view.cpp +++ b/apps/statistics/histogram_banner_view.cpp @@ -24,9 +24,9 @@ TextView * HistogramBannerView::textViewAtIndex(int i) const { return (TextView *)textViews[i]; } -PointerTextView * HistogramBannerView::pointerTextViewAtIndex(int index) const { - const PointerTextView * textViews[6] = {&m_intervalLegendView, nullptr, &m_sizeLegendView, nullptr, &m_frequencyLegendView, nullptr}; - return (PointerTextView *)textViews[index]; +MessageTextView * HistogramBannerView::messageTextViewAtIndex(int index) const { + const MessageTextView * textViews[6] = {&m_intervalLegendView, nullptr, &m_sizeLegendView, nullptr, &m_frequencyLegendView, nullptr}; + return (MessageTextView *)textViews[index]; } } diff --git a/apps/statistics/histogram_banner_view.h b/apps/statistics/histogram_banner_view.h index 15b33dcfc..6386141f8 100644 --- a/apps/statistics/histogram_banner_view.h +++ b/apps/statistics/histogram_banner_view.h @@ -13,12 +13,12 @@ public: private: int numberOfSubviews() const override; TextView * textViewAtIndex(int i) const override; - PointerTextView * pointerTextViewAtIndex(int index) const override; - PointerTextView m_intervalLegendView; + MessageTextView * messageTextViewAtIndex(int index) const override; + MessageTextView m_intervalLegendView; BufferTextView m_intervalView; - PointerTextView m_sizeLegendView; + MessageTextView m_sizeLegendView; BufferTextView m_sizeView; - PointerTextView m_frequencyLegendView; + MessageTextView m_frequencyLegendView; BufferTextView m_frequencyView; }; diff --git a/apps/statistics/histogram_parameter_controller.cpp b/apps/statistics/histogram_parameter_controller.cpp index aac1aa903..e53351b33 100644 --- a/apps/statistics/histogram_parameter_controller.cpp +++ b/apps/statistics/histogram_parameter_controller.cpp @@ -8,7 +8,7 @@ namespace Statistics { HistogramParameterController::HistogramParameterController(Responder * parentResponder, Store * store) : FloatParameterController(parentResponder), - m_cells{PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), PointerTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default)}, + m_cells{MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default), MessageTableCellWithEditableText(&m_selectableTableView, this, m_draftTextBuffer, I18n::Message::Default)}, m_store(store) { } @@ -32,7 +32,7 @@ void HistogramParameterController::willDisplayCellForIndex(HighlightCell * cell, if (index == numberOfRows()-1) { return; } - PointerTableCellWithEditableText * myCell = (PointerTableCellWithEditableText *)cell; + MessageTableCellWithEditableText * myCell = (MessageTableCellWithEditableText *)cell; I18n::Message labels[2] = {I18n::Message::RectangleWidth, I18n::Message::BarStart}; myCell->setMessage(labels[index]); FloatParameterController::willDisplayCellForIndex(cell, index); diff --git a/apps/statistics/histogram_parameter_controller.h b/apps/statistics/histogram_parameter_controller.h index 35cd24f27..07569d33b 100644 --- a/apps/statistics/histogram_parameter_controller.h +++ b/apps/statistics/histogram_parameter_controller.h @@ -20,8 +20,8 @@ private: float parameterAtIndex(int index) override; float previousParameterAtIndex(int index) override; void setParameterAtIndex(int parameterIndex, float f) override; - char m_draftTextBuffer[PointerTableCellWithEditableText::k_bufferLength]; - PointerTableCellWithEditableText m_cells[2]; + char m_draftTextBuffer[MessageTableCellWithEditableText::k_bufferLength]; + MessageTableCellWithEditableText m_cells[2]; float m_previousParameters[2]; Store * m_store; }; diff --git a/apps/statistics/store_controller.cpp b/apps/statistics/store_controller.cpp index ded96aa2f..66d087bec 100644 --- a/apps/statistics/store_controller.cpp +++ b/apps/statistics/store_controller.cpp @@ -10,7 +10,7 @@ namespace Statistics { StoreController::StoreController(Responder * parentResponder, Store * store, ButtonRowController * header) : Shared::StoreController(parentResponder, store, header), - m_titleCells{EvenOddPointerTextCell(KDText::FontSize::Small), EvenOddPointerTextCell(KDText::FontSize::Small)} + m_titleCells{EvenOddMessageTextCell(KDText::FontSize::Small), EvenOddMessageTextCell(KDText::FontSize::Small)} { } @@ -19,7 +19,7 @@ void StoreController::willDisplayCellAtLocation(HighlightCell * cell, int i, int if (cellAtLocationIsEditable(i, j)) { return; } - EvenOddPointerTextCell * mytitleCell = (EvenOddPointerTextCell *)cell; + EvenOddMessageTextCell * mytitleCell = (EvenOddMessageTextCell *)cell; if (i == 0) { mytitleCell->setMessage(I18n::Message::Values); return; diff --git a/apps/statistics/store_controller.h b/apps/statistics/store_controller.h index 6b3799521..3d50afdc9 100644 --- a/apps/statistics/store_controller.h +++ b/apps/statistics/store_controller.h @@ -13,7 +13,7 @@ public: void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override; private: HighlightCell * titleCells(int index) override; - EvenOddPointerTextCell m_titleCells[k_numberOfTitleCells]; + EvenOddMessageTextCell m_titleCells[k_numberOfTitleCells]; }; } diff --git a/apps/title_bar_view.h b/apps/title_bar_view.h index 52777987e..9965fb7d6 100644 --- a/apps/title_bar_view.h +++ b/apps/title_bar_view.h @@ -17,7 +17,7 @@ private: int numberOfSubviews() const override; void layoutSubviews() override; View * subviewAtIndex(int index) override; - PointerTextView m_titleView; + MessageTextView m_titleView; BatteryView m_batteryView; BufferTextView m_preferenceView; }; diff --git a/apps/variable_box_controller.cpp b/apps/variable_box_controller.cpp index 6225315be..0bd971ee3 100644 --- a/apps/variable_box_controller.cpp +++ b/apps/variable_box_controller.cpp @@ -107,7 +107,7 @@ int VariableBoxController::ContentViewController::reusableCellCount(int type) { void VariableBoxController::ContentViewController::willDisplayCellForIndex(HighlightCell * cell, int index) { if (m_currentPage == Page::RootMenu) { I18n::Message label = nodeLabelAtIndex(index); - PointerTableCell * myCell = (PointerTableCell *)cell; + MessageTableCell * myCell = (MessageTableCell *)cell; myCell->setMessage(label); return; } diff --git a/apps/variable_box_controller.h b/apps/variable_box_controller.h index c2c76f54b..375000b46 100644 --- a/apps/variable_box_controller.h +++ b/apps/variable_box_controller.h @@ -55,7 +55,7 @@ private: int m_previousSelectedRow; Page m_currentPage; VariableBoxLeafCell m_leafCells[k_maxNumberOfDisplayedRows]; - PointerTableCellWithChevron m_nodeCells[k_numberOfMenuRows]; + MessageTableCellWithChevron m_nodeCells[k_numberOfMenuRows]; SelectableTableView m_selectableTableView; }; ContentViewController m_contentViewController; diff --git a/escher/Makefile b/escher/Makefile index 9bd2101d2..11ce86c55 100644 --- a/escher/Makefile +++ b/escher/Makefile @@ -13,7 +13,7 @@ objs += $(addprefix escher/src/,\ even_odd_buffer_text_cell.o\ even_odd_editable_text_cell.o\ even_odd_expression_cell.o\ - even_odd_pointer_text_cell.o\ + even_odd_message_text_cell.o\ expression_table_cell.o\ expression_table_cell_with_pointer.o\ expression_view.o\ @@ -24,17 +24,17 @@ objs += $(addprefix escher/src/,\ input_view_controller.o\ key_view.o\ list_view_data_source.o\ + message_table_cell.o\ + message_table_cell_with_buffer.o\ + message_table_cell_with_chevron.o\ + message_table_cell_with_chevron_and_message.o\ + message_table_cell_with_chevron_and_expression.o\ + message_table_cell_with_editable_text.o\ + message_table_cell_with_message.o\ + message_table_cell_with_switch.o\ + message_text_view.o\ modal_view_controller.o\ palette.o\ - pointer_table_cell.o\ - pointer_table_cell_with_buffer.o\ - pointer_table_cell_with_chevron.o\ - pointer_table_cell_with_chevron_and_pointer.o\ - pointer_table_cell_with_chevron_and_expression.o\ - pointer_table_cell_with_editable_text.o\ - pointer_table_cell_with_pointer.o\ - pointer_table_cell_with_switch.o\ - pointer_text_view.o\ responder.o\ run_loop.o\ scroll_view.o\ diff --git a/escher/include/escher.h b/escher/include/escher.h index 9a4812f83..33e5f8b6f 100644 --- a/escher/include/escher.h +++ b/escher/include/escher.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include @@ -27,18 +27,18 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include diff --git a/escher/include/escher/alternate_empty_view_controller.h b/escher/include/escher/alternate_empty_view_controller.h index 8cef1b8a3..ac3041b5a 100644 --- a/escher/include/escher/alternate_empty_view_controller.h +++ b/escher/include/escher/alternate_empty_view_controller.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include class AlternateEmptyViewController : public ViewController { @@ -25,7 +25,7 @@ private: private: int numberOfSubviews() const override; View * subviewAtIndex(int index) override; - PointerTextView m_message; + MessageTextView m_message; ViewController * m_mainViewController; AlternateEmptyViewDelegate * m_delegate; }; diff --git a/escher/include/escher/button.h b/escher/include/escher/button.h index f361110e1..af618a583 100644 --- a/escher/include/escher/button.h +++ b/escher/include/escher/button.h @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include class Button : public HighlightCell, public Responder { @@ -14,7 +14,7 @@ public: void setHighlighted(bool highlight) override; KDSize minimalSizeForOptimalDisplay() const override; protected: - PointerTextView m_pointerTextView; + MessageTextView m_messageTextView; private: constexpr static KDCoordinate k_verticalMargin = 5; constexpr static KDCoordinate k_horizontalMargin = 10; diff --git a/escher/include/escher/even_odd_pointer_text_cell.h b/escher/include/escher/even_odd_message_text_cell.h similarity index 62% rename from escher/include/escher/even_odd_pointer_text_cell.h rename to escher/include/escher/even_odd_message_text_cell.h index 4b44b2d61..05d87ae61 100644 --- a/escher/include/escher/even_odd_pointer_text_cell.h +++ b/escher/include/escher/even_odd_message_text_cell.h @@ -1,13 +1,13 @@ -#ifndef ESCHER_EVEN_ODD_POINTER_TEXT_CELL_H -#define ESCHER_EVEN_ODD_POINTER_TEXT_CELL_H +#ifndef ESCHER_EVEN_ODD_MESSAGE_TEXT_CELL_H +#define ESCHER_EVEN_ODD_MESSAGE_TEXT_CELL_H #include #include -#include +#include -class EvenOddPointerTextCell : public EvenOddCell { +class EvenOddMessageTextCell : public EvenOddCell { public: - EvenOddPointerTextCell(KDText::FontSize size = KDText::FontSize::Large); + EvenOddMessageTextCell(KDText::FontSize size = KDText::FontSize::Large); void setEven(bool even) override; void setHighlighted(bool highlight) override; void setMessage(I18n::Message textContent, KDColor textColor = KDColorBlack); @@ -16,7 +16,7 @@ public: View * subviewAtIndex(int index) override; void layoutSubviews() override; protected: - PointerTextView m_pointerTextView; + MessageTextView m_messageTextView; }; #endif diff --git a/escher/include/escher/expression_table_cell_with_pointer.h b/escher/include/escher/expression_table_cell_with_pointer.h index 8cbf2b519..fc382125d 100644 --- a/escher/include/escher/expression_table_cell_with_pointer.h +++ b/escher/include/escher/expression_table_cell_with_pointer.h @@ -3,7 +3,7 @@ #include #include -#include +#include class ExpressionTableCellWithPointer : public ExpressionTableCell { public: @@ -12,7 +12,7 @@ public: void setHighlighted(bool highlight) override; void setAccessoryMessage(I18n::Message messageBody); private: - PointerTextView m_accessoryView; + MessageTextView m_accessoryView; }; #endif diff --git a/escher/include/escher/pointer_table_cell.h b/escher/include/escher/message_table_cell.h similarity index 57% rename from escher/include/escher/pointer_table_cell.h rename to escher/include/escher/message_table_cell.h index 7bf8e875f..d80109627 100644 --- a/escher/include/escher/pointer_table_cell.h +++ b/escher/include/escher/message_table_cell.h @@ -1,19 +1,19 @@ -#ifndef ESCHER_POINTER_TABLE_CELL_H -#define ESCHER_POINTER_TABLE_CELL_H +#ifndef ESCHER_MESSAGE_TABLE_CELL_H +#define ESCHER_MESSAGE_TABLE_CELL_H -#include +#include #include #include -class PointerTableCell : public TableCell { +class MessageTableCell : public TableCell { public: - PointerTableCell(I18n::Message label = (I18n::Message)0, KDText::FontSize size = KDText::FontSize::Small, Layout layout = Layout::Horizontal); + MessageTableCell(I18n::Message label = (I18n::Message)0, KDText::FontSize size = KDText::FontSize::Small, Layout layout = Layout::Horizontal); View * labelView() const override; virtual void setHighlighted(bool highlight) override; void setMessage(I18n::Message message); virtual void setTextColor(KDColor color); private: - PointerTextView m_pointerTextView; + MessageTextView m_messageTextView; }; #endif diff --git a/escher/include/escher/pointer_table_cell_with_buffer.h b/escher/include/escher/message_table_cell_with_buffer.h similarity index 55% rename from escher/include/escher/pointer_table_cell_with_buffer.h rename to escher/include/escher/message_table_cell_with_buffer.h index 41a0673ee..1208a7688 100644 --- a/escher/include/escher/pointer_table_cell_with_buffer.h +++ b/escher/include/escher/message_table_cell_with_buffer.h @@ -1,12 +1,12 @@ -#ifndef ESCHER_POINTER_TABLE_CELL_WITH_BUFFER_H -#define ESCHER_POINTER_TABLE_CELL_WITH_BUFFER_H +#ifndef ESCHER_MESSAGE_TABLE_CELL_WITH_BUFFER_H +#define ESCHER_MESSAGE_TABLE_CELL_WITH_BUFFER_H -#include +#include #include -class PointerTableCellWithBuffer : public PointerTableCell { +class MessageTableCellWithBuffer : public MessageTableCell { public: - PointerTableCellWithBuffer(I18n::Message message = (I18n::Message)0); + MessageTableCellWithBuffer(I18n::Message message = (I18n::Message)0); View * accessoryView() const override; void setHighlighted(bool highlight) override; void setAccessoryText(const char * textBody); diff --git a/escher/include/escher/message_table_cell_with_chevron.h b/escher/include/escher/message_table_cell_with_chevron.h new file mode 100644 index 000000000..589da1103 --- /dev/null +++ b/escher/include/escher/message_table_cell_with_chevron.h @@ -0,0 +1,15 @@ +#ifndef ESCHER_MESSAGE_TABLE_CELL_WITH_CHEVRON_H +#define ESCHER_MESSAGE_TABLE_CELL_WITH_CHEVRON_H + +#include +#include + +class MessageTableCellWithChevron : public MessageTableCell { +public: + MessageTableCellWithChevron(I18n::Message message = (I18n::Message)0, KDText::FontSize size = KDText::FontSize::Small); + View * accessoryView() const override; +private: + ChevronView m_accessoryView; +}; + +#endif diff --git a/escher/include/escher/pointer_table_cell_with_chevron_and_expression.h b/escher/include/escher/message_table_cell_with_chevron_and_expression.h similarity index 53% rename from escher/include/escher/pointer_table_cell_with_chevron_and_expression.h rename to escher/include/escher/message_table_cell_with_chevron_and_expression.h index 30c2e7903..e1423629a 100644 --- a/escher/include/escher/pointer_table_cell_with_chevron_and_expression.h +++ b/escher/include/escher/message_table_cell_with_chevron_and_expression.h @@ -1,12 +1,12 @@ -#ifndef ESCHER_POINTER_TABLE_CELL_WITH_CHEVRON_AND_EXPRESSION_H -#define ESCHER_POINTER_TABLE_CELL_WITH_CHEVRON_AND_EXPRESSION_H +#ifndef ESCHER_MESSAGE_TABLE_CELL_WITH_CHEVRON_AND_EXPRESSION_H +#define ESCHER_MESSAGE_TABLE_CELL_WITH_CHEVRON_AND_EXPRESSION_H -#include +#include #include -class PointerTableCellWithChevronAndExpression : public PointerTableCellWithChevron { +class MessageTableCellWithChevronAndExpression : public MessageTableCellWithChevron { public: - PointerTableCellWithChevronAndExpression(I18n::Message message = (I18n::Message)0, KDText::FontSize size = KDText::FontSize::Small); + MessageTableCellWithChevronAndExpression(I18n::Message message = (I18n::Message)0, KDText::FontSize size = KDText::FontSize::Small); View * subAccessoryView() const override; void setHighlighted(bool highlight) override; void setExpression(Poincare::ExpressionLayout * expressionLayout); diff --git a/escher/include/escher/message_table_cell_with_chevron_and_message.h b/escher/include/escher/message_table_cell_with_chevron_and_message.h new file mode 100644 index 000000000..6f3044293 --- /dev/null +++ b/escher/include/escher/message_table_cell_with_chevron_and_message.h @@ -0,0 +1,16 @@ +#ifndef ESCHER_MESSAGE_TABLE_CELL_WITH_CHEVRON_AND_MESSAGE_H +#define ESCHER_MESSAGE_TABLE_CELL_WITH_CHEVRON_AND_MESSAGE_H + +#include + +class MessageTableCellWithChevronAndMessage : public MessageTableCellWithChevron { +public: + MessageTableCellWithChevronAndMessage(KDText::FontSize labelSize = KDText::FontSize::Small, KDText::FontSize contentSize = KDText::FontSize::Small); + View * subAccessoryView() const override; + void setHighlighted(bool highlight) override; + void setSubtitle(I18n::Message text); +private: + MessageTextView m_subtitleView; +}; + +#endif diff --git a/escher/include/escher/pointer_table_cell_with_editable_text.h b/escher/include/escher/message_table_cell_with_editable_text.h similarity index 68% rename from escher/include/escher/pointer_table_cell_with_editable_text.h rename to escher/include/escher/message_table_cell_with_editable_text.h index 16a7886f5..c878e159f 100644 --- a/escher/include/escher/pointer_table_cell_with_editable_text.h +++ b/escher/include/escher/message_table_cell_with_editable_text.h @@ -1,13 +1,13 @@ -#ifndef ESCHER_POINTER_TABLE_CELL_WITH_EDITABLE_TEXT_H -#define ESCHER_POINTER_TABLE_CELL_WITH_EDITABLE_TEXT_H +#ifndef ESCHER_MESSAGE_TABLE_CELL_WITH_EDITABLE_TEXT_H +#define ESCHER_MESSAGE_TABLE_CELL_WITH_EDITABLE_TEXT_H #include -#include +#include #include -class PointerTableCellWithEditableText : public Responder, public PointerTableCell { +class MessageTableCellWithEditableText : public Responder, public MessageTableCell { public: - PointerTableCellWithEditableText(Responder * parentResponder, TextFieldDelegate * textFieldDelegate, char * draftTextBuffer, I18n::Message message = (I18n::Message)0); + MessageTableCellWithEditableText(Responder * parentResponder, TextFieldDelegate * textFieldDelegate, char * draftTextBuffer, I18n::Message message = (I18n::Message)0); View * accessoryView() const override; const char * editedText() const; void didBecomeFirstResponder() override; diff --git a/escher/include/escher/pointer_table_cell_with_pointer.h b/escher/include/escher/message_table_cell_with_message.h similarity index 50% rename from escher/include/escher/pointer_table_cell_with_pointer.h rename to escher/include/escher/message_table_cell_with_message.h index 9a0b54477..02257f96e 100644 --- a/escher/include/escher/pointer_table_cell_with_pointer.h +++ b/escher/include/escher/message_table_cell_with_message.h @@ -1,18 +1,18 @@ -#ifndef ESCHER_POINTER_TABLE_CELL_WITH_POINTER_H -#define ESCHER_POINTER_TABLE_CELL_WITH_POINTER_H +#ifndef ESCHER_MESSAGE_TABLE_CELL_WITH_MESSAGE_H +#define ESCHER_MESSAGE_TABLE_CELL_WITH_MESSAGE_H -#include +#include -class PointerTableCellWithPointer : public PointerTableCell { +class MessageTableCellWithMessage : public MessageTableCell { public: - PointerTableCellWithPointer(I18n::Message message = (I18n::Message)0, Layout layout = Layout::Vertical); + MessageTableCellWithMessage(I18n::Message message = (I18n::Message)0, Layout layout = Layout::Vertical); View * accessoryView() const override; void setHighlighted(bool highlight) override; void setAccessoryMessage(I18n::Message textBody); void setTextColor(KDColor color) override; void setAccessoryTextColor(KDColor color); protected: - PointerTextView m_accessoryView; + MessageTextView m_accessoryView; }; #endif diff --git a/escher/include/escher/message_table_cell_with_switch.h b/escher/include/escher/message_table_cell_with_switch.h new file mode 100644 index 000000000..2b54e1bf8 --- /dev/null +++ b/escher/include/escher/message_table_cell_with_switch.h @@ -0,0 +1,15 @@ +#ifndef ESCHER_MESSAGE_TABLE_CELL_WITH_SWITCH_H +#define ESCHER_MESSAGE_TABLE_CELL_WITH_SWITCH_H + +#include +#include + +class MessageTableCellWithSwitch : public MessageTableCell { +public: + MessageTableCellWithSwitch(I18n::Message message = (I18n::Message)0); + View * accessoryView() const override; +private: + SwitchView m_accessoryView; +}; + +#endif diff --git a/escher/include/escher/pointer_text_view.h b/escher/include/escher/message_text_view.h similarity index 73% rename from escher/include/escher/pointer_text_view.h rename to escher/include/escher/message_text_view.h index c51ce9d4f..4ca547ea4 100644 --- a/escher/include/escher/pointer_text_view.h +++ b/escher/include/escher/message_text_view.h @@ -1,12 +1,12 @@ -#ifndef ESCHER_POINTER_TEXT_VIEW_H -#define ESCHER_POINTER_TEXT_VIEW_H +#ifndef ESCHER_MESSAGE_TEXT_VIEW_H +#define ESCHER_MESSAGE_TEXT_VIEW_H #include #include -class PointerTextView : public TextView { +class MessageTextView : public TextView { public: - PointerTextView(KDText::FontSize size = KDText::FontSize::Large, I18n::Message message = (I18n::Message)0, float horizontalAlignment = 0.0f, float verticalAlignment = 0.0f, + MessageTextView(KDText::FontSize size = KDText::FontSize::Large, I18n::Message message = (I18n::Message)0, float horizontalAlignment = 0.0f, float verticalAlignment = 0.0f, KDColor textColor = KDColorBlack, KDColor backgroundColor = KDColorWhite); void setText(const char * text) override; void setMessage(I18n::Message message); diff --git a/escher/include/escher/pointer_table_cell_with_chevron.h b/escher/include/escher/pointer_table_cell_with_chevron.h deleted file mode 100644 index c1743dec2..000000000 --- a/escher/include/escher/pointer_table_cell_with_chevron.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef ESCHER_POINTER_TABLE_CELL_WITH_CHEVRON_H -#define ESCHER_POINTER_TABLE_CELL_WITH_CHEVRON_H - -#include -#include - -class PointerTableCellWithChevron : public PointerTableCell { -public: - PointerTableCellWithChevron(I18n::Message message = (I18n::Message)0, KDText::FontSize size = KDText::FontSize::Small); - View * accessoryView() const override; -private: - ChevronView m_accessoryView; -}; - -#endif diff --git a/escher/include/escher/pointer_table_cell_with_chevron_and_pointer.h b/escher/include/escher/pointer_table_cell_with_chevron_and_pointer.h deleted file mode 100644 index f11e31630..000000000 --- a/escher/include/escher/pointer_table_cell_with_chevron_and_pointer.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef ESCHER_POINTER_TABLE_CELL_WITH_CHEVRON_AND_POINTER_H -#define ESCHER_POINTER_TABLE_CELL_WITH_CHEVRON_AND_POINTER_H - -#include - -class PointerTableCellWithChevronAndPointer : public PointerTableCellWithChevron { -public: - PointerTableCellWithChevronAndPointer(KDText::FontSize labelSize = KDText::FontSize::Small, KDText::FontSize contentSize = KDText::FontSize::Small); - View * subAccessoryView() const override; - void setHighlighted(bool highlight) override; - void setSubtitle(I18n::Message text); -private: - PointerTextView m_subtitleView; -}; - -#endif diff --git a/escher/include/escher/pointer_table_cell_with_switch.h b/escher/include/escher/pointer_table_cell_with_switch.h deleted file mode 100644 index 7b0b76d2a..000000000 --- a/escher/include/escher/pointer_table_cell_with_switch.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef ESCHER_POINTER_TABLE_CELL_WITH_SWITCH_H -#define ESCHER_POINTER_TABLE_CELL_WITH_SWITCH_H - -#include -#include - -class PointerTableCellWithSwitch : public PointerTableCell { -public: - PointerTableCellWithSwitch(I18n::Message message = (I18n::Message)0); - View * accessoryView() const override; -private: - SwitchView m_accessoryView; -}; - -#endif diff --git a/escher/include/escher/warning_controller.h b/escher/include/escher/warning_controller.h index 85d032560..c45c0304e 100644 --- a/escher/include/escher/warning_controller.h +++ b/escher/include/escher/warning_controller.h @@ -2,7 +2,7 @@ #define ESCHER_WARNING_CONTROLLER_H #include -#include +#include #include #include @@ -25,7 +25,7 @@ private: private: constexpr static KDCoordinate k_verticalMargin = 40; constexpr static KDCoordinate k_horizontalMargin = 20; - PointerTextView m_textView; + MessageTextView m_textView; }; ContentView m_contentView; diff --git a/escher/src/alternate_empty_view_controller.cpp b/escher/src/alternate_empty_view_controller.cpp index 5b1a66ddd..f15956703 100644 --- a/escher/src/alternate_empty_view_controller.cpp +++ b/escher/src/alternate_empty_view_controller.cpp @@ -6,7 +6,7 @@ /* ContentView */ AlternateEmptyViewController::ContentView::ContentView(ViewController * mainViewController, AlternateEmptyViewDelegate * delegate) : - m_message(PointerTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen)), + m_message(MessageTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorBlack, Palette::WallScreen)), m_mainViewController(mainViewController), m_delegate(delegate) { diff --git a/escher/src/button.cpp b/escher/src/button.cpp index c97ebc769..7a4c0f4c1 100644 --- a/escher/src/button.cpp +++ b/escher/src/button.cpp @@ -5,7 +5,7 @@ Button::Button(Responder * parentResponder, I18n::Message textBody, Invocation invocation, KDText::FontSize size, KDColor textColor) : HighlightCell(), Responder(parentResponder), - m_pointerTextView(PointerTextView(size, textBody, 0.5f, 0.5f, textColor)), + m_messageTextView(MessageTextView(size, textBody, 0.5f, 0.5f, textColor)), m_invocation(invocation) { } @@ -16,11 +16,11 @@ int Button::numberOfSubviews() const { View * Button::subviewAtIndex(int index) { assert(index == 0); - return &m_pointerTextView; + return &m_messageTextView; } void Button::layoutSubviews() { - m_pointerTextView.setFrame(bounds()); + m_messageTextView.setFrame(bounds()); } bool Button::handleEvent(Ion::Events::Event event) { @@ -34,11 +34,11 @@ bool Button::handleEvent(Ion::Events::Event event) { void Button::setHighlighted(bool highlight) { HighlightCell::setHighlighted(highlight); KDColor backgroundColor = highlight? Palette::Select : KDColorWhite; - m_pointerTextView.setBackgroundColor(backgroundColor); + m_messageTextView.setBackgroundColor(backgroundColor); markRectAsDirty(bounds()); } KDSize Button::minimalSizeForOptimalDisplay() const { - KDSize textSize = m_pointerTextView.minimalSizeForOptimalDisplay(); + KDSize textSize = m_messageTextView.minimalSizeForOptimalDisplay(); return KDSize(textSize.width() + k_horizontalMargin, textSize.height() + k_verticalMargin); } diff --git a/escher/src/even_odd_message_text_cell.cpp b/escher/src/even_odd_message_text_cell.cpp new file mode 100644 index 000000000..38fee43e0 --- /dev/null +++ b/escher/src/even_odd_message_text_cell.cpp @@ -0,0 +1,40 @@ +#include +#include + +EvenOddMessageTextCell::EvenOddMessageTextCell(KDText::FontSize size) : + EvenOddCell(), + m_messageTextView(size, (I18n::Message)0, 0.5f, 0.5f) +{ +} + +void EvenOddMessageTextCell::setHighlighted(bool highlight) { + EvenOddCell::setHighlighted(highlight); + m_messageTextView.setBackgroundColor(backgroundColor()); +} + +void EvenOddMessageTextCell::setEven(bool even) { + EvenOddCell::setEven(even); + m_messageTextView.setBackgroundColor(backgroundColor()); +} + +void EvenOddMessageTextCell::setMessage(I18n::Message title, KDColor textColor) { + m_messageTextView.setMessage(title); + m_messageTextView.setTextColor(textColor); +} + +void EvenOddMessageTextCell::setAlignment(float horizontalAlignment, float verticalAlignment) { + m_messageTextView.setAlignment(horizontalAlignment, verticalAlignment); +} + +int EvenOddMessageTextCell::numberOfSubviews() const { + return 1; +} + +View * EvenOddMessageTextCell::subviewAtIndex(int index) { + assert(index == 0); + return &m_messageTextView; +} + +void EvenOddMessageTextCell::layoutSubviews() { + m_messageTextView.setFrame(bounds()); +} diff --git a/escher/src/even_odd_pointer_text_cell.cpp b/escher/src/even_odd_pointer_text_cell.cpp deleted file mode 100644 index 9f0cffa34..000000000 --- a/escher/src/even_odd_pointer_text_cell.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include -#include - -EvenOddPointerTextCell::EvenOddPointerTextCell(KDText::FontSize size) : - EvenOddCell(), - m_pointerTextView(size, (I18n::Message)0, 0.5f, 0.5f) -{ -} - -void EvenOddPointerTextCell::setHighlighted(bool highlight) { - EvenOddCell::setHighlighted(highlight); - m_pointerTextView.setBackgroundColor(backgroundColor()); -} - -void EvenOddPointerTextCell::setEven(bool even) { - EvenOddCell::setEven(even); - m_pointerTextView.setBackgroundColor(backgroundColor()); -} - -void EvenOddPointerTextCell::setMessage(I18n::Message title, KDColor textColor) { - m_pointerTextView.setMessage(title); - m_pointerTextView.setTextColor(textColor); -} - -void EvenOddPointerTextCell::setAlignment(float horizontalAlignment, float verticalAlignment) { - m_pointerTextView.setAlignment(horizontalAlignment, verticalAlignment); -} - -int EvenOddPointerTextCell::numberOfSubviews() const { - return 1; -} - -View * EvenOddPointerTextCell::subviewAtIndex(int index) { - assert(index == 0); - return &m_pointerTextView; -} - -void EvenOddPointerTextCell::layoutSubviews() { - m_pointerTextView.setFrame(bounds()); -} diff --git a/escher/src/expression_table_cell_with_pointer.cpp b/escher/src/expression_table_cell_with_pointer.cpp index dde44a0c0..407c81d7a 100644 --- a/escher/src/expression_table_cell_with_pointer.cpp +++ b/escher/src/expression_table_cell_with_pointer.cpp @@ -4,7 +4,7 @@ ExpressionTableCellWithPointer::ExpressionTableCellWithPointer(I18n::Message accessoryMessage, Layout layout) : ExpressionTableCell(layout), - m_accessoryView(PointerTextView(KDText::FontSize::Small, accessoryMessage, 0.0f, 0.5f, Palette::GreyDark, KDColorWhite)) + m_accessoryView(MessageTextView(KDText::FontSize::Small, accessoryMessage, 0.0f, 0.5f, Palette::GreyDark, KDColorWhite)) { if (layout == Layout::Horizontal) { m_accessoryView.setAlignment(1.0f, 0.5f); diff --git a/escher/src/message_table_cell.cpp b/escher/src/message_table_cell.cpp new file mode 100644 index 000000000..e35f36c6c --- /dev/null +++ b/escher/src/message_table_cell.cpp @@ -0,0 +1,28 @@ +#include +#include +#include + +MessageTableCell::MessageTableCell(I18n::Message label, KDText::FontSize size, Layout layout) : + TableCell(layout), + m_messageTextView(MessageTextView(size, label, 0, 0.5, KDColorBlack, KDColorWhite)) +{ +} + +View * MessageTableCell::labelView() const { + return (View *)&m_messageTextView; +} + +void MessageTableCell::setHighlighted(bool highlight) { + HighlightCell::setHighlighted(highlight); + KDColor backgroundColor = highlight? Palette::Select : KDColorWhite; + m_messageTextView.setBackgroundColor(backgroundColor); +} + +void MessageTableCell::setMessage(I18n::Message text) { + m_messageTextView.setMessage(text); + layoutSubviews(); +} + +void MessageTableCell::setTextColor(KDColor color) { + m_messageTextView.setTextColor(color); +} diff --git a/escher/src/message_table_cell_with_buffer.cpp b/escher/src/message_table_cell_with_buffer.cpp new file mode 100644 index 000000000..fb05563f8 --- /dev/null +++ b/escher/src/message_table_cell_with_buffer.cpp @@ -0,0 +1,32 @@ +#include +#include + +MessageTableCellWithBuffer::MessageTableCellWithBuffer(I18n::Message message) : + MessageTableCell(message), + m_accessoryView(BufferTextView(KDText::FontSize::Large, 1.0f, 0.5f)) +{ +} + +void MessageTableCellWithBuffer::setAccessoryText(const char * textBody) { + m_accessoryView.setText(textBody); + reloadCell(); +} + +const char * MessageTableCellWithBuffer::accessoryText() { + return m_accessoryView.text(); +} + +View * MessageTableCellWithBuffer::accessoryView() const { + return (View *)&m_accessoryView; +} + +void MessageTableCellWithBuffer::setHighlighted(bool highlight) { + MessageTableCell::setHighlighted(highlight); + KDColor backgroundColor = isHighlighted()? Palette::Select : KDColorWhite; + m_accessoryView.setBackgroundColor(backgroundColor); +} + +void MessageTableCellWithBuffer::setTextColor(KDColor color) { + m_accessoryView.setTextColor(color); + MessageTableCell::setTextColor(color); +} diff --git a/escher/src/message_table_cell_with_chevron.cpp b/escher/src/message_table_cell_with_chevron.cpp new file mode 100644 index 000000000..6957c4b23 --- /dev/null +++ b/escher/src/message_table_cell_with_chevron.cpp @@ -0,0 +1,12 @@ +#include + +MessageTableCellWithChevron::MessageTableCellWithChevron(I18n::Message message, KDText::FontSize size) : + MessageTableCell(message, size), + m_accessoryView(ChevronView()) +{ +} + +View * MessageTableCellWithChevron::accessoryView() const { + return (View *)&m_accessoryView; +} + diff --git a/escher/src/pointer_table_cell_with_chevron_and_expression.cpp b/escher/src/message_table_cell_with_chevron_and_expression.cpp similarity index 53% rename from escher/src/pointer_table_cell_with_chevron_and_expression.cpp rename to escher/src/message_table_cell_with_chevron_and_expression.cpp index 262e4d6b4..d3e46ee75 100644 --- a/escher/src/pointer_table_cell_with_chevron_and_expression.cpp +++ b/escher/src/message_table_cell_with_chevron_and_expression.cpp @@ -1,23 +1,23 @@ -#include +#include #include -PointerTableCellWithChevronAndExpression::PointerTableCellWithChevronAndExpression(I18n::Message message, KDText::FontSize size) : - PointerTableCellWithChevron(message, size), +MessageTableCellWithChevronAndExpression::MessageTableCellWithChevronAndExpression(I18n::Message message, KDText::FontSize size) : + MessageTableCellWithChevron(message, size), m_subtitleView(1.0f, 0.5f, Palette::GreyDark) { } -View * PointerTableCellWithChevronAndExpression::subAccessoryView() const { +View * MessageTableCellWithChevronAndExpression::subAccessoryView() const { return (View *)&m_subtitleView; } -void PointerTableCellWithChevronAndExpression::setHighlighted(bool highlight) { - PointerTableCellWithChevron::setHighlighted(highlight); +void MessageTableCellWithChevronAndExpression::setHighlighted(bool highlight) { + MessageTableCellWithChevron::setHighlighted(highlight); KDColor backgroundColor = isHighlighted()? Palette::Select : KDColorWhite; m_subtitleView.setBackgroundColor(backgroundColor); } -void PointerTableCellWithChevronAndExpression::setExpression(Poincare::ExpressionLayout * expressionLayout) { +void MessageTableCellWithChevronAndExpression::setExpression(Poincare::ExpressionLayout * expressionLayout) { m_subtitleView.setExpression(expressionLayout); reloadCell(); layoutSubviews(); diff --git a/escher/src/message_table_cell_with_chevron_and_message.cpp b/escher/src/message_table_cell_with_chevron_and_message.cpp new file mode 100644 index 000000000..c42e4f223 --- /dev/null +++ b/escher/src/message_table_cell_with_chevron_and_message.cpp @@ -0,0 +1,24 @@ +#include +#include + +MessageTableCellWithChevronAndMessage::MessageTableCellWithChevronAndMessage(KDText::FontSize labelSize, KDText::FontSize contentSize) : + MessageTableCellWithChevron((I18n::Message)0, labelSize), + m_subtitleView(contentSize, (I18n::Message)0, 1.0f, 0.5f, Palette::GreyDark) +{ +} + +View * MessageTableCellWithChevronAndMessage::subAccessoryView() const { + return (View *)&m_subtitleView; +} + +void MessageTableCellWithChevronAndMessage::setHighlighted(bool highlight) { + MessageTableCellWithChevron::setHighlighted(highlight); + KDColor backgroundColor = isHighlighted()? Palette::Select : KDColorWhite; + m_subtitleView.setBackgroundColor(backgroundColor); +} + +void MessageTableCellWithChevronAndMessage::setSubtitle(I18n::Message text) { + m_subtitleView.setMessage(text); + reloadCell(); + layoutSubviews(); +} diff --git a/escher/src/pointer_table_cell_with_editable_text.cpp b/escher/src/message_table_cell_with_editable_text.cpp similarity index 51% rename from escher/src/pointer_table_cell_with_editable_text.cpp rename to escher/src/message_table_cell_with_editable_text.cpp index 9e370ba01..fe32faade 100644 --- a/escher/src/pointer_table_cell_with_editable_text.cpp +++ b/escher/src/message_table_cell_with_editable_text.cpp @@ -1,42 +1,42 @@ -#include +#include #include #include -PointerTableCellWithEditableText::PointerTableCellWithEditableText(Responder * parentResponder, TextFieldDelegate * textFieldDelegate, char * draftTextBuffer, I18n::Message message) : +MessageTableCellWithEditableText::MessageTableCellWithEditableText(Responder * parentResponder, TextFieldDelegate * textFieldDelegate, char * draftTextBuffer, I18n::Message message) : Responder(parentResponder), - PointerTableCell(message), + MessageTableCell(message), m_textField(TextField(this, m_textBody, draftTextBuffer, 255, textFieldDelegate, KDText::FontSize::Large, 1.0f, 0.5f)) { } -View * PointerTableCellWithEditableText::accessoryView() const { +View * MessageTableCellWithEditableText::accessoryView() const { return (View *)&m_textField; } -const char * PointerTableCellWithEditableText::editedText() const { +const char * MessageTableCellWithEditableText::editedText() const { return m_textField.text(); } -void PointerTableCellWithEditableText::didBecomeFirstResponder() { +void MessageTableCellWithEditableText::didBecomeFirstResponder() { app()->setFirstResponder(&m_textField); } -void PointerTableCellWithEditableText::setEditing(bool isEditing) { +void MessageTableCellWithEditableText::setEditing(bool isEditing) { m_textField.setEditing(isEditing); } -void PointerTableCellWithEditableText::setHighlighted(bool highlight) { - PointerTableCell::setHighlighted(highlight); +void MessageTableCellWithEditableText::setHighlighted(bool highlight) { + MessageTableCell::setHighlighted(highlight); KDColor backgroundColor = highlight? Palette::Select : KDColorWhite; m_textField.setBackgroundColor(backgroundColor); } -void PointerTableCellWithEditableText::setAccessoryText(const char * text) { +void MessageTableCellWithEditableText::setAccessoryText(const char * text) { m_textField.setText(text); layoutSubviews(); } -void PointerTableCellWithEditableText::setTextColor(KDColor color) { +void MessageTableCellWithEditableText::setTextColor(KDColor color) { m_textField.setTextColor(color); - PointerTableCell::setTextColor(color); + MessageTableCell::setTextColor(color); } diff --git a/escher/src/message_table_cell_with_message.cpp b/escher/src/message_table_cell_with_message.cpp new file mode 100644 index 000000000..adf721a97 --- /dev/null +++ b/escher/src/message_table_cell_with_message.cpp @@ -0,0 +1,35 @@ +#include +#include + +MessageTableCellWithMessage::MessageTableCellWithMessage(I18n::Message message, Layout layout) : + MessageTableCell(message, KDText::FontSize::Small, layout), + m_accessoryView(MessageTextView(KDText::FontSize::Small, (I18n::Message)0, 0.0f, 0.5f)) +{ + if (layout != Layout::Vertical) { + m_accessoryView.setAlignment(1.0f, 0.5f); + } +} + +void MessageTableCellWithMessage::setAccessoryMessage(I18n::Message textBody) { + m_accessoryView.setMessage(textBody); + reloadCell(); +} + +View * MessageTableCellWithMessage::accessoryView() const { + return (View *)&m_accessoryView; +} + +void MessageTableCellWithMessage::setHighlighted(bool highlight) { + MessageTableCell::setHighlighted(highlight); + KDColor backgroundColor = isHighlighted()? Palette::Select : KDColorWhite; + m_accessoryView.setBackgroundColor(backgroundColor); +} + +void MessageTableCellWithMessage::setTextColor(KDColor color) { + m_accessoryView.setTextColor(color); + MessageTableCell::setTextColor(color); +} + +void MessageTableCellWithMessage::setAccessoryTextColor(KDColor color) { + m_accessoryView.setTextColor(color); +} diff --git a/escher/src/message_table_cell_with_switch.cpp b/escher/src/message_table_cell_with_switch.cpp new file mode 100644 index 000000000..9307929b7 --- /dev/null +++ b/escher/src/message_table_cell_with_switch.cpp @@ -0,0 +1,12 @@ +#include +#include + +MessageTableCellWithSwitch::MessageTableCellWithSwitch(I18n::Message message) : + MessageTableCell(message), + m_accessoryView(SwitchView()) +{ +} + +View * MessageTableCellWithSwitch::accessoryView() const { + return (View *)&m_accessoryView; +} diff --git a/escher/src/pointer_text_view.cpp b/escher/src/message_text_view.cpp similarity index 68% rename from escher/src/pointer_text_view.cpp rename to escher/src/message_text_view.cpp index b7796113a..a2867ea68 100644 --- a/escher/src/pointer_text_view.cpp +++ b/escher/src/message_text_view.cpp @@ -1,27 +1,27 @@ -#include +#include #include -PointerTextView::PointerTextView(KDText::FontSize size, I18n::Message message, float horizontalAlignment, float verticalAlignment, +MessageTextView::MessageTextView(KDText::FontSize size, I18n::Message message, float horizontalAlignment, float verticalAlignment, KDColor textColor, KDColor backgroundColor) : TextView(size, horizontalAlignment, verticalAlignment, textColor, backgroundColor), m_message(message) { } -const char * PointerTextView::text() const { +const char * MessageTextView::text() const { return I18n::translate(m_message); } -void PointerTextView::setText(const char * text) { +void MessageTextView::setText(const char * text) { assert(false); } -void PointerTextView::setMessage(I18n::Message message) { +void MessageTextView::setMessage(I18n::Message message) { m_message = message; markRectAsDirty(bounds()); } -KDSize PointerTextView::minimalSizeForOptimalDisplay() const { +KDSize MessageTextView::minimalSizeForOptimalDisplay() const { KDCoordinate width = 0; for (int l = 0; l < I18n::numberOfLanguages(); l++) { KDCoordinate newWidth = KDText::stringSize(I18n::translate(m_message, (I18n::Language)l), m_fontSize).width(); diff --git a/escher/src/pointer_table_cell.cpp b/escher/src/pointer_table_cell.cpp deleted file mode 100644 index bece85eb0..000000000 --- a/escher/src/pointer_table_cell.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include -#include -#include - -PointerTableCell::PointerTableCell(I18n::Message label, KDText::FontSize size, Layout layout) : - TableCell(layout), - m_pointerTextView(PointerTextView(size, label, 0, 0.5, KDColorBlack, KDColorWhite)) -{ -} - -View * PointerTableCell::labelView() const { - return (View *)&m_pointerTextView; -} - -void PointerTableCell::setHighlighted(bool highlight) { - HighlightCell::setHighlighted(highlight); - KDColor backgroundColor = highlight? Palette::Select : KDColorWhite; - m_pointerTextView.setBackgroundColor(backgroundColor); -} - -void PointerTableCell::setMessage(I18n::Message text) { - m_pointerTextView.setMessage(text); - layoutSubviews(); -} - -void PointerTableCell::setTextColor(KDColor color) { - m_pointerTextView.setTextColor(color); -} diff --git a/escher/src/pointer_table_cell_with_buffer.cpp b/escher/src/pointer_table_cell_with_buffer.cpp deleted file mode 100644 index 0deadee34..000000000 --- a/escher/src/pointer_table_cell_with_buffer.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include -#include - -PointerTableCellWithBuffer::PointerTableCellWithBuffer(I18n::Message message) : - PointerTableCell(message), - m_accessoryView(BufferTextView(KDText::FontSize::Large, 1.0f, 0.5f)) -{ -} - -void PointerTableCellWithBuffer::setAccessoryText(const char * textBody) { - m_accessoryView.setText(textBody); - reloadCell(); -} - -const char * PointerTableCellWithBuffer::accessoryText() { - return m_accessoryView.text(); -} - -View * PointerTableCellWithBuffer::accessoryView() const { - return (View *)&m_accessoryView; -} - -void PointerTableCellWithBuffer::setHighlighted(bool highlight) { - PointerTableCell::setHighlighted(highlight); - KDColor backgroundColor = isHighlighted()? Palette::Select : KDColorWhite; - m_accessoryView.setBackgroundColor(backgroundColor); -} - -void PointerTableCellWithBuffer::setTextColor(KDColor color) { - m_accessoryView.setTextColor(color); - PointerTableCell::setTextColor(color); -} diff --git a/escher/src/pointer_table_cell_with_chevron.cpp b/escher/src/pointer_table_cell_with_chevron.cpp deleted file mode 100644 index da0c3e8d7..000000000 --- a/escher/src/pointer_table_cell_with_chevron.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include - -PointerTableCellWithChevron::PointerTableCellWithChevron(I18n::Message message, KDText::FontSize size) : - PointerTableCell(message, size), - m_accessoryView(ChevronView()) -{ -} - -View * PointerTableCellWithChevron::accessoryView() const { - return (View *)&m_accessoryView; -} - diff --git a/escher/src/pointer_table_cell_with_chevron_and_pointer.cpp b/escher/src/pointer_table_cell_with_chevron_and_pointer.cpp deleted file mode 100644 index 9401b4422..000000000 --- a/escher/src/pointer_table_cell_with_chevron_and_pointer.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include -#include - -PointerTableCellWithChevronAndPointer::PointerTableCellWithChevronAndPointer(KDText::FontSize labelSize, KDText::FontSize contentSize) : - PointerTableCellWithChevron((I18n::Message)0, labelSize), - m_subtitleView(contentSize, (I18n::Message)0, 1.0f, 0.5f, Palette::GreyDark) -{ -} - -View * PointerTableCellWithChevronAndPointer::subAccessoryView() const { - return (View *)&m_subtitleView; -} - -void PointerTableCellWithChevronAndPointer::setHighlighted(bool highlight) { - PointerTableCellWithChevron::setHighlighted(highlight); - KDColor backgroundColor = isHighlighted()? Palette::Select : KDColorWhite; - m_subtitleView.setBackgroundColor(backgroundColor); -} - -void PointerTableCellWithChevronAndPointer::setSubtitle(I18n::Message text) { - m_subtitleView.setMessage(text); - reloadCell(); - layoutSubviews(); -} diff --git a/escher/src/pointer_table_cell_with_pointer.cpp b/escher/src/pointer_table_cell_with_pointer.cpp deleted file mode 100644 index 6fa5d2059..000000000 --- a/escher/src/pointer_table_cell_with_pointer.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include -#include - -PointerTableCellWithPointer::PointerTableCellWithPointer(I18n::Message message, Layout layout) : - PointerTableCell(message, KDText::FontSize::Small, layout), - m_accessoryView(PointerTextView(KDText::FontSize::Small, (I18n::Message)0, 0.0f, 0.5f)) -{ - if (layout != Layout::Vertical) { - m_accessoryView.setAlignment(1.0f, 0.5f); - } -} - -void PointerTableCellWithPointer::setAccessoryMessage(I18n::Message textBody) { - m_accessoryView.setMessage(textBody); - reloadCell(); -} - -View * PointerTableCellWithPointer::accessoryView() const { - return (View *)&m_accessoryView; -} - -void PointerTableCellWithPointer::setHighlighted(bool highlight) { - PointerTableCell::setHighlighted(highlight); - KDColor backgroundColor = isHighlighted()? Palette::Select : KDColorWhite; - m_accessoryView.setBackgroundColor(backgroundColor); -} - -void PointerTableCellWithPointer::setTextColor(KDColor color) { - m_accessoryView.setTextColor(color); - PointerTableCell::setTextColor(color); -} - -void PointerTableCellWithPointer::setAccessoryTextColor(KDColor color) { - m_accessoryView.setTextColor(color); -} diff --git a/escher/src/pointer_table_cell_with_switch.cpp b/escher/src/pointer_table_cell_with_switch.cpp deleted file mode 100644 index 749a4e004..000000000 --- a/escher/src/pointer_table_cell_with_switch.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include -#include - -PointerTableCellWithSwitch::PointerTableCellWithSwitch(I18n::Message message) : - PointerTableCell(message), - m_accessoryView(SwitchView()) -{ -} - -View * PointerTableCellWithSwitch::accessoryView() const { - return (View *)&m_accessoryView; -} diff --git a/escher/src/warning_controller.cpp b/escher/src/warning_controller.cpp index 894c57816..9d5ae6569 100644 --- a/escher/src/warning_controller.cpp +++ b/escher/src/warning_controller.cpp @@ -3,7 +3,7 @@ WarningController::ContentView::ContentView() : SolidColorView(KDColorBlack), - m_textView(PointerTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorWhite, KDColorBlack)) + m_textView(MessageTextView(KDText::FontSize::Small, (I18n::Message)0, 0.5f, 0.5f, KDColorWhite, KDColorBlack)) { }