Fixed ticket #23: No close button in conference dialog when no confernces are in...

diff --git a/src/gui/conferenceeditor.ui b/src/gui/conferenceeditor.ui
index 485cb198e21637fe49cd9778b3ede1846e4143df..3c1c602e1b48d8e06985b9a211250639fccf7866 100644 (file)
--- a/src/gui/conferenceeditor.ui
+++ b/src/gui/conferenceeditor.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
    <rect>
     <x>0</x>
     <y>0</y>

-    <width>557</width>
-    <height>384</height>
+    <width>596</width>
+    <height>267</height>

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


@@ -17,7 +17,7 @@
    <iconset resource="../../data/data.qrc">
     <normaloff>:/confclerk.svg</normaloff>:/confclerk.svg</iconset>
   </property>
    <iconset resource="../../data/data.qrc">
     <normaloff>:/confclerk.svg</normaloff>:/confclerk.svg</iconset>
   </property>

-  <layout class="QHBoxLayout" name="horizontalLayout_4" stretch="0,1">
+  <layout class="QHBoxLayout" name="horizontalLayout_4">

    <item>
     <widget class="QWidget" name="widget_2" native="true">
      <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QWidget" name="widget_2" native="true">
      <layout class="QVBoxLayout" name="verticalLayout_2">


@@ -100,7 +100,7 @@
     </widget>
    </item>
    <item>
     </widget>
    </item>
    <item>

-    <layout class="QVBoxLayout" name="verticalLayout">
+    <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0">

      <item>
       <widget class="QStackedWidget" name="conferenceInfo">
        <property name="currentIndex">
      <item>
       <widget class="QStackedWidget" name="conferenceInfo">
        <property name="currentIndex">


@@ -221,38 +221,38 @@
            </item>
           </layout>
          </item>
            </item>
           </layout>
          </item>

-         <item>
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QDialogButtonBox" name="buttonBox">
-           <property name="standardButtons">
-            <set>QDialogButtonBox::Close</set>
-           </property>
-          </widget>
-         </item>

         </layout>
        </widget>
        <widget class="QWidget" name="conferenceInfoEmpty"/>
       </widget>
      </item>
         </layout>
        </widget>
        <widget class="QWidget" name="conferenceInfoEmpty"/>
       </widget>
      </item>

+     <item>
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Close</set>
+       </property>
+      </widget>
+     </item>

     </layout>
    </item>
   </layout>
  </widget>
  <resources>
     </layout>
    </item>
   </layout>
  </widget>
  <resources>

-  <include location="../icons.qrc"/>

   <include location="../../data/data.qrc"/>
   <include location="../../data/data.qrc"/>

+  <include location="../icons.qrc"/>

  </resources>
  <connections/>
 </ui>
  </resources>
  <connections/>
 </ui>