The Polar Arrange Tab of the Arrange Dialog now hides the parametric

controls until the user selects the corresponding radio button

(bzr r11073.1.35)

3 files changed, 12 insertions, 8 deletions

diff --git a/src/ui/dialog/polar-arrange-tab.cpp b/src/ui/dialog/polar-arrange-tab.cpp
index 2056c7820..623aa4e3e 100644
--- a/src/ui/dialog/polar-arrange-tab.cpp
+++ b/src/ui/dialog/polar-arrange-tab.cpp
@@ -75,16 +75,13 @@ PolarArrangeTab::PolarArrangeTab(ArrangeDialog *parent_)
 	arrangeOnParametersRadio.signal_toggled().connect(sigc::mem_fun(*this, &PolarArrangeTab::on_arrange_radio_changed));
 	pack_start(arrangeOnParametersRadio, false, false);
 
-	//FIXME: Objects in grid do not line up properly!
 	centerLabel.set_text(_("Center X/Y:"));
 	parametersTable.attach(centerLabel, 0, 1, 0, 1, Gtk::FILL);
 	centerX.setDigits(2);
-	//centerX.set_size_request(60, -1);
 	centerX.setIncrements(0.2, 0);
 	centerX.setRange(-10000, 10000);
 	centerX.setValue(0, "px");
 	centerY.setDigits(2);
-	//centerY.set_size_request(120, -1);
 	centerY.setIncrements(0.2, 0);
 	centerY.setRange(-10000, 10000);
 	centerY.setValue(0, "px");
@@ -94,12 +91,10 @@ PolarArrangeTab::PolarArrangeTab(ArrangeDialog *parent_)
 	radiusLabel.set_text(_("Radius X/Y:"));
 	parametersTable.attach(radiusLabel, 0, 1, 1, 2, Gtk::FILL);
 	radiusX.setDigits(2);
-	//radiusX.set_size_request(60, -1);
 	radiusX.setIncrements(0.2, 0);
 	radiusX.setRange(0.001, 10000);
 	radiusX.setValue(100, "px");
 	radiusY.setDigits(2);
-	//radiusY.set_size_request(120, -1);
 	radiusY.setIncrements(0.2, 0);
 	radiusY.setRange(0.001, 10000);
 	radiusY.setValue(100, "px");
@@ -109,12 +104,10 @@ PolarArrangeTab::PolarArrangeTab(ArrangeDialog *parent_)
 	angleLabel.set_text(_("Angle X/Y:"));
 	parametersTable.attach(angleLabel, 0, 1, 2, 3, Gtk::FILL);
 	angleX.setDigits(2);
-	//angleX.set_size_request(60, -1);
 	angleX.setIncrements(0.2, 0);
 	angleX.setRange(-10000, 10000);
 	angleX.setValue(0, "°");
 	angleY.setDigits(2);
-	//angleY.set_size_request(120, -1);
 	angleY.setIncrements(0.2, 0);
 	angleY.setRange(-10000, 10000);
 	angleY.setValue(180, "°");
@@ -394,6 +387,8 @@ void PolarArrangeTab::on_arrange_radio_changed()
 
 	radiusX.set_sensitive(arrangeParametric);
 	radiusY.set_sensitive(arrangeParametric);
+
+	parametersTable.set_visible(arrangeParametric);
 }
 
 void PolarArrangeTab::on_anchor_radio_changed()
diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
index c967509f9..1ed099120 100644
--- a/src/ui/dialog/tile.cpp
+++ b/src/ui/dialog/tile.cpp
@@ -41,7 +41,14 @@ ArrangeDialog::ArrangeDialog()
     _arrangeButton->set_use_underline(true);
     _arrangeButton->set_tooltip_text(_("Arrange selected objects"));
     contents->pack_start(_arrangeBox);
-    show_all_children();
+    //show_all_children();
+}
+
+
+void ArrangeDialog::on_show()
+{
+	UI::Widget::Panel::on_show();
+	_polarArrangeTab->on_arrange_radio_changed();
 }
 
 void ArrangeDialog::_apply()
diff --git a/src/ui/dialog/tile.h b/src/ui/dialog/tile.h
index d42dd7f65..8d4e9584b 100644
--- a/src/ui/dialog/tile.h
+++ b/src/ui/dialog/tile.h
@@ -54,6 +54,8 @@ public:
      */
     virtual void _apply();
 
+    virtual void on_show();
+
 	static ArrangeDialog& getInstance() { return *new ArrangeDialog(); }
 };