plexx-dev/Nassi-Shneiderman-Diagramm-Generator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ small layout change & improvement

Browse Source
This commit is contained in:
oleting
2020-12-27 23:20:29 +01:00
parent ee5060fcbb
commit 9b27d055b2
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gui/gui.py
View File

@@ -4,6 +4,7 @@ from interpreter.interpret_source import JavaSyntaxError, ScopeNotFoundException
import PySimpleGUI as sg import PySimpleGUI as sg
import os.path import os.path
import random import random
import secrets
import logging import logging
import time import time
@@ -39,6 +40,11 @@ class Gui:
sg.In(size=(25, 1), enable_events=True, key="-OUTPUT FOLDER-"), sg.In(size=(25, 1), enable_events=True, key="-OUTPUT FOLDER-"),
sg.FolderBrowse(), sg.FolderBrowse(),
], ],
[
sg.Text('Output name'),
sg.In(size=(25, 1), enable_events=True, key='-OUTPUT NAME-'),
sg.Button('Confirm', key='-SET OUTPUT NAME-'),
],
[ [
sg.HSeparator(), sg.HSeparator(),
], ],
@@ -51,11 +57,6 @@ class Gui:
sg.FileBrowse(file_types=(('TTF-File', '*.ttf'), ('ALL Files', sg.FileBrowse(file_types=(('TTF-File', '*.ttf'), ('ALL Files',
'*.*')), key='-TTF FILE-'), '*.*')), key='-TTF FILE-'),
], ],
[
sg.Text('Output name'),
sg.In(size=(25, 1), enable_events=True, key='-OUTPUT NAME-'),
sg.Button('Done', key='-SET OUTPUT NAME-'),
],
] ]
@@ -71,7 +72,7 @@ class Gui:
] ]
diagramm_viewer_column = [ diagramm_viewer_column = [
[sg.Text("Choose your code for preview. ", size=(100, 10))], [sg.Text("Choose your code for preview. ", auto_size_text=True)],
[sg.Text(key="-TOUT-", auto_size_text=True)], [sg.Text(key="-TOUT-", auto_size_text=True)],
[sg.Image(key='-IMAGE-')], [sg.Image(key='-IMAGE-')],
] ]
@@ -103,7 +104,7 @@ class Gui:
def show_gui(self, window: sg.Window): def show_gui(self, window: sg.Window):
font_filepath = None font_filepath = None
output_name = 'unnamed' output_name = None
sg.popup('The Interpreter is WIP and cannot interpret classes or function definitions as those do not exist in Nass-Shneidermann Diagrams. A fix is in the making.', sg.popup('The Interpreter is WIP and cannot interpret classes or function definitions as those do not exist in Nass-Shneidermann Diagrams. A fix is in the making.',
auto_close=True, auto_close_duration=5) auto_close=True, auto_close_duration=5)
@@ -130,7 +131,9 @@ class Gui:
) )
output_path = values['-OUTPUT FOLDER-'] output_path = values['-OUTPUT FOLDER-']
if output_name is None:
sg.popup_auto_close('You dont set a name for the image, it will be named random.')
output_name = secrets.token_hex(16)
if file_there((output_path + '/' + output_name)) is True: if file_there((output_path + '/' + output_name)) is True:
proceed = sg.popup_yes_no( proceed = sg.popup_yes_no(
'File already exist! Continue?', title='File alreday exist!') 'File already exist! Continue?', title='File alreday exist!')
@@ -138,6 +141,7 @@ class Gui:
nassi(filepath=file_path, output_path=output_path, outputname=output_name, gui=self, nassi(filepath=file_path, output_path=output_path, outputname=output_name, gui=self,
font_filepath=font_filepath) font_filepath=font_filepath)
fnames = output(values) fnames = output(values)
sg.popup_annoying('Successful created!', title='Created', sg.popup_annoying('Successful created!', title='Created',
auto_close_duration=2, auto_close=True, text_color='green') auto_close_duration=2, auto_close=True, text_color='green')