merged with feature-newgui
This commit is contained in:
commit
4d955c5a06
|
@ -67,7 +67,8 @@ class Component(QtCore.QObject):
|
|||
quit(1)
|
||||
else:
|
||||
print('Opening "%s" preset on layer %s' % (
|
||||
preset, self.compPos))
|
||||
preset, self.compPos)
|
||||
)
|
||||
self.core.openPreset(path, self.compPos, preset)
|
||||
else:
|
||||
print(
|
||||
|
|
|
@ -174,7 +174,8 @@ class Component(__base__.Component):
|
|||
painter.setBrush(brush)
|
||||
painter.drawRect(
|
||||
self.x, self.y,
|
||||
self.sizeWidth, self.sizeHeight)
|
||||
self.sizeWidth, self.sizeHeight
|
||||
)
|
||||
painter.end()
|
||||
imBytes = image.bits().asstring(image.numBytes())
|
||||
return Image.frombytes('RGBA', (width, height), imBytes)
|
||||
|
|
|
@ -211,7 +211,8 @@ class Core():
|
|||
)
|
||||
except KeyError as e:
|
||||
print('%s missing value %s' % (
|
||||
self.selectedComponents[i], e))
|
||||
self.selectedComponents[i], e)
|
||||
)
|
||||
|
||||
if clearThis:
|
||||
self.clearPreset(i)
|
||||
|
@ -465,7 +466,8 @@ class Core():
|
|||
def presetToString(dictionary):
|
||||
'''Alphabetizes a dict into OrderedDict & returns string repr'''
|
||||
return repr(
|
||||
OrderedDict(sorted(dictionary.items(), key=lambda t: t[0])))
|
||||
OrderedDict(sorted(dictionary.items(), key=lambda t: t[0]))
|
||||
)
|
||||
|
||||
@staticmethod
|
||||
def presetFromString(string):
|
||||
|
|
|
@ -76,7 +76,10 @@ if __name__ == "__main__":
|
|||
|
||||
topMargin = 0 if (dpi == 96) else int(10 * (dpi / 96))
|
||||
window.resize(
|
||||
window.width() * (dpi / 96), window.height() * (dpi / 96))
|
||||
window.width() *
|
||||
(dpi / 96), window.height() *
|
||||
(dpi / 96)
|
||||
)
|
||||
# window.verticalLayout_2.setContentsMargins(0, topMargin, 0, 0)
|
||||
|
||||
main = MainWindow(window, proj)
|
||||
|
|
|
@ -27,12 +27,20 @@ class PresetManager(QtWidgets.QDialog):
|
|||
|
||||
# connect button signals
|
||||
self.window.pushButton_delete.clicked.connect(
|
||||
self.openDeletePresetDialog)
|
||||
self.openDeletePresetDialog
|
||||
)
|
||||
self.window.pushButton_rename.clicked.connect(
|
||||
self.openRenamePresetDialog)
|
||||
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)
|
||||
self.openRenamePresetDialog
|
||||
)
|
||||
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()
|
||||
|
@ -99,7 +107,8 @@ class PresetManager(QtWidgets.QDialog):
|
|||
for vers, preset in presets:
|
||||
if not presetFilter or presetFilter in preset:
|
||||
self.window.listWidget_presets.addItem(
|
||||
'%s: %s' % (component, preset))
|
||||
'%s: %s' % (component, preset)
|
||||
)
|
||||
self.presetRows.append((component, vers, preset))
|
||||
if preset not in presetNames:
|
||||
presetNames.append(preset)
|
||||
|
|
Reference in New Issue