From e803956d75050cb63aba1fe86f8149e4b6e3bedf Mon Sep 17 00:00:00 2001 From: Roz K Date: Sun, 12 Oct 2025 04:11:18 +0200 Subject: [PATCH] cleanup --- pyui/mainframe.py | 10 +++++++++- pyui/mainframe_generated.py | 30 +++++++++++++++--------------- pyui/preview.py | 8 +++++++- pyui/preview_generated.py | 4 ++-- pyui/resources/mainframe.fbp | 24 ++++++++++++------------ pyui/resources/preview.fbp | 2 +- pyui/video.py | 7 +------ 7 files changed, 47 insertions(+), 38 deletions(-) diff --git a/pyui/mainframe.py b/pyui/mainframe.py index 88ab386..5a51938 100644 --- a/pyui/mainframe.py +++ b/pyui/mainframe.py @@ -17,4 +17,12 @@ from . import mainframe_generated class MainFrame(mainframe_generated.MainFrame): - pass + __slots__ = 'media_panel', 'preview_panel', 'navigation_panel', 'filter_panel', 'timeline_panel' + + def __init__(self, parent): + mainframe_generated.MainFrame.__init__(self, parent) + self.media_panel = self._media_panel + self.preview_panel = self._preview_panel + self.navigation_panel = self._navigation_panel + self.filter_panel = self._filter_panel + self.timeline_panel = self._timeline_panel diff --git a/pyui/mainframe_generated.py b/pyui/mainframe_generated.py index 1680c63..6606975 100644 --- a/pyui/mainframe_generated.py +++ b/pyui/mainframe_generated.py @@ -48,7 +48,7 @@ class MainFrame ( wx.Frame ): self.media_splitter.Bind( wx.EVT_IDLE, self.media_splitterOnIdle ) self.media_splitter.SetMinimumPaneSize( 100 ) - self.media_panel = wx.Panel( self.media_splitter, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) + self._media_panel = wx.Panel( self.media_splitter, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) self.right_panel = wx.Panel( self.media_splitter, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) right_sizer = wx.BoxSizer( wx.HORIZONTAL ) @@ -60,15 +60,15 @@ class MainFrame ( wx.Frame ): self.center_panel = wx.Panel( self.filter_splitter, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) center_sizer = wx.BoxSizer( wx.VERTICAL ) - self.preview_panel = PreviewPanel( self.center_panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) - center_sizer.Add( self.preview_panel, 1, wx.EXPAND | wx.ALL, 5 ) + self._preview_panel = PreviewPanel( self.center_panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) + center_sizer.Add( self._preview_panel, 1, wx.EXPAND | wx.ALL, 5 ) - self.navigation_panel = wx.Panel( self.center_panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) + self._navigation_panel = wx.Panel( self.center_panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) navigation_sizer = wx.BoxSizer( wx.VERTICAL ) scrubber_sizer = wx.BoxSizer( wx.HORIZONTAL ) - self.scrubber_slider = wx.Slider( self.navigation_panel, wx.ID_ANY, 50, 0, 100, wx.DefaultPosition, wx.DefaultSize, wx.SL_HORIZONTAL ) + self.scrubber_slider = wx.Slider( self._navigation_panel, wx.ID_ANY, 50, 0, 100, wx.DefaultPosition, wx.DefaultSize, wx.SL_HORIZONTAL ) scrubber_sizer.Add( self.scrubber_slider, 1, wx.ALL, 5 ) @@ -76,7 +76,7 @@ class MainFrame ( wx.Frame ): control_sizer = wx.BoxSizer( wx.HORIZONTAL ) - self.control_toolbar = wx.ToolBar( self.navigation_panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TB_HORIZONTAL ) + self.control_toolbar = wx.ToolBar( self._navigation_panel, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TB_HORIZONTAL ) self.m_tool1 = self.control_toolbar.AddTool( wx.ID_ANY, _(u"tool"), wx.NullBitmap, wx.NullBitmap, wx.ITEM_NORMAL, wx.EmptyString, wx.EmptyString, None ) self.control_toolbar.Realize() @@ -87,32 +87,32 @@ class MainFrame ( wx.Frame ): navigation_sizer.Add( control_sizer, 0, wx.EXPAND, 5 ) - self.navigation_panel.SetSizer( navigation_sizer ) - self.navigation_panel.Layout() - navigation_sizer.Fit( self.navigation_panel ) - center_sizer.Add( self.navigation_panel, 0, wx.EXPAND | wx.ALL, 5 ) + self._navigation_panel.SetSizer( navigation_sizer ) + self._navigation_panel.Layout() + navigation_sizer.Fit( self._navigation_panel ) + center_sizer.Add( self._navigation_panel, 0, wx.EXPAND | wx.ALL, 5 ) self.center_panel.SetSizer( center_sizer ) self.center_panel.Layout() center_sizer.Fit( self.center_panel ) - self.filter_panel = wx.Panel( self.filter_splitter, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) - self.filter_splitter.SplitVertically( self.center_panel, self.filter_panel, -200 ) + self._filter_panel = wx.Panel( self.filter_splitter, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) + self.filter_splitter.SplitVertically( self.center_panel, self._filter_panel, -200 ) right_sizer.Add( self.filter_splitter, 1, wx.EXPAND, 5 ) self.right_panel.SetSizer( right_sizer ) self.right_panel.Layout() right_sizer.Fit( self.right_panel ) - self.media_splitter.SplitVertically( self.media_panel, self.right_panel, 200 ) + self.media_splitter.SplitVertically( self._media_panel, self.right_panel, 200 ) top_sizer.Add( self.media_splitter, 1, wx.EXPAND, 5 ) self.top_panel.SetSizer( top_sizer ) self.top_panel.Layout() top_sizer.Fit( self.top_panel ) - self.timeline_panel = wx.Panel( self.timeline_splitter, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) - self.timeline_splitter.SplitHorizontally( self.top_panel, self.timeline_panel, -100 ) + self._timeline_panel = wx.Panel( self.timeline_splitter, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL ) + self.timeline_splitter.SplitHorizontally( self.top_panel, self._timeline_panel, -100 ) main_sizer.Add( self.timeline_splitter, 1, wx.EXPAND, 5 ) diff --git a/pyui/preview.py b/pyui/preview.py index 83e462a..eab4923 100644 --- a/pyui/preview.py +++ b/pyui/preview.py @@ -17,9 +17,15 @@ from . import preview_generated class PreviewPanel(preview_generated.PreviewPanel): + __slots__ = 'canvas', 'context' + + def __init__(self, parent, id, pos, size, style): + preview_generated.PreviewPanel.__init__(self, parent, id = id, pos = pos, size = size, style = style) + self.canvas = self._video_canvas + self.context = self._video_canvas.context def initdialog_event_handler(self, event): - self.video_panel.initialize() + self.canvas.SetCurrent(self.context) def size_event_handler(self, event): pass diff --git a/pyui/preview_generated.py b/pyui/preview_generated.py index 9b3c07f..d27d1e1 100644 --- a/pyui/preview_generated.py +++ b/pyui/preview_generated.py @@ -45,8 +45,8 @@ class PreviewPanel ( wx.Panel ): centering_sizer.Add( ( 0, 0), 1, wx.EXPAND, 5 ) - self.video_panel = VideoCanvas( self, wx.ID_ANY, wx.DefaultPosition, wx.Size( 400,300 ), wx.BORDER_NONE|wx.FULL_REPAINT_ON_RESIZE|wx.TAB_TRAVERSAL ) - centering_sizer.Add( self.video_panel, 0, wx.EXPAND, 5 ) + self._video_canvas = VideoCanvas( self, wx.ID_ANY, wx.DefaultPosition, wx.Size( 400,300 ), wx.BORDER_NONE|wx.FULL_REPAINT_ON_RESIZE|wx.TAB_TRAVERSAL ) + centering_sizer.Add( self._video_canvas, 0, wx.EXPAND, 5 ) centering_sizer.Add( ( 0, 0), 1, wx.EXPAND, 5 ) diff --git a/pyui/resources/mainframe.fbp b/pyui/resources/mainframe.fbp index 7ad4ec0..10916eb 100644 --- a/pyui/resources/mainframe.fbp +++ b/pyui/resources/mainframe.fbp @@ -325,7 +325,7 @@ 0 1 - media_panel + _media_panel 1 @@ -343,8 +343,8 @@ wxTAB_TRAVERSAL - - + + 1 1 1 @@ -396,16 +396,16 @@ wxTAB_TRAVERSAL - + right_sizer wxHORIZONTAL none - + 5 wxEXPAND 1 - + 1 1 1 @@ -463,8 +463,8 @@ - - + + 1 1 1 @@ -561,7 +561,7 @@ 0 1 - preview_panel + _preview_panel 1 @@ -619,7 +619,7 @@ 0 1 - navigation_panel + _navigation_panel 1 @@ -845,7 +845,7 @@ 0 1 - filter_panel + _filter_panel 1 @@ -910,7 +910,7 @@ 0 1 - timeline_panel + _timeline_panel 1 diff --git a/pyui/resources/preview.fbp b/pyui/resources/preview.fbp index 96f6390..4e9eb8f 100644 --- a/pyui/resources/preview.fbp +++ b/pyui/resources/preview.fbp @@ -149,7 +149,7 @@ 0 1 - video_panel + _video_canvas 1 diff --git a/pyui/video.py b/pyui/video.py index ac9e89f..3cba989 100644 --- a/pyui/video.py +++ b/pyui/video.py @@ -20,13 +20,8 @@ import wx.glcanvas class VideoCanvas(wx.glcanvas.GLCanvas): __slots__ = 'context' - def __init__(self, parent, - id = wx.ID_ANY, pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.TAB_TRAVERSAL): + def __init__(self, parent, id, pos, size, style): wx.glcanvas.GLCanvas.__init__(self, parent, id = id, pos = pos, size = size, style = style, attribList = wx.glcanvas.GLAttributes().PlatformDefaults().RGBA().FrameBuffersRGB().DoubleBuffer().EndList()) self.context = wx.glcanvas.GLContext(self, ctxAttrs = wx.glcanvas.GLContextAttrs().CoreProfile().OGLVersion(4,6).EndList()) - - def initialize(self): - self.SetCurrent(self.context) - self.SwapBuffers()