Updated the preference dialog so that is wider instead of very tall. Fixed the quickp...

diff --git a/Cura/gui/preferencesDialog.py b/Cura/gui/preferencesDialog.py
index 41bded92aa5a96de8e41a28ac4e5f13f841710bf..6df56be5581cd5ff9658331d9dfb9ea92d4244ca 100644 (file)
--- a/Cura/gui/preferencesDialog.py
+++ b/Cura/gui/preferencesDialog.py
@@ -36,21 +36,21 @@ class preferencesDialog(configBase.configWindowBase):
                        c = configBase.SettingRow(left, 'Offset Y', 'extruder_offset_y%d' % (i), '0.0', 'The offset of your secondary extruder compared to the primary.', type = 'preference')\r
                        validators.validFloat(c)\r
 \r
-               configBase.TitleRow(left, 'Filament settings')\r
-               c = configBase.SettingRow(left, 'Filament density (kg/m3)', 'filament_density', '1300', 'Weight of the filament per m3. Around 1300 for PLA. And around 1040 for ABS. This value is used to estimate the weight if the filament used for the print.', type = 'preference')\r
+               configBase.TitleRow(right, 'Filament settings')\r
+               c = configBase.SettingRow(right, 'Filament density (kg/m3)', 'filament_density', '1300', 'Weight of the filament per m3. Around 1300 for PLA. And around 1040 for ABS. This value is used to estimate the weight if the filament used for the print.', type = 'preference')\r
                validators.validFloat(c, 500.0, 3000.0)\r
-               c = configBase.SettingRow(left, 'Filament cost (price/kg)', 'filament_cost_kg', '0', 'Cost of your filament per kg, to estimate the cost of the final print.', type = 'preference')\r
+               c = configBase.SettingRow(right, 'Filament cost (price/kg)', 'filament_cost_kg', '0', 'Cost of your filament per kg, to estimate the cost of the final print.', type = 'preference')\r
                validators.validFloat(c, 0.0)\r
-               c = configBase.SettingRow(left, 'Filament cost (price/m)', 'filament_cost_meter', '0', 'Cost of your filament per meter, to estimate the cost of the final print.', type = 'preference')\r
+               c = configBase.SettingRow(right, 'Filament cost (price/m)', 'filament_cost_meter', '0', 'Cost of your filament per meter, to estimate the cost of the final print.', type = 'preference')\r
                validators.validFloat(c, 0.0)\r
                \r
-               configBase.TitleRow(left, 'Communication settings')\r
-               c = configBase.SettingRow(left, 'Serial port', 'serial_port', ['AUTO'] + machineCom.serialList(), 'Serial port to use for communication with the printer', type = 'preference')\r
-               c = configBase.SettingRow(left, 'Baudrate', 'serial_baud', '250000', 'Speed of the serial port communication\nNeeds to match your firmware settings\nCommon values are 250000, 115200, 57600', type = 'preference')\r
+               configBase.TitleRow(right, 'Communication settings')\r
+               c = configBase.SettingRow(right, 'Serial port', 'serial_port', ['AUTO'] + machineCom.serialList(), 'Serial port to use for communication with the printer', type = 'preference')\r
+               c = configBase.SettingRow(right, 'Baudrate', 'serial_baud', '250000', 'Speed of the serial port communication\nNeeds to match your firmware settings\nCommon values are 250000, 115200, 57600', type = 'preference')\r
 \r
-               configBase.TitleRow(left, 'Slicer settings')\r
-               #c = configBase.SettingRow(left, 'Slicer selection', 'slicer', ['Cura (Skeinforge based)', 'Slic3r'], 'Which slicer to use to slice objects. Usually the Cura engine produces the best results. But Slic3r is developing fast and is faster with slicing.', type = 'preference')\r
-               c = configBase.SettingRow(left, 'Save profile on slice', 'save_profile', False, 'When slicing save the profile as [stl_file]_profile.ini next to the model.', type = 'preference')\r
+               configBase.TitleRow(right, 'Slicer settings')\r
+               #c = configBase.SettingRow(right, 'Slicer selection', 'slicer', ['Cura (Skeinforge based)', 'Slic3r'], 'Which slicer to use to slice objects. Usually the Cura engine produces the best results. But Slic3r is developing fast and is faster with slicing.', type = 'preference')\r
+               c = configBase.SettingRow(right, 'Save profile on slice', 'save_profile', False, 'When slicing save the profile as [stl_file]_profile.ini next to the model.', type = 'preference')\r
                \r
                self.okButton = wx.Button(left, -1, 'Ok')\r
                left.GetSizer().Add(self.okButton, (left.GetSizer().GetRows(), 1))\r

diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py
index 63928fd3ee55693d9762c59b3563e018ab5fa971..ffd2ac7c0f72927dca29867a117df593a5b3161d 100644 (file)
--- a/Cura/gui/simpleMode.py
+++ b/Cura/gui/simpleMode.py
@@ -187,7 +187,7 @@ class simpleModeWindow(configBase.configWindowBase):
                #put('retraction_amount', '0.0')
                #put('retraction_extra', '0.0')
                put('travel_speed', '150')
-               put('max_z_speed', '1.0')
+               put('max_z_speed', '3.0')
                put('bottom_layer_speed', '25')
                put('cool_min_layer_time', '10')
                put('fan_enabled', 'True')