From ffef031f0c930b63abe89386ad7edfcff0469029 Mon Sep 17 00:00:00 2001
From: Denis Declara <declara91@gmail.com>
Date: Sun, 15 Apr 2012 14:27:18 +0200
Subject: Improved User interface. Added controls for Center, Radius and
 Angles. Note that none of them actually do something yet

(bzr r11073.1.14)
---
 src/ui/dialog/tile.cpp | 31 +++++++++++++++++++++++++++----
 src/ui/dialog/tile.h   | 15 +++++++++++++--
 2 files changed, 40 insertions(+), 6 deletions(-)

(limited to 'src/ui')

diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
index 0e3b24f7c..dd49ac9eb 100644
--- a/src/ui/dialog/tile.cpp
+++ b/src/ui/dialog/tile.cpp
@@ -142,14 +142,21 @@ void ArrangeDialog::_apply()
 }
 
 PolarArrangeTab::PolarArrangeTab(ArrangeDialog *parent_)
-	: parent(parent_)
+	: parent(parent_),
+	  parametersTable(3, 3, false),
+	  centerY("", "Y coordinate of the center", UNIT_TYPE_LINEAR),
+	  centerX("", "X coordinate of the center", centerY),
+	  radiusY("", "Y coordinate of the radius", UNIT_TYPE_LINEAR),
+	  radiusX("", "X coordinate of the radius", radiusY),
+	  angleY("", "Starting angle", UNIT_TYPE_RADIAL),
+	  angleX("", "End angle", angleY)
 {
 	anchorPointLabel.set_text("Anchor point:");
 	anchorPointLabel.set_alignment(Gtk::ALIGN_START);
 	pack_start(anchorPointLabel, false, false);
 
 	anchorBoundingBoxRadio.set_label("Object's bounding box:");
-	anchorBoundingBoxRadio.set_group(anchorRadioGroup);
+	anchorRadioGroup = anchorBoundingBoxRadio.get_group();
 	pack_start(anchorBoundingBoxRadio, false, false);
 
 	pack_start(anchorSelector, false, false);
@@ -163,12 +170,28 @@ PolarArrangeTab::PolarArrangeTab(ArrangeDialog *parent_)
 	pack_start(arrangeOnLabel, false, false);
 
 	arrangeOnCircleRadio.set_label("Last selected circle/ellipse/arc");
-	anchorObjectPivotRadio.set_group(arrangeRadioGroup);
+	arrangeRadioGroup = arrangeOnCircleRadio.get_group();
 	pack_start(arrangeOnCircleRadio, false, false);
 
 	arrangeOnParametersRadio.set_label("Parameterized:");
-	anchorObjectPivotRadio.set_group(arrangeRadioGroup);
+	arrangeOnParametersRadio.set_group(arrangeRadioGroup);
 	pack_start(arrangeOnParametersRadio, false, false);
+
+	centerLabel.set_text("Center X/Y:");
+	parametersTable.attach(centerLabel, 0, 1, 0, 1);
+	parametersTable.attach(centerX, 1, 2, 0, 1, Gtk::EXPAND);
+	parametersTable.attach(centerY, 2, 3, 0, 1, Gtk::EXPAND);
+
+	radiusLabel.set_text("Radius X/Y:");
+	parametersTable.attach(radiusLabel, 0, 1, 1, 2);
+	parametersTable.attach(radiusX, 1, 2, 1, 2, Gtk::EXPAND);
+	parametersTable.attach(radiusY, 2, 3, 1, 2, Gtk::EXPAND);
+
+	angleLabel.set_text("Center X/Y:");
+	parametersTable.attach(angleLabel, 0, 1, 2, 3);
+	parametersTable.attach(angleX, 1, 2, 2, 3, Gtk::EXPAND);
+	parametersTable.attach(angleY, 2, 3, 2, 3, Gtk::EXPAND);
+	pack_start(parametersTable, false, false);
 }
 
 void PolarArrangeTab::arrange()
diff --git a/src/ui/dialog/tile.h b/src/ui/dialog/tile.h
index ab075fb28..40352f90d 100644
--- a/src/ui/dialog/tile.h
+++ b/src/ui/dialog/tile.h
@@ -207,8 +207,19 @@ private:
     Gtk::RadioButton       arrangeOnCircleRadio;
     Gtk::RadioButton       arrangeOnParametersRadio;
 
-    Inkscape::UI::Widget::SpinButton centerXSpin;
-    Inkscape::UI::Widget::SpinButton centerYSpin;
+    Gtk::Table             parametersTable;
+
+    Gtk::Label             centerLabel;
+    Inkscape::UI::Widget::ScalarUnit centerY;
+    Inkscape::UI::Widget::ScalarUnit centerX;
+
+    Gtk::Label             radiusLabel;
+    Inkscape::UI::Widget::ScalarUnit radiusY;
+    Inkscape::UI::Widget::ScalarUnit radiusX;
+
+    Gtk::Label             angleLabel;
+    Inkscape::UI::Widget::ScalarUnit angleY;
+    Inkscape::UI::Widget::ScalarUnit angleX;
 
 
 };
-- 
cgit v1.2.3