afterstep (2.2.9-5) 12_afterstep_configs.patch

Summary

 afterstep/audio.in    |    2 +-
 afterstep/autoexec.in |    4 ++--
 afterstep/database    |    4 +++-
 afterstep/forms       |   29 +++++++++++++++--------------
 afterstep/pager.in    |    2 +-
 afterstep/wharf       |   39 ++++++++++++++++++++++-----------------
 afterstep/winlist     |    4 ++--
 7 files changed, 46 insertions(+), 38 deletions(-)

    
download this patch

Patch contents

Debianise config files.

diff -ruN -x config.guess -x config.sub AfterStep-2.2.9-old/afterstep/audio.in AfterStep-2.2.9/afterstep/audio.in
--- AfterStep-2.2.9-old/afterstep/audio.in	2000-10-20 05:27:58.000000000 +0200
+++ AfterStep-2.2.9/afterstep/audio.in	2009-07-12 12:06:24.000000000 +0200
@@ -12,7 +12,7 @@
 #*AudioPlayCmd                  builtin-stdout
 # see ./configure --with-soundplayer to set your player proggy
 # here only args should go. (completely ommit if no args)
-*AudioPlayCmd                   @AUDIO_PLAY_CMD@
+*AudioPlayCmd                   builtin-cat
 
 *AudioDelay                     1
 *Audio  startup                 meepmeep.au
diff -ruN -x config.guess -x config.sub AfterStep-2.2.9-old/afterstep/autoexec.in AfterStep-2.2.9/afterstep/autoexec.in
--- AfterStep-2.2.9-old/afterstep/autoexec.in	2006-03-09 22:33:06.000000000 +0100
+++ AfterStep-2.2.9/afterstep/autoexec.in	2009-07-12 12:06:24.000000000 +0200
@@ -30,8 +30,8 @@
 	Module  "I"     Wharf
 	Wait    "I"     Wharf
 	Module  "I"     Pager 0 @with_desktops_1@
-	Module  "I:WinTabs:TermTabs"  WinTabs --myname TermTabs --pattern "*term*" --exclude-pattern "mc*" --geometry +5+100 --title "term tabs"
-	Wait    "I:WinTabs:TermTabs"  TermTabs
+	Module  "I"     WinTabs --myname TermTabs --pattern "*term*" --exclude-pattern "mc*" --exclude-pattern "Ice*" --geometry +5+100 --title "term tabs"
+	Wait    "I"     WinTabs
 EndFunction
 
 Function "InitFunction"
diff -ruN -x config.guess -x config.sub AfterStep-2.2.9-old/afterstep/database AfterStep-2.2.9/afterstep/database
--- AfterStep-2.2.9-old/afterstep/database	2007-07-22 04:29:55.000000000 +0200
+++ AfterStep-2.2.9/afterstep/database	2009-07-12 12:09:54.000000000 +0200
@@ -35,7 +35,7 @@
 Style 	"*WharfSubfolder*"       AllowCover
 Style 	"AskWharf"      Handles
 Style   "Banner"        NoTitle, Sticky, Layer 2, WindowListSkip, NoHandles
-Style   "WinTabs"       Title, Layer 0, Slippery, Handles, AllowCover 
+Style   "WinTabs"       Title, Layer 0, Slippery, Handles, AllowCover, WindowListHit
 
 Style   "NEdit"         Title, Slippery, Layer 0, Handles, AllowCover 
 
@@ -74,6 +74,8 @@
 # , StartsOnDesk 1
 Style	"Netscape"		Icon netscape.xpm, IgnoreConfig	
 # , StartsOnDesk 1
+Style	"Iceape-bin"		IgnoreConfig
+Style	"Iceweasel"		IgnoreConfig
 
 # Email apps
 #Style	"Thunderbird-bin"	StartsOnDesk 2
