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
@@ -29,10 +29,10 @@
         <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>
@@ -71,10 +71,25 @@
             <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>
@@ -105,8 +120,26 @@
         <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">
@@ -504,8 +537,12 @@
                     </property>
                 </widget>
             </hbox>
         </widget>
+                    </vbox>
+                </widget>
+            </vbox>
+        </widget>
         <widget>
             <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
@@ -535,10 +572,10 @@
                     </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>
@@ -564,10 +601,10 @@
                     </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>
@@ -593,10 +630,10 @@
                     </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>
@@ -622,10 +659,10 @@
                     </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>
@@ -651,10 +688,10 @@
                     </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>
@@ -680,10 +717,10 @@
                     </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>
@@ -709,10 +746,10 @@
                     </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>
@@ -738,10 +775,10 @@
                     </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>
@@ -767,10 +804,10 @@
                     </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>
@@ -796,10 +833,10 @@
                     </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>
@@ -825,10 +862,10 @@
                     </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>
@@ -854,10 +891,10 @@
                     </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>
@@ -883,10 +920,10 @@
                     </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>
@@ -912,10 +949,10 @@
                     </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>
@@ -941,10 +978,10 @@
                     </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>
@@ -970,10 +1007,10 @@
                     </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>