Skip to content

Commit 8a86b56

Browse files
PySimpleGUIPySimpleGUI
committed
one_line_progress_meter - key parameter now defaults. No need to specify if you have only ONE meter going.
1 parent bf9b702 commit 8a86b56

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎PySimpleGUI.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/python3
22

3-
version = __version__ = "4.20.0.8 Unreleased\n Ability to add your own theme easier using theme_add_new, VSeparator added (spelling error), removed Radio update clearing all if one is cleared (forgot about reset_group), new Element.set_vscroll_position method, added initial_folder to popup_get_folder and default_path to no_window version of popup_get_file, HorizontalSeparator (FINALLY), added keys to separators, added color parameter to Separators (defaults to theme text color), docstring for Window.get_screen_size"
3+
version = __version__ = "4.20.0.9 Unreleased\n Ability to add your own theme easier using theme_add_new, VSeparator added (spelling error), removed Radio update clearing all if one is cleared (forgot about reset_group), new Element.set_vscroll_position method, added initial_folder to popup_get_folder and default_path to no_window version of popup_get_file, HorizontalSeparator (FINALLY), added keys to separators, added color parameter to Separators (defaults to theme text color), docstring for Window.get_screen_size, added default key for one_line_progress_meter"
44

55
port = 'PySimpleGUI'
66

@@ -11677,15 +11677,15 @@ def ComputeProgressStats(self):
1167711677
return self.stat_messages
1167811678

1167911679

11680-
def OneLineProgressMeter(title, current_value, max_value, key, *args, orientation='v', bar_color=(None, None), button_color=None, size=DEFAULT_PROGRESS_BAR_SIZE, border_width=None, grab_anywhere=False, no_titlebar=False):
11680+
def OneLineProgressMeter(title, current_value, max_value, key='OK for 1 meter', *args, orientation='v', bar_color=(None, None), button_color=None, size=DEFAULT_PROGRESS_BAR_SIZE, border_width=None, grab_anywhere=False, no_titlebar=False):
1168111681
"""
1168211682
:param title: text to display in eleemnt
1168311683
:type title: (str)
1168411684
:param current_value: current value
1168511685
:type current_value: (int)
1168611686
:param max_value: max value of QuickMeter
1168711687
:type max_value: (int)
11688-
:param key: Used with window.FindElement and with return values to uniquely identify this element
11688+
:param key: Used to differentiate between mutliple meters. Used to cancel meter early. Now optional as there is a default value for single meters
1168911689
:type key: Union[str, int, tuple]
1169011690
:param *args: stuff to output
1169111691
:type *args: (Any)
@@ -11717,7 +11717,7 @@ def OneLineProgressMeter(title, current_value, max_value, key, *args, orientatio
1171711717
return rc == METER_OK
1171811718

1171911719

11720-
def OneLineProgressMeterCancel(key):
11720+
def OneLineProgressMeterCancel(key='OK for 1 meter'):
1172111721
"""
1172211722
Cancels and closes a previously created One Line Progress Meter window
1172311723

‎PySimpleGUIQt/PySimpleGUIQt.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/python3
2-
version = __version__ = "0.35.0.4 Unreleased\nMassive update of docstrings (thanks nngogol), default for slider tick interval set automatically now, margins added to Window but not yet hooked up, VSeparator added (spelling error), added Radio.reset_group and removed clearing all when one of them is cleared (recent change)"
2+
version = __version__ = "0.35.0.5 Unreleased\nMassive update of docstrings (thanks nngogol), default for slider tick interval set automatically now, margins added to Window but not yet hooked up, VSeparator added (spelling error), added Radio.reset_group and removed clearing all when one of them is cleared (recent change), added default key for one_line_progress_meter"
33

44
port = 'PySimpleGUIQt'
55

@@ -7034,7 +7034,7 @@ def ComputeProgressStats(self):
70347034
return self.stat_messages
70357035

70367036

