|
1 | 1 | #!/usr/bin/python3 |
2 | | -version = __version__ = "0.34.0.1 Unreleased - Added element_justification parm to Column Frame Tab Window" |
| 2 | +version = __version__ = "0.34.0.2 Unreleased - Added element_justification parm to Column Frame Tab Window, fix for Multiline.get, MultilineOutput.get" |
3 | 3 |
|
4 | 4 | port = 'PySimpleGUIQt' |
5 | 5 |
|
@@ -1064,7 +1064,7 @@ def Update(self, value=None, disabled=None, append=False, autoscroll=False, back |
1064 | 1064 |
|
1065 | 1065 |
|
1066 | 1066 | def Get(self): |
1067 | | - self.QT_TextEdit.toPlainText() |
| 1067 | + return self.QT_TextEdit.toPlainText() |
1068 | 1068 |
|
1069 | 1069 | def SetFocus(self): |
1070 | 1070 | self.QT_TextEdit.setFocus() |
@@ -1148,7 +1148,7 @@ def Update(self, value=None, disabled=None, append=False, autoscroll=None, backg |
1148 | 1148 |
|
1149 | 1149 |
|
1150 | 1150 | def Get(self): |
1151 | | - self.QT_TextBrowser.toPlainText() |
| 1151 | + return self.QT_TextBrowser.toPlainText() |
1152 | 1152 |
|
1153 | 1153 |
|
1154 | 1154 | def print(self, *args, end=None, sep=None, text_color=None, background_color=None, autoscroll=True): |
@@ -3176,11 +3176,7 @@ class Window: |
3176 | 3176 | active_popups = {} |
3177 | 3177 |
|
3178 | 3178 | def __init__(self, title, layout=None, default_element_size=DEFAULT_ELEMENT_SIZE, default_button_element_size=(None, None), |
3179 | | - auto_size_text=None, auto_size_buttons=None, location=(None, None), size=(None, None), element_padding=None, button_color=None, font=None, |
3180 | | - progress_bar_color=(None, None), background_color=None, border_depth=None, auto_close=False, |
3181 | | - auto_close_duration=DEFAULT_AUTOCLOSE_TIME, icon=DEFAULT_WINDOW_ICON, force_toplevel=False, |
3182 | | - alpha_channel=1, return_keyboard_events=False, use_default_focus=True, text_justification=None, |
3183 | | - element_justification='float', no_titlebar=False, grab_anywhere=False, keep_on_top=False, resizable=True, disable_close=False, disable_minimize=False, background_image=None, finalize=False, metadata=None): |
| 3179 | + auto_size_text=None, auto_size_buttons=None, location=(None, None), size=(None, None), element_padding=None, button_color=None, font=None, progress_bar_color=(None, None), background_color=None, border_depth=None, auto_close=False, auto_close_duration=DEFAULT_AUTOCLOSE_TIME, icon=DEFAULT_WINDOW_ICON, force_toplevel=False, alpha_channel=1, return_keyboard_events=False, use_default_focus=True, text_justification=None, element_justification='float', no_titlebar=False, grab_anywhere=False, keep_on_top=False, resizable=True, disable_close=False, disable_minimize=False, background_image=None, finalize=False, metadata=None): |
3184 | 3180 | ''' |
3185 | 3181 |
|
3186 | 3182 | :param title: |
@@ -4874,6 +4870,10 @@ def PackFormIntoFrame(container_elem, containing_frame, toplevel_win): |
4874 | 4870 | style = style_entry(background_color=element.BackgroundColor) |
4875 | 4871 | # style += 'background-color: %s;' % element.BackgroundColor |
4876 | 4872 | style += style_entry(border='0px solid gray') |
| 4873 | + # style += style_entry(margin='{}px {}px {}px {}px'.format(*full_element_pad)) |
| 4874 | + # style += style_entry(margin='0px 0px 0px 0px') |
| 4875 | + # style += 'margin: {}px {}px {}px {}px;'.format(*full_element_pad) |
| 4876 | + |
4877 | 4877 | # style += 'border: 0px solid gray; ' |
4878 | 4878 | style = style_generate('QGroupBox', style) |
4879 | 4879 | column_widget.setStyleSheet(style) |
|
0 commit comments