aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/init.in2
-rw-r--r--doc/asciidoc/fluxbox.12
-rw-r--r--doc/asciidoc/fluxbox.txt2
-rw-r--r--doc/fluxbox.1.in2
-rw-r--r--nls/C/Translation.m3
-rw-r--r--nls/en_GB/Translation.m3
-rw-r--r--nls/en_GB/generated-ISO-8859-1.m3
-rw-r--r--nls/en_GB/generated-UTF-8.m3
-rw-r--r--nls/en_US/Translation.m3
-rw-r--r--nls/en_US/generated-ISO-8859-1.m3
-rw-r--r--nls/en_US/generated-UTF-8.m3
-rw-r--r--nls/fluxbox-nls.hh3
-rw-r--r--src/IconbarTool.cc12
13 files changed, 32 insertions, 12 deletions
diff --git a/data/init.in b/data/init.in
index ef83d41..aea9dac 100644
--- a/data/init.in
+++ b/data/init.in
@@ -11,7 +11,7 @@ session.screen0.strftimeFormat: %k:%M
11session.screen0.focusNewWindows: True 11session.screen0.focusNewWindows: True
12session.screen0.focusModel: ClickToFocus 12session.screen0.focusModel: ClickToFocus
13session.screen0.fullMaximization: False 13session.screen0.fullMaximization: False
14session.screen0.edgeSnapThreshold: 0 14session.screen0.edgeSnapThreshold: 10
15session.screen0.rowPlacementDirection: LeftToRight 15session.screen0.rowPlacementDirection: LeftToRight
16session.screen0.workspaces: 4 16session.screen0.workspaces: 4
17session.screen0.colPlacementDirection: TopToBottom 17session.screen0.colPlacementDirection: TopToBottom
diff --git a/doc/asciidoc/fluxbox.1 b/doc/asciidoc/fluxbox.1
index d9337c6..a5d394f 100644
--- a/doc/asciidoc/fluxbox.1
+++ b/doc/asciidoc/fluxbox.1
@@ -985,7 +985,7 @@ session\.screen0\.edgeSnapThreshold: <integer>
985 When moving a window across your screen, fluxbox is able to have it `snap\' 985 When moving a window across your screen, fluxbox is able to have it `snap\'
986 to the edges of the screen and other windows for easy placement\. This 986 to the edges of the screen and other windows for easy placement\. This
987 variable tells fluxbox the distance (in pixels) at which the window will 987 variable tells fluxbox the distance (in pixels) at which the window will
988 jump to the edge\. Default: 0 988 jump to the edge\. Default: 10
989 989
990session\.screen0\.windowPlacement: <placement strategy> 990session\.screen0\.windowPlacement: <placement strategy>
991 This resource specifies where to place new windows when not otherwise 991 This resource specifies where to place new windows when not otherwise
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index 60e4006..4c41474 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -906,7 +906,7 @@ session.screen0.edgeSnapThreshold: <integer>
906 When moving a window across your screen, fluxbox is able to have it `snap' 906 When moving a window across your screen, fluxbox is able to have it `snap'
907 to the edges of the screen and other windows for easy placement. This 907 to the edges of the screen and other windows for easy placement. This
908 variable tells fluxbox the distance (in pixels) at which the window will 908 variable tells fluxbox the distance (in pixels) at which the window will
909 jump to the edge. Default: 0 909 jump to the edge. Default: 10
910 910
911session.screen0.windowPlacement: <placement strategy> 911session.screen0.windowPlacement: <placement strategy>
912 This resource specifies where to place new windows when not otherwise 912 This resource specifies where to place new windows when not otherwise
diff --git a/doc/fluxbox.1.in b/doc/fluxbox.1.in
index d9337c6..a5d394f 100644
--- a/doc/fluxbox.1.in
+++ b/doc/fluxbox.1.in
@@ -985,7 +985,7 @@ session\.screen0\.edgeSnapThreshold: <integer>
985 When moving a window across your screen, fluxbox is able to have it `snap\' 985 When moving a window across your screen, fluxbox is able to have it `snap\'
986 to the edges of the screen and other windows for easy placement\. This 986 to the edges of the screen and other windows for easy placement\. This
987 variable tells fluxbox the distance (in pixels) at which the window will 987 variable tells fluxbox the distance (in pixels) at which the window will
988 jump to the edge\. Default: 0 988 jump to the edge\. Default: 10
989 989
990session\.screen0\.windowPlacement: <placement strategy> 990session\.screen0\.windowPlacement: <placement strategy>
991 This resource specifies where to place new windows when not otherwise 991 This resource specifies where to place new windows when not otherwise
diff --git a/nls/C/Translation.m b/nls/C/Translation.m
index df07dcd..e7d9422 100644
--- a/nls/C/Translation.m
+++ b/nls/C/Translation.m
@@ -19,6 +19,9 @@ $set 1 #Align
1915 Top Left 1915 Top Left
2016 Top Right 2016 Top Right
2117 Vertical 2117 Vertical
2218 Center
2319 Top
2420 Bottom
22 25
23$set 2 #BaseDisplay 26$set 2 #BaseDisplay
24 27
diff --git a/nls/en_GB/Translation.m b/nls/en_GB/Translation.m
index df07dcd..e7d9422 100644
--- a/nls/en_GB/Translation.m
+++ b/nls/en_GB/Translation.m
@@ -19,6 +19,9 @@ $set 1 #Align
1915 Top Left 1915 Top Left
2016 Top Right 2016 Top Right
2117 Vertical 2117 Vertical
2218 Center
2319 Top
2420 Bottom
22 25
23$set 2 #BaseDisplay 26$set 2 #BaseDisplay
24 27
diff --git a/nls/en_GB/generated-ISO-8859-1.m b/nls/en_GB/generated-ISO-8859-1.m
index df07dcd..e7d9422 100644
--- a/nls/en_GB/generated-ISO-8859-1.m
+++ b/nls/en_GB/generated-ISO-8859-1.m
@@ -19,6 +19,9 @@ $set 1 #Align
1915 Top Left 1915 Top Left
2016 Top Right 2016 Top Right
2117 Vertical 2117 Vertical
2218 Center
2319 Top
2420 Bottom
22 25
23$set 2 #BaseDisplay 26$set 2 #BaseDisplay
24 27
diff --git a/nls/en_GB/generated-UTF-8.m b/nls/en_GB/generated-UTF-8.m
index f15bc9a..80b71ce 100644
--- a/nls/en_GB/generated-UTF-8.m
+++ b/nls/en_GB/generated-UTF-8.m
@@ -19,6 +19,9 @@ $set 1 #Align
1915 Top Left 1915 Top Left
2016 Top Right 2016 Top Right
2117 Vertical 2117 Vertical
2218 Center
2319 Top
2420 Bottom
22 25
23$set 2 #BaseDisplay 26$set 2 #BaseDisplay
24 27
diff --git a/nls/en_US/Translation.m b/nls/en_US/Translation.m
index df07dcd..e7d9422 100644
--- a/nls/en_US/Translation.m
+++ b/nls/en_US/Translation.m
@@ -19,6 +19,9 @@ $set 1 #Align
1915 Top Left 1915 Top Left
2016 Top Right 2016 Top Right
2117 Vertical 2117 Vertical
2218 Center
2319 Top
2420 Bottom
22 25
23$set 2 #BaseDisplay 26$set 2 #BaseDisplay
24 27
diff --git a/nls/en_US/generated-ISO-8859-1.m b/nls/en_US/generated-ISO-8859-1.m
index df07dcd..e7d9422 100644
--- a/nls/en_US/generated-ISO-8859-1.m
+++ b/nls/en_US/generated-ISO-8859-1.m
@@ -19,6 +19,9 @@ $set 1 #Align
1915 Top Left 1915 Top Left
2016 Top Right 2016 Top Right
2117 Vertical 2117 Vertical
2218 Center
2319 Top
2420 Bottom
22 25
23$set 2 #BaseDisplay 26$set 2 #BaseDisplay
24 27
diff --git a/nls/en_US/generated-UTF-8.m b/nls/en_US/generated-UTF-8.m
index f15bc9a..80b71ce 100644
--- a/nls/en_US/generated-UTF-8.m
+++ b/nls/en_US/generated-UTF-8.m
@@ -19,6 +19,9 @@ $set 1 #Align
1915 Top Left 1915 Top Left
2016 Top Right 2016 Top Right
2117 Vertical 2117 Vertical
2218 Center
2319 Top
2420 Bottom
22 25
23$set 2 #BaseDisplay 26$set 2 #BaseDisplay
24 27
diff --git a/nls/fluxbox-nls.hh b/nls/fluxbox-nls.hh
index 0f3ad18..a304995 100644
--- a/nls/fluxbox-nls.hh
+++ b/nls/fluxbox-nls.hh
@@ -24,6 +24,9 @@ enum {
24 AlignTopLeft = 15, 24 AlignTopLeft = 15,
25 AlignTopRight = 16, 25 AlignTopRight = 16,
26 AlignVertical = 17, 26 AlignVertical = 17,
27 AlignCenter = 18,
28 AlignTop = 19,
29 AlignBottom = 20,
27 30
28 BaseDisplaySet = 2, 31 BaseDisplaySet = 2,
29 BaseDisplayAborting = 1, 32 BaseDisplayAborting = 1,
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index f2ed082..f352237 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -72,15 +72,11 @@ void FbTk::Resource<FbTk::Container::Alignment>::setDefaultValue() {
72 72
73template<> 73template<>
74string FbTk::Resource<FbTk::Container::Alignment>::getString() const { 74string FbTk::Resource<FbTk::Container::Alignment>::getString() const {
75 switch (m_value) { 75 if (m_value == FbTk::Container::LEFT)
76 case FbTk::Container::LEFT:
77 return string("Left"); 76 return string("Left");
78 case FbTk::Container::RIGHT: 77 if (m_value == FbTk::Container::RIGHT)
79 return string("Right"); 78 return string("Right");
80 case FbTk::Container::RELATIVE: 79 return string("Relative");
81 return string("Relative");
82 }
83 return string("Left");
84} 80}
85 81
86template<> 82template<>
@@ -261,7 +257,7 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent,
261 m_mode("none"), 257 m_mode("none"),
262 m_rc_mode(screen.resourceManager(), "{static groups} (workspace)", 258 m_rc_mode(screen.resourceManager(), "{static groups} (workspace)",
263 screen.name() + ".iconbar.mode", screen.altName() + ".Iconbar.Mode"), 259 screen.name() + ".iconbar.mode", screen.altName() + ".Iconbar.Mode"),
264 m_rc_alignment(screen.resourceManager(), FbTk::Container::LEFT, 260 m_rc_alignment(screen.resourceManager(), FbTk::Container::RELATIVE,
265 screen.name() + ".iconbar.alignment", screen.altName() + ".Iconbar.Alignment"), 261 screen.name() + ".iconbar.alignment", screen.altName() + ".Iconbar.Alignment"),
266 m_rc_client_width(screen.resourceManager(), 70, 262 m_rc_client_width(screen.resourceManager(), 70,
267 screen.name() + ".iconbar.iconWidth", screen.altName() + ".Iconbar.IconWidth"), 263 screen.name() + ".iconbar.iconWidth", screen.altName() + ".Iconbar.IconWidth"),