make calculator behave better when display hight is small

1 files changed, 71 insertions, 34 deletions

diff --git a/noncore/tools/calculator/calculator.ui b/noncore/tools/calculator/calculator.ui
index e8218ab..0f26040 100644
--- a/noncore/tools/calculator/calculator.ui
+++ b/noncore/tools/calculator/calculator.ui
@@ -25,18 +25,18 @@
         <name>name</name>
         <cstring>Calculator</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>271</width>
-            <height>404</height>
+            <width>389</width>
+            <height>562</height>
         </rect>
     </property>
     <property stdset="1">
         <name>sizePolicy</name>
         <sizepolicy>
             <hsizetype>5</hsizetype>
             <vsizetype>5</vsizetype>
         </sizepolicy>
@@ -67,18 +67,33 @@
     </property>
     <vbox>
         <property stdset="1">
             <name>margin</name>
             <number>0</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
+            <number>2</number>
+        </property>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout7</cstring>
+            </property>
+            <vbox>
+                <property stdset="1">
+                    <name>margin</name>
             <number>0</number>
         </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
         <widget>
             <class>QLCDNumber</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>LCD</cstring>
             </property>
             <property stdset="1">
                 <name>sizePolicy</name>
@@ -101,16 +116,34 @@
                 <name>segmentStyle</name>
                 <enum>Flat</enum>
             </property>
         </widget>
         <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
+                        <cstring>Layout6</cstring>
+                    </property>
+                    <property>
+                        <name>layoutSpacing</name>
+                    </property>
+                    <vbox>
+                        <property stdset="1">
+                            <name>margin</name>
+                            <number>0</number>
+                        </property>
+                        <property stdset="1">
+                            <name>spacing</name>
+                            <number>2</number>
+                        </property>
+                        <widget>
+                            <class>QLayoutWidget</class>
+                            <property stdset="1">
+                                <name>name</name>
                 <cstring>Layout4</cstring>
             </property>
             <hbox>
                 <property stdset="1">
                     <name>margin</name>
                     <number>0</number>
                 </property>
                 <property stdset="1">
@@ -500,16 +533,20 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
                         <string>+/-</string>
                     </property>
                 </widget>
             </hbox>
         </widget>
+                    </vbox>
+                </widget>
+            </vbox>
+        </widget>
         <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Layout5</cstring>
             </property>
             <grid>
                 <property stdset="1">
@@ -531,18 +568,18 @@
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>font</name>
                         <font>
-                            <family>adobe-helvetica</family>
-                            <pointsize>24</pointsize>
+                            <family>adobe-courier</family>
+                            <pointsize>16</pointsize>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
@@ -560,18 +597,18 @@
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>font</name>
                         <font>
-                            <family>adobe-helvetica</family>
-                            <pointsize>24</pointsize>
+                            <family>adobe-courier</family>
+                            <pointsize>16</pointsize>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
@@ -589,18 +626,18 @@
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>font</name>
                         <font>
-                            <family>adobe-helvetica</family>
-                            <pointsize>24</pointsize>
+                            <family>adobe-courier</family>
+                            <pointsize>16</pointsize>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
@@ -618,18 +655,18 @@
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>font</name>
                         <font>
-                            <family>adobe-helvetica</family>
-                            <pointsize>24</pointsize>
+                            <family>adobe-courier</family>
+                            <pointsize>16</pointsize>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
@@ -647,18 +684,18 @@
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>font</name>
                         <font>
-                            <family>adobe-helvetica</family>
-                            <pointsize>24</pointsize>
+                            <family>adobe-courier</family>
+                            <pointsize>16</pointsize>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
@@ -676,18 +713,18 @@
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>font</name>
                         <font>
-                            <family>adobe-helvetica</family>
-                            <pointsize>24</pointsize>
+                            <family>adobe-courier</family>
+                            <pointsize>16</pointsize>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
@@ -705,18 +742,18 @@
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>font</name>
                         <font>
-                            <family>adobe-helvetica</family>
-                            <pointsize>24</pointsize>
+                            <family>adobe-courier</family>
+                            <pointsize>16</pointsize>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
@@ -734,18 +771,18 @@
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>font</name>
                         <font>
-                            <family>adobe-helvetica</family>
-                            <pointsize>24</pointsize>
+                            <family>adobe-courier</family>
+                            <pointsize>16</pointsize>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
@@ -763,18 +800,18 @@
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>font</name>
                         <font>
-                            <family>adobe-helvetica</family>
-                            <pointsize>24</pointsize>
+                            <family>adobe-courier</family>
+                            <pointsize>16</pointsize>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
@@ -792,18 +829,18 @@
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>font</name>
                         <font>
-                            <family>adobe-helvetica</family>
-                            <pointsize>24</pointsize>
+                            <family>adobe-courier</family>
+                            <pointsize>16</pointsize>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
@@ -821,18 +858,18 @@
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>font</name>
                         <font>
-                            <family>adobe-helvetica</family>
-                            <pointsize>24</pointsize>
+                            <family>adobe-courier</family>
+                            <pointsize>16</pointsize>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
@@ -850,18 +887,18 @@
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>font</name>
                         <font>
-                            <family>adobe-helvetica</family>
-                            <pointsize>24</pointsize>
+                            <family>adobe-courier</family>
+                            <pointsize>16</pointsize>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
@@ -879,18 +916,18 @@
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>font</name>
                         <font>
-                            <family>adobe-helvetica</family>
-                            <pointsize>24</pointsize>
+                            <family>adobe-courier</family>
+                            <pointsize>16</pointsize>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
@@ -908,18 +945,18 @@
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>font</name>
                         <font>
-                            <family>adobe-helvetica</family>
-                            <pointsize>24</pointsize>
+                            <family>adobe-courier</family>
+                            <pointsize>16</pointsize>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
@@ -937,18 +974,18 @@
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>font</name>
                         <font>
-                            <family>adobe-helvetica</family>
-                            <pointsize>24</pointsize>
+                            <family>adobe-courier</family>
+                            <pointsize>16</pointsize>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>
@@ -966,18 +1003,18 @@
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>font</name>
                         <font>
-                            <family>adobe-helvetica</family>
-                            <pointsize>24</pointsize>
+                            <family>adobe-courier</family>
+                            <pointsize>16</pointsize>
                         </font>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </property>
                     <property stdset="1">
                         <name>text</name>