Source

Target

Commits (2)
Showing with 7 additions and 13 deletions
......@@ -10,7 +10,6 @@ class ProgressFrame(wx.Frame):
self.cancelMode = True
self.done = True
self.autoShow = False
self.autoClose = False
xSize,ySize = wx.DisplaySize()
size = (int(xSize*0.75),int(ySize*0.33))
......@@ -94,9 +93,6 @@ class ProgressFrame(wx.Frame):
if self.autoShow:
evt = wx.PyCommandEvent(wx.EVT_BUTTON.typeId,self.show.GetId())
wx.PostEvent(self.show, evt)
elif self.autoClose:
evt = wx.PyCommandEvent(wx.EVT_BUTTON.typeId,self.close.GetId())
wx.PostEvent(self.close, evt)
self.progress.SetValue(self.count)
......
......@@ -8,19 +8,17 @@ from library import ScreenshotManager, SettingsManager
class MyApp(wx.App):
def __init__(self,autoClose):
def __init__(self):
super().__init__(clearSigInt=True)
self.settingsFrame = SettingsFrame(self.refreshProgressDialog)
self.frame = None
self.autoClose = autoClose
self.launchProgressFrame()
def launchProgressFrame(self):
self.screenshotManager = ScreenshotManager(True)
self.progress = ProgressFrame()
self.progress.autoClose = self.autoClose
self.progress.settings.Bind(wx.EVT_BUTTON, self.OnSettings)
self.progress.show.Bind(wx.EVT_BUTTON, self.OnMainFrame)
self.progress.Bind(wx.EVT_CLOSE, self.OnClose)
......@@ -56,7 +54,7 @@ class MyApp(wx.App):
def OnClose(self, event):
if event.CanVeto():
if self.progress.cancelMode or self.progress.done or self.progress.autoShow or self.progress.autoClose:
if self.progress.cancelMode or self.progress.done or self.progress.autoShow:
self.screenshotManager.stopThread = True
event.Skip()
if self.settingsFrame: self.settingsFrame.Close()
......@@ -82,19 +80,19 @@ if __name__ == '__main__':
help='The path to search for screenshot files',
required=False,
dest='screenshotPath')
parser.add_argument('-ac', '--auto-close',
help='To just compare screenshot without GUI (for CI-CD)',
parser.add_argument('-wd', '--windowed',
help='Launch GUI or just compare screenshot',
required=False,
dest='autoClose')
dest='windowed')
args = parser.parse_args()
settingsmanager = SettingsManager()
if args.referencePath != None: settingsmanager.referencesPath = args.referencePath
if args.screenshotPath != None: settingsmanager.screenshotsPath = args.screenshotPath
settingsmanager.saveSettings()
if args.autoClose=="true":
if args.windowed=="false":
ScreenshotManager(False)
else:
app = MyApp(True if args.autoClose=="true" else False)
app = MyApp()
app.MainLoop()
\ No newline at end of file