Skip to content

Commit

Permalink
two desktop layouts: Horizontal and Vertical (in progress)
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomasFunk committed Aug 19, 2012
1 parent 9c07dd6 commit baa4647
Show file tree
Hide file tree
Showing 18 changed files with 782 additions and 452 deletions.
52 changes: 52 additions & 0 deletions .settings
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#***********************************************************************
# Environment settings
#***********************************************************************
# DO NOT EDIT! WILL BE CHANGED BY FVWMFORM-BASESETUP!

#-----------------------------------------------------------------------
# The actual theme. Be changed dynamically via FuncChangeDecor
#-----------------------------------------------------------------------
InfoStoreAdd used_theme Ambience

#-----------------------------------------------------------------------
# Each Nightshade theme is located in $[FVWM_USERDIR]/themes
# Here the path to the actual theme will be set
# Be changed dynamically via FuncChangeDecor
#-----------------------------------------------------------------------
SetEnv NS_THEMEDIR $[FVWM_USERDIR]/themes/$[infostore.used_theme]

#-----------------------------------------------------------------------
# wallpaper directory path.
#-----------------------------------------------------------------------
InfoStoreAdd wallpaper_dir $[FVWM_USERDIR]/wallpapers

#-----------------------------------------------------------------------
# default used font for all Fvwm parts
#-----------------------------------------------------------------------
InfoStoreAdd used_font Arial

#-----------------------------------------------------------------------
# default font size
#-----------------------------------------------------------------------
InfoStoreAdd fontsize 12

#-----------------------------------------------------------------------
# The actual layout
#-----------------------------------------------------------------------
InfoStoreAdd used_layout Horizontal


#***********************************************************************
# Default applications
#***********************************************************************

#-----------------------------------------------------------------------
# terminal
#-----------------------------------------------------------------------
InfoStoreAdd default_terminal konsole

#-----------------------------------------------------------------------
# browser
#-----------------------------------------------------------------------
InfoStoreAdd default_browser firefox

9 changes: 9 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
History:
07/31/2012 V 0.5
- roll out some infostore variables to .settings so that an update of the
config won't destroy user settings
- create two desktop layouts: Horizontal and Vertical
- replace xclock with conky (because of transparent background)
- fix bug that FuncDesktopCreateScreenshot creates now the whole desktop
not only the active window


07/31/2012 V 0.4.5
- update relevant parts related to Fvwm Default Config V 0.21.7
- add some comments and delete unused lines
Expand Down
20 changes: 0 additions & 20 deletions bin/Changelog_fvwm-xdg-menu

This file was deleted.

112 changes: 112 additions & 0 deletions bin/FvwmForm-BaseSetup
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
#-----------------------------------------------------------------------
# File: FvwmForm-BaseSetup
# Version: 1.1.0
# Licence: GPL 2
#
# Description: Script to configure default settings
#
# Author: Thomas Funk <t.funk@web.de>
# Created: 08/01/2012
# Changed: 08/12/2012
#-----------------------------------------------------------------------

DestroyModuleConfig FvwmForm-BaseSetup: *
*FvwmForm-BaseSetup: WarpPointer
# Layout
*FvwmForm-BaseSetup: Line center
*FvwmForm-BaseSetup: Text "Fvwm-Nightshade Base Setup"
*FvwmForm-BaseSetup: Line center
*FvwmForm-BaseSetup: Text " "
*FvwmForm-BaseSetup: Line left
*FvwmForm-BaseSetup: Text "Use this setup to configure default settings."
*FvwmForm-BaseSetup: Line left
*FvwmForm-BaseSetup: Text " "
*FvwmForm-BaseSetup: Line

*FvwmForm-BaseSetup: Line center
*FvwmForm-BaseSetup: Text "---------- Decoration (Windows, Menus) ----------"
*FvwmForm-BaseSetup: Line

*FvwmForm-BaseSetup: Line left
*FvwmForm-BaseSetup: Text "Used Theme: "
*FvwmForm-BaseSetup: Input Theme 15 "Ambience"
*FvwmForm-BaseSetup: Text " (Others: Default, Air)"
*FvwmForm-BaseSetup: Line

*FvwmForm-BaseSetup: Line left
*FvwmForm-BaseSetup: Text "Used Font: "
*FvwmForm-BaseSetup: Input Font 15 "Arial"
*FvwmForm-BaseSetup: Text " (E.g. Sans, Helvetia, Verdana)"
*FvwmForm-BaseSetup: Line

*FvwmForm-BaseSetup: Line left
*FvwmForm-BaseSetup: Text "Used Font size:"
*FvwmForm-BaseSetup: Input Fontsize 3 "12"
*FvwmForm-BaseSetup: Text " (E.g. 10, 11, 13)"
*FvwmForm-BaseSetup: Line

*FvwmForm-BaseSetup: Line left
*FvwmForm-BaseSetup: Text " "
*FvwmForm-BaseSetup: Line center
*FvwmForm-BaseSetup: Text "------- Panels (Iconman, Pager, Systray) -------"
*FvwmForm-BaseSetup: Line

*FvwmForm-BaseSetup: Line left
*FvwmForm-BaseSetup: Text "Used Layout: "
*FvwmForm-BaseSetup: Selection SelItype single
*FvwmForm-BaseSetup: Choice LayoutH LayoutH on "Horizontal (Panels on top/bottom)"
*FvwmForm-BaseSetup: Line left
*FvwmForm-BaseSetup: Text " "
*FvwmForm-BaseSetup: Choice LayoutV LayoutV off "Vertical (Panels on right/left side)"
*FvwmForm-BaseSetup: Line

