From 1fe9ef3056e80dfed05bbb1b00443c11a64223c1 Mon Sep 17 00:00:00 2001 From: mathias Date: Tue, 12 Jul 2005 04:56:05 +0000 Subject: [PATCH] Renaming of 'bsetroot' to 'fbsetroot' (Mathias) blackbox's 'bsetroot' and fluxbox's 'bsetroot' have different syntax nowadays and collide when you install fluxbox and blackbox. hence the renaming. --- ChangeLog | 10 +++++++- doc/Makefile.am | 4 ++-- doc/{bsetroot.1 => fbsetroot.1} | 37 ++++++++++++------------------ nls/C/Translation.m | 2 +- nls/be_BY/Translation.m | 2 +- nls/bg_BG/Translation.m | 2 +- nls/cs_CZ/Translation.m | 2 +- nls/da_DK/Translation.m | 2 +- nls/de_DE/Translation.m | 2 +- nls/es_ES/Translation.m | 2 +- nls/et_EE/Translation.m | 2 +- nls/fluxbox-nls.hh | 8 +++---- nls/fr_FR/Translation.m | 2 +- nls/it_IT/Translation.m | 2 +- nls/ja_JP/Translation.m | 2 +- nls/ko_KR/Translation.m | 2 +- nls/lv_LV/Translation.m | 2 +- nls/nl_NL/Translation.m | 2 +- nls/pl_PL/Translation.m | 2 +- nls/pt_BR/Translation.m | 2 +- nls/pt_PT/Translation.m | 2 +- nls/ru_RU/Translation.m | 2 +- nls/sl_SI/Translation.m | 2 +- nls/sv_SE/Translation.m | 2 +- nls/tr_TR/Translation.m | 2 +- nls/vi_VN/Translation.m | 2 +- util/Makefile.am | 8 +++---- util/fbsetbg | 14 +++++------ util/{bsetroot.cc => fbsetroot.cc} | 28 +++++++++++----------- util/{bsetroot.hh => fbsetroot.hh} | 12 +++++----- util/startfluxbox.in | 2 +- 31 files changed, 84 insertions(+), 83 deletions(-) rename doc/{bsetroot.1 => fbsetroot.1} (78%) rename util/{bsetroot.cc => fbsetroot.cc} (94%) rename util/{bsetroot.hh => fbsetroot.hh} (89%) diff --git a/ChangeLog b/ChangeLog index 9278b389..7fbc1f37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ (Format: Year/Month/Day) Changes for 0.9.14: -*05/07/07: +*05/07/12: + Renaming of 'bsetroot' to 'fbsetroot' (Mathias) + blackbox's 'bsetroot' and fluxbox's 'bsetroot' have different syntax + nowadays and collide when you install fluxbox and blackbox. hence + the renaming + updated manpage, helper utils (fbgm, startfluxbox, fbsetbg), nls etc +*05/07/06: + Added even more applications to fbgm (Mathias) + fluxbox-generate_menu.in * Added info about locale path in -info argument (Thanks php-coder) src/main.cc, nls/* *05/07/05: diff --git a/doc/Makefile.am b/doc/Makefile.am index 13d3c3b7..7568c188 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -4,9 +4,9 @@ SUBDIRS = ru CLEANFILES = fluxbox.1 fluxstyle.1 MAINTAINERCLEANFILES = Makefile.in -man_MANS = fluxbox.1 bsetroot.1 fbrun.1 fbsetbg.1 \ +man_MANS = fluxbox.1 fbsetroot.1 fbrun.1 fbsetbg.1 \ startfluxbox.1 fluxstyle.1 fbrun.1 -EXTRA_DIST=fluxbox.1.in bsetroot.1 fbrun.1 startfluxbox.1 fbsetbg.1 \ +EXTRA_DIST=fluxbox.1.in fbsetroot.1 fbrun.1 startfluxbox.1 fbsetbg.1 \ fluxstyle.1.in Coding_style distclean-local: rm -f *\~ diff --git a/doc/bsetroot.1 b/doc/fbsetroot.1 similarity index 78% rename from doc/bsetroot.1 rename to doc/fbsetroot.1 index 9d4bd079..ec8c0884 100644 --- a/doc/bsetroot.1 +++ b/doc/fbsetroot.1 @@ -1,5 +1,5 @@ .\" -.\" Man page for Bsetroot +.\" Man page for fbsetroot .\" .\" Copyright (c) 2000 by Wilbert Berendsen .\" Copyright (c) 2004 by Curt "Asenchi" Micol @@ -19,36 +19,35 @@ .\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR .\" PERFORMANCE OF THIS DOCUMENTATION .\" -.TH bsetroot 1 "June 25th, 2004" "0.60.3" +.TH fbsetroot 1 "July 8th, 2005" "0.9.13" .SH NAME -bsetroot \- a simple background utility used by the Fluxbox window manager, ori -ginally written -for and by the original Blackbox window manager team. +fbsetroot \- a simple background utility used by the Fluxbox window manager, originally +written for and by the original Blackbox window manager team. .SH SYNOPSIS -.BR bsetroot " \-help" +.BR fbsetroot " \-help" .br -.B bsetroot +.B fbsetroot .RI "[ \-display " display " ] \-solid " color .br -.B bsetroot +.B fbsetroot .RI "[ \-display " display " ] \-mod " "x y" " \-fg " color " \-bg " color .br -.B bsetroot +.B fbsetroot .RI "[ \-display " display " ] \-gradient " texture " \-from " color " \-to " color .SH DESCRIPTION -Bsetroot is a utility that can control the appearance of the root window in +fbsetroot is a utility that can control the appearance of the root window in three ways: Either give it a solid color, or write a two color modula pattern to it, or render a gradient texture, based on two different colors. .PP -Bsetroot resembles +fbsetroot resembles .IR xsetroot (1) in this functionality but it supports multiple screen displays, and gradient textures the same way as Blackbox or Fluxbox does. It doesn't handle cursors etc. -Bsetroot was originally part of the Blackbox package and was carried over with -the code that became Fluxbox. +fbsetroot was originally part of the Blackbox package and was carried over with +the code that became Fluxbox. It was called bsetroot back in those days. .SH OPTIONS -Bsetroot operates in three ways, you must choose one of the first 3 options: +fbsetroot operates in three ways, you must choose one of the first 3 options: .TP .BI \-solid " color" Sets the root window to specified color. @@ -75,7 +74,7 @@ color. .RE .TP .BI \-display " display" -Tells Bsetroot to connect to the specified display. +Tells fbsetroot to connect to the specified display. .TP .BI "\-bg, \-background " color Background color. @@ -104,13 +103,7 @@ operation mode. .B \-help Prints version info and short help text. .SH AUTHOR -Bsetroot is written and maintained by Brad Hughes -.nh \" hyphenation off -(blackbox@alug.org) -.hy \" on again -and Jeff Raven -.nh -(jraven@psu.edu). +fbsetroot is written and maintained by the Fluxbox Development Team .PP This manpage was modified by Curt "Asenchi" Micol for the Fluxbox window manager. diff --git a/nls/C/Translation.m b/nls/C/Translation.m index 620b6443..ebd8847f 100644 --- a/nls/C/Translation.m +++ b/nls/C/Translation.m @@ -213,7 +213,7 @@ $set 17 #Workspace 3 New Workspace 4 Remove Last -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: error: must specify one of: -solid, -mod, -gradient\n 2 Couldn't create pixmap atoms, giving up! diff --git a/nls/be_BY/Translation.m b/nls/be_BY/Translation.m index 1c3993dd..3c2c771b 100644 --- a/nls/be_BY/Translation.m +++ b/nls/be_BY/Translation.m @@ -211,7 +211,7 @@ $set 17 #Workspace 3 Íîâàå ïðàöî¢íàå ìåñöà 4 Âûäàë³öü àïîøíÿå -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: ïàìûëêà: ïàâ³ííà áûöü íåøòà ç íàñòóïíàãà: -solid, -mod, -gradient\n 2 Couldn't create pixmap atoms, giving up! diff --git a/nls/bg_BG/Translation.m b/nls/bg_BG/Translation.m index 73976535..a82f35ea 100644 --- a/nls/bg_BG/Translation.m +++ b/nls/bg_BG/Translation.m @@ -104,7 +104,7 @@ $set 17 #Workspace 3 Íîâî Ðàáîòíî Ìÿñòî 4 Ìàõíè Ïîñëåäíîòî -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: error: must specify one of: -solid, -mod, -gradient\n 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ diff --git a/nls/cs_CZ/Translation.m b/nls/cs_CZ/Translation.m index ef8eb6b2..20ab7106 100644 --- a/nls/cs_CZ/Translation.m +++ b/nls/cs_CZ/Translation.m @@ -210,7 +210,7 @@ $set 17 #Workspace 3 Nová plocha 4 Odstranit poslední -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: error: must specify one of: -solid, -mod, -gradient\n 2 Couldn't create pixmap atoms, giving up! diff --git a/nls/da_DK/Translation.m b/nls/da_DK/Translation.m index da986719..0e555d58 100644 --- a/nls/da_DK/Translation.m +++ b/nls/da_DK/Translation.m @@ -104,7 +104,7 @@ $set 17 #Workspace 3 Nyt skrivebord 4 Fjern sidste -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: fejl: specificér en af følgende: -solid, -mod, -gradient\n 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ diff --git a/nls/de_DE/Translation.m b/nls/de_DE/Translation.m index 6c28c4df..8036e97f 100644 --- a/nls/de_DE/Translation.m +++ b/nls/de_DE/Translation.m @@ -206,7 +206,7 @@ $set 17 #Workspace 3 Neuer Desktop 4 Letzten Desktop entfernen -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: error: must specify one of: -solid, -mod, -gradient\n 2 Couldn't create pixmap atoms, giving up! diff --git a/nls/es_ES/Translation.m b/nls/es_ES/Translation.m index 6008ef78..11489c61 100644 --- a/nls/es_ES/Translation.m +++ b/nls/es_ES/Translation.m @@ -104,7 +104,7 @@ $set 17 #Workspace 3 Escritorio nuevo 4 Quitar el último escritorio -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: error: es necesario especifiar uno de: -solid, -mod, -gradient\n 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ diff --git a/nls/et_EE/Translation.m b/nls/et_EE/Translation.m index e36a6815..023ed30f 100644 --- a/nls/et_EE/Translation.m +++ b/nls/et_EE/Translation.m @@ -102,7 +102,7 @@ $set 17 #Workspace 3 Uus töölaud 4 Eemalda viimane -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: viga: pead määratlema ühe järgnevaist: -solid, -mod, -gradient\n 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ diff --git a/nls/fluxbox-nls.hh b/nls/fluxbox-nls.hh index a6c9079b..26057a90 100644 --- a/nls/fluxbox-nls.hh +++ b/nls/fluxbox-nls.hh @@ -202,10 +202,10 @@ enum { WorkspaceNewWorkspace = 3, WorkspaceRemoveLast = 4, - bsetrootSet = 18, - bsetrootMustSpecify = 1, - bsetrootNoPixmapAtoms = 2, - bsetrootUsage = 3, + fbsetrootSet = 18, + fbsetrootMustSpecify = 1, + fbsetrootNoPixmapAtoms = 2, + fbsetrootUsage = 3, mainSet = 19, mainDISPLAYRequiresArg = 1, diff --git a/nls/fr_FR/Translation.m b/nls/fr_FR/Translation.m index 27c63333..cac5c5b8 100644 --- a/nls/fr_FR/Translation.m +++ b/nls/fr_FR/Translation.m @@ -104,7 +104,7 @@ $set 17 #Workspace 3 Nouveau bureau 4 Supprimer le dernier -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: Erreur: il faut préciser: -solid, -mod, -gradient\n 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ diff --git a/nls/it_IT/Translation.m b/nls/it_IT/Translation.m index 888fe0be..9add2e17 100644 --- a/nls/it_IT/Translation.m +++ b/nls/it_IT/Translation.m @@ -103,7 +103,7 @@ $set 17 #Workspace 3 Crea una nuova 4 Elimina l'ultima -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: errore: specicare una delle opzioni : -solid, -mod, -gradient\n 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ diff --git a/nls/ja_JP/Translation.m b/nls/ja_JP/Translation.m index 9441ba0b..b4e868fd 100644 --- a/nls/ja_JP/Translation.m +++ b/nls/ja_JP/Translation.m @@ -106,7 +106,7 @@ $set 17 #Workspace 3 ¿·µ¬¥ï¡¼¥¯¥¹¥Ú¡¼¥¹ºîÀ® 4 ËöÈø¤Î¥ï¡¼¥¯¥¹¥Ú¡¼¥¹¤òºï½ü -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: error: ¼¡¤ÎÃ椫¤é°ì¤Ä¤òÁªÂò¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó: -solid, -mod, -gradient\n 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ diff --git a/nls/ko_KR/Translation.m b/nls/ko_KR/Translation.m index c74627f6..3bd28073 100644 --- a/nls/ko_KR/Translation.m +++ b/nls/ko_KR/Translation.m @@ -210,7 +210,7 @@ $set 17 #Workspace 3 »õ ÀÛ¾÷°ø°£ Ãß°¡ 4 ¸¶Áö¸· °Í Á¦°Å -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: error: must specify one of: -solid, -mod, -gradient\n 2 Couldn't create pixmap atoms, giving up! diff --git a/nls/lv_LV/Translation.m b/nls/lv_LV/Translation.m index d09f1050..0a4998ee 100644 --- a/nls/lv_LV/Translation.m +++ b/nls/lv_LV/Translation.m @@ -103,7 +103,7 @@ $set 17 #Workspace 3 Jauna Darba vieta 4 Noòemt Pçdçjo -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: kïûda: jânosaka viens no: -solid, -mod, -gradient\n 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ diff --git a/nls/nl_NL/Translation.m b/nls/nl_NL/Translation.m index 3493cbf0..2381c808 100644 --- a/nls/nl_NL/Translation.m +++ b/nls/nl_NL/Translation.m @@ -105,7 +105,7 @@ $set 17 #Workspace 3 Nieuw werkveld 4 Verwijder laatste -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: error: must specify one of: -solid, -mod, -gradient\n 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ diff --git a/nls/pl_PL/Translation.m b/nls/pl_PL/Translation.m index 69c4e893..1c13f3ab 100644 --- a/nls/pl_PL/Translation.m +++ b/nls/pl_PL/Translation.m @@ -217,7 +217,7 @@ $set 17 #Workspace 3 Nowy Pulpit 4 Usuñ Ostatni -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: b³±d: musisz okre¶liæ jedno z: -solid, -mod, -gradient\n 2 Nie mogê stowrzyæ elementów pixmap - dajê sobie spokój! diff --git a/nls/pt_BR/Translation.m b/nls/pt_BR/Translation.m index 4bc31450..1fb44c65 100644 --- a/nls/pt_BR/Translation.m +++ b/nls/pt_BR/Translation.m @@ -104,7 +104,7 @@ $set 17 #Workspace 3 Nova Area de Trabalho 4 Remover Ultima -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: erro: necessario especificar um dos seguintes argumentos: -solid, -mod, -gradient\n 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ diff --git a/nls/pt_PT/Translation.m b/nls/pt_PT/Translation.m index 1aee9a07..162c16bd 100644 --- a/nls/pt_PT/Translation.m +++ b/nls/pt_PT/Translation.m @@ -104,7 +104,7 @@ $set 17 #Workspace 3 Nova Area de Trabalho 4 Remover Ultima Area de Trabalho -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: erro: necessario especificar um dos seguintes argumentos: -solid, -mod, -gradient\n 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ diff --git a/nls/ru_RU/Translation.m b/nls/ru_RU/Translation.m index 454ff3a1..1c4d24e3 100644 --- a/nls/ru_RU/Translation.m +++ b/nls/ru_RU/Translation.m @@ -154,7 +154,7 @@ $set 17 #Workspace 3 îÏ×ÙÊ ÒÁÂÏÞÉÊ ÓÔÏÌ 4 õÄÁÌÉÔØ ÐÏÓÌÅÄÎÉÊ -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: ÏÛÉÂËÁ: ÎÅÏÂÈÏÄÉÍÏ ÚÁÄÁÔØ ÏÄÉÎ ÉÚ ÓÌÅÄÕÀÝÉÈ ËÌÀÞÅÊ: -solid, -mod, -gradient\n 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ diff --git a/nls/sl_SI/Translation.m b/nls/sl_SI/Translation.m index 9b96ec19..3228cc7d 100644 --- a/nls/sl_SI/Translation.m +++ b/nls/sl_SI/Translation.m @@ -105,7 +105,7 @@ $set 17 #Workspace 3 Nova delovna povr¹ina 4 Odstrani zadnjo -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: napaka: doloèiti je treba eno: -solid, -mod, -gradient\n 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ diff --git a/nls/sv_SE/Translation.m b/nls/sv_SE/Translation.m index 87670cfb..2458774d 100644 --- a/nls/sv_SE/Translation.m +++ b/nls/sv_SE/Translation.m @@ -105,7 +105,7 @@ $set 17 #Workspace 3 Nytt skrivbord 4 Ta bort sista -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: fel: måste specifiera en av: -solid, -mod, -gradient\n 3 %s 2.0: (c) 1997-2000 Brad Hughes\n\n\ diff --git a/nls/tr_TR/Translation.m b/nls/tr_TR/Translation.m index 74444c86..af871cca 100644 --- a/nls/tr_TR/Translation.m +++ b/nls/tr_TR/Translation.m @@ -104,7 +104,7 @@ $set 17 #Workspace 3 Yeni Masaüstü 4 Son Masaüstünü Kaldýr -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s : hata : -solid, -mod yada -gradient'den en az birisini belirlemek zorundasýnýz\n 3 %s 2.0 : Telif hakký (c) 1997-2000 Brad Hughes\n\n\ diff --git a/nls/vi_VN/Translation.m b/nls/vi_VN/Translation.m index b538b79c..39e7459f 100644 --- a/nls/vi_VN/Translation.m +++ b/nls/vi_VN/Translation.m @@ -185,7 +185,7 @@ $set 17 #Workspace 3 Không gian má»›i 4 Xóa không gian cuối -$set 18 #bsetroot +$set 18 #fbsetroot 1 %s: lá»—i: cần Ä‘Æ°a ra má»™t trong các từ khóa sau: -solid, -mod, -gradient\n 2 Không thể tạo các pixmap! diff --git a/util/Makefile.am b/util/Makefile.am index 3e45aa65..58a232f5 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -2,9 +2,9 @@ SUBDIRS= fbrun INCLUDES= -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk bin_SCRIPTS= fbsetbg fluxbox-generate_menu startfluxbox -bin_PROGRAMS= bsetroot -bsetroot_SOURCES= bsetroot.cc bsetroot.hh -bsetroot_LDADD= ../src/FbRootWindow.o ../src/FbAtoms.o \ +bin_PROGRAMS= fbsetroot +fbsetroot_SOURCES= fbsetroot.cc fbsetroot.hh +fbsetroot_LDADD=../src/FbRootWindow.o ../src/FbAtoms.o \ ../src/FbTk/libFbTk.a MAINTAINERCLEANFILES= Makefile.in @@ -16,7 +16,7 @@ all-local: startfluxbox clean-local: rm -f startfluxbox fluxbox-generate_menu -bsetroot.o: bsetroot.cc ../config.h $(srcdir)/bsetroot.hh \ +fbsetroot.o: fbsetroot.cc ../config.h $(srcdir)/fbsetroot.hh \ $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh startfluxbox: startfluxbox.in diff --git a/util/fbsetbg b/util/fbsetbg index a75f4612..eaa1f9d6 100644 --- a/util/fbsetbg +++ b/util/fbsetbg @@ -61,7 +61,7 @@ display_usage() { cat << EOF Usage: $command [-u/-U [wallpapersetter]] [-fFcCtTaA /path/to/wallpaper] [-r/-R /path/to/wallpaperdirectory] - [-b/-B bsetrootoptions] [-l] [-h] [-i] [-p] + [-b/-B fbsetrootoptions] [-l] [-h] [-i] [-p] Use \`\`$command -h'' for a complete help message. EOF @@ -80,7 +80,7 @@ Options: ( if your bgsetter doesn't support this we fall back to -f ) -u Use specified wallpapersetter, use no argument to forget. - -b Forward the options to bsetroot. + -b Forward the options to fbsetroot. -r set random wallpaper from a directory -F,-C,-T,-A,-U,-B,-R same as uncapsed but without remembering. @@ -174,7 +174,7 @@ message() { remembercommand() { grep -vs "|${DISPLAY}$" ${lastwallpaper} > ${lastwallpaper}.tmp mv -f ${lastwallpaper}.tmp ${lastwallpaper} - if [ "$option" = bsetroot ]; then + if [ "$option" = fbsetroot ]; then echo $option'|'$wallpaper'|'$DISPLAY >> $lastwallpaper return fi @@ -262,11 +262,11 @@ while [ $# -gt 0 ]; do wallpaper=$2 remember=false break ;; - -b) option=bsetroot + -b) option=fbsetroot shift wallpaper=$* break ;; - -B) option=bsetroot + -B) option=fbsetroot shift wallpaper=$* remember=false @@ -461,8 +461,8 @@ if [ -z "$DISPLAY" ]; then fi -if [ "$option" = bsetroot ]; then - bsetroot $wallpaper +if [ "$option" = fbsetroot ]; then + fbsetroot $wallpaper if [ ! "$remember" = false ]; then remembercommand fi diff --git a/util/bsetroot.cc b/util/fbsetroot.cc similarity index 94% rename from util/bsetroot.cc rename to util/fbsetroot.cc index 56cec1a1..434f150c 100644 --- a/util/bsetroot.cc +++ b/util/fbsetroot.cc @@ -20,7 +20,7 @@ // $Id$ -#include "bsetroot.hh" +#include "fbsetroot.hh" #include "../src/FbTk/I18n.hh" #include "../src/FbTk/ImageControl.hh" @@ -52,7 +52,7 @@ using namespace std; -bsetroot::bsetroot(int argc, char **argv, char *dpy_name) +fbsetroot::fbsetroot(int argc, char **argv, char *dpy_name) : FbTk::App(dpy_name), m_app_name(argv[0]) { pixmaps = (Pixmap *) 0; @@ -121,7 +121,7 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name) if ((mod + sol + grd) != true) { _FB_USES_NLS; cerr< display connection\n" " -mod modula pattern\n" " -foreground, -fg modula foreground color\n" @@ -393,7 +393,7 @@ void bsetroot::usage(int exit_code) { " -to gradient end color\n\n" " -solid solid color\n\n" " -help print this help text and exit\n", - "bsetroot usage options")<