From 0748e088a0fb4fdce638893a995463675cdf7c11 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Fri, 8 Mar 2013 23:07:14 +0100
Subject: [PATCH] Reorder options in simple mode

---
 lib/Slic3r/GUI/SkeinPanel.pm |  1 +
 lib/Slic3r/GUI/Tab.pm        | 22 ++++++++--------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/lib/Slic3r/GUI/SkeinPanel.pm b/lib/Slic3r/GUI/SkeinPanel.pm
index 33218edc1..0c214bd34 100644
--- a/lib/Slic3r/GUI/SkeinPanel.pm
+++ b/lib/Slic3r/GUI/SkeinPanel.pm
@@ -331,6 +331,7 @@ sub config {
     if ($self->{mode} eq 'simple') {
         # set some sensible defaults
         $config->set('first_layer_height', $config->nozzle_diameter->[0]);
+        $config->set('avoid_crossing_perimeters', 1);
     }
     
     return $config;
diff --git a/lib/Slic3r/GUI/Tab.pm b/lib/Slic3r/GUI/Tab.pm
index f9c127c68..0c2aa8076 100644
--- a/lib/Slic3r/GUI/Tab.pm
+++ b/lib/Slic3r/GUI/Tab.pm
@@ -406,17 +406,11 @@ sub build_simple {
     
     $self->add_options_page('', '', optgroups => [
         {
-            title => 'Layer height',
-            options => [qw(layer_height)],
-        },
-        {
-            title => 'Vertical shells',
-            options => [qw(perimeters)],
-        },
-        {
-            title => 'Horizontal shells',
-            options => [qw(top_solid_layers bottom_solid_layers)],
+            title => 'General',
+            options => [qw(layer_height perimeters top_solid_layers bottom_solid_layers)],
             lines => [
+                Slic3r::GUI::OptionsGroup->single_option_line('layer_height'),
+                Slic3r::GUI::OptionsGroup->single_option_line('perimeters'),
                 {
                     label   => 'Solid layers',
                     options => [qw(top_solid_layers bottom_solid_layers)],
@@ -427,6 +421,10 @@ sub build_simple {
             title => 'Infill',
             options => [qw(fill_density fill_pattern)],
         },
+        {
+            title => 'Support material',
+            options => [qw(support_material support_material_spacing raft_layers)],
+        },
         {
             title => 'Speed',
             options => [qw(perimeter_speed infill_speed travel_speed)],
@@ -435,10 +433,6 @@ sub build_simple {
             title => 'Brim',
             options => [qw(brim_width)],
         },
-        {
-            title => 'Support material',
-            options => [qw(support_material support_material_spacing)],
-        },
         {
             title => 'Sequential printing',
             options => [qw(complete_objects extruder_clearance_radius extruder_clearance_height)],