Merge commit 'e984b9f54a0c733aab34a8ec19724dc4114ade28' into master-merge

diff --git a/libs/gtkutil/paned.cpp b/libs/gtkutil/paned.cpp
index e664aef4ee400ee5d9120f05919a918c855f7c0d..bc0d1f7ac53e812d5563e8ee6bdd8c5c79721f65 100644 (file)
--- a/libs/gtkutil/paned.cpp
+++ b/libs/gtkutil/paned.cpp
@@ -49,7 +49,7 @@ PanedState g_hpaned = { 0.5f, -1, };
 PanedState g_vpaned1 = { 0.5f, -1, };
 PanedState g_vpaned2 = { 0.5f, -1, };
 
-ui::HPaned create_split_views( ui::Widget topleft, ui::Widget topright, ui::Widget botleft, ui::Widget botright ){
+ui::Widget create_split_views( ui::Widget topleft, ui::Widget topright, ui::Widget botleft, ui::Widget botright, ui::Widget& vsplit1, ui::Widget& vsplit2 ){
        auto hsplit = ui::HPaned(ui::New);
        hsplit.show();
 
@@ -58,25 +58,27 @@ ui::HPaned create_split_views( ui::Widget topleft, ui::Widget topright, ui::Widg
 
        {
                auto vsplit = ui::VPaned(ui::New);
-               gtk_paned_add1( GTK_PANED( hsplit ), vsplit  );
-               vsplit.show();
+               vsplit1 = vsplit;
+               gtk_paned_add1( GTK_PANED( hsplit ), GTK_WIDGET( vsplit ) );
+               gtk_widget_show( GTK_WIDGET( vsplit ) );
 
                vsplit.connect( "size_allocate", G_CALLBACK( vpaned_allocate ), &g_vpaned1 );
                vsplit.connect( "notify::position", G_CALLBACK( paned_position ), &g_vpaned1 );
 
-               gtk_paned_add1( GTK_PANED( vsplit ), create_framed_widget( topleft  ) );
-               gtk_paned_add2( GTK_PANED( vsplit ), create_framed_widget( topright  ) );
+               gtk_paned_add1( GTK_PANED( vsplit ), GTK_WIDGET( create_framed_widget( topleft ) ) );
+               gtk_paned_add2( GTK_PANED( vsplit ), GTK_WIDGET( create_framed_widget( botleft ) ) );
        }
        {
                auto vsplit = ui::VPaned(ui::New);
-               gtk_paned_add2( GTK_PANED( hsplit ), vsplit  );
-               vsplit.show();
+               vsplit2 = vsplit;
+               gtk_paned_add2( GTK_PANED( hsplit ), GTK_WIDGET( vsplit ) );
+               gtk_widget_show( GTK_WIDGET( vsplit ) );
 
                vsplit.connect( "size_allocate", G_CALLBACK( vpaned_allocate ), &g_vpaned2 );
                vsplit.connect( "notify::position", G_CALLBACK( paned_position ), &g_vpaned2 );
 
-               gtk_paned_add1( GTK_PANED( vsplit ), create_framed_widget( botleft  ) );
-               gtk_paned_add2( GTK_PANED( vsplit ), create_framed_widget( botright  ) );
+               gtk_paned_add1( GTK_PANED( vsplit ), GTK_WIDGET( create_framed_widget( topright ) ) );
+               gtk_paned_add2( GTK_PANED( vsplit ), GTK_WIDGET( create_framed_widget( botright ) ) );
        }
        return hsplit;
 }

diff --git a/libs/gtkutil/paned.h b/libs/gtkutil/paned.h
index 951a72d7bc08237d008b2030f61229c0f28989ac..1a19d9c541874ac2cc8d52035da6734d4c41d446 100644 (file)
--- a/libs/gtkutil/paned.h
+++ b/libs/gtkutil/paned.h
@@ -19,12 +19,12 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <gtk/gtk.h>
-#include <uilib/uilib.h>
-
 #if !defined( INCLUDED_GTKUTIL_PANED_H )
 #define INCLUDED_GTKUTIL_PANED_H
 
+#include <gtk/gtk.h>
+#include <uilib/uilib.h>
+
 class PanedState
 {
 public:
@@ -36,6 +36,5 @@ gboolean hpaned_allocate( ui::Widget widget, GtkAllocation* allocation, PanedSta
 gboolean vpaned_allocate( ui::Widget widget, GtkAllocation* allocation, PanedState* paned );
 gboolean paned_position( ui::Widget widget, gpointer dummy, PanedState* paned );
 
-ui::HPaned create_split_views( ui::Widget topleft, ui::Widget topright, ui::Widget botleft, ui::Widget botright );
-
+ui::Widget create_split_views( ui::Widget topleft, ui::Widget botleft, ui::Widget topright, ui::Widget botright, ui::Widget& vsplit1, ui::Widget& vsplit2 );
 #endif

diff --git a/radiant/brushmanip.cpp b/radiant/brushmanip.cpp
index 549e6e87da1ebf6cddc0d5a0cc927d6dbcccfebe..4299ee80409e6ebab0a734aaea8521319ca454bf 100644 (file)
--- a/radiant/brushmanip.cpp
+++ b/radiant/brushmanip.cpp
@@ -156,7 +156,7 @@ void Brush_ConstructPrism( Brush& brush, const AABB& bounds, std::size_t sides,
 }
 
 const std::size_t c_brushCone_minSides = 3;
-const std::size_t c_brushCone_maxSides = 32;
+const std::size_t c_brushCone_maxSides = c_brush_maxFaces - 1;
 const char* const c_brushCone_name = "brushCone";
 
 void Brush_ConstructCone( Brush& brush, const AABB& bounds, std::size_t sides, const char* shader, const TextureProjection& projection ){

diff --git a/radiant/entity.cpp b/radiant/entity.cpp
index c555715cc2fccf995b03214518fa4fa83fe907e1..ffc8af303bb65c1b59694d3bc14b3aad9b640855 100644 (file)
--- a/radiant/entity.cpp
+++ b/radiant/entity.cpp
@@ -610,7 +610,7 @@ void Entity_constructMenu( ui::Menu menu ){
                create_menu_item_with_mnemonic( menu, "_KillConnect", "KillConnectSelection" );
        }
        create_menu_item_with_mnemonic( menu, "_Select Color...", "EntityColor" );
-       create_menu_item_with_mnemonic( menu, "_Normalize Color...", "NormalizeColor" );
+       create_menu_item_with_mnemonic( menu, "_Normalize Color", "NormalizeColor" );
 }
 
 

diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp
index d052ff125a7eb75b2121027f73e55440baba65b1..cb22f515ffec769ea52a85bdb9db436ff1347080 100644 (file)
--- a/radiant/gtkdlgs.cpp
+++ b/radiant/gtkdlgs.cpp
@@ -48,6 +48,7 @@
 
 #include <gdk/gdkkeysyms.h>
 #include <uilib/uilib.h>
+#include <gtk/gtkspinbutton.h>
 
 #include "os/path.h"
 #include "math/aabb.h"
@@ -355,6 +356,8 @@ void DoProjectSettings(){
 
 void DoSides( int type, int axis ){
        ModalDialog dialog;
+       //GtkEntry* sides_entry;
+       GtkWidget* sides_spin;
 
        auto window = MainFrame_getWindow().create_dialog_window("Arbitrary sides", G_CALLBACK(dialog_delete_callback ), &dialog );
 
@@ -370,11 +373,39 @@ void DoSides( int type, int axis ){
                        label.show();
                        hbox.pack_start( label, FALSE, FALSE, 0 );
                }
+//             {
+//                     auto entry = sides_entry;
+//                     entry.show();
+//                     hbox.pack_start( entry, FALSE, FALSE, 0 );
+//                     gtk_widget_grab_focus( entry  );
+//             }
                {
-                       auto entry = sides_entry;
-                       entry.show();
-                       hbox.pack_start( entry, FALSE, FALSE, 0 );
-                       gtk_widget_grab_focus( entry  );
+                       GtkAdjustment* adj;
+                       EBrushPrefab BrushPrefabType = (EBrushPrefab)type;
+                       switch ( BrushPrefabType )
+                       {
+                       case eBrushPrism :
+                       case eBrushCone :
+                               adj = GTK_ADJUSTMENT( gtk_adjustment_new( 8, 3, 1022, 1, 10, 0 ) );
+                               break;
+                       case eBrushSphere :
+                               adj = GTK_ADJUSTMENT( gtk_adjustment_new( 8, 3, 31, 1, 10, 0 ) );
+                               break;
+                       case eBrushRock :
+                               adj = GTK_ADJUSTMENT( gtk_adjustment_new( 32, 10, 1000, 1, 10, 0 ) );
+                               break;
+                       default:
+                               adj = GTK_ADJUSTMENT( gtk_adjustment_new( 8, 3, 31, 1, 10, 0 ) );
+                               break;
+                       }
+
+                       GtkWidget* spin = gtk_spin_button_new( adj, 1, 0 );
+                       gtk_widget_show( spin );
+                       gtk_box_pack_start( GTK_BOX( hbox ), spin, FALSE, FALSE, 0 );
+                       gtk_widget_set_size_request( spin, 64, -1 );
+                       gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( spin ), TRUE );
+
+                       sides_spin = spin;
                }
                {
             auto vbox = create_dialog_vbox( 4 );
@@ -394,9 +425,12 @@ void DoSides( int type, int axis ){
        }
 
        if ( modal_dialog_show( window, dialog ) == eIDOK ) {
-               const char *str = gtk_entry_get_text( sides_entry );
+//             const char *str = gtk_entry_get_text( sides_entry );
 
-               Scene_BrushConstructPrefab( GlobalSceneGraph(), (EBrushPrefab)type, atoi( str ), TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ) );
+//             Scene_BrushConstructPrefab( GlobalSceneGraph(), (EBrushPrefab)type, atoi( str ), TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ) );
+               gtk_spin_button_update ( GTK_SPIN_BUTTON( sides_spin ) );
+               int sides = static_cast<int>( gtk_spin_button_get_value( GTK_SPIN_BUTTON( sides_spin ) ) );
+               Scene_BrushConstructPrefab( GlobalSceneGraph(), (EBrushPrefab)type, sides, TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ) );
        }
 
        window.destroy();

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index dd18db7101188bd41e12623e6e07687f7fadfda4..46960e22f8bf80bc060864a8d960566e7a6e272d 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -2387,9 +2387,10 @@ ui::MenuItem create_misc_menu(){
        create_menu_item_with_mnemonic( menu, "Find brush...", "FindBrush" );
        create_menu_item_with_mnemonic( menu, "Map Info...", "MapInfo" );
        // http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=394
-//  create_menu_item_with_mnemonic(menu, "_Print XY View", FreeCaller<void(), WXY_Print>());
-       create_menu_item_with_mnemonic( menu, "_Background select", makeCallbackF(WXY_BackgroundSelect) );
+//  create_menu_item_with_mnemonic(menu, "_Print XY View", makeCallbackF( WXY_Print ));
+       create_menu_item_with_mnemonic( menu, "_Background image...", makeCallbackF(WXY_BackgroundSelect) );
        create_menu_item_with_mnemonic( menu, "Fullscreen", "Fullscreen" );
+       create_menu_item_with_mnemonic( menu, "Maximize view", "MaximizeView" );
        return misc_menu_item;
 }
 
@@ -3103,7 +3104,7 @@ void MainFrame::Create(){
                PositionWindowOnPrimaryScreen( g_layout_globals.m_position );
        }
 #endif
-               window_set_position( window, g_layout_globals.m_position );
+       window_set_position( window, g_layout_globals.m_position );
 
        m_window = window;
 
@@ -3252,10 +3253,14 @@ void MainFrame::Create(){
                {
                        auto frame = create_framed_widget( TextureBrowser_constructWindow( GroupDialog_getWindow() ) );
                        g_page_textures = GroupDialog_addPage( "Textures", frame, TextureBrowserExportTitleCaller() );
-
                        WORKAROUND_GOBJECT_SET_GLWIDGET( GroupDialog_getWindow(), TextureBrowser_getGLWidget() );
                }
 
+               // FIXME: find a way to do it with newer syntax
+               // m_vSplit = 0;
+               // m_hSplit = 0;
+               // m_vSplit2 = 0;
+
                GroupDialog_show();
        }
        else if ( CurrentStyle() == eSplit )
@@ -3281,8 +3286,8 @@ void MainFrame::Create(){
 
                ui::Widget xz = m_pXZWnd->GetWidget();
 
-        auto split = create_split_views( camera, yz, xy, xz );
-               vbox.pack_start( split, TRUE, TRUE, 0 );
+               m_hSplit = create_split_views( camera, yz, xy, xz, m_vSplit, m_vSplit2 );
+               vbox.pack_start( m_hSplit, TRUE, TRUE, 0 );
 
                {
             auto frame = create_framed_widget( TextureBrowser_constructWindow( GroupDialog_getWindow() ) );
@@ -3318,7 +3323,9 @@ void MainFrame::Create(){
                vbox.pack_start( hsplit, TRUE, TRUE, 0 );
                hsplit.show();
 
-               ui::Widget split = create_split_views( camera, yz, xy, xz );
+               /* Before merging NetRadiantCustom:
+               ui::Widget split = create_split_views( camera, yz, xy, xz ); */
+               m_hSplit = create_split_views( camera, yz, xy, xz, m_vSplit, m_vSplit2 );
 
                ui::Widget vsplit = ui::VPaned(ui::New);
                vsplit.show();
@@ -3329,11 +3336,19 @@ void MainFrame::Create(){
                // console
                ui::Widget console_window = create_framed_widget( Console_constructWindow( window ) );
 
-               gtk_paned_add1( GTK_PANED( hsplit ), split );
+               /* Before merging NetRadiantCustom:
+               gtk_paned_add1( GTK_PANED( hsplit ), m_hSplit );
                gtk_paned_add2( GTK_PANED( hsplit ), vsplit );
 
                gtk_paned_add1( GTK_PANED( vsplit ), texture_window  );
                gtk_paned_add2( GTK_PANED( vsplit ), console_window  );
+               */
+
+               gtk_paned_pack1( GTK_PANED( hsplit ), m_hSplit, TRUE, TRUE );
+               gtk_paned_pack2( GTK_PANED( hsplit ), vsplit, TRUE, TRUE);
+
+               gtk_paned_pack1( GTK_PANED( vsplit ), texture_window, TRUE, TRUE );
+               gtk_paned_pack2( GTK_PANED( vsplit ), console_window, TRUE, TRUE );
 
                hsplit.connect( "size_allocate", G_CALLBACK( hpaned_allocate ), &g_single_hpaned );
                hsplit.connect( "notify::position", G_CALLBACK( paned_position ), &g_single_hpaned );
@@ -3397,7 +3412,7 @@ void MainFrame::SaveWindowInfo(){
        }
 
        if( gdk_window_get_state( GTK_WIDGET( m_window )->window ) == 0 ){
-       g_layout_globals.m_position = m_position_tracker.getPosition();
+               g_layout_globals.m_position = m_position_tracker.getPosition();
        }
 
        g_layout_globals.nState = gdk_window_get_state( gtk_widget_get_window(m_window ) );
@@ -3582,6 +3597,73 @@ void MainFrame_toggleFullscreen(){
        }
 }
 
+class MaximizeView
+{
+public:
+       MaximizeView(): m_maximized( false ){
+       }
+       void toggle(){
+               return m_maximized ? restore() : maximize();
+       }
+private:
+       bool m_maximized;
+       int m_vSplitPos;
+       int m_vSplit2Pos;
+       int m_hSplitPos;
+
+       void restore(){
+               m_maximized = false;
+               gtk_paned_set_position( GTK_PANED( g_pParentWnd->m_vSplit ), m_vSplitPos );
+               gtk_paned_set_position( GTK_PANED( g_pParentWnd->m_vSplit2 ), m_vSplit2Pos );
+               gtk_paned_set_position( GTK_PANED( g_pParentWnd->m_hSplit ), m_hSplitPos );
+       }
+
+       void maximize(){
+               m_maximized = true;
+               m_vSplitPos = gtk_paned_get_position( GTK_PANED( g_pParentWnd->m_vSplit ) );
+               m_vSplit2Pos = gtk_paned_get_position( GTK_PANED( g_pParentWnd->m_vSplit2 ) );
+               m_hSplitPos = gtk_paned_get_position( GTK_PANED( g_pParentWnd->m_hSplit ) );
+
+               int vSplitX, vSplitY, vSplit2X, vSplit2Y, hSplitX, hSplitY;
+               gdk_window_get_origin( GTK_WIDGET( g_pParentWnd->m_vSplit )->window, &vSplitX, &vSplitY );
+               gdk_window_get_origin( GTK_WIDGET( g_pParentWnd->m_vSplit2 )->window, &vSplit2X, &vSplit2Y );
+               gdk_window_get_origin( GTK_WIDGET( g_pParentWnd->m_hSplit )->window, &hSplitX, &hSplitY );
+
+               vSplitY += m_vSplitPos;
+               vSplit2Y += m_vSplit2Pos;
+               hSplitX += m_hSplitPos;
+
+               int cur_x, cur_y;
+               Sys_GetCursorPos( MainFrame_getWindow(), &cur_x, &cur_y );
+
+               if( cur_x > hSplitX ){
+                       gtk_paned_set_position( GTK_PANED( g_pParentWnd->m_hSplit ), 0 );
+               }
+               else{
+                       gtk_paned_set_position( GTK_PANED( g_pParentWnd->m_hSplit ), 9999 );
+               }
+               if( cur_y > vSplitY ){
+                       gtk_paned_set_position( GTK_PANED( g_pParentWnd->m_vSplit ), 0 );
+               }
+               else{
+                       gtk_paned_set_position( GTK_PANED( g_pParentWnd->m_vSplit ), 9999 );
+               }
+               if( cur_y > vSplit2Y ){
+                       gtk_paned_set_position( GTK_PANED( g_pParentWnd->m_vSplit2 ), 0 );
+               }
+               else{
+                       gtk_paned_set_position( GTK_PANED( g_pParentWnd->m_vSplit2 ), 9999 );
+               }
+       }
+};
+
+MaximizeView g_maximizeview;
+
+void Maximize_View(){
+       if( g_pParentWnd != 0 && g_pParentWnd->m_vSplit != 0 && g_pParentWnd->m_vSplit2 != 0 && g_pParentWnd->m_hSplit != 0 )
+               g_maximizeview.toggle();
+}
+
 #include "preferencesystem.h"
 #include "stringio.h"
 #include "transformpath/transformpath.h"
@@ -3666,7 +3748,7 @@ void MainFrame_Construct(){
        GlobalCommands_insert( "ColorSchemeQER", makeCallbackF(ColorScheme_QER) );
        GlobalCommands_insert( "ColorSchemeBlackAndGreen", makeCallbackF(ColorScheme_Black) );
        GlobalCommands_insert( "ColorSchemeYdnar", makeCallbackF(ColorScheme_Ydnar) );
-       GlobalCommands_insert("ColorSchemeAdwaitaDark", makeCallbackF(ColorScheme_AdwaitaDark));
+       GlobalCommands_insert( "ColorSchemeAdwaitaDark", makeCallbackF(ColorScheme_AdwaitaDark));
        GlobalCommands_insert( "ChooseTextureBackgroundColor", makeCallback( g_ColoursMenu.m_textureback ) );
        GlobalCommands_insert( "ChooseGridBackgroundColor", makeCallback( g_ColoursMenu.m_xyback ) );
        GlobalCommands_insert( "ChooseGridMajorColor", makeCallback( g_ColoursMenu.m_gridmajor ) );
@@ -3683,6 +3765,7 @@ void MainFrame_Construct(){
        GlobalCommands_insert( "ChooseOrthoViewNameColor", makeCallback( g_ColoursMenu.m_viewname ) );
 
        GlobalCommands_insert( "Fullscreen", makeCallbackF( MainFrame_toggleFullscreen ), Accelerator( GDK_F11 ) );
+       GlobalCommands_insert( "MaximizeView", makeCallbackF( Maximize_View ), Accelerator( GDK_F12 ) );
 
 
        GlobalCommands_insert( "CSGSubtract", makeCallbackF(CSG_Subtract), Accelerator( 'U', (GdkModifierType)GDK_SHIFT_MASK ) );

diff --git a/radiant/mainframe.h b/radiant/mainframe.h
index 00eccd7c5ba5c3b06fc1baebec7ac599ee336956..e48337904fcdd8b594938fd4119d251d68fa8713 100644 (file)
--- a/radiant/mainframe.h
+++ b/radiant/mainframe.h
@@ -73,10 +73,13 @@ void Create();
 void SaveWindowInfo();
 void Shutdown();
 
+public:
 ui::Widget m_vSplit{ui::null};
 ui::Widget m_hSplit{ui::null};
 ui::Widget m_vSplit2{ui::null};
 
+private:
+
 XYWnd* m_pXYWnd;
 XYWnd* m_pYZWnd;
 XYWnd* m_pXZWnd;

diff --git a/radiant/patch.cpp b/radiant/patch.cpp
index f99e65451d52f90aadcf9df69afc448e799fa198..a92597d4c95e461a9d1b5773b8fcea2b7bd3e267 100644 (file)
--- a/radiant/patch.cpp
+++ b/radiant/patch.cpp
@@ -812,20 +812,20 @@ void Patch::InsertPoints( EMatrixMajor mt, bool bFirst ){
                return;
        }
        if ( bFirst ) {
-               pos = height - 1;
+               pos = 2;
        }
        else
        {
-               pos = 2;
+               pos = height - 1;
        }
 
        if ( pos >= height ) {
                if ( bFirst ) {
-                       pos = height - 1;
+                       pos = 2;
                }
                else
                {
-                       pos = 2;
+                       pos = height - 1;
                }
        }
        else if ( pos == 0 ) {
@@ -956,19 +956,19 @@ void Patch::RemovePoints( EMatrixMajor mt, bool bFirst ){
                return;
        }
        if ( bFirst ) {
-               pos = height - 3;
+               pos = 2;
        }
        else
        {
-               pos = 2;
+               pos = height - 3;
        }
        if ( pos >= height ) {
                if ( bFirst ) {
-                       pos = height - 3;
+                       pos = 2;
                }
                else
                {
-                       pos = 2;
+                       pos = height - 3;
                }
        }
        else if ( pos == 0 ) {

diff --git a/radiant/patchmanip.cpp b/radiant/patchmanip.cpp
index dae11c60d5a70b03564a1ddbd0ff0ac9dd1aea5e..7e21b4fcdedb9ea4a32a29d5777ecff1780f2d96 100644 (file)
--- a/radiant/patchmanip.cpp
+++ b/radiant/patchmanip.cpp
@@ -49,7 +49,7 @@
 
 PatchCreator* g_patchCreator = 0;
 
-void Scene_PatchConstructPrefab( scene::Graph& graph, const AABB aabb, const char* shader, EPatchPrefab eType, int axis, std::size_t width = 3, std::size_t height = 3 ){
+void Scene_PatchConstructPrefab( scene::Graph& graph, const AABB aabb, const char* shader, EPatchPrefab eType, int axis, std::size_t width = 3, std::size_t height = 3, bool redisperse = false ){
        Select_Delete();
        GlobalSelectionSystem().setSelectedAll( false );
 
@@ -60,6 +60,10 @@ void Scene_PatchConstructPrefab( scene::Graph& graph, const AABB aabb, const cha
        patch->SetShader( shader );
 
        patch->ConstructPrefab( aabb, eType, axis, width, height );
+       if( redisperse ){
+               patch->Redisperse( COL );
+               patch->Redisperse( ROW );
+       }
        patch->controlPointsChanged();
 
        {
@@ -196,20 +200,19 @@ void Scene_PatchDoCap_Selected( scene::Graph& graph, const char* shader ){
        }
 }
 
-void Patch_deform( Patch& patch, scene::Instance& instance, const int deform ){
+void Patch_deform( Patch& patch, scene::Instance& instance, const int deform, const int axis ){
        patch.undoSave();
 
-       for (PatchControlIter i = patch.begin(); i != patch.end(); ++i)
-       {
+       for ( PatchControlIter i = patch.begin(); i != patch.end(); ++i ){
                PatchControl& control = *i;
-               int randomNumber = int( deform * (float(std::rand()) / float(RAND_MAX)));
-               control.m_vertex[2] += randomNumber;
+               int randomNumber = int( deform * ( float( std::rand() ) / float( RAND_MAX ) ) );
+               control.m_vertex[ axis ] += randomNumber;
        }
 
        patch.controlPointsChanged();
 }
 
-void Scene_PatchDeform( scene::Graph& graph, const int deform )
+void Scene_PatchDeform( scene::Graph& graph, const int deform, const int axis )
 {
        InstanceVector instances;
        Scene_forEachVisibleSelectedPatchInstance([&](PatchInstance &patch) {
@@ -217,7 +220,7 @@ void Scene_PatchDeform( scene::Graph& graph, const int deform )
        });
        for ( InstanceVector::const_iterator i = instances.begin(); i != instances.end(); ++i )
        {
-               Patch_deform( *Node_getPatch( ( *i )->path().top() ), *( *i ), deform );
+               Patch_deform( *Node_getPatch( ( *i )->path().top() ), *( *i ), deform, axis );
        }
 
 }
@@ -541,28 +544,28 @@ void Patch_Plane(){
        DoNewPatchDlg( ePlane, 3, 3, 3, 3, 0, 0 );
 }
 
-void Patch_InsertInsertColumn(){
-       UndoableCommand undo( "patchInsertColumns" );
+void Patch_InsertFirstColumn(){
+       UndoableCommand undo( "patchInsertFirstColumns" );
 
-       Scene_PatchInsertRemove_Selected( GlobalSceneGraph(), true, true, false );
+       Scene_PatchInsertRemove_Selected( GlobalSceneGraph(), true, true, true );
 }
 
-void Patch_InsertAddColumn(){
-       UndoableCommand undo( "patchAddColumns" );
+void Patch_InsertLastColumn(){
+       UndoableCommand undo( "patchInsertLastColumns" );
 
-       Scene_PatchInsertRemove_Selected( GlobalSceneGraph(), true, true, true );
+       Scene_PatchInsertRemove_Selected( GlobalSceneGraph(), true, true, false );
 }
 
-void Patch_InsertInsertRow(){
-       UndoableCommand undo( "patchInsertRows" );
+void Patch_InsertFirstRow(){
+       UndoableCommand undo( "patchInsertFirstRows" );
 
-       Scene_PatchInsertRemove_Selected( GlobalSceneGraph(), true, false, false );
+       Scene_PatchInsertRemove_Selected( GlobalSceneGraph(), true, false, true );
 }
 
-void Patch_InsertAddRow(){
-       UndoableCommand undo( "patchAddRows" );
+void Patch_InsertLastRow(){
+       UndoableCommand undo( "patchInsertLastRows" );
 
-       Scene_PatchInsertRemove_Selected( GlobalSceneGraph(), true, false, true );
+       Scene_PatchInsertRemove_Selected( GlobalSceneGraph(), true, false, false );
 }
 
 void Patch_DeleteFirstColumn(){
@@ -777,29 +780,25 @@ void PatchPreferences_construct(){
 void Patch_registerCommands(){
        GlobalCommands_insert( "InvertCurveTextureX", makeCallbackF(Patch_FlipTextureX), Accelerator( 'I', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
        GlobalCommands_insert( "InvertCurveTextureY", makeCallbackF(Patch_FlipTextureY), Accelerator( 'I', (GdkModifierType)GDK_SHIFT_MASK ) );
-       GlobalCommands_insert( "IncPatchColumn", makeCallbackF(Patch_InsertInsertColumn), Accelerator( GDK_KP_Add, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
-       GlobalCommands_insert( "IncPatchRow", makeCallbackF(Patch_InsertInsertRow), Accelerator( GDK_KP_Add, (GdkModifierType)GDK_CONTROL_MASK ) );
-       GlobalCommands_insert( "DecPatchColumn", makeCallbackF(Patch_DeleteLastColumn), Accelerator( GDK_KP_Subtract, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
-       GlobalCommands_insert( "DecPatchRow", makeCallbackF(Patch_DeleteLastRow), Accelerator( GDK_KP_Subtract, (GdkModifierType)GDK_CONTROL_MASK ) );
        GlobalCommands_insert( "NaturalizePatch", makeCallbackF(Patch_NaturalTexture), Accelerator( 'N', (GdkModifierType)GDK_CONTROL_MASK ) );
        GlobalCommands_insert( "PatchCylinder", makeCallbackF(Patch_Cylinder) );
-       GlobalCommands_insert( "PatchDenseCylinder", makeCallbackF(Patch_DenseCylinder) );
-       GlobalCommands_insert( "PatchVeryDenseCylinder", makeCallbackF(Patch_VeryDenseCylinder) );
+//     GlobalCommands_insert( "PatchDenseCylinder", makeCallbackF(Patch_DenseCylinder) );
+//     GlobalCommands_insert( "PatchVeryDenseCylinder", makeCallbackF(Patch_VeryDenseCylinder) );
        GlobalCommands_insert( "PatchSquareCylinder", makeCallbackF(Patch_SquareCylinder) );
        GlobalCommands_insert( "PatchXactCylinder", makeCallbackF(Patch_XactCylinder) );
        GlobalCommands_insert( "PatchXactSphere", makeCallbackF(Patch_XactSphere) );
        GlobalCommands_insert( "PatchXactCone", makeCallbackF(Patch_XactCone) );
        GlobalCommands_insert( "PatchEndCap", makeCallbackF(Patch_Endcap) );
        GlobalCommands_insert( "PatchBevel", makeCallbackF(Patch_Bevel) );
-       GlobalCommands_insert( "PatchSquareBevel", makeCallbackF(Patch_SquareBevel) );
-       GlobalCommands_insert( "PatchSquareEndcap", makeCallbackF(Patch_SquareEndcap) );
+//     GlobalCommands_insert( "PatchSquareBevel", makeCallbackF(Patch_SquareBevel) );
+//     GlobalCommands_insert( "PatchSquareEndcap", makeCallbackF(Patch_SquareEndcap) );
        GlobalCommands_insert( "PatchCone", makeCallbackF(Patch_Cone) );
        GlobalCommands_insert( "PatchSphere", makeCallbackF(Patch_Sphere) );
        GlobalCommands_insert( "SimplePatchMesh", makeCallbackF(Patch_Plane), Accelerator( 'P', (GdkModifierType)GDK_SHIFT_MASK ) );
-       GlobalCommands_insert( "PatchInsertInsertColumn", makeCallbackF(Patch_InsertInsertColumn), Accelerator( GDK_KEY_KP_Add, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
-       GlobalCommands_insert( "PatchInsertAddColumn", makeCallbackF(Patch_InsertAddColumn) );
-       GlobalCommands_insert( "PatchInsertInsertRow", makeCallbackF(Patch_InsertInsertRow), Accelerator( GDK_KEY_KP_Add, (GdkModifierType)GDK_CONTROL_MASK ) );
-       GlobalCommands_insert( "PatchInsertAddRow", makeCallbackF(Patch_InsertAddRow) );
+       GlobalCommands_insert( "PatchInsertFirstColumn", makeCallbackF(Patch_InsertFirstColumn), Accelerator( GDK_KEY_KP_Add, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
+       GlobalCommands_insert( "PatchInsertLastColumn", makeCallbackF(Patch_InsertLastColumn) );
+       GlobalCommands_insert( "PatchInsertFirstRow", makeCallbackF(Patch_InsertFirstRow), Accelerator( GDK_KEY_KP_Add, (GdkModifierType)GDK_CONTROL_MASK ) );
+       GlobalCommands_insert( "PatchInsertLastRow", makeCallbackF(Patch_InsertLastRow) );
        GlobalCommands_insert( "PatchDeleteFirstColumn", makeCallbackF(Patch_DeleteFirstColumn) );
        GlobalCommands_insert( "PatchDeleteLastColumn", makeCallbackF(Patch_DeleteLastColumn), Accelerator( GDK_KEY_KP_Subtract, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
        GlobalCommands_insert( "PatchDeleteFirstRow", makeCallbackF(Patch_DeleteFirstRow), Accelerator( GDK_KEY_KP_Subtract, (GdkModifierType)GDK_CONTROL_MASK ) );
@@ -812,10 +811,10 @@ void Patch_registerCommands(){
        GlobalCommands_insert( "MatrixTranspose", makeCallbackF(Patch_Transpose), Accelerator( 'M', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
        GlobalCommands_insert( "CapCurrentCurve", makeCallbackF(Patch_Cap), Accelerator( 'C', (GdkModifierType)GDK_SHIFT_MASK ) );
        GlobalCommands_insert( "CycleCapTexturePatch", makeCallbackF(Patch_CycleProjection), Accelerator( 'N', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
-       GlobalCommands_insert( "MakeOverlayPatch", makeCallbackF(Patch_OverlayOn), Accelerator( 'Y' ) );
-       GlobalCommands_insert( "ClearPatchOverlays", makeCallbackF(Patch_OverlayOff), Accelerator( 'L', (GdkModifierType)GDK_CONTROL_MASK ) );
+//     GlobalCommands_insert( "MakeOverlayPatch", makeCallbackF(Patch_OverlayOn), Accelerator( 'Y' ) );
+//     GlobalCommands_insert( "ClearPatchOverlays", makeCallbackF(Patch_OverlayOff), Accelerator( 'L', (GdkModifierType)GDK_CONTROL_MASK ) );
        GlobalCommands_insert( "PatchDeform", makeCallbackF(Patch_Deform) );
-       GlobalCommands_insert( "PatchThicken", makeCallbackF(Patch_Thicken) );
+       GlobalCommands_insert( "PatchThicken", makeCallbackF(Patch_Thicken), Accelerator( 'T', (GdkModifierType)GDK_CONTROL_MASK ) );
 }
 
 void Patch_constructToolbar( ui::Toolbar toolbar ){
@@ -823,58 +822,49 @@ void Patch_constructToolbar( ui::Toolbar toolbar ){
 }
 
 void Patch_constructMenu( ui::Menu menu ){
-       create_menu_item_with_mnemonic( menu, "Cylinder", "PatchCylinder" );
-       {
-               auto menu_in_menu = create_sub_menu_with_mnemonic( menu, "More Cylinders" );
-               if ( g_Layout_enableDetachableMenus.m_value ) {
-                       menu_tearoff( menu_in_menu );
-               }
-               create_menu_item_with_mnemonic( menu_in_menu, "Dense Cylinder", "PatchDenseCylinder" );
-               create_menu_item_with_mnemonic( menu_in_menu, "Very Dense Cylinder", "PatchVeryDenseCylinder" );
-               create_menu_item_with_mnemonic( menu_in_menu, "Square Cylinder", "PatchSquareCylinder" );
-               create_menu_item_with_mnemonic( menu_in_menu, "Exact Cylinder...", "PatchXactCylinder" );
-       }
-       menu_separator( menu );
-       create_menu_item_with_mnemonic( menu, "End cap", "PatchEndCap" );
+       create_menu_item_with_mnemonic( menu, "Simple Patch Mesh...", "SimplePatchMesh" );
        create_menu_item_with_mnemonic( menu, "Bevel", "PatchBevel" );
-       {
-//             auto menu_in_menu = create_sub_menu_with_mnemonic( menu, "More End caps, Bevels" );
+       create_menu_item_with_mnemonic( menu, "End cap", "PatchEndCap" );
+       create_menu_item_with_mnemonic( menu, "Cylinder (9x3)", "PatchCylinder" );
+       create_menu_item_with_mnemonic( menu, "Square Cylinder (9x3)", "PatchSquareCylinder" );
+       create_menu_item_with_mnemonic( menu, "Exact Cylinder...", "PatchXactCylinder" );
+       create_menu_item_with_mnemonic( menu, "Cone (9x3)", "PatchCone" );
+       create_menu_item_with_mnemonic( menu, "Exact Cone...", "PatchXactCone" );
+       create_menu_item_with_mnemonic( menu, "Sphere (9x5)", "PatchSphere" );
+       create_menu_item_with_mnemonic( menu, "Exact Sphere...", "PatchXactSphere" );
+//     {
+//             ui::Menu menu_in_menu = create_sub_menu_with_mnemonic( menu, "More Cylinders" );
 //             if ( g_Layout_enableDetachableMenus.m_value ) {
 //                     menu_tearoff( menu_in_menu );
 //             }
-               create_menu_item_with_mnemonic( menu, "Square Endcap", "PatchSquareBevel" );
-               create_menu_item_with_mnemonic( menu, "Square Bevel", "PatchSquareEndcap" );
-       }
-       menu_separator( menu );
-       create_menu_item_with_mnemonic( menu, "Cone", "PatchCone" );
-       create_menu_item_with_mnemonic( menu, "Exact Cone...", "PatchXactCone" );
-       menu_separator( menu );
-       create_menu_item_with_mnemonic( menu, "Sphere", "PatchSphere" );
-       create_menu_item_with_mnemonic( menu, "Exact Sphere...", "PatchXactSphere" );
+//             create_menu_item_with_mnemonic( menu_in_menu, "Dense Cylinder", "PatchDenseCylinder" );
+//             create_menu_item_with_mnemonic( menu_in_menu, "Very Dense Cylinder", "PatchVeryDenseCylinder" );
+//             create_menu_item_with_mnemonic( menu_in_menu, "Square Cylinder", "PatchSquareCylinder" );
+//     }
+//     {
+//             //not implemented
+//             create_menu_item_with_mnemonic( menu, "Square Endcap", "PatchSquareBevel" );
+//             create_menu_item_with_mnemonic( menu, "Square Bevel", "PatchSquareEndcap" );
+//     }
        menu_separator( menu );
-       create_menu_item_with_mnemonic( menu, "Simple Patch Mesh...", "SimplePatchMesh" );
+       create_menu_item_with_mnemonic( menu, "Cap Selection", "CapCurrentCurve" );
        menu_separator( menu );
        {
-               auto menu_in_menu = create_sub_menu_with_mnemonic( menu, "Insert" );
+               auto menu_in_menu = create_sub_menu_with_mnemonic( menu, "Insert/Delete" );
                if ( g_Layout_enableDetachableMenus.m_value ) {
                        menu_tearoff( menu_in_menu );
                }
-               create_menu_item_with_mnemonic( menu_in_menu, "Add (2) Columns", "PatchInsertAddColumn" );
-               create_menu_item_with_mnemonic( menu_in_menu, "Insert (2) Columns", "PatchInsertInsertColumn" );
+               create_menu_item_with_mnemonic( menu_in_menu, "Insert (2) First Columns", "PatchInsertFirstColumn" );
+               create_menu_item_with_mnemonic( menu_in_menu, "Insert (2) Last Columns", "PatchInsertLastColumn" );
                menu_separator( menu_in_menu );
-               create_menu_item_with_mnemonic( menu_in_menu, "Add (2) Rows", "PatchInsertAddRow" );
-               create_menu_item_with_mnemonic( menu_in_menu, "Insert (2) Rows", "PatchInsertInsertRow" );
-       }
-       {
-               auto menu_in_menu = create_sub_menu_with_mnemonic( menu, "Delete" );
-               if ( g_Layout_enableDetachableMenus.m_value ) {
-                       menu_tearoff( menu_in_menu );
-               }
-               create_menu_item_with_mnemonic( menu_in_menu, "First (2) Columns", "PatchDeleteFirstColumn" );
-               create_menu_item_with_mnemonic( menu_in_menu, "Last (2) Columns", "PatchDeleteLastColumn" );
+               create_menu_item_with_mnemonic( menu_in_menu, "Insert (2) First Rows", "PatchInsertFirstRow" );
+               create_menu_item_with_mnemonic( menu_in_menu, "Insert (2) Last Rows", "PatchInsertLastRow" );
                menu_separator( menu_in_menu );
-               create_menu_item_with_mnemonic( menu_in_menu, "First (2) Rows", "PatchDeleteFirstRow" );
-               create_menu_item_with_mnemonic( menu_in_menu, "Last (2) Rows", "PatchDeleteLastRow" );
+               create_menu_item_with_mnemonic( menu_in_menu, "Del First (2) Columns", "PatchDeleteFirstColumn" );
+               create_menu_item_with_mnemonic( menu_in_menu, "Del Last (2) Columns", "PatchDeleteLastColumn" );
+               menu_separator( menu_in_menu );
+               create_menu_item_with_mnemonic( menu_in_menu, "Del First (2) Rows", "PatchDeleteFirstRow" );
+               create_menu_item_with_mnemonic( menu_in_menu, "Del Last (2) Rows", "PatchDeleteLastRow" );
        }
        menu_separator( menu );
        {
@@ -883,26 +873,17 @@ void Patch_constructMenu( ui::Menu menu ){
                        menu_tearoff( menu_in_menu );
                }
                create_menu_item_with_mnemonic( menu_in_menu, "Invert", "InvertCurve" );
-//             auto menu_3 = create_sub_menu_with_mnemonic( menu_in_menu, "Re-disperse" );
-//             if ( g_Layout_enableDetachableMenus.m_value ) {
-//                     menu_tearoff( menu_3 );
-//             }
-               menu_separator( menu_in_menu );
-               create_menu_item_with_mnemonic( menu, "Rows", "RedisperseRows" );
-               create_menu_item_with_mnemonic( menu, "Columns", "RedisperseCols" );
-//             auto menu_4 = create_sub_menu_with_mnemonic( menu_in_menu, "Smooth" );
-//             if ( g_Layout_enableDetachableMenus.m_value ) {
-//                     menu_tearoff( menu_4 );
-//             }
-               create_menu_item_with_mnemonic( menu, "Rows", "SmoothRows" );
-               create_menu_item_with_mnemonic( menu, "Columns", "SmoothCols" );
                create_menu_item_with_mnemonic( menu_in_menu, "Transpose", "MatrixTranspose" );
 
+               menu_separator( menu_in_menu );
+               create_menu_item_with_mnemonic( menu_in_menu, "Re-disperse Rows", "RedisperseRows" );
+               create_menu_item_with_mnemonic( menu_in_menu, "Re-disperse Columns", "RedisperseCols" );
+
+               menu_separator( menu_in_menu );
+               create_menu_item_with_mnemonic( menu_in_menu, "Smooth Rows", "SmoothRows" );
+               create_menu_item_with_mnemonic( menu_in_menu, "Smooth Columns", "SmoothCols" );
        }
        menu_separator( menu );
-       create_menu_item_with_mnemonic( menu, "Cap Selection", "CapCurrentCurve" );
-       create_menu_item_with_mnemonic( menu, "Cycle Cap Texture", "CycleCapTexturePatch" );
-       menu_separator( menu );
        {
                auto menu_in_menu = create_sub_menu_with_mnemonic( menu, "Texture" );
                if ( g_Layout_enableDetachableMenus.m_value ) {
@@ -914,15 +895,15 @@ void Patch_constructMenu( ui::Menu menu ){
                create_menu_item_with_mnemonic( menu_in_menu, "Invert Y", "InvertCurveTextureY" );
 
        }
-       menu_separator( menu );
-       {
-               auto menu_in_menu = create_sub_menu_with_mnemonic( menu, "Overlay" );
-               if ( g_Layout_enableDetachableMenus.m_value ) {
-                       menu_tearoff( menu_in_menu );
-               }
-               create_menu_item_with_mnemonic( menu_in_menu, "Set", "MakeOverlayPatch" );
-               create_menu_item_with_mnemonic( menu_in_menu, "Clear", "ClearPatchOverlays" );
-       }
+//     menu_separator( menu );
+//     {
+//             auto menu_in_menu = create_sub_menu_with_mnemonic( menu, "Overlay" );
+//             if ( g_Layout_enableDetachableMenus.m_value ) {
+//                     menu_tearoff( menu_in_menu );
+//             }
+//             create_menu_item_with_mnemonic( menu_in_menu, "Set", "MakeOverlayPatch" );
+//             create_menu_item_with_mnemonic( menu_in_menu, "Clear", "ClearPatchOverlays" );
+//     }
        menu_separator( menu );
        create_menu_item_with_mnemonic( menu, "Deform...", "PatchDeform" );
        create_menu_item_with_mnemonic( menu, "Thicken...", "PatchThicken" );
@@ -934,6 +915,7 @@ void Patch_constructMenu( ui::Menu menu ){
 
 void DoNewPatchDlg( EPatchPrefab prefab, int minrows, int mincols, int defrows, int defcols, int maxrows, int maxcols ){
        ModalDialog dialog;
+       GtkWidget* redisperseCheckBox;
 
        ui::Window window = MainFrame_getWindow().create_dialog_window("Patch density", G_CALLBACK(dialog_delete_callback ), &dialog );
 
@@ -945,7 +927,7 @@ void DoNewPatchDlg( EPatchPrefab prefab, int minrows, int mincols, int defrows,
                auto hbox = create_dialog_hbox( 4, 4 );
                window.add(hbox);
                {
-                       auto table = create_dialog_table( 2, 2, 4, 4 );
+                       auto table = create_dialog_table( 3, 2, 4, 4 );
                        hbox.pack_start( table, TRUE, TRUE, 0 );
                        {
                                auto label = ui::Label( "Width:" );
@@ -1004,6 +986,18 @@ void DoNewPatchDlg( EPatchPrefab prefab, int minrows, int mincols, int defrows,
                                combo.show();
                 table.attach(combo, {1, 2, 1, 2}, {GTK_EXPAND | GTK_FILL, 0});
                        }
+
+                       if( prefab != ePlane ){
+                               GtkWidget* _redisperseCheckBox = gtk_check_button_new_with_label( "Square" );
+                               gtk_widget_set_tooltip_text( _redisperseCheckBox, "Redisperse columns & rows" );
+                               gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( _redisperseCheckBox ), FALSE );
+                               gtk_widget_show( _redisperseCheckBox );
+                               gtk_table_attach( table, _redisperseCheckBox, 0, 2, 2, 3,
+                                                               (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
+                                                               (GtkAttachOptions) ( 0 ), 0, 0 );
+                               redisperseCheckBox = _redisperseCheckBox;
+                       }
+
                }
 
                {
@@ -1031,8 +1025,11 @@ void DoNewPatchDlg( EPatchPrefab prefab, int minrows, int mincols, int defrows,
        if ( modal_dialog_show( window, dialog ) == eIDOK ) {
                int w = gtk_combo_box_get_active( width ) * 2 + mincols;
                int h = gtk_combo_box_get_active( height ) * 2 + minrows;
-
-               Scene_PatchConstructPrefab( GlobalSceneGraph(), PatchCreator_getBounds(), TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ), prefab, GlobalXYWnd_getCurrentViewType(), w, h );
+               bool redisperse = false;
+               if( prefab != ePlane ){
+                       redisperse = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( redisperseCheckBox ) ) ? true : false;
+               }
+               Scene_PatchConstructPrefab( GlobalSceneGraph(), PatchCreator_getBounds(), TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ), prefab, GlobalXYWnd_getCurrentViewType(), w, h, redisperse );
        }
 
        window.destroy();
@@ -1043,6 +1040,9 @@ void DoPatchDeformDlg(){
        ModalDialog dialog;
        GtkWidget* deformW;
 
+    GtkWidget* rndY;
+       GtkWidget* rndX;
+
        ui::Window window = create_dialog_window( MainFrame_getWindow(), "Patch deform", G_CALLBACK( dialog_delete_callback ), &dialog );
 
        GtkAccelGroup* accel = gtk_accel_group_new();
@@ -1062,15 +1062,49 @@ void DoPatchDeformDlg(){
                                                                  (GtkAttachOptions) ( 0 ), 0, 0 );
                                gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
                        }
+//                     {
+//                             GtkWidget* entry = gtk_entry_new();
+//                             gtk_entry_set_text( GTK_ENTRY( entry ), "64" );
+//                             gtk_widget_show( entry );
+//                             gtk_table_attach( table, entry, 1, 2, 0, 1,
+//                                                               (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
+//                                                               (GtkAttachOptions) ( 0 ), 0, 0 );
+//
+//                             deformW = entry;
+//                     }
                        {
-                               GtkWidget* entry = gtk_entry_new();
-                               gtk_entry_set_text( GTK_ENTRY( entry ), "16" );
-                               gtk_widget_show( entry );
-                               gtk_table_attach( table, entry, 1, 2, 0, 1,
+                               GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 64, -9999, 9999, 1, 10, 0 ) );
+                               //GtkSpinButton* spin = GTK_SPIN_BUTTON( gtk_spin_button_new( adj, 1, 0 ) );
+                               GtkWidget* spin = gtk_spin_button_new( adj, 1, 0 );
+                               gtk_widget_show( spin );
+                               gtk_table_attach( table, spin, 1, 2, 0, 1,
                                                                  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                                                  (GtkAttachOptions) ( 0 ), 0, 0 );
+                               gtk_widget_set_size_request( spin, 64, -1 );
+                               gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( spin ), TRUE );
+
+                               deformW = spin;
+                       }
+                       {
+                               // Create the radio button group for choosing the axis
+                               GtkWidget* _rndZ = gtk_radio_button_new_with_label_from_widget( NULL, "Z" );
+                               GtkWidget* _rndY = gtk_radio_button_new_with_label_from_widget( GTK_RADIO_BUTTON(_rndZ), "Y" );
+                               GtkWidget* _rndX = gtk_radio_button_new_with_label_from_widget( GTK_RADIO_BUTTON(_rndZ), "X" );
+                               gtk_widget_show( _rndZ );
+                               gtk_widget_show( _rndY );
+                               gtk_widget_show( _rndX );
+
+
+                               GtkHBox* _hbox = create_dialog_hbox( 4, 4 );
+                               gtk_table_attach( table, GTK_WIDGET( _hbox ), 0, 2, 1, 2,
+                                                                 (GtkAttachOptions) ( GTK_FILL ),
+                                                                 (GtkAttachOptions) ( 0 ), 0, 0 );
+                               gtk_box_pack_start( GTK_BOX( _hbox ), GTK_WIDGET( _rndX ), TRUE, TRUE, 0 );
+                               gtk_box_pack_start( GTK_BOX( _hbox ), GTK_WIDGET( _rndY ), TRUE, TRUE, 0 );
+                               gtk_box_pack_start( GTK_BOX( _hbox ), GTK_WIDGET( _rndZ ), TRUE, TRUE, 0 );
 
-                               deformW = entry;
+                               rndX = _rndX;
+                               rndY = _rndY;
                        }
                }
                {
@@ -1092,10 +1126,18 @@ void DoPatchDeformDlg(){
        }
 
        if ( modal_dialog_show( window, dialog ) == eIDOK ) {
-               int deform = static_cast<int>( atoi( gtk_entry_get_text( GTK_ENTRY( deformW ) ) ) );
-               Scene_PatchDeform( GlobalSceneGraph(), deform );
+               //int deform = static_cast<int>( atoi( gtk_entry_get_text( GTK_ENTRY( deformW ) ) ) );
+               gtk_spin_button_update ( GTK_SPIN_BUTTON( deformW ) );
+               int deform = static_cast<int>( gtk_spin_button_get_value( GTK_SPIN_BUTTON( deformW ) ) );
+               int axis = 2; //Z
+               if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( rndX ) ) ){
+                       axis = 0;
+               }
+               else if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( rndY ) ) ){
+                       axis = 1;
+               }
+               Scene_PatchDeform( GlobalSceneGraph(), deform, axis );
        }
-
        gtk_widget_destroy( GTK_WIDGET( window ) );
 }
 
@@ -1254,7 +1296,6 @@ void DoPatchThickenDlg(){
        GtkWidget* radX;
        GtkWidget* radY;
        GtkWidget* radZ;
-       GtkWidget* radNormals;
 
        ui::Window window = create_dialog_window( MainFrame_getWindow(), "Patch thicken", G_CALLBACK( dialog_delete_callback ), &dialog );
 
@@ -1275,23 +1316,35 @@ void DoPatchThickenDlg(){
                                                                  (GtkAttachOptions) ( 0 ), 0, 0 );
                                gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
                        }
+//                     {
+//                             GtkWidget* entry = gtk_entry_new();
+//                             gtk_entry_set_text( GTK_ENTRY( entry ), "16" );
+//                             gtk_widget_set_size_request( entry, 40, -1 );
+//                             gtk_widget_show( entry );
+//                             gtk_table_attach( table, entry, 1, 2, 0, 1,
+//                                                               (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
+//                                                               (GtkAttachOptions) ( 0 ), 0, 0 );
+//
+//                             thicknessW = entry;
+//                     }
                        {
-                               GtkWidget* entry = gtk_entry_new();
-                               gtk_entry_set_text( GTK_ENTRY( entry ), "16" );
-                               gtk_widget_set_size_request( entry, 40, -1 );
-                               gtk_widget_show( entry );
-                               gtk_table_attach( table, entry, 1, 2, 0, 1,
+                               GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 16, -9999, 9999, 1, 10, 0 ) );
+                               GtkWidget* spin = gtk_spin_button_new( adj, 1, 0 );
+                               gtk_widget_show( spin );
+                               gtk_table_attach( table, spin, 1, 2, 0, 1,
                                                                  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                                                  (GtkAttachOptions) ( 0 ), 0, 0 );
+                               gtk_widget_set_size_request( spin, 48, -1 );
+                               gtk_spin_button_set_numeric( GTK_SPIN_BUTTON( spin ), TRUE );
 
-                               thicknessW = entry;
+                               thicknessW = spin;
                        }
                        {
                                // Create the "create seams" label
                                GtkWidget* _seamsCheckBox = gtk_check_button_new_with_label( "Side walls" );
                                gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( _seamsCheckBox ), TRUE );
                                gtk_widget_show( _seamsCheckBox );
-                               gtk_table_attach( table, _seamsCheckBox, 3, 4, 0, 1,
+                               gtk_table_attach( table, _seamsCheckBox, 2, 4, 0, 1,
                                                                  (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                                                  (GtkAttachOptions) ( 0 ), 0, 0 );
                                seamsW = _seamsCheckBox;
@@ -1325,7 +1378,6 @@ void DoPatchThickenDlg(){
                                radX = _radX;
                                radY = _radY;
                                radZ = _radZ;
-                               radNormals = _radNormals;
                        }
                }
                {
@@ -1347,9 +1399,11 @@ void DoPatchThickenDlg(){
        }
 
        if ( modal_dialog_show( window, dialog ) == eIDOK ) {
-               int axis;
+               int axis = 3; // Extrude along normals
                bool seams;
-               float thickness = static_cast<float>( atoi( gtk_entry_get_text( GTK_ENTRY( thicknessW ) ) ) );
+               //float thickness = static_cast<float>( atoi( gtk_entry_get_text( GTK_ENTRY( thicknessW ) ) ) );
+               gtk_spin_button_update ( GTK_SPIN_BUTTON( thicknessW ) );
+               float thickness = static_cast<float>( gtk_spin_button_get_value( GTK_SPIN_BUTTON( thicknessW ) ) );
                seams = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( seamsW )) ? true : false;
 
                if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radX))) {
@@ -1361,10 +1415,7 @@ void DoPatchThickenDlg(){
                else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radZ))) {
                        axis = 2;
                }
-               else  {
-                       // Extrude along normals
-                       axis = 3;
-               }
+
                Scene_PatchThicken( GlobalSceneGraph(), thickness, seams, axis );
        }