Some minor changes. See ChangeLog

Fvwm-Nightshade · Oct 28, 2012 · a3f6ef4 · a3f6ef4
1 parent d2ae054
commit a3f6ef4
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 42 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,18 @@
 History:
 
+10/28/2012 V 0.5.25
+- adapt styles of Pager and HorizontalPanel to G2likeTopBar
+- add new theme 'CrystalBalls'
+- addapt all other themes if some colorset option is missing anywhere
+- change FvwmBacker colorset in Air, Ambience an Tribal so that each theme
+  has its own default background
+- change in GlobalIconMan_Bar the Format string from "%c" to "%c: %t"
+- change in G2likeTopBar and HorizontalPanel the start of cpu graph from 
+  1 sec to 2 sec
+- adapt Vertical layout and VerticalPanel to new ratios
+
+
+
 10/26/2012 V 0.5.24
 - change in HorizontalPanel the calculation of percentage_voffset and 
   date_voffset for better fiting in smaller resolutions

diff --git a/README b/README
@@ -72,8 +72,8 @@ Featurelist of Fvwm Nightshade:
 - Background configurable with thumb browser (imagemagick and eterm)
 - Animation control of window moves
 - Simple "Run" command with FvwmForm
-- Some themes/decors (Tumble, Ambience, Tribal and Air). Can be changed
-  on the fly without restart
+- Some themes/decors (Tumble, Ambience, Tribal, CrystalBall and Air). 
+  Can be changed on the fly without restart
 - Own themes and layouts can be created with templates (at the moment
   only theme templates available)
 - Autostart possibility (starting apps while startup)

diff --git a/fvwm-nightshade/config b/fvwm-nightshade/config
@@ -15,7 +15,7 @@
 #
 #
 # Fvwm Nightshade Configuration
-InfoStoreAdd ns_version 0.5.24
+InfoStoreAdd ns_version 0.5.25
 # Copyright (C) 2012
 #
 # Authors:

diff --git a/fvwm-nightshade/modules/G2likeTopBar b/fvwm-nightshade/modules/G2likeTopBar
@@ -1,6 +1,6 @@
 #-----------------------------------------------------------------------
 # File:		G2likeTopBar
-# Version:	1.0.5
+# Version:	1.0.6
 # Licence: 	GPL 2
 #
 # Description:	Gnome like top bar with root menu, personal menu, systray,
@@ -10,7 +10,7 @@
 #			Bernhard Popp <kermit.popp@googlemail.com>
 #
 # Created:	10/09/2012
-# Changed:	10/15/2012
+# Changed:	10/28/2012
 #-----------------------------------------------------------------------
 #
 # Topbar
