Merge pull request #2846 from PySimpleGUI/Dev-latest

Dev latest
This commit is contained in:
PySimpleGUI 2020-04-29 11:55:58 -04:00 committed by GitHub
commit 6f75c3a0c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions

View File

@ -13,6 +13,7 @@ import itertools
Copyright 2020 PySimpleGUI
"""
sg.theme('Dark Red')
def popup_get_date(start_mon=None, start_day=None, start_year=None, begin_at_sunday_plus=0, no_titlebar=True, title='Choose Date', keep_on_top=True, location=(None, None), close_when_chosen=False, icon=None, locale=None, month_names=None, day_abbreviations=None):
"""

View File

@ -1,5 +1,5 @@
#!/usr/bin/python3
version = __version__ = "0.32.0. Released 04-Apr-2020"
version = __version__ = "0.32.0.1 Unreleased - Experimental ability for user to add widgets to layout"
port = 'PySimpleGUIQt'
@ -3250,6 +3250,7 @@ class Window:
self._Hidden = False
self.QTApplication = None
self.QT_QMainWindow = None
self.QTWindow = None # type Window.QTMainWindow
self._Size=size
self.ElementPadding = element_padding or DEFAULT_ELEMENT_PADDING
self.FocusElement = None
@ -3427,6 +3428,7 @@ class Window:
# print("quitting window")
self.QTApplication.exit() # kick the users out of the mainloop
def Read(self, timeout=None, timeout_key=TIMEOUT_KEY, close=False):
"""
THE biggest deal method in the Window class! This is how you get all of your data from your Window.
@ -4798,6 +4800,7 @@ def PackFormIntoFrame(window, containing_frame, toplevel_win):
qt_row_layout = QHBoxLayout()
for col_num, element in enumerate(flex_row):
element.ParentForm = toplevel_win # save the button's parent form object
element.parent_row_frame = element.ParentRowFrame = qt_row_layout
if toplevel_win.Font and (element.Font == DEFAULT_FONT or not element.Font):
font = toplevel_win.Font
element.Font = font
@ -4858,7 +4861,7 @@ def PackFormIntoFrame(window, containing_frame, toplevel_win):
column_widget.setStyleSheet(style)
column_layout = QFormLayout()
column_vbox = QVBoxLayout()
element.vbox_layout = column_vbox = QVBoxLayout()
PackFormIntoFrame(element, column_layout, toplevel_win)
scroll = None
@ -5929,6 +5932,13 @@ def stop_timer(timer):
# ----====----====----====----====----==== STARTUP TK ====----====----====----====----====----#
def StartupTK(window):
"""
Does the building of the window with all the widgets
:param window:
:type window: Window
:return:
"""
global using_pyqt5
ow = Window.NumOpenWindows
@ -5940,7 +5950,6 @@ def StartupTK(window):
Window.IncrementOpenCount()
# window.QTWindow = QWidget()
window.QT_QMainWindow = Window.QT_QMainWindowClass(window.ReturnKeyboardEvents, window)