Anchor widget now reads the last alignment from the settings. Anchor selection widget is also smaller now.

(bzr r11073.1.10)

4 files changed, 17 insertions, 2 deletions

diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index 746cfc1b4..528ddf5b3 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -121,7 +121,7 @@ DialogManager::DialogManager() {
         registerFactory("SvgFontsDialog",      &create<SvgFontsDialog,       FloatingBehavior>);
 #endif
         registerFactory("Swatches",            &create<SwatchesPanel,        FloatingBehavior>);
-        registerFactory("TileDialog",          &create<ArrangeDialog,           FloatingBehavior>);
+        registerFactory("TileDialog",          &create<ArrangeDialog,        FloatingBehavior>);
         registerFactory("Trace",               &create<TraceDialog,          FloatingBehavior>);
         registerFactory("Transformation",      &create<Transformation,       FloatingBehavior>);
         registerFactory("UndoHistory",         &create<UndoHistory,          FloatingBehavior>);
diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
index 9297b5154..ab3781630 100644
--- a/src/ui/dialog/tile.cpp
+++ b/src/ui/dialog/tile.cpp
@@ -732,9 +732,13 @@ GridArrangeTab::GridArrangeTab(ArrangeDialog *parent)
 
     TileBox.pack_start(SpinsHBox, false, false, MARGIN);
 
+    VertAlign = prefs->getInt("/dialogs/gridtiler/VertAlign", 1);
+    HorizAlign = prefs->getInt("/dialogs/gridtiler/HorizAlign", 1);
 
     // Anchor selection widget
     AlignLabel.set_label("Alignment:");
+    AlignLabel.set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
+    AlignmentSelector.setAlignment(HorizAlign, VertAlign);
     AlignmentSelector.on_selectionChanged().connect(sigc::mem_fun(*this, &GridArrangeTab::Align_changed));
     TileBox.pack_start(AlignLabel, false, false, MARGIN);
     TileBox.pack_start(AlignmentSelector, true, false, MARGIN);
diff --git a/src/ui/widget/anchor-selector.cpp b/src/ui/widget/anchor-selector.cpp
index aa173e0a0..49387fc34 100644
--- a/src/ui/widget/anchor-selector.cpp
+++ b/src/ui/widget/anchor-selector.cpp
@@ -13,7 +13,7 @@
 #include "ui/widget/anchor-selector.h"
 
 void AnchorSelector::setupButton(const Glib::ustring& icon, Gtk::ToggleButton& button) {
-	Gtk::Widget*  buttonIcon = Gtk::manage(sp_icon_get_icon(icon, Inkscape::ICON_SIZE_LARGE_TOOLBAR));
+	Gtk::Widget*  buttonIcon = Gtk::manage(sp_icon_get_icon(icon, Inkscape::ICON_SIZE_SMALL_TOOLBAR));
 	buttonIcon->show();
 
 	button.set_relief(Gtk::RELIEF_NONE);
@@ -67,3 +67,12 @@ void AnchorSelector::btn_activated(int index)
 		_selectionChanged.emit();
 	}
 }
+
+void AnchorSelector::setAlignment(int horizontal, int vertical)
+{
+	int index = 3 * vertical + horizontal;
+	if(index >= 0 && index < 9)
+	{
+		_buttons[index].set_active(!_buttons[index].get_active());
+	}
+}
diff --git a/src/ui/widget/anchor-selector.h b/src/ui/widget/anchor-selector.h
index ad20bf063..361528d11 100644
--- a/src/ui/widget/anchor-selector.h
+++ b/src/ui/widget/anchor-selector.h
@@ -31,6 +31,8 @@ public:
 
 	sigc::signal<void> &on_selectionChanged() { return _selectionChanged; }
 
+	void setAlignment(int horizontal, int vertical);
+
 	AnchorSelector();
 	virtual ~AnchorSelector();
 };