about dialog

 - added GNU GPL v2 notice

diff --git a/src/gui/about.ui b/src/gui/about.ui
index a6d1b6b3ed7c1bb24199d1dbc879cc681c7b814b..7d59713a61e722ea4681834e9356373b649f3c34 100644 (file)
--- a/src/gui/about.ui
+++ b/src/gui/about.ui
@@ -9,7 +9,7 @@
     <x>0</x>
     <y>0</y>
     <width>500</width>
     <x>0</x>
     <y>0</y>
     <width>500</width>

-    <height>300</height>
+    <height>607</height>

    </rect>
   </property>
   <property name="sizePolicy" >
    </rect>
   </property>
   <property name="sizePolicy" >


@@ -27,7 +27,7 @@
   <property name="maximumSize" >
    <size>
     <width>500</width>
   <property name="maximumSize" >
    <size>
     <width>500</width>

-    <height>300</height>
+    <height>1000</height>

    </size>
   </property>
   <property name="palette" >
    </size>
   </property>
   <property name="palette" >


@@ -147,9 +147,9 @@
           <property name="geometry" >
            <rect>
             <x>0</x>
           <property name="geometry" >
            <rect>
             <x>0</x>

-            <y>-183</y>
+            <y>0</y>

             <width>431</width>
             <width>431</width>

-            <height>421</height>
+            <height>551</height>

            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_2" >
            </rect>
           </property>
           <layout class="QGridLayout" name="gridLayout_2" >


@@ -192,7 +192,7 @@
               <item>
                <widget class="QLabel" name="description" >
                 <property name="text" >
               <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>
+                 <string>Qt FOSDEM 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="wordWrap" >
                  <bool>true</bool>


@@ -203,95 +203,143 @@
                </widget>
               </item>
               <item>
                </widget>
               </item>
               <item>

-               <widget class="QLabel" name="spacer_2" >
+               <widget class="QLabel" name="label_3" >

                 <property name="text" >
                  <string/>
                 </property>
                </widget>
               </item>
               <item>
                 <property name="text" >
                  <string/>
                 </property>
                </widget>
               </item>
               <item>

-               <widget class="QLabel" name="label_3" >
+               <widget class="QGroupBox" name="groupBox" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="minimumSize" >
+                 <size>
+                  <width>0</width>
+                  <height>0</height>
+                 </size>
+                </property>

                 <property name="font" >
                  <font>
                   <weight>75</weight>
                   <bold>true</bold>
                  </font>
                 </property>
                 <property name="font" >
                  <font>
                   <weight>75</weight>
                   <bold>true</bold>
                  </font>
                 </property>

-                <property name="text" >
-                 <string>Developers:</string>
+                <property name="title" >
+                 <string>Developers</string>

                 </property>
                 </property>

+                <layout class="QVBoxLayout" name="verticalLayout_4" >
+                 <item>
+                  <widget class="QLabel" name="label_4" >
+                   <property name="sizePolicy" >
+                    <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="font" >
+                    <font>
+                     <weight>50</weight>
+                     <bold>false</bold>
+                    </font>
+                   </property>
+                   <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>
+                </layout>

                </widget>
               </item>
               <item>
                </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/>
+               <widget class="QGroupBox" name="groupBox_2" >
+                <property name="sizePolicy" >
+                 <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>

                 </property>
                 </property>

-               </widget>
-              </item>
-              <item>
-               <widget class="QLabel" name="copyright" >

                 <property name="font" >
                  <font>
                 <property name="font" >
                  <font>

-                  <pointsize>9</pointsize>
+                  <weight>75</weight>
+                  <bold>true</bold>

                  </font>
                 </property>
                  </font>
                 </property>

-                <property name="text" >
-                 <string>Copyright (C) Ixonos, 2010</string>
-                </property>
-                <property name="wordWrap" >
-                 <bool>true</bool>
+                <property name="title" >
+                 <string>Notice</string>

                 </property>
                 </property>

+                <layout class="QVBoxLayout" name="verticalLayout_5" >
+                 <item>
+                  <widget class="QLabel" name="label_5" >
+                   <property name="sizePolicy" >
+                    <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="font" >
+                    <font>
+                     <weight>50</weight>
+                     <bold>false</bold>
+                    </font>
+                   </property>
+                   <property name="text" >
+                    <string>Qt FOSDEM is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version.</string>
+                   </property>
+                   <property name="wordWrap" >
+                    <bool>true</bool>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLabel" name="label_6" >
+                   <property name="font" >
+                    <font>
+                     <weight>50</weight>
+                     <bold>false</bold>
+                    </font>
+                   </property>
+                   <property name="text" >
+                    <string>Qt FOSDEM is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.</string>
+                   </property>
+                   <property name="wordWrap" >
+                    <bool>true</bool>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>

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

-               <widget class="QLabel" name="spacer_4" >
+               <widget class="QLabel" name="copyright" >

                 <property name="text" >
                 <property name="text" >

-                 <string/>
+                 <string>Copyright (C) Ixonos, 2010</string>

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

-               <widget class="QLabel" name="warranty" >
-                <property name="font" >
-                 <font>
-                  <pointsize>9</pointsize>
-                 </font>
+               <spacer name="verticalSpacer_2" >
+                <property name="orientation" >
+                 <enum>Qt::Vertical</enum>

                 </property>
                 </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 name="sizeHint" stdset="0" >
+                 <size>
+                  <width>20</width>
+                  <height>40</height>
+                 </size>

                 </property>
                 </property>

-                <property name="wordWrap" >
-                 <bool>true</bool>
-                </property>
-               </widget>
+               </spacer>

               </item>
              </layout>
             </widget>
            </item>
               </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>
           </layout>
          </widget>
         </widget>

diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
index 86ba5b87ee542308c61c37b35a8d1bc881aa6ecd..2391f4a4cef11a1700f888a0821b9469f2c6d23b 100644 (file)
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@@ -16,7 +16,7 @@
    </size>
   </property>
   <property name="windowTitle" >
    </size>
   </property>
   <property name="windowTitle" >

-   <string>MainWindow</string>
+   <string>FOSDEM Schedule</string>

   </property>
   <widget class="QWidget" name="centralwidget" >
    <layout class="QGridLayout" name="gridLayout" >
   </property>
   <widget class="QWidget" name="centralwidget" >
    <layout class="QGridLayout" name="gridLayout" >