modified 'about' dialog

 - changed "Qt FOSDEM" -> "FOSDEM Schedule"

diff --git a/src/gui/about.ui b/src/gui/about.ui
index 7d59713a61e722ea4681834e9356373b649f3c34..ecb405c95cc46cee5a01faf1af3fdb29295836b9 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>607</height>
+    <height>609</height>

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


@@ -148,8 +148,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
            <rect>
             <x>0</x>
             <y>0</y>

-            <width>431</width>
-            <height>551</height>
+            <width>446</width>
+            <height>547</height>

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


@@ -171,7 +171,7 @@
                  </font>
                 </property>
                 <property name="text" >
                  </font>
                 </property>
                 <property name="text" >

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

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


@@ -192,7 +192,7 @@
               <item>
                <widget class="QLabel" name="description" >
                 <property name="text" >
               <item>
                <widget class="QLabel" name="description" >
                 <property name="text" >

-                 <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>
+                 <string>FOSDEM Schedule is an application written in Qt, which makes the conference schedule available offline. Supports searches on various items (speaker, speech topic, location, etc.). For Nokia N810 and N900 Internet Tablets.</string>

                 </property>
                 <property name="wordWrap" >
                  <bool>true</bool>
                 </property>
                 <property name="wordWrap" >
                  <bool>true</bool>


@@ -212,7 +212,7 @@
               <item>
                <widget class="QGroupBox" name="groupBox" >
                 <property name="sizePolicy" >
               <item>
                <widget class="QGroupBox" name="groupBox" >
                 <property name="sizePolicy" >

-                 <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+                 <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >

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


@@ -236,7 +236,7 @@
                  <item>
                   <widget class="QLabel" name="label_4" >
                    <property name="sizePolicy" >
                  <item>
                   <widget class="QLabel" name="label_4" >
                    <property name="sizePolicy" >

-                    <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+                    <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >

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


@@ -291,7 +291,7 @@
                     </font>
                    </property>
                    <property name="text" >
                     </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>
+                    <string>FOSDEM Schedule 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>
                    <property name="wordWrap" >
                     <bool>true</bool>


@@ -307,7 +307,7 @@
                     </font>
                    </property>
                    <property name="text" >
                     </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>
+                    <string>FOSDEM Schedule 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>
                    <property name="wordWrap" >
                     <bool>true</bool>


@@ -324,19 +324,6 @@
                 </property>
                </widget>
               </item>
                 </property>
                </widget>
               </item>

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

diff --git a/src/gui/importschedulewidget.cpp b/src/gui/importschedulewidget.cpp
index c2806afd6b00851142ea1c3b144461b0c08b5ad5..4ff87d8746863f84ea966cf33fa3105f71b4da0d 100644 (file)
--- a/src/gui/importschedulewidget.cpp
+++ b/src/gui/importschedulewidget.cpp
@@ -18,6 +18,10 @@ ImportScheduleWidget::ImportScheduleWidget(QWidget *aParent)
 
     connect(browse, SIGNAL(clicked()), SLOT(browseSchedule()));
     progressBar->hide();
 
     connect(browse, SIGNAL(clicked()), SLOT(browseSchedule()));
     progressBar->hide();

+
+    cancel->hide();
+    online->hide();
+    importAction->hide();

 }
 
 ImportScheduleWidget::~ImportScheduleWidget()
 }
 
 ImportScheduleWidget::~ImportScheduleWidget()

diff --git a/src/gui/importschedulewidget.ui b/src/gui/importschedulewidget.ui
index e746ebfe7bbfb89144fe7802880b55acd637a882..c2ee410fcaf9d8e7c6522b9f9b0b2fdc79def6c7 100644 (file)
--- a/src/gui/importschedulewidget.ui
+++ b/src/gui/importschedulewidget.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
    <rect>
     <x>0</x>
     <y>0</y>

-    <width>379</width>
-    <height>48</height>
+    <width>634</width>
+    <height>66</height>

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


@@ -34,6 +34,39 @@
        </property>
       </widget>
      </item>
        </property>
       </widget>
      </item>

+     <item>
+      <widget class="QGroupBox" name="importAction" >
+       <property name="title" >
+        <string/>
+       </property>
+       <layout class="QHBoxLayout" name="horizontalLayout" >
+        <item>
+         <widget class="QRadioButton" name="update" >
+          <property name="text" >
+           <string>Update</string>
+          </property>
+          <property name="checked" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QRadioButton" name="replace" >
+          <property name="text" >
+           <string>Replace</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="online" >
+       <property name="text" >
+        <string>Online</string>
+       </property>
+      </widget>
+     </item>

      <item>
       <widget class="QPushButton" name="browse" >
        <property name="sizePolicy" >
      <item>
       <widget class="QPushButton" name="browse" >
        <property name="sizePolicy" >


@@ -47,8 +80,21 @@
        </property>
       </widget>
      </item>
        </property>
       </widget>
      </item>

+     <item>
+      <widget class="QPushButton" name="cancel" >
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>

      <item>
       <widget class="QProgressBar" name="progressBar" >
      <item>
       <widget class="QProgressBar" name="progressBar" >

+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+         <horstretch>0</horstretch>
+         <verstretch>10</verstretch>
+        </sizepolicy>
+       </property>

        <property name="value" >
         <number>0</number>
        </property>
        <property name="value" >
         <number>0</number>
        </property>