[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[344] fvwm/components

[<dom...@us...>]

Revision: 344
          http://sourceforge.net/p/fvwm-crystal/code/344
Author:   dominique_libre
Date:     2013-05-03 20:16:00 +0000 (Fri, 03 May 2013)
Log Message:
-----------
associated files in functions, styles and desktop: introduce font style preference

Modified Paths:
--------------
    ChangeLog
    fvwm/components/desktop/FVWM-Crystal_Functions
    fvwm/components/functions/Debug-Functions
    fvwm/components/functions/FvwmExpose
    fvwm/components/functions/FvwmFormDefault
    fvwm/components/functions/FvwmIdent
    fvwm/components/functions/Icon-Amiga
    fvwm/components/functions/Icon-Launcher
    fvwm/components/functions/Icon-Mwm
    fvwm/components/functions/MakePanel
    fvwm/components/functions/Tooltip
    fvwm/components/styles/FVWM
    fvwm/components/styles/Menu

Modified: ChangeLog
===================================================================
--- ChangeLog	2013-05-03 19:16:41 UTC (rev 343)
+++ ChangeLog	2013-05-03 20:16:00 UTC (rev 344)
@@ -9,8 +9,9 @@
 + scripts/FontSelector/FontSelector: FvwmScript based xft font selector for
   Fvwm-Crystal; introduced font style preferences
 + preferences/*FontStyle: new font style default setup
-  functions/preferences-Menu: converted font preferences to FontSelector;
-
+  functions/preferences-Menu: converted font preferences to FontSelector
+  associated files in functions, styles and desktop: introduce font style preference
+   
 Mercredi 1 Mai 2913 Dominique Michel
   updated the version to 3.1.8
   functions/Icon-Thumbnails: fix for desiconification of fullscreen windows;

Modified: fvwm/components/desktop/FVWM-Crystal_Functions
===================================================================
--- fvwm/components/desktop/FVWM-Crystal_Functions	2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/desktop/FVWM-Crystal_Functions	2013-05-03 20:16:00 UTC (rev 344)
@@ -20,6 +20,9 @@
 LoadPreferences PanelFontSize
 LoadPreferences TitleFontSize
 LoadPreferences MenuFontSize
+LoadPreferences PanelFontStyle
+LoadPreferences TitleFontStyle
+LoadPreferences MenuFontStyle
 
 ## Load the prefs with only Styles initialisation
 LoadPreferences PrivilegedTerminals

Modified: fvwm/components/functions/Debug-Functions
===================================================================
--- fvwm/components/functions/Debug-Functions	2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/Debug-Functions	2013-05-03 20:16:00 UTC (rev 344)
@@ -16,11 +16,11 @@
 *FvwmIconMan-Debug-WindowList: Title "Debug Window List: Title [icon:icon title] | class/resource"
 PipeRead "echo *FvwmIconMan-Debug-WindowList: ButtonGeometry $((($[vp.width]-12)/2))x24"
 *FvwmIconMan-Debug-WindowList: ManagerGeometry +3+3
-*FvwmIconMan-Debug-WindowList: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]"
+*FvwmIconMan-Debug-WindowList: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:$[panel_font_style]"
 *FvwmIconMan-Debug-WindowList: Tips always
 *FvwmIconMan-Debug-WindowList: TipsDelays 400 100
 *FvwmIconMan-Debug-WindowList: TipsFormat "%c/%r"
-*FvwmIconMan-Debug-WindowList: TipsFont "xft:$[panel_font]:pixelsize=$[panel_font_size]:Bold"
+*FvwmIconMan-Debug-WindowList: TipsFont "xft:$[panel_font]:pixelsize=$[panel_font_size]:$[panel_font_style]"
 *FvwmIconMan-Debug-WindowList: TipsBorderWidth 2
 *FvwmIconMan-Debug-WindowList: TipsColorset $[infostore.cs_panel_inactive]
 *FvwmIconMan-Debug-WindowList: TipsJustification leftup
@@ -44,7 +44,7 @@
 Module FvwmIconMan FvwmIconMan-Debug-WindowList
 
 *FvwmIdent: Colorset $[infostore.cs_panel_active]
-*FvwmIdent: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]"
+*FvwmIdent: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:$[panel_font_style]"
 *FvwmIdent: MinimalLayer 6
 
 DestroyMenu /Debug/WindowList

Modified: fvwm/components/functions/FvwmExpose
===================================================================
--- fvwm/components/functions/FvwmExpose	2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/FvwmExpose	2013-05-03 20:16:00 UTC (rev 344)
@@ -32,7 +32,7 @@
 + I *FvwmExpose: ActiveColorset $[infostore.cs_panel_active]
 + I *FvwmExpose: Padding 4 4
 + I *FvwmExpose: Frame 0
-+ I *FvwmExpose: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:Bold:Italic"
++ I *FvwmExpose: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:$[panel_font_style]"
 + I All (!Iconic, !FvwmMiniConsoleNeedsUniqueName, !Shaded, CurrentPage, AcceptsFocus) FvwmExpose-Thumbnail
 + I Module FvwmButtons FvwmExpose
 + I None (FvwmExpose) Wait

Modified: fvwm/components/functions/FvwmFormDefault
===================================================================
--- fvwm/components/functions/FvwmFormDefault	2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/FvwmFormDefault	2013-05-03 20:16:00 UTC (rev 344)
@@ -1,10 +1,10 @@
 # Default settings for FvwmForm
 *FvwmFormDefault: Colorset $[infostore.cs_panel_inactive]
 *FvwmFormDefault: ItemColorset $[infostore.cs_panel_active]
-*FvwmFormDefault: Font "xft:$[menu_font]:pixelsize=$[menu_font_size]"
-*FvwmFormDefault: InputFont "xft:$[menu_font]:pixelsize=$[menu_font_size]"
-*FvwmFormDefault: ButtonFont "xft:$[menu_font]:pixelsize=$[menu_font_size]:Bold"
-*FvwmFormDefault: TimeoutFont "xft:$[menu_font]:pixelsize=$[menu_font_size]:Bold"
+*FvwmFormDefault: Font "xft:$[menu_font]:pixelsize=$[menu_font_size]:$[menu_font_style]"
+*FvwmFormDefault: InputFont "xft:$[menu_font]:pixelsize=$[menu_font_size]:$[menu_font_style]"
+*FvwmFormDefault: ButtonFont "xft:$[menu_font]:pixelsize=$[menu_font_size]:$[menu_font_style]"
+*FvwmFormDefault: TimeoutFont "xft:$[menu_font]:pixelsize=$[menu_font_size]:$[menu_font_style]"
 
 # ViM modeline {{{1
 # vim:foldmethod=marker:foldenable:foldlevel=0:filetype=fvwm

Modified: fvwm/components/functions/FvwmIdent
===================================================================
--- fvwm/components/functions/FvwmIdent	2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/FvwmIdent	2013-05-03 20:16:00 UTC (rev 344)
@@ -1,5 +1,5 @@
 # Settings for FvwmIdent
-*FvwmIdent: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:Bold"
+*FvwmIdent: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:$[panel_font_style]"
 *FvwmIdent: Colorset $[infostore.cs_panel_active]
 
 # ViM modeline {{{1

Modified: fvwm/components/functions/Icon-Amiga
===================================================================
--- fvwm/components/functions/Icon-Amiga	2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/Icon-Amiga	2013-05-03 20:16:00 UTC (rev 344)
@@ -7,7 +7,7 @@
 Style * IconTitleRelief 0
 Style * IconBackgroundRelief 0
 Style * IconBackgroundPadding 0
-Style * IconFont "xft:$[title_font]:pixelsize=$[title_font_size]"
+Style * IconFont "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
 Style * IconTitleFormat %n (%t)
 Style * StickyIcon
 Style * IconSize 68 68

Modified: fvwm/components/functions/Icon-Launcher
===================================================================
--- fvwm/components/functions/Icon-Launcher	2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/Icon-Launcher	2013-05-03 20:16:00 UTC (rev 344)
@@ -45,7 +45,7 @@
 + I Module FvwmButtons $0
 + I Module FvwmAuto 10 -menter "Change-Icon $0 $1" "Restore-Icon $0 $1"
 + I Style $0 UseStyle *
-+ I Style $0 Icon $1, StartIconic, StartsLowered, !Handles, VariablePosition, BorderWidth 0, !Borders, ParentalRelativity, IconTitle, IconTitleColorset $[infostore.cs_menu_active], HilightIconTitleColorset $[infostore.cs_menu_active], IconTitleFormat %n, IconBackgroundColorset $[infostore.cs_icon_inactive], IconBackgroundColorset $[infostore.cs_icon_inactive], IconTitleRelief 0, IconBackgroundRelief 0, IconBackgroundRelief 0, IconFont "xft:$[title_font]:pixelsize=$[title_font_size]", StickyIcon,!StickyStippledIconTitle 
++ I Style $0 Icon $1, StartIconic, StartsLowered, !Handles, VariablePosition, BorderWidth 0, !Borders, ParentalRelativity, IconTitle, IconTitleColorset $[infostore.cs_menu_active], HilightIconTitleColorset $[infostore.cs_menu_active], IconTitleFormat %n, IconBackgroundColorset $[infostore.cs_icon_inactive], IconBackgroundColorset $[infostore.cs_icon_inactive], IconTitleRelief 0, IconBackgroundRelief 0, IconBackgroundRelief 0, IconFont "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]", StickyIcon,!StickyStippledIconTitle 
 
 DestroyFunc Change-Icon
 AddToFunc Change-Icon

Modified: fvwm/components/functions/Icon-Mwm
===================================================================
--- fvwm/components/functions/Icon-Mwm	2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/Icon-Mwm	2013-05-03 20:16:00 UTC (rev 344)
@@ -7,7 +7,7 @@
 Style * IconTitleRelief 0
 Style * IconBackgroundRelief 0
 Style * IconBackgroundPadding 10
-Style * IconFont "xft:$[title_font]:pixelsize=$[title_font_size]:Bold"
+Style * IconFont "xft:$[title_font]:pixelsize=$[title_font_size]:$[title_font_style]"
 Style * IconTitleFormat %n (%t)
 Style * IconSize 48 48
 

Modified: fvwm/components/functions/MakePanel
===================================================================
--- fvwm/components/functions/MakePanel	2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/MakePanel	2013-05-03 20:16:00 UTC (rev 344)
@@ -22,7 +22,7 @@
 + I *FvwmButtons-$0: Columns $4
 + I *FvwmButtons-$0: Padding $5
 + I *FvwmButtons-$0: Frame $6
-+ I *FvwmButtons-$0: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]"
++ I *FvwmButtons-$0: Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:$[panel_font_style]"
 
 ## Make a button ##
 ###################

Modified: fvwm/components/functions/Tooltip
===================================================================
--- fvwm/components/functions/Tooltip	2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/functions/Tooltip	2013-05-03 20:16:00 UTC (rev 344)
@@ -26,7 +26,7 @@
 + I *FvwmButtons-Tooltip-$0: Rows 1
 + I *FvwmButtons-Tooltip-$0: Padding 1 1
 + I *FvwmButtons-Tooltip-$0: Frame 0
-+ I *FvwmButtons-Tooltip-$0: Font "xft:$[panel_font]:pixelsize=$[menu_font_size]"
++ I *FvwmButtons-Tooltip-$0: Font "xft:$[panel_font]:pixelsize=$[menu_font_size]:$[panel_font_style]"
 + I *FvwmButtons-Tooltip-$0: (1x1, Id "Tooltip-$0", Title (Side) "$[gt.$1]  $2")
 + I Style FvwmButtons-Tooltip-$0 Layer $4
 + I Module FvwmButtons FvwmButtons-Tooltip-$0

Modified: fvwm/components/styles/FVWM
===================================================================
--- fvwm/components/styles/FVWM	2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/styles/FVWM	2013-05-03 20:16:00 UTC (rev 344)
@@ -18,7 +18,7 @@
 
 Style FvwmIdent UseStyle FvwmParts
 Style FvwmIdent VariablePosition, \
-      Font "xft:$[panel_font]:pixelsize=$[panel_font_size]"
+      Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:$[panel_font_style]"
 
 Style FvwmForm Sticky, WindowListSkip, \
       FixedSize, StaysOnTop, !Handles, BorderWidth 1, HandleWidth 1, \

Modified: fvwm/components/styles/Menu
===================================================================
--- fvwm/components/styles/Menu	2013-05-03 19:16:41 UTC (rev 343)
+++ fvwm/components/styles/Menu	2013-05-03 20:16:00 UTC (rev 344)
@@ -16,6 +16,6 @@
 MenuStyle * TitleWarpOff
 MenuStyle * TrianglesSolid
 MenuStyle * VerticalItemSpacing 1 4
-MenuStyle * Font "xft:$[menu_font]:pixelsize=$[menu_font_size]"
+MenuStyle * Font "xft:$[menu_font]:pixelsize=$[menu_font_size]:$[menu_font_style]"
 
 # vim:ft=fvwm

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.