*FvwmForm-BaseSetup: Line left
*FvwmForm-BaseSetup: Text " "
*FvwmForm-BaseSetup: Line center
*FvwmForm-BaseSetup: Text "----------------- Applications -----------------"
*FvwmForm-BaseSetup: Line

*FvwmForm-BaseSetup: Line left
*FvwmForm-BaseSetup: Text "Used Terminal: "
*FvwmForm-BaseSetup: Input Terminal 15 "xterm"
*FvwmForm-BaseSetup: Text " (E.g. konsole, aterm, rxvt)"
*FvwmForm-BaseSetup: Line

*FvwmForm-BaseSetup: Line left
*FvwmForm-BaseSetup: Text "Used Browser: "
*FvwmForm-BaseSetup: Input Browser 15 "firefox"
*FvwmForm-BaseSetup: Text " (E.g. chromium, seamonkey)"

*FvwmForm-BaseSetup: Line left
*FvwmForm-BaseSetup: Text " "
*FvwmForm-BaseSetup: Line expand
*FvwmForm-BaseSetup: Button quit "Apply & Save"
*FvwmForm-BaseSetup: Command $(Theme? FuncWriteInfoStoreToFileAndSet used_theme $(Theme) $[FVWM_USERDIR]/.settings)
*FvwmForm-BaseSetup: Command $(LayoutH? FuncWriteInfoStoreToFileAndSet used_layout Horizontal $[FVWM_USERDIR]/.settings)
*FvwmForm-BaseSetup: Command $(LayoutH?!rm -f $[FVWM_USERDIR]/.layout; ln -s $[FVWM_USERDIR]/layouts/Horizontal $[FVWM_USERDIR]/.layout)
*FvwmForm-BaseSetup: Command $(LayoutV? FuncWriteInfoStoreToFileAndSet used_layout Vertical $[FVWM_USERDIR]/.settings)
*FvwmForm-BaseSetup: Command $(LayoutV?!rm -f $[FVWM_USERDIR]/.layout; ln -s $[FVWM_USERDIR]/layouts/Vertical $[FVWM_USERDIR]/.layout)
*FvwmForm-BaseSetup: Command $(Font? FuncWriteInfoStoreToFileAndSet used_font $(Font) $[FVWM_USERDIR]/.settings)
*FvwmForm-BaseSetup: Command $(Fontsize? FuncWriteInfoStoreToFileAndSet fontsize $(Fontsize) $[FVWM_USERDIR]/.settings)
*FvwmForm-BaseSetup: Command $(Terminal? FuncWriteInfoStoreToFileAndSet default_terminal $(Terminal) $[FVWM_USERDIR]/.settings)
*FvwmForm-BaseSetup: Command $(Browser? FuncWriteInfoStoreToFileAndSet default_browser $(Browser) $[FVWM_USERDIR]/.settings)
*FvwmForm-BaseSetup: Command Restart

# Before saving the data, remove any previously saved data:
*FvwmForm-BaseSetup: Command DestroyModuleConfig SavedBaseSetup: *
*FvwmForm-BaseSetup: Command !( /bin/echo \
"# This file last created by FvwmForm-BaseSetup on: `/bin/date`."; /bin/echo \
'*SavedBaseSetup: Theme $(Theme) ' ; /bin/echo \
'*SavedBaseSetup: LayoutH $(LayoutH?on) ' ; /bin/echo \
'*SavedBaseSetup: LayoutV $(LayoutV?on) ' ; /bin/echo \
'*SavedBaseSetup: Font $(Font) ' ; /bin/echo \
'*SavedBaseSetup: Fontsize $(Fontsize) ' ; /bin/echo \
'*SavedBaseSetup: Terminal $(Terminal) ' ; /bin/echo \
'*SavedBaseSetup: Browser $(Browser) ' ; /bin/echo \
) > ${FVWM_USERDIR}/.FvwmForm-BaseSetup

*FvwmForm-BaseSetup: Button restart "Reset"
*FvwmForm-BaseSetup: Button quit "Cancel"
*FvwmForm-BaseSetup: Command Nop
# Tell FvwmForm to read vars from the .FvwmForm-BaseSetup file:
*FvwmForm-BaseSetup: UseData .FvwmForm-BaseSetup *SavedBaseSetup
46 changes: 46 additions & 0 deletions bin/built-trayapplist
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#-----------------------------------------------------------------------
# File: built-trayapplist.sh
# Version: 1.0.0
# Licence: GPL 2
#
# Description: shell script to generate a list of actual available
# applets in systray (stalonetray)
#
# Parameters: built-trayapplist.sh <stalonetray_logfile> <applist_file>
#
# Remarks: stalonetray must started with --log-level info and
# output redirected with 2>stalonetray_logfile
#
# Author: Thomas Funk <t.funk@web.de>
# Created: 08/13/2012
# Changed:
#-----------------------------------------------------------------------

#!/bin/bash

infile=$1
outfile=$2

# first delete outfile
if [ -f $outfile ]
then
rm -f $outfile
fi

# get windows ids of last available applets
windows_ids=`sed -n '/tray status/h;/tray status/!H;$!b;x;p' $infile |sed -n '/tray status/,/-----------------------------------/p' | grep wid |cut -d" " -f3`

for id in $windows_ids
do
#echo id: $id
# get PID of the applet
PID=`xprop -id $id _NET_WM_PID |cut -d" " -f3`
#echo PID: $PID
# get command string
cmd=`ps -p $PID -o cmd=`
#echo cmd: $cmd
# put cmd in outfile
echo $cmd >> $outfile
done

exit 0
Loading

0 comments on commit baa4647

Please sign in to comment.