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
@@ -9,124 +9,157 @@
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 *********************************************************************</comment>
 <widget>
     <class>QWidget</class>
     <property stdset="1">
         <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>
     </property>
     <property stdset="1">
         <name>maximumSize</name>
         <size>
             <width>32767</width>
             <height>32767</height>
         </size>
     </property>
     <property stdset="1">
         <name>baseSize</name>
         <size>
             <width>235</width>
             <height>100</height>
         </size>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Experimental Calculator</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </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>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>
                 <sizepolicy>
                     <hsizetype>1</hsizetype>
                     <vsizetype>1</vsizetype>
                 </sizepolicy>
             </property>
             <property stdset="1">
                 <name>font</name>
                 <font>
                     <pointsize>7</pointsize>
                 </font>
             </property>
             <property stdset="1">
                 <name>numDigits</name>
                 <number>15</number>
             </property>
             <property stdset="1">
                 <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">
                     <name>spacing</name>
                     <number>0</number>
                 </property>
                 <widget>
                     <class>QComboBox</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>ComboBoxFunction</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <sizepolicy>
                             <hsizetype>1</hsizetype>
                             <vsizetype>1</vsizetype>
                         </sizepolicy>
                     </property>
@@ -484,516 +517,520 @@
                 <widget>
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButtonF10</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <sizepolicy>
                             <hsizetype>5</hsizetype>
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
                     <property stdset="1">
                         <name>focusPolicy</name>
                         <enum>TabFocus</enum>
                     </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">
                     <name>margin</name>
                     <number>0</number>
                 </property>
                 <property stdset="1">
                     <name>spacing</name>
                     <number>0</number>
                 </property>
                 <widget row="2"  column="2" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButton3</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <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>
                         <string>3</string>
                     </property>
                 </widget>
                 <widget row="1"  column="2" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButton6</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <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>
                         <string>6</string>
                     </property>
                 </widget>
                 <widget row="3"  column="2" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButtonEquals</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <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>
                         <string>=</string>
                     </property>
                 </widget>
                 <widget row="3"  column="0" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButton0</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <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>
                         <string>0</string>
                     </property>
                 </widget>
                 <widget row="1"  column="3" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButtonMinus</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <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>
                         <string>-</string>
                     </property>
                 </widget>
                 <widget row="2"  column="3" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButtonTimes</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <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>
                         <string>x</string>
                     </property>
                 </widget>
                 <widget row="1"  column="0" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButton4</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <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>
                         <string>4</string>
                     </property>
                 </widget>
                 <widget row="0"  column="1" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButton8</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <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>
                         <string>8</string>
                     </property>
                 </widget>
                 <widget row="3"  column="3" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButtonDivide</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <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>
                         <string>/</string>
                     </property>
                 </widget>
                 <widget row="0"  column="3" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButtonAdd</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <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>
                         <string>+</string>
                     </property>
                 </widget>
                 <widget row="2"  column="0" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButton1</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <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>
                         <string>1</string>
                     </property>
                 </widget>
                 <widget row="3"  column="1" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButtonDecimal</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <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>
                         <string>.</string>
                     </property>
                 </widget>
                 <widget row="1"  column="1" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButton5</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <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>
                         <string>5</string>
                     </property>
                 </widget>
                 <widget row="0"  column="0" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButton7</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <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>
                         <string>7</string>
                     </property>
                 </widget>
                 <widget row="0"  column="2" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButton9</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <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>
                         <string>9</string>
                     </property>
                 </widget>
                 <widget row="2"  column="1" >
                     <class>QPushButton</class>
                     <property stdset="1">
                         <name>name</name>
                         <cstring>PushButton2</cstring>
                     </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <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>
                         <string>2</string>
                     </property>
                 </widget>
             </grid>
         </widget>
     </vbox>
 </widget>
 <tabstops>
     <tabstop>ComboBoxFunction</tabstop>
     <tabstop>PushButtonMPlus</tabstop>
     <tabstop>PushButtonMR</tabstop>
     <tabstop>PushButtonMC</tabstop>
     <tabstop>PushButtonCE</tabstop>
     <tabstop>PushButtonF6</tabstop>
     <tabstop>PushButtonF7</tabstop>
     <tabstop>PushButtonF8</tabstop>