modified 'about application' dialog

diff --git a/src/gui/about.ui b/src/gui/about.ui
index ddd991434e89a69e98c1c2df3a8bbe8a97b4e68f..a6d1b6b3ed7c1bb24199d1dbc879cc681c7b814b 100644 (file)
--- a/src/gui/about.ui
+++ b/src/gui/about.ui
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >

  <class>AboutDialog</class>
  <class>AboutDialog</class>

- <widget class="QDialog" name="AboutDialog">
-  <property name="windowModality">
+ <widget class="QDialog" name="AboutDialog" >
+  <property name="windowModality" >

    <enum>Qt::WindowModal</enum>
   </property>
    <enum>Qt::WindowModal</enum>
   </property>

-  <property name="geometry">
+  <property name="geometry" >

    <rect>
     <x>0</x>
     <y>0</y>
    <rect>
     <x>0</x>
     <y>0</y>


@@ -13,39 +12,39 @@
     <height>300</height>
    </rect>
   </property>
     <height>300</height>
    </rect>
   </property>

-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >

     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>

-  <property name="minimumSize">
+  <property name="minimumSize" >

    <size>
     <width>77</width>
     <height>77</height>
    </size>
   </property>
    <size>
     <width>77</width>
     <height>77</height>
    </size>
   </property>

-  <property name="maximumSize">
+  <property name="maximumSize" >

    <size>
     <width>500</width>
     <height>300</height>
    </size>
   </property>
    <size>
     <width>500</width>
     <height>300</height>
    </size>
   </property>

-  <property name="palette">
+  <property name="palette" >

    <palette>
     <active>
    <palette>
     <active>

-     <colorrole role="Base">
-      <brush brushstyle="SolidPattern">
-       <color alpha="255">
+     <colorrole role="Base" >
+      <brush brushstyle="SolidPattern" >
+       <color alpha="255" >

         <red>239</red>
         <green>235</green>
         <blue>231</blue>
        </color>
       </brush>
      </colorrole>
         <red>239</red>
         <green>235</green>
         <blue>231</blue>
        </color>
       </brush>
      </colorrole>

-     <colorrole role="AlternateBase">
-      <brush brushstyle="SolidPattern">
-       <color alpha="255">
+     <colorrole role="AlternateBase" >
+      <brush brushstyle="SolidPattern" >
+       <color alpha="255" >

         <red>239</red>
         <green>235</green>
         <blue>231</blue>
         <red>239</red>
         <green>235</green>
         <blue>231</blue>


@@ -54,18 +53,18 @@
      </colorrole>
     </active>
     <inactive>
      </colorrole>
     </active>
     <inactive>

-     <colorrole role="Base">
-      <brush brushstyle="SolidPattern">
-       <color alpha="255">
+     <colorrole role="Base" >
+      <brush brushstyle="SolidPattern" >
+       <color alpha="255" >

         <red>239</red>
         <green>235</green>
         <blue>231</blue>
        </color>
       </brush>
      </colorrole>
         <red>239</red>
         <green>235</green>
         <blue>231</blue>
        </color>
       </brush>
      </colorrole>

-     <colorrole role="AlternateBase">
-      <brush brushstyle="SolidPattern">
-       <color alpha="255">
+     <colorrole role="AlternateBase" >
+      <brush brushstyle="SolidPattern" >
+       <color alpha="255" >

         <red>239</red>
         <green>235</green>
         <blue>231</blue>
         <red>239</red>
         <green>235</green>
         <blue>231</blue>


@@ -74,18 +73,18 @@
      </colorrole>
     </inactive>
     <disabled>
      </colorrole>
     </inactive>
     <disabled>

-     <colorrole role="Base">
-      <brush brushstyle="SolidPattern">
-       <color alpha="255">
+     <colorrole role="Base" >
+      <brush brushstyle="SolidPattern" >
+       <color alpha="255" >

         <red>255</red>
         <green>255</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>
         <red>255</red>
         <green>255</green>
         <blue>255</blue>
        </color>
       </brush>
      </colorrole>