@@ -162,7 +162,7 @@ DestroyModuleConfig G2likeTopBar: *
 #-----------------------------------------------------------------------
 *G2likeTopBar: (5x1, Colorset 13, Swallow (UseOld, Close, Kill, Respawn) "conky_cpu" \
 		    `Exec exec conky -t '${color $[fg.cs13]}${voffset -$[infostore.graph_voffset]}${cpugraph $[infostore.bar_height],$[infostore.graph_width] 71fb06 fb0634 -t}\\n${font $[infostore.used_font]:size=$[infostore.date_fsize]}${voffset -$[infostore.percentage_voffset]}$alignc${cpu cpu0}%' \
-		    -c $[FNS_SYSTEMDIR]/layouts/rc-files/conkyrc_cpu -p 1`)
+		    -c $[FNS_SYSTEMDIR]/layouts/rc-files/conkyrc_cpu -p 2`)
 
 #-----------------------------------------------------------------------
 # Clock

diff --git a/fvwm-nightshade/modules/GlobalIconMan_Bar b/fvwm-nightshade/modules/GlobalIconMan_Bar
@@ -1,13 +1,13 @@
 #-----------------------------------------------------------------------
 # File:		GlobalIconMan_Bar
-# Version:	1.0.0
+# Version:	1.0.1
 # Licence: 	GPL 2
 #
 # Description:	Global IconMan swallowed in a bar
 #
 # Author:	Thomas Funk <t.funk@web.de>	
 # Created:	10/09/2012
-# Changed:	<MM/DD/YYYY>
+# Changed:	10/28/2012
 #-----------------------------------------------------------------------
 
 
@@ -19,29 +19,29 @@ Style GlobalIconManBar !Title, NeverFocus, WindowListSkip, StaysOnBottom, Handle
 DestroyModuleConfig GlobalIconManBar: *
 *GlobalIconManBar: 1 IconName					GlobalIconMan
 *GlobalIconManBar: 1 Title						"Global IconMan"
-*GlobalIconManBar: 1 ButtonGeometry			$[infostore.iconman_button_geometry]
+*GlobalIconManBar: 1 ButtonGeometry				$[infostore.iconman_button_geometry]
 *GlobalIconManBar: 1 ManagerGeometry  			$[infostore.iconman_manager_geometry]
 *GlobalIconManBar: 1 MaxButtonWidthByColumns	4
 *GlobalIconManBar: 1 Colorset					10
 *GlobalIconManBar: 1 IconColorset				12
 *GlobalIconManBar: 1 PlainColorset				10
-*GlobalIconManBar: 1 SelectColorset			11
+*GlobalIconManBar: 1 SelectColorset				11
 *GlobalIconManBar: 1 FocusColorset				11
-*GlobalIconManBar: 1 FocusAndSelectColorset	11
+*GlobalIconManBar: 1 FocusAndSelectColorset		11
 
-*GlobalIconManBar: 1 IconButton				down
+*GlobalIconManBar: 1 IconButton					down
 *GlobalIconManBar: 1 PlainButton				up
 *GlobalIconManBar: 1 SelectButton				down
 *GlobalIconManBar: 1 FocusButton				up
 *GlobalIconManBar: 1 FocusAndSelectButton		down
 
 *GlobalIconManBar: 1 ReliefThickness			1
-*GlobalIconManBar: 1 Resolution				page
-*GlobalIconManBar: 1 UseWinList				true
+*GlobalIconManBar: 1 Resolution					page
+*GlobalIconManBar: 1 UseWinList					true
 
 *GlobalIconManBar: 1 DrawIcons					always
 *GlobalIconManBar: 1 Sort						name
-*GlobalIconManBar: 1 Format					"%c"
+*GlobalIconManBar: 1 Format						"%c: %t"
 *GlobalIconManBar: 1 Font						"xft:$[infostore.used_font]:pixelsize=$[infostore.fontsize]"
 
 *GlobalIconManBar: 1 Tips						$[infostore.tips_iman]

diff --git a/fvwm-nightshade/modules/HorizontalPanel b/fvwm-nightshade/modules/HorizontalPanel
@@ -1,6 +1,6 @@
 #-----------------------------------------------------------------------
 # File:		HorizontalPanel
-# Version:	1.0.7
+# Version:	1.0.8
 # Licence: 	GPL 2
 #
 # Description:	FvwmButtons panel for horizontal layout. Position on the
@@ -15,10 +15,11 @@
 #			Bernhard Popp <kermit.popp@googlemail.com>
 #
 # Created:	08/11/2012
-# Changed:	10/26/2012
+# Changed:	10/28/2012
 #-----------------------------------------------------------------------
 
-Style HorizontalPanel !Title, Sticky, WindowListSkip, StaysOnBottom, HandleWidth 2
+Style HorizontalPanel !Title, Sticky, NeverFocus, WindowListSkip, HandleWidth 2
+Style HorizontalPanel StaysOnBottom, !Iconifiable, !Maximizable, FixedSize, FixedPosition
 
 
 #=======================================================================
@@ -51,17 +52,6 @@ PipeRead "echo InfoStoreAdd time_hsize `perl -e 'printf \"%.0f\",$[infostore.fon
 PipeRead "echo InfoStoreAdd date_fsize `perl -e 'printf \"%.0f\",$[infostore.fontsize]/($[infostore.hratio])'`"
 PipeRead "echo InfoStoreAdd date_voffset `perl -e 'printf \"%.0f\",($[infostore.hratio]*3)'`"
 
