From 2ab539073b115e3e05cab6b95c4ea638bd8d1b6f Mon Sep 17 00:00:00 2001 From: Mark Tiefenbruck Date: Mon, 18 Aug 2008 02:06:46 -0700 Subject: fix some defaults --- data/init.in | 2 +- doc/asciidoc/fluxbox.1 | 2 +- doc/asciidoc/fluxbox.txt | 2 +- doc/fluxbox.1.in | 2 +- nls/C/Translation.m | 3 +++ nls/en_GB/Translation.m | 3 +++ nls/en_GB/generated-ISO-8859-1.m | 3 +++ nls/en_GB/generated-UTF-8.m | 3 +++ nls/en_US/Translation.m | 3 +++ nls/en_US/generated-ISO-8859-1.m | 3 +++ nls/en_US/generated-UTF-8.m | 3 +++ nls/fluxbox-nls.hh | 3 +++ src/IconbarTool.cc | 12 ++++-------- 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 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 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: 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: 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: 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: 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: 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: 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 15 Top Left 16 Top Right 17 Vertical +18 Center +19 Top +20 Bottom $set 2 #BaseDisplay 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 15 Top Left 16 Top Right 17 Vertical +18 Center +19 Top +20 Bottom $set 2 #BaseDisplay 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 15 Top Left 16 Top Right 17 Vertical +18 Center +19 Top +20 Bottom $set 2 #BaseDisplay 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 15 Top Left 16 Top Right 17 Vertical +18 Center +19 Top +20 Bottom $set 2 #BaseDisplay 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 15 Top Left 16 Top Right 17 Vertical +18 Center +19 Top +20 Bottom $set 2 #BaseDisplay 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 15 Top Left 16 Top Right 17 Vertical +18 Center +19 Top +20 Bottom $set 2 #BaseDisplay 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 15 Top Left 16 Top Right 17 Vertical +18 Center +19 Top +20 Bottom $set 2 #BaseDisplay 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 { AlignTopLeft = 15, AlignTopRight = 16, AlignVertical = 17, + AlignCenter = 18, + AlignTop = 19, + AlignBottom = 20, BaseDisplaySet = 2, 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::setDefaultValue() { template<> string FbTk::Resource::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"), -- cgit v0.11.2