From dc6fcf4ec96d4f4345ad86b1940d4b31d6771a0f Mon Sep 17 00:00:00 2001
From: Denis Declara <declara91@gmail.com>
Date: Sat, 31 Mar 2012 15:20:19 +0200
Subject: Brought old code, "Rows and Columns" in it's own class. Added a
 separate class for the panel. Still some cleanup to do.

(bzr r11073.1.8)
---
 src/ui/dialog/dialog-manager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/ui/dialog/dialog-manager.cpp')

diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index 60011ca9d..746cfc1b4 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<TileDialog,           FloatingBehavior>);
+        registerFactory("TileDialog",          &create<ArrangeDialog,           FloatingBehavior>);
         registerFactory("Trace",               &create<TraceDialog,          FloatingBehavior>);
         registerFactory("Transformation",      &create<Transformation,       FloatingBehavior>);
         registerFactory("UndoHistory",         &create<UndoHistory,          FloatingBehavior>);
@@ -156,7 +156,7 @@ DialogManager::DialogManager() {
         registerFactory("SvgFontsDialog",      &create<SvgFontsDialog,       DockBehavior>);
 #endif
         registerFactory("Swatches",            &create<SwatchesPanel,        DockBehavior>);
-        registerFactory("TileDialog",          &create<TileDialog,           DockBehavior>);
+        registerFactory("TileDialog",          &create<ArrangeDialog,           DockBehavior>);
         registerFactory("Trace",               &create<TraceDialog,          DockBehavior>);
         registerFactory("Transformation",      &create<Transformation,       DockBehavior>);
         registerFactory("UndoHistory",         &create<UndoHistory,          DockBehavior>);
-- 
cgit v1.2.3


From 13a67ac44b1120308c2fc607715ddf0cf3d516e9 Mon Sep 17 00:00:00 2001
From: Denis Declara <declara91@gmail.com>
Date: Mon, 2 Apr 2012 12:08:22 +0200
Subject: Anchor widget now reads the last alignment from the settings. Anchor
 selection widget is also smaller now.

(bzr r11073.1.10)
---
 src/ui/dialog/dialog-manager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/dialog/dialog-manager.cpp')

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>);
-- 
cgit v1.2.3


From 3c85270dc7bfe702a7b88dfc0361ef1ac31376f2 Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Thu, 27 Mar 2014 15:22:24 -0400
Subject: Get pollar tiling working agains with trunk

(bzr r11073.1.37)
---
 src/ui/dialog/dialog-manager.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/ui/dialog/dialog-manager.cpp')

diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index 32ceb397a..47e1fdd30 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -150,12 +150,8 @@ DialogManager::DialogManager() {
 //        registerFactory("PrintColorsPreviewDialog",      &create<PrintColorsPreviewDialog,       DockBehavior>);
         registerFactory("SvgFontsDialog",      &create<SvgFontsDialog,       DockBehavior>);
         registerFactory("Swatches",            &create<SwatchesPanel,        DockBehavior>);
-<<<<<<< TREE
-        registerFactory("TileDialog",          &create<ArrangeDialog,           DockBehavior>);
-=======
+        registerFactory("TileDialog",          &create<ArrangeDialog,        DockBehavior>);
         registerFactory("Symbols",             &create<SymbolsDialog,        DockBehavior>);
-        registerFactory("TileDialog",          &create<TileDialog,           DockBehavior>);
->>>>>>> MERGE-SOURCE
         registerFactory("Trace",               &create<TraceDialog,          DockBehavior>);
         registerFactory("PixelArt",            &create<PixelArtDialog,       DockBehavior>);
         registerFactory("Transformation",      &create<Transformation,       DockBehavior>);
-- 
cgit v1.2.3