Rename in source files to Cura

diff --git a/SkeinPyPy/fabmetheus_utilities/settings.py b/SkeinPyPy/fabmetheus_utilities/settings.py
index 3c312b16479ba3a16f2e289f15f5966dd6576ad0..351c3cce8548aa5ec56e1e977ce6c2cd78e42654 100644 (file)
--- a/SkeinPyPy/fabmetheus_utilities/settings.py
+++ b/SkeinPyPy/fabmetheus_utilities/settings.py
@@ -88,7 +88,7 @@ def calculateMultiplyDistance(setting):
        edgeWidth = calculateEdgeWidth(setting)
        return 10.0 / edgeWidth
 
-def getSkeinPyPyProfileInformation():
+def getProfileInformation():
        return {
                'carve': {
                        'Add_Layer_Template_to_SVG': DEFSET,
@@ -400,9 +400,9 @@ def safeConfigName(name):
 def getReadRepository(repository):
        "Read the configuration for this 'repository'"
        
-       info = getSkeinPyPyProfileInformation()
+       info = getProfileInformation()
        if not info.has_key(repository.name):
-               print "Warning: Plugin: " + repository.name + " missing from SkeinPyPy info"
+               print "Warning: Plugin: " + repository.name + " missing from Cura info"
                return repository
        info = info[repository.name]
        
@@ -410,7 +410,7 @@ def getReadRepository(repository):
        for p in repository.preferences:
                name = safeConfigName(p.name)
                if not info.has_key(name):
-                       print "Setting: " + repository.name + ":" + name + " missing from SkeinPyPy info"
+                       print "Setting: " + repository.name + ":" + name + " missing from Cura info"
                        continue
                if isinstance(info[name], types.FunctionType):
                        p.setValueToString(str(info[name](p)))

diff --git a/SkeinPyPy/newui/configWizard.py b/SkeinPyPy/newui/configWizard.py
index 70701586cfe0e16ffd21251a0e023de762e29b03..4450195bb2325bf1be51931e82827352741ba49c 100644 (file)
--- a/SkeinPyPy/newui/configWizard.py
+++ b/SkeinPyPy/newui/configWizard.py
@@ -60,10 +60,10 @@ class InfoPage(wx.wizard.WizardPageSimple):
 class FirstInfoPage(InfoPage):\r
        def __init__(self, parent):\r
                super(FirstInfoPage, self).__init__(parent, "First time run wizard")\r
-               self.AddText('Welcome, and thanks for trying SkeinPyPy!')\r
+               self.AddText('Welcome, and thanks for trying Cura!')\r
                self.AddSeperator()\r
                self.AddText('This wizard will help you with the following steps:')\r
-               self.AddText('* Configure SkeinPyPy for your machine')\r
+               self.AddText('* Configure Cura for your machine')\r
                self.AddText('* Upgrade your firmware')\r
                self.AddText('* Calibrate your machine')\r
                #self.AddText('* Do your first print')\r
@@ -73,7 +73,7 @@ class RepRapInfoPage(InfoPage):
                super(RepRapInfoPage, self).__init__(parent, "RepRap information")\r
                self.AddText('Sorry, but this wizard will not help you with\nconfiguring and calibrating your RepRap.')\r
                self.AddSeperator()\r
-               self.AddText('You will have to manually install Marlin firmware\nand configure SkeinPyPy.')\r
+               self.AddText('You will have to manually install Marlin or Sprinter firmware\nand configure Cura.')\r
 \r
 class MachineSelectPage(InfoPage):\r
        def __init__(self, parent):\r
@@ -116,7 +116,7 @@ class FirmwareUpgradePage(InfoPage):
                self.AddHiddenSeperator()\r
                self.AddText('The firmware shipping with new Ultimakers works, but upgrades\nhave been made to make better prints, and make calibration easier.')\r
                self.AddHiddenSeperator()\r
-               self.AddText('SkeinPyPy requires these new features and thus\nyour firmware will most likely need to be upgraded.\nYou will get the chance to do so now.')\r
+               self.AddText('Cura requires these new features and thus\nyour firmware will most likely need to be upgraded.\nYou will get the chance to do so now.')\r
                upgradeButton, skipUpgradeButton = self.AddDualButton('Upgrade to Marlin firmware', 'Skip upgrade')\r
                upgradeButton.Bind(wx.EVT_BUTTON, self.OnUpgradeClick)\r
                skipUpgradeButton.Bind(wx.EVT_BUTTON, self.OnSkipClick)\r

diff --git a/SkeinPyPy/newui/mainWindow.py b/SkeinPyPy/newui/mainWindow.py
index 9d04138f250c694a239f897c92a8086b23de60f6..28ccb57ed76e7a7955eb2e6356534252b9190da5 100644 (file)
--- a/SkeinPyPy/newui/mainWindow.py
+++ b/SkeinPyPy/newui/mainWindow.py
@@ -13,12 +13,13 @@ from newui import preferencesDialog
 from newui import configWizard
 from newui import machineCom
 from newui import profile
+from newui import printWindow
 
 def main():
        app = wx.App(False)
        if profile.getPreference('wizardDone') == 'False':
                if os.name == 'darwin':
-                       wx.MessageBox('The MacOS version of SkeinPyPy is experimental.\nThere are still UI/usability bugs. Check the issue list at:\nhttps://github.com/daid/SkeinPyPy/issues\nfor details.\nPlease report any extra issue you find.', 'MacOS Warning', wx.OK | wx.ICON_INFORMATION)
+                       wx.MessageBox('The MacOS version of Cura is experimental.\nThere are still UI/usability bugs. Check the issue list at:\nhttps://github.com/daid/SkeinPyPy/issues\nfor details.\nPlease report any extra issue you find.', 'MacOS Warning', wx.OK | wx.ICON_INFORMATION)
                configWizard.configWizard()
                profile.putPreference("wizardDone", "True")
        mainWindow()
@@ -27,7 +28,7 @@ def main():
 class mainWindow(configBase.configWindowBase):
        "Main user interface window"
        def __init__(self):
-               super(mainWindow, self).__init__(title='SkeinPyPy')
+               super(mainWindow, self).__init__(title='Cura')
                
                wx.EVT_CLOSE(self, self.OnClose)
                
@@ -161,8 +162,10 @@ class mainWindow(configBase.configWindowBase):
                # load and slice buttons.
                loadButton = wx.Button(self, -1, 'Load Model')
                sliceButton = wx.Button(self, -1, 'Slice to GCode')
+               #printButton = wx.Button(self, -1, 'Print GCode')
                self.Bind(wx.EVT_BUTTON, self.OnLoadModel, loadButton)
                self.Bind(wx.EVT_BUTTON, self.OnSlice, sliceButton)
+               #self.Bind(wx.EVT_BUTTON, self.OnPrint, printButton)
                #Also bind double clicking the 3D preview to load an STL file.
                self.preview3d.glCanvas.Bind(wx.EVT_LEFT_DCLICK, self.OnLoadModel, self.preview3d.glCanvas)
 
@@ -174,7 +177,8 @@ class mainWindow(configBase.configWindowBase):
                sizer.AddGrowableCol(2)
                sizer.AddGrowableRow(0)
                sizer.Add(loadButton, (1,1), flag=wx.RIGHT, border=5)
-               sizer.Add(sliceButton, (1,2))
+               sizer.Add(sliceButton, (1,2), flag=wx.RIGHT, border=5)
+               #sizer.Add(printButton, (1,3), flag=wx.RIGHT, border=5)
                self.sizer = sizer
 
                if self.filename != "None":
@@ -254,6 +258,9 @@ class mainWindow(configBase.configWindowBase):
                newSize.IncBy(0, spp.GetSize().GetHeight())
                self.SetSize(newSize)
                self.progressPanelList.append(spp)
+       
+       def OnPrint(self, e):
+               printWindow.printWindow()
 
        def OnExpertOpen(self, e):
                acw = advancedConfig.advancedConfigWindow()

diff --git a/SkeinPyPy/skeinforge_application/skeinforge_utilities/skeinforge_profile.py b/SkeinPyPy/skeinforge_application/skeinforge_utilities/skeinforge_profile.py
index fbdc972ddb783903526f3075443815ed61dfb46e..38f8c9c2293f09462a3a30bf2ccde3219c76ca95 100644 (file)
--- a/SkeinPyPy/skeinforge_application/skeinforge_utilities/skeinforge_profile.py
+++ b/SkeinPyPy/skeinforge_application/skeinforge_utilities/skeinforge_profile.py
@@ -15,7 +15,7 @@ def getCraftTypeName():
        return 'extrusion'
 
 def getProfileName(craftTypeName):
-       return 'SkeinPyPy profile:' + craftTypeName
+       return 'Cura profile:' + craftTypeName
 
 def addListsToCraftTypeRepository(fileNameHelp, repository):
     #print('addListsToCraftTypeRepository:', fileNameHelp, repository)

diff --git a/SkeinPyPy/skeinpypy.py b/SkeinPyPy/skeinpypy.py
index f307961794c9c4ad1e2aa0db04915a7d09aa18e0..b968a941c4d72665399d1271dba558c3b7f5e376 100644 (file)
--- a/SkeinPyPy/skeinpypy.py
+++ b/SkeinPyPy/skeinpypy.py
@@ -3,7 +3,7 @@
 This page is in the table of contents.
 ==Overview==
 ===Introduction===
-SkeinPyPy is a GPL tool chain to forge a gcode skein for a model. Based on Skeinforge.
+Cura is a GPL tool chain to forge a gcode skein for a model. Based on Skeinforge.
 
 The slicing code is the same as Skeinforge. But the UI has been revamped to be... sane.