Removed _export suffix. Slighty changed some texts.

diff --git a/Cura/cura_sf/fabmetheus_utilities/settings.py b/Cura/cura_sf/fabmetheus_utilities/settings.py
index b5d03d3bd99239436fba2daaeb5af1cc49e369f1..70f8965d5ff72bd9accc856462ed83dc5927866f 100644 (file)
--- a/Cura/cura_sf/fabmetheus_utilities/settings.py
+++ b/Cura/cura_sf/fabmetheus_utilities/settings.py
@@ -395,7 +395,7 @@ def getProfileInformation():
                },'export': {
                        'Activate_Export': "True",
                        'Add_Descriptive_Extension': DEFSET,
-                       'Add_Export_Suffix': DEFSET,
+                       'Add_Export_Suffix': "False",
                        'Add_Profile_Extension': DEFSET,
                        'Add_Timestamp_Extension': DEFSET,
                        'Also_Send_Output_To': DEFSET,

diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index 8a7fc57bb4163b9de8508b2b0eaf8d3c47930ebf..52285b46d17099439b987b1efc16a51ce24d02b9 100644 (file)
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -104,7 +104,7 @@ class mainWindow(configBase.configWindowBase):
                
                if profile.getPreference('lastFile') != '':
                        self.filelist = profile.getPreference('lastFile').split(';')
-                       self.SetTitle(self.filelist[-1] + ' - Cura - ' + version.getVersion())
+                       self.SetTitle('Cura - %s - %s' % (version.getVersion(), self.filelist[-1]))
                else:
                        self.filelist = []
                self.progressPanelList = []

diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py
index d27f0d4365c8932bcd3d704266236367705ace94..6ddc38be95f73b0941f0c3aca07ffee0306bd4f9 100644 (file)
--- a/Cura/gui/simpleMode.py
+++ b/Cura/gui/simpleMode.py
@@ -55,7 +55,7 @@ class simpleModeWindow(configBase.configWindowBase):
                
                if profile.getPreference('lastFile') != '':
                        self.filelist = profile.getPreference('lastFile').split(';')
-                       self.SetTitle(self.filelist[-1] + ' - Cura - ' + version.getVersion())
+                       self.SetTitle('Cura - %s - %s' % (version.getVersion(), self.filelist[-1]))
                else:
                        self.filelist = []
                self.progressPanelList = []

diff --git a/Cura/gui/sliceProgessPanel.py b/Cura/gui/sliceProgessPanel.py
index 238248e7f24ce4f51da82780c70d049cbca7c448..28f7582604595ead45ae9ccbb1bedaa8c5b74200 100644 (file)
--- a/Cura/gui/sliceProgessPanel.py
+++ b/Cura/gui/sliceProgessPanel.py
@@ -126,7 +126,7 @@ class sliceProgessPanel(wx.Panel):
                progresValue = ((self.totalDoneFactor + sliceRun.sliceStepTimeFactor[stepName] * layer / maxLayer) / sliceRun.totalRunTimeFactor) * 10000
                self.progressGauge.SetValue(int(progresValue))
                taskbar.setProgress(self.GetParent(), int(progresValue), self.progressGauge.GetRange())
-               self.statusText.SetLabel(stepName + " [" + str(layer) + "/" + str(maxLayer) + "]")
+               self.statusText.SetLabel("Preparing: processing %s [%d/%d]" % (stepName, layer, maxLayer))
 
 class WorkerThread(threading.Thread):
        def __init__(self, notifyWindow, filelist, cmdList):

diff --git a/Cura/util/sliceRun.py b/Cura/util/sliceRun.py
index 3bb3fc6199965b16624dc9a8cea6ebbc68ee79ed..d065abc1b895d388f13aa8c574a452fbb90b1e45 100644 (file)
--- a/Cura/util/sliceRun.py
+++ b/Cura/util/sliceRun.py
@@ -98,7 +98,7 @@ def runSlice(fileNames):
                        subprocess.call(getSliceCommand(fileName))
 
 def getExportFilename(filename, ext = "gcode"):
-       return "%s_export.%s" % (filename[: filename.rfind('.')], ext)
+       return "%s.%s" % (filename[: filename.rfind('.')], ext)
 
 #Get a short filename in 8.3 format for proper saving on SD.
 def getShortFilename(filename):
@@ -112,7 +112,7 @@ def getSliceCommand(filename):
                if slic3rExe == False:
                        return False
                cmd = [slic3rExe,
-                       '--output-filename-format', '[input_filename_base]_export.gcode',
+                       '--output-filename-format', '[input_filename_base].gcode',
                        '--nozzle-diameter', str(profile.calculateEdgeWidth()),
                        '--print-center', '%s,%s' % (profile.getProfileSetting('machine_center_x'), profile.getProfileSetting('machine_center_y')),
                        '--z-offset', '0',