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

[Change] Settings camelCase

Browse Source
This commit is contained in:
Quentin Guidée
2020-07-02 18:10:19 +02:00
parent bd6c7200cd
commit cd2a250d20
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/settings/sub_menu/math_options_controller.cpp
View File

@@ -64,10 +64,10 @@ void MathOptionsController::willDisplayCellForIndex(HighlightCell * cell, int in
childIndex = (int)preferences->complexFormat();
break;
case I18n::Message::SymbolMultiplication:
childIndex = (int)preferences->symbolofMultiplication();
childIndex = (int)preferences->symbolOfMultiplication();
break;
case I18n::Message::SymbolFunction:
childIndex = (int)preferences->symbolofFunction();
childIndex = (int)preferences->symbolOfFunction();
break;
default:
break;

6
apps/settings/sub_menu/preferences_controller.cpp
View File

@@ -261,7 +261,7 @@ void PreferencesController::setPreferenceWithValueIndex(I18n::Message message, i
} else if (message == I18n::Message::SymbolMultiplication) {
preferences->setSymbolMultiplication((Preferences::SymbolMultiplication)valueIndex);
} else if (message == I18n::Message::SymbolFunction) {
preferences->setSymbolofFunction((Preferences::SymbolFunction)valueIndex);
preferences->setSymbolOfFunction((Preferences::SymbolFunction)valueIndex);
} else if (message == I18n::Message::FontSizes) {
GlobalPreferences::sharedGlobalPreferences()->setFont(valueIndex == 0 ? KDFont::LargeFont : KDFont::SmallFont);
}
@@ -287,10 +287,10 @@ int PreferencesController::valueIndexForPreference(I18n::Message message) const
}
#endif
if (message == I18n::Message::SymbolMultiplication) {
return (int)preferences->symbolofMultiplication();
return (int)preferences->symbolOfMultiplication();
}
if (message == I18n::Message::SymbolFunction) {
return (int)preferences->symbolofFunction();
return (int)preferences->symbolOfFunction();
}
if (message == I18n::Message::FontSizes) {
return GlobalPreferences::sharedGlobalPreferences()->font() == KDFont::LargeFont ? 0 : 1;

8
poincare/include/poincare/preferences.h
View File

@@ -75,10 +75,10 @@ public:
void setNumberOfSignificantDigits(uint8_t numberOfSignificantDigits) { m_numberOfSignificantDigits = numberOfSignificantDigits; }
LEDColor colorOfLED() const { return m_colorOfLED; }
void setColorOfLED(LEDColor color) { m_colorOfLED = color; }
SymbolMultiplication symbolofMultiplication() const { return m_symbolMultiplication; }
void setSymbolMultiplication(SymbolMultiplication symbolofMultiplication) { m_symbolMultiplication = symbolofMultiplication; }
SymbolFunction symbolofFunction() const { return m_symbolFunction; }
void setSymbolofFunction(SymbolFunction symbolofFunction) { m_symbolFunction = symbolofFunction; }
SymbolMultiplication symbolOfMultiplication() const { return m_symbolMultiplication; }
void setSymbolMultiplication(SymbolMultiplication symbolOfMultiplication) { m_symbolMultiplication = symbolOfMultiplication; }
SymbolFunction symbolOfFunction() const { return m_symbolFunction; }
void setSymbolOfFunction(SymbolFunction symbolOfFunction) { m_symbolFunction = symbolOfFunction; }
PythonFont pythonFont() const { return m_pythonFont; }
void setPythonFont(PythonFont pythonFont) { m_pythonFont = pythonFont; }
const KDFont * KDPythonFont() const { return (m_pythonFont == PythonFont::Small) ? KDFont::SmallFont : KDFont::LargeFont; }

8
poincare/src/layout_cursor.cpp
View File

@@ -111,7 +111,7 @@ void LayoutCursor::addEmptyMatrixLayout() {
void LayoutCursor::addLog() {
Preferences * preferences = Preferences::sharedPreferences();
switch((int)preferences->symbolofFunction()){
switch((int)preferences->symbolOfFunction()){
case 1:
addEmpty10Log();
break;
@@ -180,7 +180,7 @@ void LayoutCursor::addEmptyArgLog() {
void LayoutCursor::addRoot() {
Preferences * preferences = Preferences::sharedPreferences();
switch((int)preferences->symbolofFunction()){
switch((int)preferences->symbolOfFunction()){
case 1:
addEmptyArgSquareRootLayout();
break;
@@ -240,7 +240,7 @@ void LayoutCursor::addEmptyTenPowerLayout() {
EmptyLayout emptyLayout = EmptyLayout::Builder();
Preferences * preferences = Preferences::sharedPreferences();
int Symbol;
switch((int)preferences->symbolofMultiplication()){
switch((int)preferences->symbolOfMultiplication()){
case 1:
Symbol = UCodePointMiddleDot;
break;
@@ -276,7 +276,7 @@ void LayoutCursor::addXNTCodePointLayout() {
void LayoutCursor::addMultiplicationPointLayout(){
Preferences * preferences = Preferences::sharedPreferences();
switch((int)preferences->symbolofMultiplication()){
switch((int)preferences->symbolOfMultiplication()){
case 1:
addLayoutAndMoveCursor(HorizontalLayout::Builder(CodePointLayout::Builder(UCodePointMiddleDot)));
break;

4
poincare/src/multiplication.cpp
View File

@@ -181,14 +181,14 @@ CodePoint MultiplicationNode::operatorSymbol() const {
* × --> 2
* * --> 3 */
int sign = -1;
if(preferences->symbolofMultiplication() == Poincare::Preferences::SymbolMultiplication::Auto){
if(preferences->symbolOfMultiplication() == Poincare::Preferences::SymbolMultiplication::Auto){
for (int i = 0; i < numberOfChildren() - 1; i++) {
/* The operator symbol must be the same for all operands of the multiplication.
* If one operator has to be '×', they will all be '×'. Idem for '·'. */
sign = std::max(sign, operatorSymbolBetween(childAtIndex(i)->rightLayoutShape(), childAtIndex(i+1)->leftLayoutShape()));
}
} else {
switch(preferences->symbolofMultiplication()){
switch(preferences->symbolOfMultiplication()){
case Poincare::Preferences::SymbolMultiplication::MiddleDot :
sign = 1; // · --> · (1)
break;