mirror of
https://bitbucket.org/smil3y/kde-workspace.git
synced 2025-02-24 02:42:50 +00:00
plasma: reset calculator applet operator on equal operation
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
ac7474d362
commit
50bd202229
1 changed files with 4 additions and 1 deletions
|
@ -345,7 +345,6 @@ void CalculatorAppletWidget::slotPlus()
|
||||||
slotClear();
|
slotClear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void CalculatorAppletWidget::slot1()
|
void CalculatorAppletWidget::slot1()
|
||||||
{
|
{
|
||||||
m_label->setText(kAddNumber(m_label->text(), 1));
|
m_label->setText(kAddNumber(m_label->text(), 1));
|
||||||
|
@ -370,21 +369,25 @@ void CalculatorAppletWidget::slotEqual()
|
||||||
case CalculatorAppletWidget::OperatorDiv: {
|
case CalculatorAppletWidget::OperatorDiv: {
|
||||||
const qreal currentnumber = m_label->text().toFloat();
|
const qreal currentnumber = m_label->text().toFloat();
|
||||||
m_label->setText(QString::number(m_savednumber / currentnumber));
|
m_label->setText(QString::number(m_savednumber / currentnumber));
|
||||||
|
m_operator = CalculatorAppletWidget::OperatorNone;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case CalculatorAppletWidget::OperatorMul: {
|
case CalculatorAppletWidget::OperatorMul: {
|
||||||
const qreal currentnumber = m_label->text().toFloat();
|
const qreal currentnumber = m_label->text().toFloat();
|
||||||
m_label->setText(QString::number(m_savednumber * currentnumber));
|
m_label->setText(QString::number(m_savednumber * currentnumber));
|
||||||
|
m_operator = CalculatorAppletWidget::OperatorNone;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case CalculatorAppletWidget::OperatorMinus: {
|
case CalculatorAppletWidget::OperatorMinus: {
|
||||||
const qreal currentnumber = m_label->text().toFloat();
|
const qreal currentnumber = m_label->text().toFloat();
|
||||||
m_label->setText(QString::number(m_savednumber - currentnumber));
|
m_label->setText(QString::number(m_savednumber - currentnumber));
|
||||||
|
m_operator = CalculatorAppletWidget::OperatorNone;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case CalculatorAppletWidget::OperatorPlus: {
|
case CalculatorAppletWidget::OperatorPlus: {
|
||||||
const qreal currentnumber = m_label->text().toFloat();
|
const qreal currentnumber = m_label->text().toFloat();
|
||||||
m_label->setText(QString::number(m_savednumber + currentnumber));
|
m_label->setText(QString::number(m_savednumber + currentnumber));
|
||||||
|
m_operator = CalculatorAppletWidget::OperatorNone;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue