cleanup
This commit is contained in:
@ -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
|
||||
|
||||
@ -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 )
|
||||
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 )
|
||||
|
||||
@ -325,7 +325,7 @@
|
||||
<property name="minimize_button">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="moveable">1</property>
|
||||
<property name="name">media_panel</property>
|
||||
<property name="name">_media_panel</property>
|
||||
<property name="pane_border">1</property>
|
||||
<property name="pane_position"></property>
|
||||
<property name="pane_size"></property>
|
||||
@ -343,8 +343,8 @@
|
||||
<property name="window_style">wxTAB_TRAVERSAL</property>
|
||||
</object>
|
||||
</object>
|
||||
<object class="splitteritem" expanded="false">
|
||||
<object class="wxPanel" expanded="false">
|
||||
<object class="splitteritem" expanded="true">
|
||||
<object class="wxPanel" expanded="true">
|
||||
<property name="BottomDockable">1</property>
|
||||
<property name="LeftDockable">1</property>
|
||||
<property name="RightDockable">1</property>
|
||||
@ -396,16 +396,16 @@
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style">wxTAB_TRAVERSAL</property>
|
||||
<object class="wxBoxSizer" expanded="false">
|
||||
<object class="wxBoxSizer" expanded="true">
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">right_sizer</property>
|
||||
<property name="orient">wxHORIZONTAL</property>
|
||||
<property name="permission">none</property>
|
||||
<object class="sizeritem" expanded="false">
|
||||
<object class="sizeritem" expanded="true">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxEXPAND</property>
|
||||
<property name="proportion">1</property>
|
||||
<object class="wxSplitterWindow" expanded="false">
|
||||
<object class="wxSplitterWindow" expanded="true">
|
||||
<property name="BottomDockable">1</property>
|
||||
<property name="LeftDockable">1</property>
|
||||
<property name="RightDockable">1</property>
|
||||
@ -463,8 +463,8 @@
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
<object class="splitteritem" expanded="false">
|
||||
<object class="wxPanel" expanded="false">
|
||||
<object class="splitteritem" expanded="true">
|
||||
<object class="wxPanel" expanded="true">
|
||||
<property name="BottomDockable">1</property>
|
||||
<property name="LeftDockable">1</property>
|
||||
<property name="RightDockable">1</property>
|
||||
@ -561,7 +561,7 @@
|
||||
<property name="minimize_button">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="moveable">1</property>
|
||||
<property name="name">preview_panel</property>
|
||||
<property name="name">_preview_panel</property>
|
||||
<property name="pane_border">1</property>
|
||||
<property name="pane_position"></property>
|
||||
<property name="pane_size"></property>
|
||||
@ -619,7 +619,7 @@
|
||||
<property name="minimize_button">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="moveable">1</property>
|
||||
<property name="name">navigation_panel</property>
|
||||
<property name="name">_navigation_panel</property>
|
||||
<property name="pane_border">1</property>
|
||||
<property name="pane_position"></property>
|
||||
<property name="pane_size"></property>
|
||||
@ -845,7 +845,7 @@
|
||||
<property name="minimize_button">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="moveable">1</property>
|
||||
<property name="name">filter_panel</property>
|
||||
<property name="name">_filter_panel</property>
|
||||
<property name="pane_border">1</property>
|
||||
<property name="pane_position"></property>
|
||||
<property name="pane_size"></property>
|
||||
@ -910,7 +910,7 @@
|
||||
<property name="minimize_button">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="moveable">1</property>
|
||||
<property name="name">timeline_panel</property>
|
||||
<property name="name">_timeline_panel</property>
|
||||
<property name="pane_border">1</property>
|
||||
<property name="pane_position"></property>
|
||||
<property name="pane_size"></property>
|
||||
|
||||
@ -149,7 +149,7 @@
|
||||
<property name="minimize_button">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="moveable">1</property>
|
||||
<property name="name">video_panel</property>
|
||||
<property name="name">_video_canvas</property>
|
||||
<property name="pane_border">1</property>
|
||||
<property name="pane_position"></property>
|
||||
<property name="pane_size"></property>
|
||||
|
||||
@ -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()
|
||||
|
||||
Reference in New Issue
Block a user