From dfc73323567560fca9b4f2637be0a3008bf8ef21 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Tue, 21 Jul 2015 16:24:21 +0300
Subject: [PATCH] Field Calculated value.

--HG--
branch : feature
---
 .../share/resources/tapeicon/24x24/equal.png  | Bin 118 -> 0 bytes
 src/app/tape/tmainwindow.cpp                  |   4 +-
 src/app/tape/tmainwindow.ui                   |  73 +++++++-----------
 3 files changed, 27 insertions(+), 50 deletions(-)
 delete mode 100644 src/app/tape/share/resources/tapeicon/24x24/equal.png

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 89a704c56dde804f97a31f5f24afb55609b80438..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 118
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4%caKYZ?lYt`Io-U3d
z9-YYv609r?%FN7%>!YF$xOg9S*OibF>uCyfu$0j4cGHz$En#5TwUtSf<45{Dpf(0i
LS3j3^P6<r_Xxko?

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 @@
              </property>
             </widget>
            </item>
-           <item row="4" column="0">
-            <widget class="QLabel" name="labelValue">
+           <item row="5" column="0">
+            <widget class="QLabel" name="labelFormula">
              <property name="text">
-              <string>Value:</string>
+              <string>Formula:</string>
              </property>
             </widget>
            </item>
-           <item row="4" column="1">
+           <item row="5" column="1">
             <layout class="QHBoxLayout" name="horizontalLayoutValue">
              <item>
               <widget class="QPlainTextEdit" name="plainTextEditFormula">
@@ -207,93 +207,58 @@
                </property>
               </widget>
              </item>
-             <item>
-              <widget class="QLabel" name="labelEqual">
-               <property name="text">
-                <string/>
-               </property>
-               <property name="pixmap">
-                <pixmap resource="share/resources/tapeicon.qrc">:/tapeicon/24x24/equal.png</pixmap>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QLabel" name="labelResultCalculation">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>87</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="toolTip">
-                <string>Value of first angle</string>
-               </property>
-               <property name="whatsThis">
-                <string notr="true"/>
-               </property>
-               <property name="text">
-                <string>_</string>
-               </property>
-              </widget>
-             </item>
             </layout>
            </item>
-           <item row="5" column="0">
+           <item row="6" column="0">
             <widget class="QLabel" name="labelBaseValue">
              <property name="text">
               <string>Base value:</string>
              </property>
             </widget>
            </item>
-           <item row="5" column="1">
+           <item row="6" column="1">
             <widget class="QDoubleSpinBox" name="doubleSpinBoxBaseValue">
              <property name="enabled">
               <bool>false</bool>
              </property>
             </widget>
            </item>
-           <item row="6" column="0">
+           <item row="7" column="0">
             <widget class="QLabel" name="labelInSizes">
              <property name="text">
               <string>In sizes:</string>
              </property>
             </widget>
            </item>
-           <item row="6" column="1">
+           <item row="7" column="1">
             <widget class="QDoubleSpinBox" name="doubleSpinBoxInSizes">
              <property name="enabled">
               <bool>false</bool>
              </property>
             </widget>
            </item>
-           <item row="7" column="0">
+           <item row="8" column="0">
             <widget class="QLabel" name="labelInHeights">
              <property name="text">
               <string>In heights:</string>
              </property>
             </widget>
            </item>
-           <item row="7" column="1">
+           <item row="8" column="1">
             <widget class="QDoubleSpinBox" name="doubleSpinBoxInHeights">
              <property name="enabled">
               <bool>false</bool>
              </property>
             </widget>
            </item>
-           <item row="8" column="0">
+           <item row="9" column="0">
             <widget class="QLabel" name="label_7">
              <property name="text">
               <string>Description:</string>
              </property>
             </widget>
            </item>
-           <item row="8" column="1">
+           <item row="9" column="1">
             <widget class="QPlainTextEdit" name="plainTextEdit">
              <property name="enabled">
               <bool>false</bool>
@@ -365,6 +330,20 @@
              </item>
             </layout>
            </item>
+           <item row="4" column="0">
+            <widget class="QLabel" name="labelCalculated">
+             <property name="text">
+              <string>Calculated value:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="1">
+            <widget class="QLabel" name="labelCalculatedValue">
+             <property name="text">
+              <string notr="true">0</string>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </item>