From b048312882f80d43e3d8b1573814badf70fe3b92 Mon Sep 17 00:00:00 2001
From: tassaron
Date: Sat, 10 Jun 2017 12:10:05 -0400
Subject: close button works, dialogs properly parented

hint text wording changed by IamDH4's suggestion
---
 mainwindow.py    |  4 +++-
 presetmanager.py | 18 ++++++++++++------
 presetmanager.ui |  6 +++---
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/mainwindow.py b/mainwindow.py
index 45262f7..3e49ab2 100644
--- a/mainwindow.py
+++ b/mainwindow.py
@@ -601,7 +601,9 @@ class MainWindow(QtCore.QObject):
             print('project file missing value: %s' % e)
 
     def showMessage(self, **kwargs):
-        msg = QtGui.QMessageBox()
+        parent = kwargs['parent'] if 'parent' in kwargs else self.window
+        msg = QtGui.QMessageBox(parent)
+        msg.setModal(True)
         msg.setText(kwargs['msg'])
         msg.setIcon(
             kwargs['icon'] if 'icon' in kwargs else QtGui.QMessageBox.Information)
diff --git a/presetmanager.py b/presetmanager.py
index 73a2431..04a9042 100644
--- a/presetmanager.py
+++ b/presetmanager.py
@@ -21,9 +21,9 @@ class PresetManager(QtGui.QDialog):
         # connect button signals
         self.window.pushButton_delete.clicked.connect(self.openDeletePresetDialog)
         self.window.pushButton_rename.clicked.connect(self.openRenamePresetDialog)
-        self.window.pushButton_close.clicked.connect(self.close)
         self.window.pushButton_import.clicked.connect(self.openImportDialog)
         self.window.pushButton_export.clicked.connect(self.openExportDialog)
+        self.window.pushButton_close.clicked.connect(self.window.close)
 
         # create filter box and preset list
         self.drawFilterList()
@@ -91,7 +91,8 @@ class PresetManager(QtGui.QDialog):
                 if not presetFilter or presetFilter in preset:
                     self.window.listWidget_presets.addItem('%s: %s' % (component, preset))
                     self.presetRows.append((component, vers, preset))
-                presetNames.append(preset)
+                if preset not in presetNames:
+                    presetNames.append(preset)
         self.autocomplete.setStringList(presetNames)
 
     def drawFilterList(self):
@@ -120,7 +121,7 @@ class PresetManager(QtGui.QDialog):
             )
             if OK:
                 if core.Core.badName(newName):
-                    self.warnMessage()
+                    self.warnMessage(self.parent.window)
                     continue
                 if newName:
                     if index != -1:
@@ -185,7 +186,9 @@ class PresetManager(QtGui.QDialog):
         comp, vers, name = self.presetRows[row]
         ch = self.parent.showMessage(
             msg='Really delete %s?' % name,
-            showCancel=True, icon=QtGui.QMessageBox.Warning
+            showCancel=True,
+            icon=QtGui.QMessageBox.Warning,
+            parent=self.window
         )
         if not ch:
             return
@@ -197,10 +200,11 @@ class PresetManager(QtGui.QDialog):
         filepath = os.path.join(self.presetDir, comp, str(vers), name)
         os.remove(filepath)
 
-    def warnMessage(self):
+    def warnMessage(self, window=None):
         self.parent.showMessage(
             msg='Preset names must contain only letters, '
-            'numbers, and spaces.')
+            'numbers, and spaces.',
+            parent=window if window else self.window)
 
     def openRenamePresetDialog(self):
         presetList = self.window.listWidget_presets
@@ -242,6 +246,8 @@ class PresetManager(QtGui.QDialog):
             "Preset Files (*.avl)")
         if filename:
             self.core.importPreset(filename)
+            self.findPresets()
+            self.drawPresetList()
 
     def openExportDialog(self):
         filename = QtGui.QFileDialog.getSaveFileName(
diff --git a/presetmanager.ui b/presetmanager.ui
index 47568fb..b3c25fe 100644
--- a/presetmanager.ui
+++ b/presetmanager.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>475</width>
-    <height>360</height>
+    <width>497</width>
+    <height>377</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -111,7 +111,7 @@
      <item alignment="Qt::AlignRight">
       <widget class="QLabel" name="label">
        <property name="text">
-        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Right-click components in the list to create presets.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:10pt; font-style:italic;&quot;&gt;Right-click components in the main window to create presets&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
       </widget>
      </item>
-- 
cgit v1.2.3