modifs

DMX-2.0/Main.cs

@@ -27,8 +27,10 @@ namespace DMX2
 		{
 			bool fullscreen = false;
 			//WebServer ws = null; bool webserv = false;
-			OSCServer osc = null; bool oscEn=true;
-			System.IO.FileInfo openfile=null;
+			OSCServer osc = null;
+			bool oscEn = true;
+			System.IO.FileInfo openfile = null;
+			bool live = false;
 
 			// Traitement des options en ligne de commande :
 
@@ -38,21 +40,25 @@ namespace DMX2
 				case "fs":
 					fullscreen = true;
 					break;
+				case "live":
+					live = true;
+					break;
 				case "noosc":
-					oscEn=false;
+					oscEn = false;
 					break;
 				/*case "ws":
 					webserv = true;
 					break;		*/			
 				default:
-					if(System.IO.File.Exists(arg))
-						openfile = new System.IO.FileInfo(arg);
+					if (System.IO.File.Exists (arg))
+						openfile = new System.IO.FileInfo (arg);
 					break;
 				}
 			}
 
 			//if(webserv) ws = new WebServer();
-			if(oscEn) osc = new OSCServer();
+			if (oscEn)
+				osc = new OSCServer ();
 
 			// Initialisation GTK#
 			Application.Init ();
@@ -75,13 +81,33 @@ namespace DMX2
 			// Creation de la fenetre principale
 			MainWindow win = new MainWindow ();
 			// application des options
-			if(fullscreen) win.ToggleFullscreen();
+			if (fullscreen)
+				win.ToggleFullscreen ();
 
-			if (openfile!=null) win.OpenFile(openfile);
+			if (openfile != null)
+				win.OpenFile (openfile);
 
 			// Gestion des erreurs non traitées dans l'interface
 			GLib.ExceptionManager.UnhandledException += HandleUnhandledException;
 
+			System.IO.DirectoryInfo hDir = new System.IO.DirectoryInfo (Environment.GetEnvironmentVariable ("HOME"));
+			if (hDir.Exists) {
+				if (live) {
+					System.IO.DirectoryInfo lDir = 
+						new System.IO.DirectoryInfo(hDir.FullName+"/LIVE");
+					if(lDir.Exists)
+						hDir=lDir;
+				}
+				var cDir=new System.IO.DirectoryInfo(hDir.FullName+"/loupiottes");
+				if(!cDir.Exists)
+					cDir.Create();
+				cDir.Refresh();
+				if(cDir.Exists)
+					win.CurFolder = cDir.FullName;
+				else
+					win.CurFolder = hDir.FullName;
+			}
+
 			// Lancement
 			win.Show ();
 			Application.Run ();

DMX-2.0/MainWindow.cs

@@ -33,6 +33,11 @@ namespace DMX2
 		FileInfo conduiteFile=null;
 		int lastSaveHash=0;
 
+		public string CurFolder{
+			get;
+			set;
+		}
+
 		Gtk.Container seqCtn=null;
  
 		public static MainWindow Win {
@@ -390,9 +395,10 @@ namespace DMX2
 			                                              "Enregistrer", ResponseType.Accept);
 
 			fcd.Filter = new FileFilter ();
-
 			fcd.Filter.AddPattern ("*.dmx2");
 
+			fcd.SetCurrentFolder(CurFolder);
+
 			bool ok = false;
 
 			while (!ok) {
@@ -420,10 +426,13 @@ namespace DMX2
 				}
 				else ok=true;
 			}
+			CurFolder = fcd.CurrentFolder;
 			fcd.Destroy();
 			return SaveFile();
 		}
 
+
+
 		bool SaveFile ()
 		{
 			if (conduiteFile == null)
@@ -450,12 +459,14 @@ namespace DMX2
 
 			fcd.Filter = new FileFilter ();
 			fcd.Filter.AddPattern ("*.dmx2");
+			fcd.SetCurrentFolder(CurFolder);
 			if ((ResponseType)fcd.Run () == ResponseType.Cancel || fcd.Filename==null) {
 				fcd.Destroy ();
 				return;
 			}	
 
 			FileInfo file = new FileInfo (fcd.Filename);
+			CurFolder = fcd.CurrentFolder;
 			fcd.Destroy ();
 			OpenFile (file);
 		}		

live-dmx/config/bootloaders/isolinux/isolinux.cfg

@@ -1,4 +1,4 @@
 include menu.cfg
 default vesamenu.c32
 prompt 0
-timeout 5
+timeout 50

live-dmx/config/bootloaders/syslinux/live.cfg.in

@@ -1,12 +1,7 @@
 label live-@FLAVOUR@
-	menu label ^Live (@FLAVOUR@)
+	menu label ^Loupiottes Live (@FLAVOUR@)
 	menu default
 	linux @LINUX@
 	initrd @INITRD@
 	append @APPEND_LIVE@
 
-label live-@FLAVOUR@-failsafe
-	menu label ^Live (@FLAVOUR@ failsafe)
-	linux @LINUX@
-	initrd @INITRD@
-	append @APPEND_LIVE_FAILSAFE@

live-dmx/config/bootloaders/syslinux/menu.cfg

@@ -4,14 +4,5 @@ menu width 82
 menu title Boot menu
 include stdmenu.cfg
 include live.cfg
-include install.cfg
-menu begin advanced
-	menu title ^Advanced options
-	include stdmenu.cfg
-	label mainmenu
-		menu label ^Back..
-		menu exit
-	include advanced.cfg
-menu end
 
 menu clear

live-dmx/config/bootloaders/syslinux/syslinux.cfg

@@ -1,4 +1,4 @@
 include menu.cfg
 default vesamenu.c32
 prompt 0
-timeout 5
+timeout 50

live-dmx/config/hooks/persistence.binary

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-unxz binary/persistence.xz 

live-dmx/config/includes.chroot/etc/rc.local

@@ -1,3 +0,0 @@
-cp /usr/lib/cli/gstreamer-sharp-0.9/libgstreamersharpglue-0.10.so /usr/lib/mono/gac/gstreamer-sharp/*/
-
-exit 0

live-dmx/config/includes.chroot/etc/skel/LIVE

@@ -0,0 +1 @@
+/lib/live/mount/medium

live-dmx/config/includes.chroot/etc/skel/autostart.sh

@@ -6,5 +6,5 @@ nm-applet &
 #xterm &
 #aconnectgui &
 volumeicon &
-mono /usr/local/bin/DMX-2.0.exe fullscreen aguibtn &
+mono /usr/local/bin/DMX-2.0.exe fullscreen live &