From: Steven Abadie <steven@alephobjects.com>
Date: Thu, 20 Nov 2014 04:48:07 +0000 (-0700)
Subject: Awesome rocktopus now loads on first launch of Cura.
X-Git-Tag: 14.09-1.18~45
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=978f5f49e2128aba325dad873bb5e5035ca5b504;p=cura.git

Awesome rocktopus now loads on first launch of Cura.

Close #47
---

diff --git a/Cura/gui/app.py b/Cura/gui/app.py
index cb2c68c5..38b7f8ad 100644
--- a/Cura/gui/app.py
+++ b/Cura/gui/app.py
@@ -125,7 +125,7 @@ class CuraApp(wx.App):
 				profile.loadPreferences(os.path.join(otherCuraInstalls[-1], 'preferences.ini'))
 				profile.loadProfile(os.path.join(otherCuraInstalls[-1], 'current_profile.ini'))
 			#Check if we need to copy our examples
-			exampleFile = os.path.normpath(os.path.join(resources.resourceBasePath, 'example', 'OpenHardwareKeychain.stl'))
+			exampleFile = os.path.normpath(os.path.join(resources.resourceBasePath, 'example', 'Rocktopus.stl'))
 
 			self.loadFiles = [exampleFile]
 			if self.splash is not None:
diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index 90f47827..a417c1ac 100644
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -466,7 +466,7 @@ setting('postSwitchExtruder.gcode', """;Switch between the current extruder and
 
 setting('startMode', 'Simple', ['Simple', 'Normal'], 'preference', 'hidden')
 setting('oneAtATime', 'True', bool, 'preference', 'hidden')
-setting('lastFile', os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'resources', 'example', 'OpenHardwareKeychain.stl')), str, 'preference', 'hidden')
+setting('lastFile', os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'resources', 'example', 'Rocktopus.stl')), str, 'preference', 'hidden')
 setting('save_profile', 'False', bool, 'preference', 'hidden').setLabel(_("Save profile on slice"), _("When slicing save the profile as [stl_file]_profile.ini next to the model."))
 setting('filament_cost_kg', '0', float, 'preference', 'hidden').setLabel(_("Cost (price/kg)"), _("Cost of your filament per kg, to estimate the cost of the final print."))
 setting('filament_cost_meter', '0', float, 'preference', 'hidden').setLabel(_("Cost (price/m)"), _("Cost of your filament per meter, to estimate the cost of the final print."))
diff --git a/resources/example/Attribution.txt b/resources/example/Attribution.txt
index df4588dd..ffd91976 100644
--- a/resources/example/Attribution.txt
+++ b/resources/example/Attribution.txt
@@ -1,9 +1,11 @@
 All the models in this example directory can be found on Thingiverse (www.thingiverse.com), a site for sharing digital designs for physical objects.  Sharing is fun!
 
-The below models are shared under the CC BY-SA 3.0 license (http://creativecommons.org/licenses/by-sa/3.0/), and can be shared and used freely as long as attribution is added:
+The below models, unless noted otherwise are shared under the CC BY-SA 3.0 license (http://creativecommons.org/licenses/by-sa/3.0/), and can be shared and used freely as long as attribution is added:
 
 * UltimakerHandle.stl: Ultimaker handle by Silvius
   http://www.thingiverse.com/thing:22819
 
 * OpenHardwareKeychain.stl: Open Hardware Keychain by kevinkline4124
   http://www.thingiverse.com/thing:21596
+
+* Rocktopus.stl: Rocktopus by Kent Johnson is licensed under CC BY-SA 4.0 and derived from work by dietz1 and yeoldebrian.
diff --git a/resources/example/Rocktopus.stl b/resources/example/Rocktopus.stl
new file mode 100644
index 00000000..a4c984fe
Binary files /dev/null and b/resources/example/Rocktopus.stl differ