diff --git a/subsync/gui/layout/syncwin.fbp b/subsync/gui/layout/syncwin.fbp index 514a82c..5c673cf 100644 --- a/subsync/gui/layout/syncwin.fbp +++ b/subsync/gui/layout/syncwin.fbp @@ -268,191 +268,90 @@ - 10 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM - 1 - - 2 - wxBOTH - 0 - 0 - 0 - - fgSizer7 - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - 280,-1 - 1 - m_gaugeProgress - 1 - - - protected - 1 - - 100 - Resizable - 1 - - wxGA_HORIZONTAL - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - 0 % - - 0 - - - 0 - - 1 - m_textProgress - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - + 5 + wxALL|wxEXPAND|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + 320,-1 + 1 + m_gaugeProgress + 1 + + + protected + 1 + + 100 + Resizable + 1 + + wxGA_HORIZONTAL + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/subsync/gui/layout/syncwin.py b/subsync/gui/layout/syncwin.py index a5f43ac..9e17112 100644 --- a/subsync/gui/layout/syncwin.py +++ b/subsync/gui/layout/syncwin.py @@ -35,24 +35,11 @@ def __init__( self, parent ): self.m_textStatus.Wrap( -1 ) fgSizer6.Add( self.m_textStatus, 0, wx.ALL|wx.EXPAND, 5 ) - fgSizer7 = wx.FlexGridSizer( 0, 2, 0, 0 ) - fgSizer7.AddGrowableCol( 0 ) - fgSizer7.AddGrowableRow( 0 ) - fgSizer7.SetFlexibleDirection( wx.BOTH ) - fgSizer7.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) - self.m_gaugeProgress = wx.Gauge( self.m_panel1, wx.ID_ANY, 100, wx.DefaultPosition, wx.DefaultSize, wx.GA_HORIZONTAL ) self.m_gaugeProgress.SetValue( 0 ) - self.m_gaugeProgress.SetMinSize( wx.Size( 280,-1 ) ) - - fgSizer7.Add( self.m_gaugeProgress, 0, wx.ALL|wx.EXPAND, 5 ) - - self.m_textProgress = wx.StaticText( self.m_panel1, wx.ID_ANY, _(u" 0 % "), wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_textProgress.Wrap( -1 ) - fgSizer7.Add( self.m_textProgress, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 ) - + self.m_gaugeProgress.SetMinSize( wx.Size( 320,-1 ) ) - fgSizer6.Add( fgSizer7, 1, wx.EXPAND|wx.ALIGN_CENTER_VERTICAL|wx.BOTTOM, 10 ) + fgSizer6.Add( self.m_gaugeProgress, 0, wx.ALL|wx.EXPAND|wx.ALIGN_CENTER_VERTICAL, 5 ) self.m_panelError = wx.Panel( self.m_panel1, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) self.m_panelError.Hide() diff --git a/subsync/gui/syncwin.py b/subsync/gui/syncwin.py index 9044e6d..ebba003 100644 --- a/subsync/gui/syncwin.py +++ b/subsync/gui/syncwin.py @@ -120,7 +120,6 @@ def setProgress(self, progress): if progress != None and 0.0 <= progress <= 1.0: pr = int(progress * 100) self.m_gaugeProgress.SetValue(pr) - self.m_textProgress.SetLabel(' {:3} % '.format(pr)) else: self.m_gaugeProgress.Pulse() @@ -142,8 +141,7 @@ def stop(self, finished=False): if abs(self.sync.getMaxChange()) > 0.3: self.m_textStatus.SetLabel(_('Subtitles synchronized')) else: - self.m_textStatus.SetLabel( - _('No need to synchronize, subtitles are good already')) + self.m_textStatus.SetLabel(_('No need to synchronize')) else: self.m_bitmapTick.Hide() self.m_bitmapCross.Show() @@ -153,8 +151,7 @@ def stop(self, finished=False): stats.factor > settings().minCorrelation**10 and stats.maxDistance < 2*settings().maxPointDist): self.m_buttonSave.Enable() - self.m_textStatus.SetLabel( - _('Couldn\'t synchronize, but you could try anyway')) + self.m_textStatus.SetLabel(_('Synchronization inconclusive')) else: self.m_textStatus.SetLabel(_('Couldn\'t synchronize')) else: