Merge pull request #758 from MikeTheWatchGuy/Dev-latest
More changes for multiple windows. New QT Demo program - GitHub scra…
This commit is contained in:
commit
09847c12bd
|
@ -0,0 +1,88 @@
|
||||||
|
#!/usr/bin/env python
|
||||||
|
import PySimpleGUIQt as sg
|
||||||
|
|
||||||
|
import re
|
||||||
|
# Import requests (to download the page)
|
||||||
|
import requests
|
||||||
|
|
||||||
|
# Import BeautifulSoup (to parse what we download)
|
||||||
|
from bs4 import BeautifulSoup
|
||||||
|
|
||||||
|
# search github for total open issues and Issue Number of first issue
|
||||||
|
def get_num_issues():
|
||||||
|
url = "https://github.com/MikeTheWatchGuy/PySimpleGUI/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc"
|
||||||
|
# set the headers like we are a browser,
|
||||||
|
headers = {
|
||||||
|
'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36'}
|
||||||
|
# download the page
|
||||||
|
response = requests.get(url, headers=headers)
|
||||||
|
# parse the downloaded homepage and grab all text,
|
||||||
|
soup = BeautifulSoup(response.text, "lxml")
|
||||||
|
# look for phrase "XXX Open"
|
||||||
|
findopen = re.compile(r"\d+ Open")
|
||||||
|
# get number of open issues
|
||||||
|
number_open_string = findopen.search(str(soup)).group(0)
|
||||||
|
num_open_issues = number_open_string[0:number_open_string.index(' ')]
|
||||||
|
# find the first issue in the list by earing for "issue-id-XXXX"
|
||||||
|
find_first_issue = re.compile(r'issue-id-\d+')
|
||||||
|
first_issue_string = find_first_issue.search(str(soup)).group(0)
|
||||||
|
first_issue = first_issue_string[9:]
|
||||||
|
return num_open_issues, first_issue
|
||||||
|
|
||||||
|
|
||||||
|
def gui():
|
||||||
|
sg.ChangeLookAndFeel('Topanga')
|
||||||
|
|
||||||
|
sg.SetOptions(border_width=0, margins=(0, 0), element_padding=(0, 0))
|
||||||
|
|
||||||
|
layout = [
|
||||||
|
[sg.T('GitHub Issues Watcher' + 48 * ' '),
|
||||||
|
sg.Button('', size=(25,25),
|
||||||
|
image_data=red_x,
|
||||||
|
key='_quit_',button_color=(sg.LOOK_AND_FEEL_TABLE['Topanga']['TEXT'],sg.LOOK_AND_FEEL_TABLE['Topanga']['BACKGROUND']),
|
||||||
|
tooltip='Closes window')],
|
||||||
|
[sg.T('', key='_status_', size=(100, 25))],
|
||||||
|
[sg.T('', key='_numissues_', size=(200, 20))],
|
||||||
|
]
|
||||||
|
|
||||||
|
window = sg.Window('Issue watcher',
|
||||||
|
no_titlebar=True,
|
||||||
|
grab_anywhere=True,
|
||||||
|
keep_on_top=True,
|
||||||
|
alpha_channel=.8, # dim the lights a little
|
||||||
|
location=(2121,310), # locate in upper right corner of screen
|
||||||
|
).Layout(layout).Finalize()
|
||||||
|
|
||||||
|
window.Refresh()
|
||||||
|
status_elem = window.FindElement('_status_')
|
||||||
|
issues_elem = window.FindElement('_numissues_')
|
||||||
|
|
||||||
|
initial_issue_count, initial_first_issue = get_num_issues()
|
||||||
|
# The Event Loop runs every 1000ms
|
||||||
|
i = 0
|
||||||
|
while True:
|
||||||
|
if i % 60 == 0: # Every 60 seconds read GitHub
|
||||||
|
status_elem.Update('Reading...')
|
||||||
|
window.Refresh()
|
||||||
|
issues, first_issue = get_num_issues()
|
||||||
|
issues_elem.Update('{} Issues. {} is first issue'.format(issues, initial_first_issue))
|
||||||
|
window.Refresh()
|
||||||
|
# if something changed, then make a popup
|
||||||
|
if issues != initial_issue_count or first_issue != initial_first_issue:
|
||||||
|
sg.PopupNoWait('Issues changed on GitHub', background_color='red')
|
||||||
|
initial_issue_count = issues
|
||||||
|
initial_first_issue = first_issue
|
||||||
|
status_elem.Update('')
|
||||||
|
else:
|
||||||
|
status_elem.Update('.' if i%2 else '') # blink a '.' every 2 seconds so know still running
|
||||||
|
# read with a 1 second timeout
|
||||||
|
event, values = window.Read(timeout=1000)
|
||||||
|
if event in ('_quit_', None):
|
||||||
|
break
|
||||||
|
i += 1
|
||||||
|
|
||||||
|
red_x = b"R0lGODlhEAAQAPeQAIsAAI0AAI4AAI8AAJIAAJUAAJQCApkAAJoAAJ4AAJkJCaAAAKYAAKcAAKcCAKcDA6cGAKgAAKsAAKsCAKwAAK0AAK8AAK4CAK8DAqUJAKULAKwLALAAALEAALIAALMAALMDALQAALUAALYAALcEALoAALsAALsCALwAAL8AALkJAL4NAL8NAKoTAKwbAbEQALMVAL0QAL0RAKsREaodHbkQELMsALg2ALk3ALs+ALE2FbgpKbA1Nbc1Nb44N8AAAMIWAMsvAMUgDMcxAKVABb9NBbVJErFYEq1iMrtoMr5kP8BKAMFLAMxKANBBANFCANJFANFEB9JKAMFcANFZANZcANpfAMJUEMZVEc5hAM5pAMluBdRsANR8AM9YOrdERMpIQs1UVMR5WNt8X8VgYMdlZcxtYtx4YNF/btp9eraNf9qXXNCCZsyLeNSLd8SSecySf82kd9qqc9uBgdyBgd+EhN6JgtSIiNuJieGHhOGLg+GKhOKamty1ste4sNO+ueenp+inp+HHrebGrefKuOPTzejWzera1O7b1vLb2/bl4vTu7fbw7ffx7vnz8f///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAJAALAAAAAAQABAAAAjUACEJHEiwYEEABniQKfNFgQCDkATQwAMokEU+PQgUFDAjjR09e/LUmUNnh8aBCcCgUeRmzBkzie6EeQBAoAAMXuA8ciRGCaJHfXzUMCAQgYooWN48anTokR8dQk4sELggBhQrU9Q8evSHiJQgLCIIfMDCSZUjhbYuQkLFCRAMAiOQGGLE0CNBcZYmaRIDLqQFGF60eTRoSxc5jwjhACFWIAgMLtgUocJFy5orL0IQRHAiQgsbRZYswbEhBIiCCH6EiJAhAwQMKU5DjHCi9gnZEHMTDAgAOw=="
|
||||||
|
|
||||||
|
refresh = b'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACb0lEQVR4XpVTXUiTbxT/vePdFuF0BTFW9ufVvMlu+iACka6CQY1gQVdtEmTMpSKzzJT/RTdCRHhT4F0Us8LGVqlo1lZaFslWQWBkN+tDkpSpbfNz797T8zy6DbUbf/Dbec7vfOycMwa0DBJjM7Ko72mBtz+KplCS6Ronf3NNxNZBt2qv4dJzL0uKwGRqU/6zHDqyd1dBk32/xMnfXOMxkVPXXYlVSLjykk4fKIb/4zgUSxEO7zRBKd4Bjm/jU9ys8f2fJoCFhRiWl6pw6+Qw0BymhlfT5Lg/xmycHA++ktL+nsRqrUOrdpBpH6hhKC7yhObti0CgKUTu0KTgcd8X4j4aB2bYvj7UPqkQrO/1cU25ESV3eJJO8LzLIQ11/CYXn5Grf4KqGF19E3Ts9iixe2QPm0dtt5PtP6NcHxF5ZVfDhIbeqMQ6E0hcI4ec327jah513T4YDM5TR/dh8vc0hkfHUxI2gwuPKyDLb2wV5cIdePuZZGwWmQxSSyqICFBVyKgJJkFaQW4Hna4THQ4X/gUiD2+QXEwjNZsASJvTgWgMqoY95WWw7raAJdjheeTEeniCTqgZu2IxswnSmGI3gEZjMiQpAMocTC2nJcm4hU9gRjp9E+6Ajb07wKFpHqRVOzKqedFUhOX4HyRnEwSjMQCB8/4IqnxU2DYiaGnsIe7n2UlK61MWe0dbW18Ijdfk/wuy7IXeEEvEvmM+kcRM4XYYSkohW62ChtIS/NKbWGwO8z9+Anp9TNSsQU2wEtVdEZy5o7Gfi7Z5ewj/vxbkPs51kYhVP4zAw3I3IN+ohSVFcfZeEs67Gid/c03E1uEv5QpTFzvZK5EAAAAASUVORK5CYII='
|
||||||
|
|
||||||
|
gui()
|
|
@ -2661,6 +2661,7 @@ class Window:
|
||||||
self.ElementPadding = element_padding or DEFAULT_ELEMENT_PADDING
|
self.ElementPadding = element_padding or DEFAULT_ELEMENT_PADDING
|
||||||
self.FocusElement = None
|
self.FocusElement = None
|
||||||
self.BackgroundImage = background_image
|
self.BackgroundImage = background_image
|
||||||
|
self.XFound = False
|
||||||
|
|
||||||
# ------------------------- Add ONE Row to Form ------------------------- #
|
# ------------------------- Add ONE Row to Form ------------------------- #
|
||||||
def AddRow(self, *args):
|
def AddRow(self, *args):
|
||||||
|
@ -2806,7 +2807,6 @@ class Window:
|
||||||
except:
|
except:
|
||||||
self.TKrootDestroyed = True
|
self.TKrootDestroyed = True
|
||||||
_my_windows.Decrement()
|
_my_windows.Decrement()
|
||||||
print('ROOT Destroyed')
|
|
||||||
results = BuildResults(self, False, self)
|
results = BuildResults(self, False, self)
|
||||||
if results[0] != None and results[0] != timeout_key:
|
if results[0] != None and results[0] != timeout_key:
|
||||||
return results
|
return results
|
||||||
|
@ -2846,6 +2846,8 @@ class Window:
|
||||||
self.LastButtonClicked = None
|
self.LastButtonClicked = None
|
||||||
return results
|
return results
|
||||||
else:
|
else:
|
||||||
|
if not self.XFound and self.Timeout != 0: # Special Qt case because returning for no reason so fake timeout
|
||||||
|
self.ReturnValues = self.TimeoutKey, self.ReturnValues[1] # fake a timeout
|
||||||
return self.ReturnValues
|
return self.ReturnValues
|
||||||
|
|
||||||
def _ReadNonBlocking(self):
|
def _ReadNonBlocking(self):
|
||||||
|
@ -3127,7 +3129,8 @@ class Window:
|
||||||
return QWidget.eventFilter(self, widget, event)
|
return QWidget.eventFilter(self, widget, event)
|
||||||
|
|
||||||
def closeEvent(self, event):
|
def closeEvent(self, event):
|
||||||
# print('GOT A CLOSE EVENT!', event)
|
# print('GOT A CLOSE EVENT!', event, self.Window.Title)
|
||||||
|
self.Window.XFound = True
|
||||||
if not self.Window.CurrentlyRunningMainloop: # quit if this is the current mainloop, otherwise don't quit!
|
if not self.Window.CurrentlyRunningMainloop: # quit if this is the current mainloop, otherwise don't quit!
|
||||||
self.Window.RootNeedsDestroying = True
|
self.Window.RootNeedsDestroying = True
|
||||||
else:
|
else:
|
||||||
|
@ -4635,6 +4638,7 @@ def StartupTK(window):
|
||||||
if not window.FormRemainedOpen:
|
if not window.FormRemainedOpen:
|
||||||
_my_windows.Decrement()
|
_my_windows.Decrement()
|
||||||
if window.RootNeedsDestroying:
|
if window.RootNeedsDestroying:
|
||||||
|
print('** Destroying window **')
|
||||||
window.QT_QMainWindow.close() # destroy the window
|
window.QT_QMainWindow.close() # destroy the window
|
||||||
window.RootNeedsDestroying = False
|
window.RootNeedsDestroying = False
|
||||||
return
|
return
|
||||||
|
@ -5652,8 +5656,8 @@ def Popup(*args, title=None, button_color=None, background_color=None, text_colo
|
||||||
total_lines += height
|
total_lines += height
|
||||||
|
|
||||||
if total_lines < 3:
|
if total_lines < 3:
|
||||||
layout.append([Text('')])
|
layout.append([Text('',text_color=text_color, background_color=background_color)])
|
||||||
layout.append([Text('')])
|
layout.append([Text('',text_color=text_color, background_color=background_color)])
|
||||||
if non_blocking:
|
if non_blocking:
|
||||||
PopupButton = DummyButton # important to use or else button will close other windows too!
|
PopupButton = DummyButton # important to use or else button will close other windows too!
|
||||||
else:
|
else:
|
||||||
|
@ -5756,7 +5760,7 @@ def PopupNonBlocking(*args, title=None, button_type=POPUP_BUTTONS_OK, button_col
|
||||||
:param location:
|
:param location:
|
||||||
:return:
|
:return:
|
||||||
"""
|
"""
|
||||||
Popup(*args, button_color=button_color, background_color=background_color, text_color=text_color,
|
Popup(*args, title=title, button_color=button_color, background_color=background_color, text_color=text_color,
|
||||||
button_type=button_type,
|
button_type=button_type,
|
||||||
auto_close=auto_close, auto_close_duration=auto_close_duration, non_blocking=non_blocking, icon=icon,
|
auto_close=auto_close, auto_close_duration=auto_close_duration, non_blocking=non_blocking, icon=icon,
|
||||||
line_width=line_width,
|
line_width=line_width,
|
||||||
|
|
Loading…
Reference in New Issue