fix some defaults

data/init.in

@@ -11,7 +11,7 @@ session.screen0.strftimeFormat:	%k:%M
 session.screen0.focusNewWindows:	True
 session.screen0.focusModel:	ClickToFocus
 session.screen0.fullMaximization:	False
-session.screen0.edgeSnapThreshold:	0
+session.screen0.edgeSnapThreshold:	10
 session.screen0.rowPlacementDirection:	LeftToRight
 session.screen0.workspaces:	4
 session.screen0.colPlacementDirection:	TopToBottom

doc/asciidoc/fluxbox.1

@@ -985,7 +985,7 @@ session\.screen0\.edgeSnapThreshold: <integer>
       When moving a window across your screen, fluxbox is able to have it `snap\'
       to the edges of the screen and other windows for easy placement\. This
       variable tells fluxbox the distance (in pixels) at which the window will
-      jump to the edge\. Default: 0
+      jump to the edge\. Default: 10
 
 session\.screen0\.windowPlacement: <placement strategy>
       This resource specifies where to place new windows when not otherwise

doc/asciidoc/fluxbox.txt

@@ -906,7 +906,7 @@ session.screen0.edgeSnapThreshold: <integer>
       When moving a window across your screen, fluxbox is able to have it `snap'
       to the edges of the screen and other windows for easy placement. This
       variable tells fluxbox the distance (in pixels) at which the window will
-      jump to the edge. Default: 0
+      jump to the edge. Default: 10
 
 session.screen0.windowPlacement: <placement strategy>
       This resource specifies where to place new windows when not otherwise

doc/fluxbox.1.in

@@ -985,7 +985,7 @@ session\.screen0\.edgeSnapThreshold: <integer>
       When moving a window across your screen, fluxbox is able to have it `snap\'
       to the edges of the screen and other windows for easy placement\. This
       variable tells fluxbox the distance (in pixels) at which the window will
-      jump to the edge\. Default: 0
+      jump to the edge\. Default: 10
 
 session\.screen0\.windowPlacement: <placement strategy>
       This resource specifies where to place new windows when not otherwise

nls/C/Translation.m

@@ -19,6 +19,9 @@ $set 1 #Align
 15 Top Left
 16 Top Right
 17 Vertical
+18 Center
+19 Top
+20 Bottom
 
 $set 2 #BaseDisplay
 

nls/en_GB/Translation.m

@@ -19,6 +19,9 @@ $set 1 #Align
 15 Top Left
 16 Top Right
 17 Vertical
+18 Center
+19 Top
+20 Bottom
 
 $set 2 #BaseDisplay
 

nls/en_GB/generated-ISO-8859-1.m

@@ -19,6 +19,9 @@ $set 1 #Align
 15 Top Left
 16 Top Right
 17 Vertical
+18 Center
+19 Top
+20 Bottom
 
 $set 2 #BaseDisplay
 

nls/en_GB/generated-UTF-8.m

@@ -19,6 +19,9 @@ $set 1 #Align
 15 Top Left
 16 Top Right
 17 Vertical
+18 Center
+19 Top
+20 Bottom
 
 $set 2 #BaseDisplay
 

nls/en_US/Translation.m

@@ -19,6 +19,9 @@ $set 1 #Align
 15 Top Left
 16 Top Right
 17 Vertical
+18 Center
+19 Top
+20 Bottom
 
 $set 2 #BaseDisplay
 

nls/en_US/generated-ISO-8859-1.m

@@ -19,6 +19,9 @@ $set 1 #Align
 15 Top Left
 16 Top Right
 17 Vertical
+18 Center
+19 Top
+20 Bottom
 
 $set 2 #BaseDisplay
 

nls/en_US/generated-UTF-8.m

@@ -19,6 +19,9 @@ $set 1 #Align
 15 Top Left
 16 Top Right
 17 Vertical
+18 Center
+19 Top
+20 Bottom
 
 $set 2 #BaseDisplay
 

nls/fluxbox-nls.hh

@@ -24,6 +24,9 @@ enum {
 	AlignTopLeft = 15,
 	AlignTopRight = 16,
 	AlignVertical = 17,
+	AlignCenter = 18,
+	AlignTop = 19,
+	AlignBottom = 20,
 
 	BaseDisplaySet = 2,
 	BaseDisplayAborting = 1,

src/IconbarTool.cc

@@ -72,15 +72,11 @@ void FbTk::Resource<FbTk::Container::Alignment>::setDefaultValue() {
 
 template<>
 string FbTk::Resource<FbTk::Container::Alignment>::getString() const {
-    switch (m_value) {
-    case FbTk::Container::LEFT:
+    if (m_value == FbTk::Container::LEFT)
         return string("Left");
-    case FbTk::Container::RIGHT:
+    if (m_value == FbTk::Container::RIGHT)
         return string("Right");
-    case FbTk::Container::RELATIVE:
-        return string("Relative");
-    }
-    return string("Left");
+    return string("Relative");
 }
 
 template<>
@@ -261,7 +257,7 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent,
     m_mode("none"),
     m_rc_mode(screen.resourceManager(), "{static groups} (workspace)",
               screen.name() + ".iconbar.mode", screen.altName() + ".Iconbar.Mode"),
-    m_rc_alignment(screen.resourceManager(), FbTk::Container::LEFT,
+    m_rc_alignment(screen.resourceManager(), FbTk::Container::RELATIVE,
                    screen.name() + ".iconbar.alignment", screen.altName() + ".Iconbar.Alignment"),
     m_rc_client_width(screen.resourceManager(), 70,
                    screen.name() + ".iconbar.iconWidth", screen.altName() + ".Iconbar.IconWidth"),