Move some gui utility files into a seperate location so the code gets a bit more seperated.
parent
c12c427569
commit
c7e497c1c8
|
@ -2,7 +2,7 @@ from __future__ import absolute_import
|
||||||
|
|
||||||
import wx, wx.stc
|
import wx, wx.stc
|
||||||
|
|
||||||
from Cura.gui import gcodeTextArea
|
from Cura.gui.util import gcodeTextArea
|
||||||
from Cura.util import profile
|
from Cura.util import profile
|
||||||
|
|
||||||
class alterationPanel(wx.Panel):
|
class alterationPanel(wx.Panel):
|
||||||
|
|
|
@ -5,7 +5,7 @@ import wx, os, multiprocessing, threading, time, shutil
|
||||||
from Cura.util import profile
|
from Cura.util import profile
|
||||||
from Cura.util import sliceRun
|
from Cura.util import sliceRun
|
||||||
from Cura.util import meshLoader
|
from Cura.util import meshLoader
|
||||||
from Cura.gui import dropTarget
|
from Cura.gui.util import dropTarget
|
||||||
|
|
||||||
class batchRunWindow(wx.Frame):
|
class batchRunWindow(wx.Frame):
|
||||||
def __init__(self, parent):
|
def __init__(self, parent):
|
||||||
|
@ -19,7 +19,6 @@ class batchRunWindow(wx.Frame):
|
||||||
self.panel = wx.Panel(self, -1)
|
self.panel = wx.Panel(self, -1)
|
||||||
self.SetSizer(wx.BoxSizer(wx.VERTICAL))
|
self.SetSizer(wx.BoxSizer(wx.VERTICAL))
|
||||||
self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND)
|
self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND)
|
||||||
#self.SetIcon(icon.getMainIcon())
|
|
||||||
|
|
||||||
self.sizer = wx.GridBagSizer(2,2)
|
self.sizer = wx.GridBagSizer(2,2)
|
||||||
self.panel.SetSizer(self.sizer)
|
self.panel.SetSizer(self.sizer)
|
||||||
|
@ -61,7 +60,7 @@ class batchRunWindow(wx.Frame):
|
||||||
self._updateListbox()
|
self._updateListbox()
|
||||||
|
|
||||||
def OnRemModel(self, e):
|
def OnRemModel(self, e):
|
||||||
if self.selection == None:
|
if self.selection is None:
|
||||||
return
|
return
|
||||||
self.list.remove(self.selection)
|
self.list.remove(self.selection)
|
||||||
self._updateListbox()
|
self._updateListbox()
|
||||||
|
|
|
@ -15,8 +15,8 @@ except:
|
||||||
print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
|
print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
|
||||||
hasOpenGLlibs = False
|
hasOpenGLlibs = False
|
||||||
|
|
||||||
from Cura.gui import toolbarUtil
|
from Cura.gui.util import toolbarUtil
|
||||||
from Cura.gui import opengl
|
from Cura.gui.util import opengl
|
||||||
from Cura.util import util3d
|
from Cura.util import util3d
|
||||||
from Cura.util import svg
|
from Cura.util import svg
|
||||||
from Cura.util import profile
|
from Cura.util import profile
|
||||||
|
@ -35,7 +35,6 @@ class flatSlicerWindow(wx.Frame):
|
||||||
self.panel = wx.Panel(self, -1)
|
self.panel = wx.Panel(self, -1)
|
||||||
self.SetSizer(wx.BoxSizer(wx.VERTICAL))
|
self.SetSizer(wx.BoxSizer(wx.VERTICAL))
|
||||||
self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND)
|
self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND)
|
||||||
#self.SetIcon(icon.getMainIcon())
|
|
||||||
|
|
||||||
self.toolbar = toolbarUtil.Toolbar(self.panel)
|
self.toolbar = toolbarUtil.Toolbar(self.panel)
|
||||||
|
|
||||||
|
|
|
@ -1,27 +0,0 @@
|
||||||
#----------------------------------------------------------------------
|
|
||||||
# This file was generated by /usr/bin/img2py
|
|
||||||
#
|
|
||||||
from wx.lib.embeddedimage import PyEmbeddedImage
|
|
||||||
|
|
||||||
Main = PyEmbeddedImage(
|
|
||||||
"iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAIAAAD9MqGbAAAAA3NCSVQICAjb4U/gAAAC/klE"
|
|
||||||
"QVQ4jYWUe0hTYRTAz+5rd5uPys2Z89mtLLecPRQpZw+ishf0gB5EQRZFWY20h/6jGQWSlJRR"
|
|
||||||
"RFGRFJXRHw3ECpRWbqRZq1WabErqqjWd7XF3d7e72x8rfKX9/jsf349zzncOn6DyPRuPBeAv"
|
|
||||||
"IY5DUBT+hy2IY/FYII1g2s2mi5Vl7WZTMBhQZS5Qqefbf3w7UlIxeYp0PBkDgMYGXenhAo4L"
|
|
||||||
"yqcqUqiZpjfGVoMeAFat35yjWTau6f3lrCwrxgn8bNWNxcvzERRl/f4TB3e9ano2ccHYuxcN"
|
|
||||||
"A46fqzdsWbpybfiIEAr3aUsYH52mzJjAROVJVOdbo7bkdMiod+gbvZYv0Sq1NDZuLoK4Xzc7"
|
|
||||||
"W43ipBRMEjFK6+cwjKHdABDNsh9KtQAgmTY9cctO1vHTdOxA+FJMTi4ZGzc2JyJTpACAE8fy"
|
|
||||||
"6l8RUtmfgqWyvAajYuPWcEgHPf8wZ2drAODW1WoylUKFJAA0ftWteaTMb15SPutpbwIUWg4t"
|
|
||||||
"u5eyXadptj0f0WdBxWWht/+Z7vH929cyvF6cDzVh/k6nmZUwHpR5O0/gDnnykvKtvzp6XJa1"
|
|
||||||
"1LahPgHg8MlTU6SxN2rO9TNMyEc3XKojRaLIokludFD+nT+jqVZQqS55LhE1ffiGCe588qYR"
|
|
||||||
"DAAEPe6Wmirn9RoifY4sc0GpvNaHBo62ALIUEFQIJgGdHSNiB9Lnlien7elgSWRoshGRWYXF"
|
|
||||||
"8es2cV2Wzrs3AUDE4QCAmElKqc08cCUr4ziOitvbynieg/D2DZczL1xzuey2XjPeUeTjaNV5"
|
|
||||||
"HdgNLk833VuP4ZFCkdw9+ImhbYDPGGGG2f9ik9X5GUeJAMfWPslJFyvEfgcvQAR8aESaURrP"
|
|
||||||
"c3szTnzsbwMAkrbFdz1kAOwzd29WnxShoveGwj7rg9EvNBZbd52xrYKKW5RI7XA6Wn701A86"
|
|
||||||
"WhFUSCm1ePKGiUwA0Os03pdWUPMAEOL8jFgBACTdJ5tXLRj1J4yFcRh89qao6ASIWcH5He5A"
|
|
||||||
"lwRiBqIX/gbbS0S3wHAu3wAAAABJRU5ErkJggg==")
|
|
||||||
getMainData = Main.GetData
|
|
||||||
getMainImage = Main.GetImage
|
|
||||||
getMainBitmap = Main.GetBitmap
|
|
||||||
getMainIcon = Main.GetIcon
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ from Cura.gui import simpleMode
|
||||||
from Cura.gui import projectPlanner
|
from Cura.gui import projectPlanner
|
||||||
from Cura.gui import batchRun
|
from Cura.gui import batchRun
|
||||||
from Cura.gui import flatSlicerWindow
|
from Cura.gui import flatSlicerWindow
|
||||||
from Cura.gui import dropTarget
|
from Cura.gui.util import dropTarget
|
||||||
from Cura.util import validators
|
from Cura.util import validators
|
||||||
from Cura.util import profile
|
from Cura.util import profile
|
||||||
from Cura.util import version
|
from Cura.util import version
|
||||||
|
@ -57,7 +57,6 @@ class mainWindow(configBase.configWindowBase):
|
||||||
extruderCount = int(profile.getPreference('extruder_amount'))
|
extruderCount = int(profile.getPreference('extruder_amount'))
|
||||||
|
|
||||||
wx.EVT_CLOSE(self, self.OnClose)
|
wx.EVT_CLOSE(self, self.OnClose)
|
||||||
#self.SetIcon(icon.getMainIcon())
|
|
||||||
|
|
||||||
self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles, meshLoader.supportedExtensions()))
|
self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles, meshLoader.supportedExtensions()))
|
||||||
|
|
||||||
|
|
|
@ -20,8 +20,8 @@ except:
|
||||||
print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
|
print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
|
||||||
hasOpenGLlibs = False
|
hasOpenGLlibs = False
|
||||||
|
|
||||||
from Cura.gui import opengl
|
from Cura.gui.util import opengl
|
||||||
from Cura.gui import toolbarUtil
|
from Cura.gui.util import toolbarUtil
|
||||||
|
|
||||||
from Cura.util import profile
|
from Cura.util import profile
|
||||||
from Cura.util import gcodeInterpreter
|
from Cura.util import gcodeInterpreter
|
||||||
|
|
|
@ -11,8 +11,8 @@ import platform
|
||||||
import wx
|
import wx
|
||||||
from wx.lib import buttons
|
from wx.lib import buttons
|
||||||
|
|
||||||
from Cura.gui import webcam
|
from Cura.gui.util import webcam
|
||||||
from Cura.gui import taskbar
|
from Cura.gui.util import taskbar
|
||||||
from Cura.util import machineCom
|
from Cura.util import machineCom
|
||||||
from Cura.util import gcodeInterpreter
|
from Cura.util import gcodeInterpreter
|
||||||
from Cura.util import power
|
from Cura.util import power
|
||||||
|
@ -118,8 +118,6 @@ class printWindow(wx.Frame):
|
||||||
if not self.cam.hasCamera():
|
if not self.cam.hasCamera():
|
||||||
self.cam = None
|
self.cam = None
|
||||||
|
|
||||||
#self.SetIcon(icon.getMainIcon())
|
|
||||||
|
|
||||||
self.SetSizer(wx.BoxSizer())
|
self.SetSizer(wx.BoxSizer())
|
||||||
self.panel = wx.Panel(self)
|
self.panel = wx.Panel(self)
|
||||||
self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND)
|
self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND)
|
||||||
|
|
|
@ -20,12 +20,12 @@ except:
|
||||||
print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
|
print "Failed to find PyOpenGL: http://pyopengl.sourceforge.net/"
|
||||||
hasOpenGLlibs = False
|
hasOpenGLlibs = False
|
||||||
|
|
||||||
from Cura.gui import opengl
|
from Cura.gui.util import opengl
|
||||||
from Cura.gui import toolbarUtil
|
from Cura.gui.util import toolbarUtil
|
||||||
from Cura.gui import configBase
|
from Cura.gui import configBase
|
||||||
from Cura.gui import printWindow
|
from Cura.gui import printWindow
|
||||||
from Cura.gui import dropTarget
|
from Cura.gui.util import dropTarget
|
||||||
from Cura.gui import taskbar
|
from Cura.gui.util import taskbar
|
||||||
from Cura.util import validators
|
from Cura.util import validators
|
||||||
from Cura.util import profile
|
from Cura.util import profile
|
||||||
from Cura.util import util3d
|
from Cura.util import util3d
|
||||||
|
@ -149,7 +149,6 @@ class projectPlanner(wx.Frame):
|
||||||
self.panel = wx.Panel(self, -1)
|
self.panel = wx.Panel(self, -1)
|
||||||
self.SetSizer(wx.BoxSizer(wx.VERTICAL))
|
self.SetSizer(wx.BoxSizer(wx.VERTICAL))
|
||||||
self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND)
|
self.GetSizer().Add(self.panel, 1, flag=wx.EXPAND)
|
||||||
#self.SetIcon(icon.getMainIcon())
|
|
||||||
|
|
||||||
self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles, meshLoader.supportedExtensions()))
|
self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles, meshLoader.supportedExtensions()))
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ from Cura.gui import configBase
|
||||||
from Cura.gui import preview3d
|
from Cura.gui import preview3d
|
||||||
from Cura.gui import sliceProgessPanel
|
from Cura.gui import sliceProgessPanel
|
||||||
from Cura.gui import preferencesDialog
|
from Cura.gui import preferencesDialog
|
||||||
from Cura.gui import dropTarget
|
from Cura.gui.util import dropTarget
|
||||||
from Cura.gui import printWindow
|
from Cura.gui import printWindow
|
||||||
from Cura.util import profile
|
from Cura.util import profile
|
||||||
from Cura.util import version
|
from Cura.util import version
|
||||||
|
@ -21,7 +21,6 @@ class simpleModeWindow(configBase.configWindowBase):
|
||||||
super(simpleModeWindow, self).__init__(title='Cura - Quickprint - ' + version.getVersion())
|
super(simpleModeWindow, self).__init__(title='Cura - Quickprint - ' + version.getVersion())
|
||||||
|
|
||||||
wx.EVT_CLOSE(self, self.OnClose)
|
wx.EVT_CLOSE(self, self.OnClose)
|
||||||
#self.SetIcon(icon.getMainIcon())
|
|
||||||
|
|
||||||
self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles, meshLoader.supportedExtensions()))
|
self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles, meshLoader.supportedExtensions()))
|
||||||
|
|
||||||
|
|
|
@ -8,8 +8,8 @@ import time
|
||||||
import re
|
import re
|
||||||
import platform
|
import platform
|
||||||
|
|
||||||
from Cura.gui import taskbar
|
|
||||||
from Cura.gui import preferencesDialog
|
from Cura.gui import preferencesDialog
|
||||||
|
from Cura.gui.util import taskbar
|
||||||
from Cura.util import profile
|
from Cura.util import profile
|
||||||
from Cura.util import sliceRun
|
from Cura.util import sliceRun
|
||||||
from Cura.util import exporer
|
from Cura.util import exporer
|
||||||
|
|
Loading…
Reference in New Issue