aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/asciidoc/fluxbox.txt4
-rw-r--r--doc/fluxbox.1.in14
-rw-r--r--src/IconbarTool.cc2
-rw-r--r--src/Toolbar.cc2
4 files changed, 11 insertions, 11 deletions
diff --git a/doc/asciidoc/fluxbox.txt b/doc/asciidoc/fluxbox.txt
index 1bb9123..824f7b6 100644
--- a/doc/asciidoc/fluxbox.txt
+++ b/doc/asciidoc/fluxbox.txt
@@ -733,7 +733,7 @@ session.screen0.toolbar.visible: <boolean>
733 733
734session.screen0.toolbar.widthPercent: <integer> 734session.screen0.toolbar.widthPercent: <integer>
735 This resource sets the width percentage of the toolbar on the screen. 735 This resource sets the width percentage of the toolbar on the screen.
736 Default: 65 736 Default: 100
737 737
738session.screen0.toolbar.tools: <tools> 738session.screen0.toolbar.tools: <tools>
739 This resource specifies the tools plugged into the toolbar. Read the 739 This resource specifies the tools plugged into the toolbar. Read the
@@ -778,7 +778,7 @@ session.screen0.iconbar.alignment: <position>
778 778
779session.screen0.iconbar.iconWidth: <integer> 779session.screen0.iconbar.iconWidth: <integer>
780 Used to specify the iconbar button width for Left/Right alignment. 780 Used to specify the iconbar button width for Left/Right alignment.
781 Default: 70 781 Default: 128
782 782
783session.screen0.strftimeFormat: <date> 783session.screen0.strftimeFormat: <date>
784 This adjusts the way the current time is displayed in the toolbar. The 784 This adjusts the way the current time is displayed in the toolbar. The
diff --git a/doc/fluxbox.1.in b/doc/fluxbox.1.in
index 11cea60..cb5f215 100644
--- a/doc/fluxbox.1.in
+++ b/doc/fluxbox.1.in
@@ -1,12 +1,12 @@
1.\" Title: fluxbox 1.\" Title: fluxbox
2.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] 2.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
3.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/> 3.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
4.\" Date: 10/12/2008 4.\" Date: 10/18/2008
5.\" Manual: [FIXME: manual] 5.\" Manual: [FIXME: manual]
6.\" Source: [FIXME: source] 6.\" Source: [FIXME: source]
7.\" Language: English 7.\" Language: English
8.\" 8.\"
9.TH "FLUXBOX" "1" "10/12/2008" "[FIXME: source]" "[FIXME: manual]" 9.TH "FLUXBOX" "1" "10/18/2008" "[FIXME: source]" "[FIXME: manual]"
10.\" ----------------------------------------------------------------- 10.\" -----------------------------------------------------------------
11.\" * (re)Define some macros 11.\" * (re)Define some macros
12.\" ----------------------------------------------------------------- 12.\" -----------------------------------------------------------------
@@ -1673,7 +1673,7 @@ session\&.screen0\&.toolbar\&.visible: <boolean>
1673 1673
1674session\&.screen0\&.toolbar\&.widthPercent: <integer> 1674session\&.screen0\&.toolbar\&.widthPercent: <integer>
1675 This resource sets the width percentage of the toolbar on the screen\&. 1675 This resource sets the width percentage of the toolbar on the screen\&.
1676 Default: 65 1676 Default: 100
1677 1677
1678session\&.screen0\&.toolbar\&.tools: <tools> 1678session\&.screen0\&.toolbar\&.tools: <tools>
1679 This resource specifies the tools plugged into the toolbar\&. Read the 1679 This resource specifies the tools plugged into the toolbar\&. Read the
@@ -1718,7 +1718,7 @@ session\&.screen0\&.iconbar\&.alignment: <position>
1718 1718
1719session\&.screen0\&.iconbar\&.iconWidth: <integer> 1719session\&.screen0\&.iconbar\&.iconWidth: <integer>
1720 Used to specify the iconbar button width for Left/Right alignment\&. 1720 Used to specify the iconbar button width for Left/Right alignment\&.
1721 Default: 70 1721 Default: 128
1722 1722
1723session\&.screen0\&.strftimeFormat: <date> 1723session\&.screen0\&.strftimeFormat: <date>
1724 This adjusts the way the current time is displayed in the toolbar\&. The 1724 This adjusts the way the current time is displayed in the toolbar\&. The
@@ -2731,9 +2731,9 @@ fluxbox is written and maintained by Henrik Kinnunen <fluxgen at fluxbox org>, S
2731.sp 2731.sp
2732Blackbox was written and maintained by Brad Hughes <blackbox at alug org> and Jeff Raven <jraven at psu edu>\&. 2732Blackbox was written and maintained by Brad Hughes <blackbox at alug org> and Jeff Raven <jraven at psu edu>\&.
2733.sp 2733.sp
2734The Official fluxbox website: http://www\&.fluxbox\&.org 2734The Official fluxbox website: \m[blue]\fBhttp://www\&.fluxbox\&.org\fR\m[]
2735.sp 2735.sp
2736Many compatible themes: \- http://boxwhore\&.org \- http://themes\&.freshmeat\&.net/ 2736Many compatible themes: \- \m[blue]\fBhttp://boxwhore\&.org\fR\m[] \- \m[blue]\fBhttp://themes\&.freshmeat\&.net/\fR\m[]
2737.sp 2737.sp
2738This manpage is the combined work of: 2738This manpage is the combined work of:
2739.sp 2739.sp
@@ -2804,7 +2804,7 @@ Numerous other languages could be available if someone jumps in\&.
2804.RE 2804.RE
2805.SH "BUGS" 2805.SH "BUGS"
2806.sp 2806.sp
2807If you find any bugs, please visit the #fluxbox irc channel on irc\&.freenode\&.net or submit them to the bug tracker at http://sf\&.net/projects/fluxbox \&. Or you may subscribe to one of the mailinglists\&. More information can be found on the official website\&. 2807If you find any bugs, please visit the #fluxbox irc channel on irc\&.freenode\&.net or submit them to the bug tracker at \m[blue]\fBhttp://sf\&.net/projects/fluxbox\fR\m[] \&. Or you may subscribe to one of the mailinglists\&. More information can be found on the official website\&.
2808.SH "SEE ALSO" 2808.SH "SEE ALSO"
2809.sp 2809.sp
2810fluxbox\-keys(5) bsetroot(1) fbsetbg(1) fbrun(1) fluxstyle(1) 2810fluxbox\-keys(5) bsetroot(1) fbsetbg(1) fbrun(1) fluxstyle(1)
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc
index 6678d1d..03cadec 100644
--- a/src/IconbarTool.cc
+++ b/src/IconbarTool.cc
@@ -260,7 +260,7 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme,
260 screen.name() + ".iconbar.mode", screen.altName() + ".Iconbar.Mode"), 260 screen.name() + ".iconbar.mode", screen.altName() + ".Iconbar.Mode"),
261 m_rc_alignment(screen.resourceManager(), FbTk::Container::RELATIVE, 261 m_rc_alignment(screen.resourceManager(), FbTk::Container::RELATIVE,
262 screen.name() + ".iconbar.alignment", screen.altName() + ".Iconbar.Alignment"), 262 screen.name() + ".iconbar.alignment", screen.altName() + ".Iconbar.Alignment"),
263 m_rc_client_width(screen.resourceManager(), 70, 263 m_rc_client_width(screen.resourceManager(), 128,
264 screen.name() + ".iconbar.iconWidth", screen.altName() + ".Iconbar.IconWidth"), 264 screen.name() + ".iconbar.iconWidth", screen.altName() + ".Iconbar.IconWidth"),
265 m_rc_client_padding(screen.resourceManager(), 10, 265 m_rc_client_padding(screen.resourceManager(), 10,
266 screen.name() + ".iconbar.iconTextPadding", screen.altName() + ".Iconbar.IconTextPadding"), 266 screen.name() + ".iconbar.iconTextPadding", screen.altName() + ".Iconbar.IconTextPadding"),
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index f23e124..96d2701 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -232,7 +232,7 @@ Toolbar::Toolbar(BScreen &scrn, FbTk::XLayer &layer, size_t width):
232 m_rc_maximize_over(scrn.resourceManager(), false, 232 m_rc_maximize_over(scrn.resourceManager(), false,
233 scrn.name() + ".toolbar.maxOver", scrn.altName() + ".Toolbar.MaxOver"), 233 scrn.name() + ".toolbar.maxOver", scrn.altName() + ".Toolbar.MaxOver"),
234 m_rc_visible(scrn.resourceManager(), true, scrn.name() + ".toolbar.visible", scrn.altName() + ".Toolbar.Visible"), 234 m_rc_visible(scrn.resourceManager(), true, scrn.name() + ".toolbar.visible", scrn.altName() + ".Toolbar.Visible"),
235 m_rc_width_percent(scrn.resourceManager(), 66, 235 m_rc_width_percent(scrn.resourceManager(), 100,
236 scrn.name() + ".toolbar.widthPercent", scrn.altName() + ".Toolbar.WidthPercent"), 236 scrn.name() + ".toolbar.widthPercent", scrn.altName() + ".Toolbar.WidthPercent"),
237 m_rc_alpha(scrn.resourceManager(), 255, 237 m_rc_alpha(scrn.resourceManager(), 255,
238 scrn.name() + ".toolbar.alpha", scrn.altName() + ".Toolbar.Alpha"), 238 scrn.name() + ".toolbar.alpha", scrn.altName() + ".Toolbar.Alpha"),