Awesome rocktopus now loads on first launch of Cura.

Close #47

diff --git a/Cura/gui/app.py b/Cura/gui/app.py
index cb2c68c5cd0910c93169aa86515ae53282c2a520..38b7f8ad14d16178e4aa37a1d5e6aba7f00eb4dd 100644 (file)
--- 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 90f47827f376a26fded4cf2e008a8c66db2ee4a0..a417c1ac705a95e93c78a9342b4819e6d6d01502 100644 (file)
--- 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 df4588dd5242fbf3b9b678209311beb64f250d87..ffd9197686671a1fdd6c8e2b848480ad8b3289fc 100644 (file)
--- 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!\r
 \r
-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:\r
+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:\r
 \r
 * UltimakerHandle.stl: Ultimaker handle by Silvius\r
   http://www.thingiverse.com/thing:22819\r
 \r
 * OpenHardwareKeychain.stl: Open Hardware Keychain by kevinkline4124\r
   http://www.thingiverse.com/thing:21596\r
+\r
+* Rocktopus.stl: Rocktopus by Kent Johnson is licensed under CC BY-SA 4.0 and derived from work by dietz1 and yeoldebrian.\r

diff --git a/resources/example/Rocktopus.stl b/resources/example/Rocktopus.stl
new file mode 100644 (file)
index 0000000..a4c984f
Binary files /dev/null and b/resources/example/Rocktopus.stl differ