[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[123]

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

Revision: 123
          http://fvwm-crystal.svn.sourceforge.net/fvwm-crystal/?rev=123&view=rev
Author:   dominique_libre
Date:     2012-07-12 22:36:55 +0000 (Thu, 12 Jul 2012)
Log Message:
-----------
fvwm-crystal.generate-menu: use FvwmForm instead of xmessage

Modified Paths:
--------------
    bin/fvwm-crystal.generate-menu
    fvwm/components/functions/Preferences-Menu

Modified: bin/fvwm-crystal.generate-menu
===================================================================
--- bin/fvwm-crystal.generate-menu	2012-07-12 21:44:08 UTC (rev 122)
+++ bin/fvwm-crystal.generate-menu	2012-07-12 22:36:55 UTC (rev 123)
@@ -82,7 +82,7 @@
 # Copy default user prefs if they don't exist.
 if [ ! -e $USERPREFS/$1 ]; then
 	cp $SYSPREFS/$1 $USERPREFS
-	xmessage "Please edit $USERPREFS/$1 at your conveniance. When done, re-run this tool."
+	FvwmCommand "Pref-Warning \"$USERPREFS/$1\""
 	exit
 fi
 
@@ -107,7 +107,7 @@
 echo " "
 echo "Installing the menu entrie in $FC_MENUBASE and the icons in $FC_ICONBASE"
 
-read PROCESS
+#read PROCESS
 
 # / FIXME (this part work, see searchkeystrings())
 # Locale test
@@ -1021,5 +1021,6 @@
 echo "You will find the list of the desktop files with non valid Main Category in non_valid_cat.log"
 
 if [ $# -ge 2 ]; then
+	rm non_valid_cat.log
 	FvwmCommand 'Module FvwmForm Menu-Restart-Dialog'
 fi

Modified: fvwm/components/functions/Preferences-Menu
===================================================================
--- fvwm/components/functions/Preferences-Menu	2012-07-12 21:44:08 UTC (rev 122)
+++ fvwm/components/functions/Preferences-Menu	2012-07-12 22:36:55 UTC (rev 123)
@@ -461,4 +461,20 @@
 *Menu-Restart-Dialog: Command Nop
 *Menu-Restart-Dialog: Line center
 
+DestroyFunc Pref-Warning
+AddToFunc Pref-Warning
++ I All (Pref-Warning-Dialog) Close
++ I DestroyModuleConfig Pref-Warning-Dialog: *
++ I *Pref-Warning-Dialog: Title "$[gt.Preference Warning]"
++ I *Pref-Warning-Dialog: Text "$[gt.Please edit the following file to suit your need]"
++ I *Pref-Warning-Dialog: Text "$[gt.and restart this tool:]"
++ I *Pref-Warning-Dialog: Text "$[*]"
++ I *Pref-Warning-Dialog: Line center
++ I *Pref-Warning-Dialog: Line center
++ I *Pref-Warning-Dialog: Button quit " $[gt.OK] " ^[
++ I *Pref-Warning-Dialog: Command Nop
++ I *Pref-Warning-Dialog: Line center
++ I Module FvwmForm Pref-Warning-Dialog
+
+
 # vim:ft=fvwm

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