diff -ruN -x config.guess -x config.sub AfterStep-2.2.9-old/afterstep/forms AfterStep-2.2.9/afterstep/forms
--- AfterStep-2.2.9-old/afterstep/forms	2000-10-20 05:27:57.000000000 +0200
+++ AfterStep-2.2.9/afterstep/forms	2009-07-12 12:06:25.000000000 +0200
@@ -17,7 +17,7 @@
 *QuitFormButton   quit      "Logout"  ^M
 *QuitFormCommand  Quit
 *QuitFormButton   quit      "Cancel"  ^[
-*QuitFormCommand  Nop
+*QuitFormCommand  Nop	""
 
 
 # FTP
@@ -40,10 +40,10 @@
 *FTPFormInput           CustomTarget    20      ""
 *FTPFormLine            expand
 *FTPFormButton          quit            "Go"    ^M
-*FTPFormCommand         Exec "-" xterm -fg white -T FTP -e ftp $(CommonTarget) $(CustomTarget)
+*FTPFormCommand         Exec "-" x-terminal-emulator -T FTP -e ftp $(CommonTarget) $(CustomTarget)
 *FTPFormButton          restart         "Clear"
 *FTPFormButton          quit            "Cancel" ^[
-*FTPFormCommand         Nop
+*FTPFormCommand         Nop	""
 
 # Xgrabsc
 *XGRABSCFormWarpPointer
@@ -62,10 +62,11 @@
 *XGRABSCFormInput           SaveTarget    35      "~/screenshot.xpm"
 *XGRABSCFormLine            expand
 *XGRABSCFormButton          quit            "Go"    ^M
-*XGRABSCFormCommand         Exec "-" xgrabsc -root -o $(SaveTarget) -bm -s $(WaitTarget) 
+#*XGRABSCFormCommand         Exec "-" xgrabsc -root -o $(SaveTarget) -bm -s $(WaitTarget) 
+*XGRABSCFormCommand         Exec "-" import -delay $(WaitTarget) $(SaveTarget)
 *XGRABSCFormButton          restart         "Clear"
 *XGRABSCFormButton          quit            "Cancel" ^[
-*XGRABSCFormCommand         Nop
+*XGRABSCFormCommand         Nop	""
 
 # Xgrab
 *XGRABFormWarpPointer
@@ -88,7 +89,7 @@
 
 *XGRABFormButton          restart         "Clear"
 *XGRABFormButton          quit            "Cancel" ^[
-*XGRABFormCommand         Nop
+*XGRABFormCommand         Nop	""
 
 # Xlock
 *XLOCKFormWarpPointer
@@ -161,7 +162,7 @@
 *XLOCKFormCommand         Exec "-" xlock -nolock -mode $(CommonTarget)
 *XLOCKFormButton          restart         "Clear"
 *XLOCKFormButton          quit            "Cancel" ^[
-*XLOCKFormCommand         Nop
+*XLOCKFormCommand         Nop	""
 
 *RUNFormWarpPointer
 *RUNFormFore            Grey70
@@ -177,10 +178,10 @@
 *RUNFormInput           CustomTarget    50      ""
 *RUNFormLine            expand
 *RUNFormButton          quit            "Go"    ^M
-*RUNFormCommand         Exec "-" xterm -fg white -bg black -T Run -e $(CustomTarget)
+*RUNFormCommand         Exec "-" x-terminal-emulator -T Run -e $(CustomTarget)
 *RUNFormButton          restart         "Clear"
 *RUNFormButton          quit            "Cancel" ^[
-*RUNFormCommand         Nop
+*RUNFormCommand         Nop	""
 
 *HELPFormWarpPointer
 *HELPFormFore            Grey70
@@ -196,10 +197,10 @@
 *HELPFormInput           CustomTarget    50      ""
 *HELPFormLine            expand
 *HELPFormButton          quit            "Go"    ^M
-*HELPFormCommand         Exec "-" xterm -fg white -bg black -T Help -e man $(CustomTarget)
+*HELPFormCommand         Exec "-" x-terminal-emulator -T Help -e man $(CustomTarget)
 *HELPFormButton          restart         "Clear"
 *HELPFormButton          quit            "Cancel" ^[
-*HELPFormCommand         Nop
+*HELPFormCommand         Nop	""
 
 *FINDFormWarpPointer
 *FINDFormFore            Grey70
@@ -215,10 +216,10 @@
 *FINDFormInput           CustomTarget    50      ""
 *FINDFormLine            expand
 *FINDFormButton          quit            "Go"    ^M
-*FINDFormCommand         Exec "-" xterm -fg white -bg black -T Find -e sh -c "locate $(CustomTarget) | less"
+*FINDFormCommand         Exec "-" x-terminal-emulator -T Find -e sh -c "locate $(CustomTarget) | less"
 *FINDFormButton          restart         "Clear"
 *FINDFormButton          quit            "Cancel" ^[
-*FINDFormCommand         Nop
+*FINDFormCommand         Nop	""
 
 *ThemeCreateFormWarpPointer
 *ThemeCreateFormFore            Grey70
@@ -244,4 +245,4 @@
 *ThemeCreateFormCommand         Exec "-" makeastheme.pl $(Background!--no_background) $(Pager!--no_pager) $(Wharf!--no_wharf) $(WinList!--no_winlist) --theme $(CustomTarget)
 *ThemeCreateFormButton          restart         "Clear"
 *ThemeCreateFormButton          quit            "Cancel" ^[
-*ThemeCreateFormCommand         Nop
+*ThemeCreateFormCommand         Nop	""
diff -ruN -x config.guess -x config.sub AfterStep-2.2.9-old/afterstep/pager.in AfterStep-2.2.9/afterstep/pager.in
--- AfterStep-2.2.9-old/afterstep/pager.in	2005-05-10 23:51:28.000000000 +0200
+++ AfterStep-2.2.9/afterstep/pager.in	2009-07-12 12:06:25.000000000 +0200
@@ -35,7 +35,7 @@
 
 *PagerDecoration  DeskBorderWidth 1, DeskBorderColor BaseDark, GridColor Inactive2Dark, SelectionColor HighActiveLight
 
-*PagerGeometry       -1+27
+*PagerGeometry       -1+1
 
 # PagerStyle is used to define look of Pager's desk window.
 # Relevant look must be defined in your look file or in this file
diff -ruN -x config.guess -x config.sub AfterStep-2.2.9-old/afterstep/wharf AfterStep-2.2.9/afterstep/wharf
--- AfterStep-2.2.9-old/afterstep/wharf	2008-02-13 06:29:04.000000000 +0100
+++ AfterStep-2.2.9/afterstep/wharf	2009-07-12 12:07:28.000000000 +0200
@@ -57,7 +57,7 @@
 #-------------------------------------------------------------------------------
 # Buttons
 #
-*WharfFullPush
+#*WharfFullPush
 #*WharfNoPush
 #*WharfNoBorder
 
@@ -71,7 +71,7 @@
 #*WharfForceSize
 *WharfRows		1
 #*WharfColumns		1
-*WharfGeometry		+1+1
+*WharfGeometry		+5+31
 *WharfBevel		Bottom,Right,NoOutline,Extra
 
 #Use this setting to set what is show in the balloon : 
@@ -85,6 +85,7 @@
 # X TErms. Note that only one of this will be displayed on Wharf, as they all
 # have same button name. Change button name ( first column after *Wharf) to make them a separate buttons :
 
+*Wharf term Monitor.xpm Exec "-" x-terminal-emulator &
 *Wharf term "-" DesktopEntry urxvt
 *Wharf term "-" DesktopEntry aterm
 
@@ -98,7 +99,7 @@
 #
 # Midnight commander file manager in the term of choice :
 #
-*Wharf MidnightCommander normal/MCInMonitorShadow ExecInTerm "-" -g 130x35 if(urxvt){-T mc-VerticalTitle -tr -tint blue -fg white -bg black} if(aterm){-T mc-VerticalTitle -tr -tint blue -fg white -bg black} if(Eterm){-O --tint blue -f white -b black) if(rxvt){-tr -fg white -bg black} -e mc &
+*Wharf MidnightCommander normal/MCInMonitorShadow ExecInTerm "-" if(urxvt){-g 130x35 -T mc-VerticalTitle -tr -tint blue -fg white -bg black} if(aterm){-g 130x35 -T mc-VerticalTitle -tr -tint blue -fg white -bg black} if(Eterm){-g 130x35 -O --tint blue -f white -b black) if(rxvt){-g 130x35 -tr -fg white -bg black} -e mc &
 
 #
 # First available GUI file manager :
@@ -118,8 +119,10 @@
 # First available GUI Web Browser :
 #
 *Wharf WebBrowser normal/WWW    Exec x-www-browser &
+*Wharf WebBrowser logos/Firefox Exec "Iceweasel" iceweasel &
 *Wharf WebBrowser logos/Firefox Exec "Firefox" firefox &
 *Wharf WebBrowser logos/Firefox Exec "Firefox2" mozilla-firefox &
+*Wharf WebBrowser logos/mozilla Exec "Iceape" iceape &
 *Wharf WebBrowser logos/mozilla Exec "Mozilla" mozilla &
 *Wharf WebBrowser logos/Opera   Exec "Opera Web Browser" opera &
 *Wharf WebBrowser normal/WWW    Exec sensible-browser &
@@ -127,11 +130,13 @@
 #
 # First available GUI e-mail client :
 #
+*Wharf Mail	logos/Thunderbird Exec "Icedove" icedove &
 *Wharf Mail	logos/Thunderbird Exec "Thunderbird" thunderbird &
 *Wharf Mail	logos/Thunderbird Exec "Thunderbird2" mozilla-thunderbird &
 *Wharf Mail	normal/MailBox2 Exec "mozilla-mail" mozilla --mail &
 *Wharf Mail	normal/MailBox2 Exec "kmail" kmail &
 *Wharf Mail	normal/MailBox2 Exec "balsa" balsa &
+*Wharf Mail	normal/MailBox2 ExecInTerm "Mutt"  -e mutt &
 *Wharf Mail	normal/MailBox2 ExecInTerm "Pine" -title "Pine e-mail and news reader" -e pine &
 
 
@@ -145,7 +150,7 @@
 # First available GUI text editor :
 #
 *Wharf TextEditor Text.xpm Exec "NEdit" nedit &
-*Wharf TextEditor Text.xpm Exec "cooledit" cooledit --look next &
+*Wharf TextEditor Text.xpm Exec "cooledit" cooledit &
 *Wharf TextEditor logos/GNU Exec "XEmacs" xemacs &
 *Wharf TextEditor Text.xpm Exec "VIM" gvim &
 
@@ -168,7 +173,7 @@
 # First available IRC client :
 #
 *Wharf IRC  normal/IRCTransparent Exec "XCHAT" xchat &
-*Wharf IRC	normal/IRCTransparent ExecInTerm "BitchX" -title "BitchX IRC" +sb if(aterm){-tr -sh 50 -fg white -bg black} if(Eterm){-O --shade 50 -f white -b black) if(rxvt){-tr -fg white -bg black} if(xterm){-fg white -bg black} -e BitchX irc.freenode.net &
+*Wharf IRC	normal/IRCTransparent ExecInTerm "BitchX" -title "BitchX IRC" if(aterm){-tr -sh 50 -fg white -bg black} if(Eterm){-O --shade 50 -f white -b black) if(rxvt){-tr -fg white -bg black} if(xterm){-fg white -bg black} -e BitchX irc.freenode.net &
 
 
 # subfolder full of games :
@@ -179,13 +184,13 @@
 # First available Audio player :
 #
 *Wharf AudioPlayer logos/Xmms Exec "X Multi Media System" xmms &
-*Wharf AudioPlayer - Swallow "wmxmms" wmxmms --single &
+*Wharf AudioPlayer - Swallow "wmxmms2" wmxmms2 -c blue &
 *Wharf AudioPlayer - Swallow "ascd" ascd &
 #
 # Mixer
 #
-*Wharf mixer - Swallow "asmixer" asmixer -g -1-1 &
 *Wharf mixer - Swallow "wmmixer" wmmixer &
+*Wharf mixer - Swallow "asmixer" asmixer -g -1-1 &
 *Wharf mixer - Swallow "asMix" asmix -shape &
 
 #
@@ -221,7 +226,7 @@
 #-------------------------------------------------------------------------------
 # Buttons
 #
-*MonitorWharfFullPush
+#*MonitorWharfFullPush
 #*MonitorWharfNoPush
 *MonitorWharfBevel		Right,NoOutline
 
@@ -253,29 +258,29 @@
 *MonitorWharf ~Folder
 
 
-*MonitorWharf xeyes - Swallow "xeyes" xeyes -geometry -100-100 &
-*MonitorWharf xeyes - PopUp   "r" Window
+#*MonitorWharf xeyes - Swallow "xeyes" xeyes -geometry -100-100 &
+#*MonitorWharf xeyes - PopUp   "r" Window
 
 
 *MonitorWharf QuitFolder normal/RedLight,dots/3_dots Folder
-*MonitorWharf 	Recycler normal/Recycle Restart "" afterstep -r
+*MonitorWharf 	Restart normal/Recycle Restart "" afterstep -r
 *MonitorWharf 	Quit normal/Stopsign Quit "" afterstep
 *MonitorWharf ~Folder
 
 *MonitorWharf asfsm - Swallow "asfsm_lite" asfsm_lite -bg Grey30 -fg Grey70 -bp None -pbg Grey40 -pfg Grey70 -pbp None -i 30 &
-*MonitorWharf loadmonitor - Swallow "asload" asload -shape -exe "aterm -e top" &
+*MonitorWharf loadmonitor - Swallow "asload" asload -shape -exe "x-terminal-emulator -e top" &
 *MonitorWharf loadmonitor - Swallow "wmavgload" wmavgload -shape -led red &
 *MonitorWharf loadmonitor - Swallow "wmcpuload" wmcpuload -bl -w &
 *MonitorWharf loadmonitor - Swallow "wmload" wmload -shape -led red &
-*MonitorWharf loadinstantmonitor - Swallow "wmfire" wmfire -f 2 &
+#*MonitorWharf loadinstantmonitor - Swallow "wmfire" wmfire -f 2 &
 *MonitorWharf asmon  - Swallow "asmon" asmon &
-*MonitorWharf wmtop  - Swallow "wmtop" wmtop &
-*MonitorWharf netmonitor - Swallow "wmnet" wmnet --driver=devstats &
-*MonitorWharf netmonitor - Swallow "wmnd" wmnd -i eth0 &
+#*MonitorWharf wmtop  - Swallow "wmtop" wmtop &
+#*MonitorWharf netmonitor - Swallow "wmnet" wmnet --driver=devstats &
+#*MonitorWharf netmonitor - Swallow "wmnd" wmnd -i eth0 &
 *MonitorWharf asmail - Swallow "asmail" asmail -geometry +0+0 &
 
 # One of the clocks - first available :
-*MonitorWharf clock - Swallow "asclock" asclock -shape -24 -position +1+1 &
+*MonitorWharf clock - Swallow "asclock" asclock -shape -24 -theme penguin -position +1+1 &
 *MonitorWharf clock - Swallow "wmclockmon" wmclockmon &
 *MonitorWharf clock - Swallow "wmitime" wmitime &
 *MonitorWharf clock - Swallow "xclock" xclock -bg gray10 -fg cyan -digital -brief &
diff -ruN -x config.guess -x config.sub AfterStep-2.2.9-old/afterstep/winlist AfterStep-2.2.9/afterstep/winlist
--- AfterStep-2.2.9-old/afterstep/winlist	2007-05-14 23:13:19.000000000 +0200
+++ AfterStep-2.2.9/afterstep/winlist	2009-07-12 12:06:25.000000000 +0200
@@ -9,7 +9,7 @@
 *WinListDefaults
 	Geometry        +0+0
 	MinSize         10000    #will be truncated to thescreen size
-	MaxRows         3
+	MaxRows         1
 	FillRowsFirst
 	UseSkipList
 	
@@ -53,7 +53,7 @@
 # location in relation to the label. If label is a key '5' on keypad
 # then keys 1 to 9 will represent icon's position, while 0 is the default.
 #*WinListIconLocation 0
-#*WinListIconSize   32x32
+*WinListIconSize   16x16
 # This is another flag for convinience - it is always overriden by IconSize
 # note that its On by default.
 #*WinListScaleIconToTextHeight