-     <colorrole role="AlternateBase">
-      <brush brushstyle="SolidPattern">
-       <color alpha="255">
+     <colorrole role="AlternateBase" >
+      <brush brushstyle="SolidPattern" >
+       <color alpha="255" >

         <red>239</red>
         <green>235</green>
         <blue>231</blue>
         <red>239</red>
         <green>235</green>
         <blue>231</blue>


@@ -95,39 +94,39 @@
     </disabled>
    </palette>
   </property>
     </disabled>
    </palette>
   </property>

-  <property name="windowTitle">
+  <property name="windowTitle" >

    <string>About application</string>
   </property>
    <string>About application</string>
   </property>

-  <property name="locale">
-   <locale language="C" country="AnyCountry"/>
+  <property name="locale" >
+   <locale country="AnyCountry" language="C" />

   </property>
   </property>

-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout">
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <layout class="QHBoxLayout" name="horizontalLayout" >

      <item>
      <item>

-      <layout class="QVBoxLayout" name="verticalLayout">
+      <layout class="QVBoxLayout" name="verticalLayout" >

        <item>
        <item>

-        <widget class="QLabel" name="FosdemIcon">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <widget class="QLabel" name="FosdemIcon" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >

            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>

-         <property name="text">
+         <property name="text" >

           <string/>
          </property>
           <string/>
          </property>

-         <property name="pixmap">
+         <property name="pixmap" >

           <pixmap>:/icons/fosdem.png</pixmap>
          </property>
         </widget>
        </item>
        <item>
           <pixmap>:/icons/fosdem.png</pixmap>
          </property>
         </widget>
        </item>
        <item>

-        <spacer name="verticalSpacer">
-         <property name="orientation">
+        <spacer name="verticalSpacer" >
+         <property name="orientation" >

           <enum>Qt::Vertical</enum>
          </property>
           <enum>Qt::Vertical</enum>
          </property>

-         <property name="sizeHint" stdset="0">
+         <property name="sizeHint" stdset="0" >

           <size>
            <width>20</width>
            <height>40</height>
           <size>
            <width>20</width>
            <height>40</height>


@@ -138,59 +137,188 @@
       </layout>
      </item>
      <item>
       </layout>
      </item>
      <item>

-      <layout class="QVBoxLayout" name="verticalLayout_2">
+      <layout class="QVBoxLayout" name="verticalLayout_2" >

        <item>
        <item>

-        <widget class="QTextBrowser" name="textBrowser">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="autoFillBackground">
-          <bool>true</bool>
-         </property>
-         <property name="locale">
-          <locale language="C" country="AnyCountry"/>
-         </property>
-         <property name="frameShape">
-          <enum>QFrame::NoFrame</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Plain</enum>
-         </property>
-         <property name="readOnly">
-          <bool>true</bool>
-         </property>
-         <property name="html">
-          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:600; color:#000000;&quot;&gt;Qt FOSDEM/Maemo&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; font-size:9pt; color:#000000;&quot;&gt;Version 1.0.0.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;The FOSDEM Maemo is an application making the conference schedule available offline. Supports searches on various items (speaker, speech topic, location, etc.). For Nokia N8x0 and N900 Internet Tablets.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; color:#000000;&quot;&gt;Developers:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; color:#000000;&quot;&gt;Berendova Monika, Hanzes Matus, Komara Martin, Korinek Pavol,&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; color:#000000;&quot;&gt;Pavelka Pavol, Timko Marek, Uzak Matus, Fortes Francisco.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; color:#000000;&quot;&gt;Copyright (C) Ixonos, 2010&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:7pt; color:#000000;&quot;&gt;This program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR PARTICULAR PURPOSE.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-         </property>
-         <property name="overwriteMode">
-          <bool>false</bool>
-         </property>
-         <property name="acceptRichText">
+        <widget class="QScrollArea" name="scrollArea" >
+         <property name="widgetResizable" >

           <bool>true</bool>
          </property>
           <bool>true</bool>
          </property>

