Menu
▾
▴
[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[34] fvwm/components
|
From: <dom...@us...> - 2010-12-22 19:24:29
|
Revision: 34
http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=34&view=rev
Author: dominique_libre
Date: 2010-12-22 19:24:23 +0000 (Wed, 22 Dec 2010)
Log Message:
-----------
Added some application styles, fixed a hard to figure out bug into the style loading order.
Modified Paths:
--------------
ChangeLog
fvwm/components/desktop/FVWM-Crystal_Styles
fvwm/components/styles/Application-Icons-22-32
fvwm/components/styles/Applications
fvwm/components/styles/FVWM
fvwm/components/styles/Window-Decorations
Modified: ChangeLog
===================================================================
--- ChangeLog 2010-12-22 19:06:29 UTC (rev 33)
+++ ChangeLog 2010-12-22 19:24:23 UTC (rev 34)
@@ -4,8 +4,10 @@
* New Amiga focus policy : click to focus without raise,
icons are move to focus :), its not AmigaOS behaviour but I like it that
way for now, may change in the future
-
* Fixed Window-Remember-*, State 2 initialisation was using old syntax
+ * Added some application styles
+ * Fixed the style order loading causing non wanted effect after restart.
+ Hope it work well now. This one was hard to figure out.
Mardi 22 décembre 2010 Dominique Michel
The commit list bounced here too !
Modified: fvwm/components/desktop/FVWM-Crystal_Styles
===================================================================
--- fvwm/components/desktop/FVWM-Crystal_Styles 2010-12-22 19:06:29 UTC (rev 33)
+++ fvwm/components/desktop/FVWM-Crystal_Styles 2010-12-22 19:24:23 UTC (rev 34)
@@ -1,9 +1,17 @@
# Default FVWM-Crystal styles
-Append components/styles/Application-Icons-22-32
+
+# FVWM, Applications and QuakeConsole styles are already loaded
+# by components/desktop/FVWM-Crystal_Preferences that do
+# a LoadPreferences LastChoosenWindowDecoration.
+# This function call launch Window-Decoration-set, which include
+# an Include components/styles/Window-Decorations, which
+# read those 3 files.
+# If we don't read all the files here, the panels get screwed.
+Include components/styles/FVWM
Append components/styles/Applications
Include components/styles/QuakeConsole
+Append components/styles/Application-Icons-22-32
Include components/styles/Menu
-Include components/styles/FVWM
Include components/styles/CursorStyle
# vim:ft=fvwm
Modified: fvwm/components/styles/Application-Icons-22-32
===================================================================
--- fvwm/components/styles/Application-Icons-22-32 2010-12-22 19:06:29 UTC (rev 33)
+++ fvwm/components/styles/Application-Icons-22-32 2010-12-22 19:24:23 UTC (rev 34)
@@ -5,8 +5,8 @@
# Default icon styles {{{1
Style ** MiniIcon 22x22/apps/default.png, Icon 32x32/apps/default.png
-# Icons below are used in �fvwm-crystal-minimal" version {{{1
-# �-----------------------------------------------------------
+# Icons below are used in "fvwm-crystal-minimal" version {{{1
+# -----------------------------------------------------------
# Terminal emulators {{{2
Style XTerm MiniIcon 22x22/apps/xterm.png, Icon 32x32/apps/xterm.png
@@ -19,7 +19,29 @@
Style Multi-gnome-terminal MiniIcon 22x22/apps/multi-gnome-terminal.png, Icon 32x32/apps/multi-gnome-terminal.png
Style xfce4-terminal MiniIcon 22x22/apps/xfce4-terminal.png, Icon 32x32/apps/xfce4-terminal.png
Style Terminator MiniIcon 22x22/apps/terminator.png, Icon 32x32/apps/terminator.png
+Style Lxterminal MiniIcon 22x22/apps/lxterminal.png, Icon 32x32/apps/lxterminal.png
+Style Vte MiniIcon 22x22/apps/vte.png, Icon 32x32/apps/vte.png
+*FvwmEvent-Terminal: Cmd
+*FvwmEvent-Terminal: PassId
+*FvwmEvent-Terminal: add_window FuncResizeTerm
+DestroyFunc FuncResizeTerm
+AddToFunc FuncResizeTerm
++ I WindowId $0 ("XTerm") Resize 80 50
++ I WindowId $0 ("aterm") Resize 80c 25
++ I WindowId $0 ("Eterm") Resize 80 60
++ I WindowId $0 ("URxwt") Resize 80 60
++ I WindowId $0 ("mrxvt") Resize 80 60
++ I WindowId $0 ("konsole") Resize 80 60
++ I WindowId $0 ("Gnome-terminal") Resize 80 60
++ I WindowId $0 ("Multi-gnome-terminal") Resize 80 60
++ I WindowId $0 ("xfce4-terminal") Resize 80 60
++ I WindowId $0 ("Terminator") Resize 80 60
++ I WindowId $0 ("Lxterminal") Resize 80 50
++ I WindowId $0 ("Vte") Resize 80 50
+
+AddToFunc StartFunction I FvwmEvent FvwmEvent-Terminal
+
# Text applications {{{2
Style elinks MiniIcon 22x22/apps/elinks.png, Icon 32x32/apps/elinks.png
Style aptsh MiniIcon 22x22/apps/aptsh.png, Icon 32x32/apps/aptsh.png
@@ -33,11 +55,13 @@
Style mc MiniIcon 22x22/apps/mc.png , Icon 32x32/apps/mc.png
Style aptitude MiniIcon 22x22/apps/aptitude.png, Icon 32x32/apps/aptitude.png
+
+
# GTK/GNOME applications {{{2
Style Gimp MiniIcon 22x22/apps/gimp.png, Icon 32x32/apps/gimp.png
Style MPlayer MiniIcon 22x22/apps/mplayer.png, Icon 32x32/apps/mplayer.png
-Style Firefox-bin MiniIcon 22x22/apps/firefox.png, Icon 32x32/apps/firefox.png
Style Firefox MiniIcon 22x22/apps/firefox.png, Icon 32x32/apps/firefox.png
+Style Firefox-bin UseStyle Firefox
Style gajim.py MiniIcon 22x22/apps/gajim.png, Icon 32x32/apps/gajim.png
Style gajim MiniIcon 22x22/apps/gajim.png, Icon 32x32/apps/gajim.png
@@ -148,7 +172,7 @@
Style gtk-gnutella MiniIcon 22x22/apps/gtk-gnutella.png, Icon 32x32/apps/gtk-gnutella.png
Style GTKtalog MiniIcon 22x22/apps/gtktalog.png, Icon 32x32/apps/gtktalog.png
Style gtktalog UseStyle GTKtalog
-Style jumpnbump-menu MiniIcon 22x22/apps/jumpnbump-menu.png, Icon 32x32/apps/jumpnbump-menu.png
+Style jumpnbump-menu MiniIcon 22x22/apps/jumpnbump.png, Icon 32x32/apps/jumpnbump.png
Style gossip MiniIcon 22x22/apps/gossip.png, Icon 32x32/apps/gossip.png
Style gaim MiniIcon 22x22/apps/gaim.png, Icon 32x32/apps/gaim.png
Style gnumeric MiniIcon 22x22/apps/gnumeric.png, Icon 32x32/apps/gnumeric.png
@@ -165,15 +189,17 @@
Style xqf MiniIcon 22x22/apps/xqf.png, Icon 32x32/apps/xqf.png
Style streamtuner MiniIcon 22x22/apps/streamtuner.png, Icon 32x32/apps/streamtuner.png
Style Flock-bin MiniIcon 22x22/apps/flock.png, Icon 32x32/apps/flock.png
-Style Mozilla-bin MiniIcon 22x22/apps/mozilla.png, Icon 32x32/apps/mozilla.png
+Style Mozilla MiniIcon 22x22/apps/mozilla.png, Icon 32x32/apps/mozilla.png
+Style Mozilla-bin UseStyle Mozilla
Style xchat MiniIcon 22x22/apps/xchat.png, Icon 32x32/apps/xchat.png
Style gnudoku MiniIcon 22x22/apps/gnudoku.png, Icon 32x32/apps/gnudoku.png
Style goobox MiniIcon 22x22/apps/goobox.png, Icon 32x32/apps/goobox.png
Style evince MiniIcon 22x22/apps/evince.png, Icon 32x32/apps/evince.png
Style seahorse MiniIcon 22x22/apps/seahorse.png, Icon 32x32/apps/seahorse.png
Style gweled MiniIcon 22x22/apps/gweled.png, Icon 32x32/apps/gweled.png
-Style Thunderbird-bin MiniIcon 22x22/apps/thunderbird.png, Icon 32x32/apps/thunderbird.png
-Style Mozilla-thunderbird-bin UseStyle Thunderbird-bin
+Style Thunderbird MiniIcon 22x22/apps/thunderbird.png, Icon 32x32/apps/thunderbird.png
+Style Thunderbird-bin UseStyle Thunderbird
+Style Mozilla-thunderbird-bin UseStyle Thunderbird
Style Evolution MiniIcon 22x22/apps/evolution.png, Icon 32x32/apps/evolution.png
Style "Evolution:shell" UseStyle Evolution
Style Mahjongg MiniIcon 22x22/apps/mahjongg.png, Icon 32x32/apps/mahjongg.png
Modified: fvwm/components/styles/Applications
===================================================================
--- fvwm/components/styles/Applications 2010-12-22 19:06:29 UTC (rev 33)
+++ fvwm/components/styles/Applications 2010-12-22 19:24:23 UTC (rev 34)
@@ -11,9 +11,13 @@
#Style Untitled !Title, !Borders
Style wine !Title, !Borders
Style lxdoom !Title, !Borders, EWMHPlacementIgnoreWorkingArea
-Style Firefox-bin NoPPosition, EWMHNoMiniIconOverride
-Style Thunderbird-bin NoPPosition, EWMHNoMiniIconOverride
-Style Mozilla-bin NoPPosition, EWMHNoMiniIconOverride
+Style Firefox NoPPosition, EWMHNoMiniIconOverride
+Style Firefox-bin UseStyle Firefox
+Style Thunderbird NoPPosition, EWMHNoMiniIconOverride
+Style Thunderbird-bin UseStyle Thunderbird
+Style Mozilla-thunderbird-bin UseStyle Thunderbird
+Style Mozilla NoPPosition, EWMHNoMiniIconOverride
+Style Mozilla-bin UseStyle Mozilla
Style kicker !Title, !Borders, NeverFocus, NoIcon, FixedSize, \
WindowListSkip, FixedPosition
@@ -23,9 +27,6 @@
Style Blender !Title, !Borders
Style giFToxic EWMHMiniIconOverride
-Style MPlayer NoTitle, !Borders, GnomeIgnoreHints, EWMHIgnoreStackingOrderHints
-Style "MPlayer - Video" Title, Borders, GnomeIgnoreHints, EWMHIgnoreStackingOrderHints
-
Style tuxeyes !Title, !Borders, StaysOnBottom, Sticky, NoIcon, \
WindowListSkip
@@ -41,12 +42,6 @@
Style FREEGLUT !Title, !Borders
-Style XMMS_Player !Title
-Style XMMS_Playlist !Title
-Style XMMS_Equalizer !Title
-
-Style beep-media-player !Title
-
Style Zinf !Title
Style OpenOffice.org* Title, Borders, NakedTransient
@@ -54,6 +49,8 @@
Style xtensoftphone !Title, !Borders
+# Media players styles are in components/Music
+
Include components/bindings/Application-Ardour
# vim:ft=fvwm
Modified: fvwm/components/styles/FVWM
===================================================================
--- fvwm/components/styles/FVWM 2010-12-22 19:06:29 UTC (rev 33)
+++ fvwm/components/styles/FVWM 2010-12-22 19:24:23 UTC (rev 34)
@@ -8,11 +8,13 @@
Style FvwmButtons UseStyle FvwmParts
Style FvwmPager UseStyle FvwmParts
Style FvwmIconMan UseStyle FvwmParts
-#Style FvwmScript UseStyle FvwmParts
+Style FvwmScript UseStyle FvwmParts
Style trayer UseStyle FvwmParts
+#Style stalonetray UseStyle FvwmParts
Style FvwmIdent UseStyle FvwmParts
-Style FvwmIdent VariablePosition
+Style FvwmIdent VariablePosition, \
+ Font "xft:$[panel_font]:pixelsize=$[panel_font_size]:encoding=iso10646-1"
Style FvwmForm Sticky, WindowListSkip, \
FixedSize, StaysOnTop, NoHandles, BorderWidth 1, HandleWidth 1, \
Modified: fvwm/components/styles/Window-Decorations
===================================================================
--- fvwm/components/styles/Window-Decorations 2010-12-22 19:06:29 UTC (rev 33)
+++ fvwm/components/styles/Window-Decorations 2010-12-22 19:24:23 UTC (rev 34)
@@ -2,8 +2,8 @@
# which can be affected by changed decoration. You don't need to use it
# directly
-Read $./FVWM
-Read $./QuakeConsole
-Read $./Applications
+Include components/style/FVWM
+Include components/style/QuakeConsole
+Include components/style/Applications
# vim:ft=fvwm
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
