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
@@ -27,14 +27,14 @@
     </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>
@@ -69,14 +69,29 @@
         <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>
@@ -103,12 +118,30 @@
             </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>
@@ -502,12 +535,16 @@
                         <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>
@@ -533,14 +570,14 @@
                             <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>
@@ -562,14 +599,14 @@
                             <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>
@@ -591,14 +628,14 @@
                             <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>
@@ -620,14 +657,14 @@
                             <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>
@@ -649,14 +686,14 @@
                             <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>
@@ -678,14 +715,14 @@
                             <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>
@@ -707,14 +744,14 @@
                             <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>
@@ -736,14 +773,14 @@
                             <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>
@@ -765,14 +802,14 @@
                             <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>
@@ -794,14 +831,14 @@
                             <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>
@@ -823,14 +860,14 @@
                             <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>
@@ -852,14 +889,14 @@
                             <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>
@@ -881,14 +918,14 @@
                             <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>
@@ -910,14 +947,14 @@
                             <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>
@@ -939,14 +976,14 @@
                             <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>
@@ -968,14 +1005,14 @@
                             <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>