Merge branch 'dev'

resources/ui_layout/Readme.md

@@ -47,13 +47,15 @@ each parameter is separated by ':'
 	* full_width: to tell to create a field that span the full width.
 	* sidetext$STR: the suffix at the right of the widget (like 'mm').
 	* sidetext_width$INT: the suffix label length (override the group one). -1 for auto.
+	* max_literal$INT[%]: if the user enter a value higher than that and it's a 'float or percent' field, then emit a pop-up to question if he doesn't forgot a '%'. If negative, it check if the value isn't lower than the absolute max_literal, instead of greater. If there is a '%' after the value, then it's multiplied by the biggest nozzle diameter.
 	* simple|advanced|expert: add one of these to modify the mode in which this setting appear.
 	* width$INT: change the width of the field. Shouod work on most type of settings.
-	* height$INT: change the height of the field. Don't works with every type of setting.
+	* height$INT: change the height of the field. Don't works with every type of setting (mostly multilne text). Set to -1 to 'disable'.
 	* precision$INT: number of digit after the dot displayed.
 	* url$STR: the url to call when clicking on it.
 	* id $INT: for setting only a single value of a setting array.
 	* idx: for setting only a single value of a setting array, with the index of the page (for extruder ui page)
+* height:INT: change the default height of settings. Don't works with every type of setting (mostly multilne text). Set to 0 or -1 to disable.
 * recommended_thin_wall_thickness_description: create a text widget to explain recommended thin wall thickness (only in a fff print tab).
 * parent_preset_description: create a text widget to explain parent preset.
 * cooling_description: create a text widget to explain cooling (only in a filament tab).

resources/ui_layout/print.ui

@@ -178,7 +178,7 @@ group:Skirt
 	setting:skirts
 	line:Distance
 		setting:skirt_distance
-		setting:label$from brim:sidetext$else from object:skirt_distance_from_brim
+		setting:label$from brim:skirt_distance_from_brim
 	end_line
 	setting:skirt_height
 	setting:draft_shield

resources/ui_layout/printer_fff.ui

@@ -5,6 +5,7 @@ group:Size and coordinates
 	setting:max_print_height
 	setting:z_offset
 	setting:z_step
+	setting:lift_min
 group:extruders_count_event:milling_count_event:Capabilities
 	extruders_count
 	setting:single_extruder_multi_material
@@ -28,8 +29,8 @@ group:silent_mode_event:Firmware
 	end_line
 	setting:gcode_filename_illegal_char
 group:Cooling fan
-	line:Speedup
-		setting:label$Speedup time:fan_speedup_time
+	line:Speedup time
+		setting:label$:fan_speedup_time
 		setting:label$Only for overhangs:fan_speedup_overhangs
 	end_line
 	setting:label$Kickstart duration:fan_kickstart
@@ -43,7 +44,10 @@ group:Thumbnails
 		setting:label$:sidetext_width$1:thumbnails_custom_color
 		setting:label$:label_width$1:thumbnails_color
 	end_line
-	setting:thumbnails_with_bed
+	line:Thumbnail options
+		setting:thumbnails_with_bed
+		setting:thumbnails_end_file
+	end_line
 group:Advanced
 	setting:use_relative_e_distances
 	setting:use_firmware_retraction
@@ -55,25 +59,25 @@ group:
 	setting:start_gcode_manual
 height:15
 group:no_title:Start G-code
-	setting:full_width:start_gcode
+	setting:full_width:height$21:start_gcode
 group:no_title:End G-code
 	setting:full_width:end_gcode
 group:no_title:Before layer change G-code
-	setting:full_width:before_layer_gcode
+	setting:full_width:height$9:before_layer_gcode
 group:no_title:After layer change G-code
-	setting:full_width:layer_gcode
+	setting:full_width:height$9:layer_gcode
 group:no_title:Tool change G-code
-	setting:full_width:toolchange_gcode
+	setting:full_width:height$9:toolchange_gcode
 group:no_title:Between objects G-code (for sequential printing)
-	setting:full_width:between_objects_gcode
+	setting:full_width:height$9:between_objects_gcode
 group:no_title:Between extrusion role change G-code
-	setting:full_width:feature_gcode
+	setting:full_width:height$9:feature_gcode
 group:no_title:Colour Change G-code
-	setting:full_width:color_change_gcode
+	setting:full_width:height$5:color_change_gcode
 group:no_title:Pause Print G-code
-	setting:full_width:pause_print_gcode
+	setting:full_width:height$5:pause_print_gcode
 group:no_title:Template Custom G-code
-	setting:full_width:template_custom_gcode
+	setting:full_width:height$5:template_custom_gcode
 height:0
 
 page:Notes:note.png

src/libslic3r/AppConfig.cpp

@@ -169,6 +169,9 @@ void AppConfig::set_defaults()
         if (get("custom_toolbar_size").empty())
             set("custom_toolbar_size", "100");
 
+        if (get("setting_icon").empty())
+            set("setting_icon", "1");
+
         if (get("auto_toolbar_size").empty())
             set("auto_toolbar_size", "100");
 
@@ -197,11 +200,11 @@ void AppConfig::set_defaults()
 
         if (get("use_rich_tooltip").empty())
             set("use_rich_tooltip", 
-#ifndef WIN32
-			"1"
-#else
+//#if __APPLE__
+			//"1"
+//#else
 			"0"
-#endif
+//#endif
 			);
     }
 #if ENABLE_CUSTOMIZABLE_FILES_ASSOCIATION_ON_WIN