From c804605699740c81aa2dfbad329ec3ba320a9b13 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 29 Mar 2008 20:53:33 +0000
Subject: [PATCH] Fix #609

---
 src/libprs500/gui2/dialogs/config.py   | 11 +++++------
 src/libprs500/gui2/dialogs/config.ui   | 19 +++++++++++++++++--
 src/libprs500/gui2/filename_pattern.ui | 17 ++---------------
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/libprs500/gui2/dialogs/config.py b/src/libprs500/gui2/dialogs/config.py
index 8f763015a5..bc2954ea95 100644
--- a/src/libprs500/gui2/dialogs/config.py
+++ b/src/libprs500/gui2/dialogs/config.py
@@ -2,8 +2,8 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 import os
 
-from PyQt4.QtGui import QDialog, QMessageBox, QListWidgetItem, QVBoxLayout
-from PyQt4.QtCore import QVariant, SIGNAL, QStringList, QTimer, Qt
+from PyQt4.QtGui import QDialog, QMessageBox, QListWidgetItem
+from PyQt4.QtCore import QVariant, SIGNAL, QStringList, QTimer, Qt, QSize
 
 from libprs500 import islinux, Settings
 from libprs500.gui2.dialogs.config_ui import Ui_Dialog
@@ -51,10 +51,9 @@ class ConfigDialog(QDialog, Ui_Dialog):
             else:
                 item.setCheckState(Qt.Checked)
                 
-        self.mbl = QVBoxLayout()
-        self.metadata_box.setLayout(self.mbl)
-        self.filename_pattern = FilenamePattern(None)
-        self.mbl.addChildWidget(self.filename_pattern)
+        self.filename_pattern = FilenamePattern(self)
+        self.metadata_box.layout().insertWidget(0, self.filename_pattern)
+        
             
         
     def compact(self, toggled):
diff --git a/src/libprs500/gui2/dialogs/config.ui b/src/libprs500/gui2/dialogs/config.ui
index df830be834..f968ac9528 100644
--- a/src/libprs500/gui2/dialogs/config.ui
+++ b/src/libprs500/gui2/dialogs/config.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>667</width>
-    <height>630</height>
+    <width>709</width>
+    <height>685</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -360,6 +360,21 @@
            <property name="title" >
             <string>&amp;Metadata from file name</string>
            </property>
+           <layout class="QVBoxLayout" >
+            <item>
+             <spacer>
+              <property name="orientation" >
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" >
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
           </widget>
          </item>
         </layout>
diff --git a/src/libprs500/gui2/filename_pattern.ui b/src/libprs500/gui2/filename_pattern.ui
index e8c8e20609..b27b4b8296 100644
--- a/src/libprs500/gui2/filename_pattern.ui
+++ b/src/libprs500/gui2/filename_pattern.ui
@@ -5,27 +5,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>498</width>
-    <height>452</height>
+    <width>349</width>
+    <height>441</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <item>
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>15</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
    <item>
     <widget class="QLabel" name="label" >
      <property name="text" >