[gnue] r9272 - in trunk/gnue-forms: . images src

[reinhard]

Author: reinhard
Date: 2007-01-12 03:25:58 -0600 (Fri, 12 Jan 2007)
New Revision: 9272

Added:
   trunk/gnue-forms/defaults/
Removed:
   trunk/gnue-forms/dialogs/
   trunk/gnue-forms/etc/
   trunk/gnue-forms/images/macosx/
   trunk/gnue-forms/images/winxp/
Modified:
   trunk/gnue-forms/MANIFEST.in
   trunk/gnue-forms/setup.cvs
   trunk/gnue-forms/setup.py
   trunk/gnue-forms/src/GFInstance.py
Log:
Update and cleanup of installation files.


Modified: trunk/gnue-forms/MANIFEST.in
===================================================================
--- trunk/gnue-forms/MANIFEST.in        2007-01-12 09:24:24 UTC (rev 9271)
+++ trunk/gnue-forms/MANIFEST.in        2007-01-12 09:25:58 UTC (rev 9272)
@@ -11,12 +11,12 @@
 include doc/man/*
 include doc/technotes/*
 
+include defaults/*
+
 include images/*
 include images/default/*
 include images/gnome/*
 include images/kde3/*
-include images/macosx/*
-include images/winxp/*
 
 include packaging/debian/*
 include packaging/fink/*
@@ -24,5 +24,3 @@
 include po/*
 
 include scripts/gnue-*
-
-include utils/gfd04to05.py

Copied: trunk/gnue-forms/defaults (from rev 9268, trunk/gnue-forms/etc)

Modified: trunk/gnue-forms/setup.cvs
===================================================================
--- trunk/gnue-forms/setup.cvs  2007-01-12 09:24:24 UTC (rev 9271)
+++ trunk/gnue-forms/setup.cvs  2007-01-12 09:25:58 UTC (rev 9272)
@@ -30,7 +30,6 @@
 
 createShell ('gfcvs', 'gnue-forms')
 
-createLink ('dialogs', '%s/share/gnue/dialogs' % CONFDIR, overwrite=1)
 createLink ('images', '%s/share/gnue/images/forms' % CONFDIR, overwrite=1)
 
-createLink ('etc/default.gfd', '%s/etc/default.gfd' % CONFDIR, overwrite=1)
+createLink ('defaults', '%s/share/gnue/forms/defaults' % CONFDIR, overwrite=1)

Modified: trunk/gnue-forms/setup.py
===================================================================
--- trunk/gnue-forms/setup.py   2007-01-12 09:24:24 UTC (rev 9271)
+++ trunk/gnue-forms/setup.py   2007-01-12 09:25:58 UTC (rev 9272)
@@ -63,24 +63,22 @@
     params ["scripts"]     = ["scripts/gnue-forms"]
 
     # The Data
-    image01files = self.allfiles ("images")
-    image02files = self.allfiles ("images/default")
-    image03files = self.allfiles ("images/gnome")
-    image04files = self.allfiles ("images/kde3")
-#    image05files = self.allfiles ("images/macosx")
-#    image06files = self.allfiles ("images/winxp")
-    man1files   = self.allfiles ("doc/man")
-    docfiles    = self.allfiles ("doc")
+    defaultsfiles = self.allfiles ("defaults")
+    image01files  = self.allfiles ("images")
+    image02files  = self.allfiles ("images/default")
+    image03files  = self.allfiles ("images/gnome")
+    image04files  = self.allfiles ("images/kde3")
+    man1files     = self.allfiles ("doc/man")
+    docfiles      = self.allfiles ("doc")
 
-    params ["data_files"] = \
-      [("share/gnue/images/forms",                       image01files),
-       ("share/gnue/images/forms/default",               image02files),
-       ("share/gnue/images/forms/gnome",                 image03files),
-       ("share/gnue/images/forms/kde3",                  image04files),
-#       ("share/gnue/images/forms/macosx",                image05files),
-#       ("share/gnue/images/forms/winxp",                 image06files),
-       ("share/man/man1",                                man1files),
-       ("share/doc/gnue-forms",                          docfiles)]
+    params ["data_files"] = [
+       ("share/gnue/forms/defaults",       defaultsfiles),
+       ("share/gnue/images/forms",         image01files),
+       ("share/gnue/images/forms/default", image02files),
+       ("share/gnue/images/forms/gnome",   image03files),
+       ("share/gnue/images/forms/kde3",    image04files),
+       ("share/man/man1",                  man1files),
+       ("share/doc/gnue-forms",            docfiles)]
 
   # ---------------------------------------------------------------------------
   # Build files to be distributed and installed:

Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2007-01-12 09:24:24 UTC (rev 9271)
+++ trunk/gnue-forms/src/GFInstance.py  2007-01-12 09:25:58 UTC (rev 9272)
@@ -166,7 +166,8 @@
                     moduleName=moduleName)
 
         assert gDebug(4, "Loading default menu and toolbar")
-        filename = os.path.join(paths.config, 'default.gfd')
+        filename = os.path.join(paths.data,
+                'share/gnue/forms/defaults/default.gfd')
         filehandle = FileUtils.openResource(filename)
         self.__default_form = loadFile(filehandle, self, initialize=0,
                 url=filename)