7037-
def OneLineProgressMeter(title, current_value, max_value, key, *args, orientation='v', bar_color=(None, None),
7037+
def OneLineProgressMeter(title, current_value, max_value, key='OK for 1 meter', *args, orientation='v', bar_color=(None, None),
70387038
button_color=None, size=DEFAULT_PROGRESS_BAR_SIZE, border_width=None, grab_anywhere=False):
70397039
"""
70407040
:param orientation: 'horizontal' or 'vertical' ('h' or 'v' work) (Default value = 'vertical' / 'v')
@@ -7063,7 +7063,7 @@ def OneLineProgressMeter(title, current_value, max_value, key, *args, orientatio
70637063
OneLineProgressMeter.exit_reasons = getattr(OneLineProgressMeter,'exit_reasons', QuickMeter.exit_reasons)
70647064
return rc == METER_OK
70657065

7066-
def OneLineProgressMeterCancel(key):
7066+
def OneLineProgressMeterCancel(key='OK for 1 meter'):
70677067
try:
70687068
meter = QuickMeter.active_meters[key]
70697069
meter.window.Close()

‎PySimpleGUIWeb/PySimpleGUIWeb.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#usr/bin/python3
22

3-
version = __version__ = "0.39.0.1 Unreleased\n , VSeparator added (spelling error)"
3+
version = __version__ = "0.39.0.2 Unreleased\n , VSeparator added (spelling error), added default key for one_line_progress_meter"
44

55
port = 'PySimpleGUIWeb'
66

@@ -5554,7 +5554,7 @@ def EasyProgressMeterCancel(title, *args):
55545554

55555555

55565556
# ============================== OneLineProgressMeter =====#
5557-
def OneLineProgressMeter(title, current_value, max_value, key, *args, orientation=None, bar_color=(None, None),
5557+
def OneLineProgressMeter(title, current_value, max_value, key='OK for 1 meter', *args, orientation=None, bar_color=(None, None),
55585558
button_color=None, size=DEFAULT_PROGRESS_BAR_SIZE, border_width=None, grab_anywhere=False):
55595559
global _one_line_progress_meters
55605560

@@ -5596,7 +5596,7 @@ def OneLineProgressMeter(title, current_value, max_value, key, *args, orientatio
55965596
return rc # return whatever the update told us
55975597

55985598

5599-
def OneLineProgressMeterCancel(key):
5599+
def OneLineProgressMeterCancel(key='OK for 1 meter'):
56005600
global _one_line_progress_meters
56015601

56025602
try:

‎PySimpleGUIWx/PySimpleGUIWx.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/python3
2-
version = __version__ = "0.17.1.2 Unreleased\n VSeparator added (spelling error), Radio.reset_group added and removed the clearing all when one cleared"
2+
version = __version__ = "0.17.1.3 Unreleased\n VSeparator added (spelling error), Radio.reset_group added and removed the clearing all when one cleared, added default key for one_line_progress_meter"
33

44
port = 'PySimpleGUIWx'
55

@@ -5639,7 +5639,7 @@ def ComputeProgressStats(self):
56395639
return self.stat_messages
56405640

56415641

5642-
def OneLineProgressMeter(title, current_value, max_value, key, *args, orientation='v', bar_color=(None, None),
5642+
def OneLineProgressMeter(title, current_value, max_value, key='OK for 1 meter', *args, orientation='v', bar_color=(None, None),
56435643
button_color=None, size=DEFAULT_PROGRESS_BAR_SIZE, border_width=None, grab_anywhere=False):
56445644
if key not in QuickMeter.active_meters:
56455645
meter = QuickMeter(title, current_value, max_value, key, *args, orientation=orientation, bar_color=bar_color,
@@ -5652,7 +5652,7 @@ def OneLineProgressMeter(title, current_value, max_value, key, *args, orientatio
56525652
OneLineProgressMeter.exit_reasons = getattr(OneLineProgressMeter,'exit_reasons', QuickMeter.exit_reasons)
56535653
return rc == METER_OK
56545654

5655-
def OneLineProgressMeterCancel(key):
5655+
def OneLineProgressMeterCancel(key='OK for 1 meter'):
56565656
try:
56575657
meter = QuickMeter.active_meters[key]
56585658
meter.window.Close()

0 commit comments

Comments
 (0)