Skip to content

Commit 548b40f

Browse files
committed
0.1.3
fix ui flating crash app on mac
1 parent 67f365f commit 548b40f

2 files changed

Lines changed: 22 additions & 22 deletions

File tree

picklescan_gui.py

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from picklescan.src.picklescan.scanner import scanned_files
88
from picklescan.src.picklescan.scanner import infected_files
99
import util.icons as ic
10+
from util.ui_flattener import ui_flattener
1011

1112
COLOR_DARK_GREEN = '#78BA04'
1213
COLOR_DARK_BLUE = '#4974a5'
@@ -21,12 +22,12 @@
2122
INFECTED_FILES_DEF = f'{INFECTED_FILES} 0'
2223
DANGEROUS_GLOBALS_DEF = f'{DANGEROUS_GLOBALS} 0'
2324

24-
right_click_menu = ['', ['Copy', 'Paste', 'Cut']]
25+
right_click_menu = ['', ['Copy', 'Paste', 'Cut','Select All', 'Clear']]
2526

2627
def do_clipboard_operation(event, window, element):
2728
if event == 'Select All':
2829
element.Widget.selection_clear()
29-
element.Widget.tag_add('sel', '1.0', 'end')
30+
# element.Widget.tag_add('sel', '1.0', 'end')
3031
elif event == 'Copy':
3132
try:
3233
text = element.Widget.selection_get()
@@ -47,9 +48,16 @@ def do_clipboard_operation(event, window, element):
4748
except:
4849
# print('Nothing selected')
4950
window['-status_info-'].update(value='Nothing selected')
51+
elif event == 'Clear':
52+
try:
53+
text = element.Widget.selection_get()
54+
element.update('')
55+
except:
56+
# print('Nothing selected')
57+
window['-status_info-'].update(value='Nothing selected')
5058

5159
def main():
52-
ver = '0.1.2'
60+
ver = '0.1.3'
5361
sg.theme('Dark Gray 15')
5462
app_title = f"Disty's Stable Diffusion Pickle Scanner GUI - Ver {ver}"
5563
isError = 0
@@ -201,27 +209,10 @@ def browse_layout(type_,visible_,disabled=False):
201209
supportme_widget = window["-supportme-"]
202210
github_widget = window["-github-"]
203211

204-
github_widget = window["-github-"]
205-
206-
207-
widgets = {
208-
scan_button_widget,
209-
huggingface_clear_button_widget,
210-
url_clear_button_widget,
211-
file_FileBrowse_widget,
212-
directory_FolderBrowse_widget,
213-
input_files_huggingface_widget,
214-
input_files_url_widget,
215-
input_files_file_widget,
216-
input_files_directory_widget,
217-
patreon_widget,
218-
github_widget,
219-
supportme_widget,
220-
}
221-
for widget in widgets:
222-
widget.Widget.config(relief='flat')
212+
223213

224214
#endregion
215+
ui_flattener(window)
225216

226217
while True:
227218
event, values = window.read()

util/ui_flattener.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#set_widget_relief_to_flat
2+
3+
def ui_flattener(window):
4+
for widget_key in window.key_dict.keys():
5+
try:
6+
window[widget_key].Widget.config(relief='flat')
7+
except:
8+
# print("error",widget_key)
9+
pass

0 commit comments

Comments
 (0)