michael/pyaudviz
michael
/
pyaudviz
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

close button works, dialogs properly parented 

hint text wording changed by IamDH4's suggestion
This commit is contained in:
tassaron 2017-06-10 12:10:05 -04:00
parent d3f979ef24
commit b048312882
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mainwindow.py
View File

@ -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)

18
presetmanager.py
View File

@ -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(

6
presetmanager.ui
View File

@ -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>