-#PipeRead "echo InfoStoreAdd time_hsize `perl -e 'printf \"%.0f\",($[infostore.fontsize]/2)'`"
-#PipeRead "echo InfoStoreAdd time_fsize `perl -e 'printf \"%.0f\",($[infostore.fontsize]-$[infostore.hratio])'`"
-#PipeRead "if [ $[vp.height] -eq 768 ]; then \
-#			echo InfoStoreAdd time_fsize 18; \
-#		  else \
-#			echo InfoStoreAdd time_fsize `perl -e 'printf \"%.0f\",($[infostore.fontsize]-$[infostore.hratio])'`; \
-#		  fi"
-
-#PipeRead "echo InfoStoreAdd date_fsize `perl -e 'printf \"%.0f\",$[infostore.fontsize]-($[infostore.hratio]*2)'`"
-#PipeRead "echo InfoStoreAdd date_voffset `perl -e 'printf \"%.0f\",4*$[infostore.hratio]'`"
-
 
 #=======================================================================
 # Panel
@@ -71,14 +61,14 @@ PipeRead "echo InfoStoreAdd date_voffset `perl -e 'printf \"%.0f\",($[infostore.
 # General
 #***********************************************************************
 DestroyModuleConfig HorizontalPanel: *
-*HorizontalPanel: Geometry		$[infostore.panel_geometry]
-*HorizontalPanel: Colorset		10
-*HorizontalPanel: ActiveColorset	10
-*HorizontalPanel: PressColorset		10
+*HorizontalPanel: Geometry			$[infostore.panel_geometry]
+*HorizontalPanel: Colorset			13
+*HorizontalPanel: ActiveColorset	13
+*HorizontalPanel: PressColorset		13
 
-*HorizontalPanel: Rows			1
-*HorizontalPanel: Columns		$[infostore.columns]
-*HorizontalPanel: Frame			0
+*HorizontalPanel: Rows				1
+*HorizontalPanel: Columns			$[infostore.columns]
+*HorizontalPanel: Frame				0
 
 #***********************************************************************
 # Buttons
@@ -114,5 +104,5 @@ DestroyModuleConfig HorizontalPanel: *
 #-----------------------------------------------------------------------
 *HorizontalPanel: ($[infostore.time_hsize]x1, Colorset 10, Swallow (UseOld, Close, Kill, Respawn) "conky_clock" \
 		    `Exec exec conky -t '${color $[fg.cs13]}${font $[infostore.used_font]:bold:size=$[infostore.time_fsize]}${voffset -$[infostore.hratio]}$alignc${time %H:%M}\\n${font $[infostore.used_font]:size=$[infostore.date_fsize]}${voffset -$[infostore.date_voffset]}$alignc${time %a %e %b}' \
-		    -c $[FNS_SYSTEMDIR]/layouts/rc-files/conkyrc_clock -p 2`, \
+		    -c $[FNS_SYSTEMDIR]/layouts/rc-files/conkyrc_clock -p 1`, \
 		    Action (mouse 0) Nop)
diff --git a/fvwm-nightshade/modules/Pager b/fvwm-nightshade/modules/Pager
@@ -1,20 +1,20 @@
 ########################################################################
 # File:		Pager
-# Version:	1.0.0
+# Version:	1.0.2
 # Licence: 	GPL 2
 #
 # Description:	shows a Fvwm-Pager
 #
 # Author:	Thomas Funk <t.funk@web.de>	
 # Created:	06/08/2012
-# Changed:	08/16/2012
+# Changed:	10/28/2012
 ########################################################################
 
-Style FvwmPager !Title, Sticky, WindowListSkip, StaysOnBottom, FixedSize, FixedPosition, HandleWidth 2
+Style FvwmPager !Title, Sticky, NeverFocus, WindowListSkip, HandleWidth 2
+Style FvwmPager StaysOnBottom, !Iconifiable, !Maximizable, FixedSize, FixedPosition
 
 DestroyModuleConfig FvwmPager: *
-#PipeRead 'echo *FvwmPager: Geometry $(($[vp.width]/5))x$[infostore.fvwm_pager_height]+$(($[vp.width]/2-($[vp.width]/5)/2))+0'
-*FvwmPager: Geometry		$[infostore.pager_geometry]
+*FvwmPager: Geometry			$[infostore.pager_geometry]
 *FvwmPager: Colorset            *  10
 *FvwmPager: HilightColorset     *  11
 *FvwmPager: BalloonColorset     *  16