Quentin Guidée 24907511f5 Fix conflicts

2020-02-23 13:27:10 +01:00

..

complex_graph_cell.cpp

[apps/shared] Create a class Dots to share dots masks between CurveView

2020-02-12 15:13:21 +01:00

complex_graph_cell.h

[apps/calculation] additional_outputs: make a parent class to

2020-02-12 15:13:21 +01:00

complex_list_controller.cpp

[apps/calculation] ComplexListController: change the way the

2020-02-12 15:13:21 +01:00

complex_list_controller.h

[apps/calculation] Handle OK events on additional outputs pop-up - WIP

2020-02-12 15:13:20 +01:00

complex_model.cpp

[apps/calculation] additional_outputs: clean and improve ComplexModel

2020-02-12 15:13:20 +01:00

complex_model.h

[apps/calculation] additional_outputs: clean and improve ComplexModel

2020-02-12 15:13:20 +01:00

expression_with_equal_sign_view.cpp

[apps/calculation] ExpressionWithEqualSignView inherits from

2020-02-12 15:13:22 +01:00

expression_with_equal_sign_view.h

[apps/calculation] ExpressionWithEqualSignView inherits from

2020-02-12 15:13:22 +01:00

expressions_list_controller.cpp

[apps/calc] Do not forget to call parent method

2020-02-21 17:04:19 +01:00

expressions_list_controller.h

[apps/calculation] Additional outputs: Clean cells when the pop-up

2020-02-20 10:56:11 +01:00

illustrated_list_controller.cpp

[apps/calc] Do not forget to call parent method

2020-02-21 17:04:19 +01:00

illustrated_list_controller.h

[apps/shared][apps/calculation] Change class names:

2020-02-12 15:13:22 +01:00

illustration_cell.cpp

[escher] Create a class Bordered instead of BorderedCell: this enable

2020-02-12 15:13:21 +01:00

illustration_cell.h

[escher] Create a class Bordered instead of BorderedCell: this enable

2020-02-12 15:13:21 +01:00

integer_list_controller.cpp

[apps/calculation] Do no display the factor expression if it is

2020-02-12 15:13:20 +01:00

integer_list_controller.h

[apps/calculation] Handle OK events on additional outputs pop-up - WIP

2020-02-12 15:13:20 +01:00

list_controller.cpp

Merge remote-tracking branch 'upstream/master' into omega-hotfix

2020-02-20 23:41:50 +01:00

list_controller.h

[apps/calculation] Improve text inserted in EditExpressionController

2020-02-12 15:13:20 +01:00

rational_list_controller.cpp

[apps/calculation][poincare] AdditionalInformationType is determined

2020-02-12 15:13:21 +01:00

rational_list_controller.h

[apps/calculation] additional_outputs: In RationalListController,

2020-02-12 15:13:21 +01:00

scrollable_three_expressions_cell.cpp

[apps/calculation] Additional outputs: Clean cells when the pop-up

2020-02-20 10:56:11 +01:00

scrollable_three_expressions_cell.h

[apps/calculation] Additional outputs: Clean cells when the pop-up

2020-02-20 10:56:11 +01:00

trigonometry_graph_cell.cpp

[apps/shared] Create a class Dots to share dots masks between CurveView

2020-02-12 15:13:21 +01:00

trigonometry_graph_cell.h

[apps/calculation] additional_outputs: make a parent class to

2020-02-12 15:13:21 +01:00

trigonometry_list_controller.cpp

[apps/calculation] Calculations now hold 4 texts: input, exact output

2020-02-12 15:13:23 +01:00

trigonometry_list_controller.h

[apps/calculation] Handle OK events on additional outputs pop-up - WIP

2020-02-12 15:13:20 +01:00

trigonometry_model.cpp

[calculation] First version of the TrigonometryListController

2020-02-12 15:13:19 +01:00

trigonometry_model.h

[apps/calculation] Trigonometry: set the range to see "cos(θ)" label

2020-02-12 15:13:20 +01:00