+         <widget class="QWidget" name="scrollAreaWidgetContents" >
+          <property name="geometry" >
+           <rect>
+            <x>0</x>
+            <y>-183</y>
+            <width>431</width>
+            <height>421</height>
+           </rect>
+          </property>
+          <layout class="QGridLayout" name="gridLayout_2" >
+           <item row="0" column="0" >
+            <widget class="QWidget" native="1" name="content" >
+             <layout class="QVBoxLayout" name="verticalLayout_3" >
+              <item>
+               <widget class="QLabel" name="label" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="font" >
+                 <font>
+                  <weight>75</weight>
+                  <bold>true</bold>
+                 </font>
+                </property>
+                <property name="text" >
+                 <string>Qt FOSDEM</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="label_2" >
+                <property name="text" >
+                 <string>Version 1.0.0</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="spacer" >
+                <property name="text" >
+                 <string/>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="description" >
+                <property name="text" >
+                 <string>The FOSDEM Maemo is an application making the conference schedule available offline. Supports searches on various items (speaker, speech topic, location, etc.). For Nokia N8x0 and N900 Internet Tablets.</string>
+                </property>
+                <property name="wordWrap" >
+                 <bool>true</bool>
+                </property>
+                <property name="openExternalLinks" >
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="spacer_2" >
+                <property name="text" >
+                 <string/>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="label_3" >
+                <property name="font" >
+                 <font>
+                  <weight>75</weight>
+                  <bold>true</bold>
+                 </font>
+                </property>
+                <property name="text" >
+                 <string>Developers:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="label_4" >
+                <property name="text" >
+                 <string>Berendova Monika, Hanzes Matus, Komara Martin, Korinek Pavol, Pavelka Pavol, Timko Marek, Uzak Matus, Fortes Francisco</string>
+                </property>
+                <property name="wordWrap" >
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="spacer_3" >
+                <property name="text" >
+                 <string/>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="copyright" >
+                <property name="font" >
+                 <font>
+                  <pointsize>9</pointsize>
+                 </font>
+                </property>
+                <property name="text" >
+                 <string>Copyright (C) Ixonos, 2010</string>
+                </property>
+                <property name="wordWrap" >
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="spacer_4" >
+                <property name="text" >
+                 <string/>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="warranty" >
+                <property name="font" >
+                 <font>
+                  <pointsize>9</pointsize>
+                 </font>
+                </property>
+                <property name="text" >
+                 <string>This program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR PARTICULAR PURPOSE.</string>
+                </property>
+                <property name="wordWrap" >
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </item>
+           <item row="1" column="0" >
+            <spacer name="verticalSpacer_2" >
+             <property name="orientation" >
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0" >
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>

         </widget>
        </item>
        <item>
         </widget>
        </item>
        <item>

-        <widget class="QDialogButtonBox" name="buttonOK">
-         <property name="standardButtons">
-          <set>QDialogButtonBox::Ok</set>
-         </property>
-        </widget>
+        <layout class="QHBoxLayout" name="horizontalLayout_2" >
+         <item>
+          <spacer name="horizontalSpacer" >
+           <property name="orientation" >
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0" >
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QPushButton" name="okButton" >
+           <property name="text" >
+            <string>OK</string>
+           </property>
+          </widget>
+         </item>
+        </layout>

        </item>
       </layout>
      </item>
        </item>
       </layout>
      </item>


@@ -201,18 +329,18 @@ p, li { white-space: pre-wrap; }
  <resources/>
  <connections>
   <connection>
  <resources/>
  <connections>
   <connection>

-   <sender>buttonOK</sender>
-   <signal>accepted()</signal>
+   <sender>okButton</sender>
+   <signal>clicked()</signal>

    <receiver>AboutDialog</receiver>
    <slot>close()</slot>
    <hints>
    <receiver>AboutDialog</receiver>
    <slot>close()</slot>
    <hints>

-    <hint type="sourcelabel">
-     <x>292</x>
-     <y>272</y>
+    <hint type="sourcelabel" >
+     <x>512</x>
+     <y>724</y>

     </hint>
     </hint>

-    <hint type="destinationlabel">
-     <x>249</x>
-     <y>149</y>
+    <hint type="destinationlabel" >
+     <x>282</x>
+     <y>375</y>

     </hint>
    </hints>
   </connection>
     </hint>
    </hints>
   </connection>