diff --git a/src/app/tape/share/resources/tapeicon/24x24/equal.png b/src/app/tape/share/resources/tapeicon/24x24/equal.png deleted file mode 100644 index 89a704c56..000000000 Binary files a/src/app/tape/share/resources/tapeicon/24x24/equal.png and /dev/null differ diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index caed092f6..35770945a 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -472,13 +472,11 @@ void TMainWindow::InitWindow() VDomDocument::UnitsToStr(m->MUnit(), true)); // Tab Measurements - delete ui->labelValue; + delete ui->labelFormula; delete ui->horizontalLayoutValue; delete ui->plainTextEditFormula; delete ui->pushButtonGrowLength; delete ui->toolButtonExprLength; - delete ui->labelEqual; - delete ui->labelResultCalculation; // Tab Information delete ui->labelGivenName; diff --git a/src/app/tape/tmainwindow.ui b/src/app/tape/tmainwindow.ui index 51dd30335..c1373e739 100644 --- a/src/app/tape/tmainwindow.ui +++ b/src/app/tape/tmainwindow.ui @@ -118,14 +118,14 @@ - - + + - Value: + Formula: - + @@ -207,93 +207,58 @@ - - - - - - - :/tapeicon/24x24/equal.png - - - - - - - - 0 - 0 - - - - - 87 - 0 - - - - Value of first angle - - - - - - _ - - - - + Base value: - + false - + In sizes: - + false - + In heights: - + false - + Description: - + false @@ -365,6 +330,20 @@ + + + + Calculated value: + + + + + + + 0 + + +