* Conduite.cs: Suppression d'une alerte a la compilation
* MainWindow.cs: Ajout de l'option pour ouverture de fichier au lancement Meilleure gestion des erreurs sur fichier * DMX-2.0.csproj: supression des params en ligne de commande sur debug * Main.cs: pas de webserver par défaut Ajout de l'option pour ouverture de fichier au lancement * gui.stetic:
This commit is contained in:
parent
6417d3adea
commit
eab625a3bf
5 changed files with 34 additions and 32 deletions
|
|
@ -74,7 +74,7 @@ namespace DMX2
|
|||
u.Nom = "Univers par Défaut";
|
||||
|
||||
// La conduite peux recevoir des evenements midi
|
||||
MidiEventProvider midip = new MidiEventProvider (eventManager);
|
||||
/*MidiEventProvider midip = */new MidiEventProvider (eventManager);
|
||||
|
||||
masterEventTarget = new actionEventTarget (
|
||||
delegate(EventData data) {
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@
|
|||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<ConsolePause>false</ConsolePause>
|
||||
<Commandlineparameters>aguibtn nows</Commandlineparameters>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
|
||||
<DebugType>none</DebugType>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,8 @@ namespace DMX2
|
|||
public static void Main (string[] args)
|
||||
{
|
||||
bool fullscreen = false, aguibtn = false;
|
||||
WebServer ws = null; bool webserv = true;
|
||||
WebServer ws = null; bool webserv = false;
|
||||
System.IO.FileInfo openfile=null;
|
||||
|
||||
// Traitement des options en ligne de commande :
|
||||
|
||||
|
|
@ -39,10 +40,12 @@ namespace DMX2
|
|||
case "aguibtn":
|
||||
aguibtn=true;
|
||||
break;
|
||||
case "nows":
|
||||
webserv = false;
|
||||
case "ws":
|
||||
webserv = true;
|
||||
break;
|
||||
default:
|
||||
if(System.IO.File.Exists(arg))
|
||||
openfile = new System.IO.FileInfo(arg);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -68,7 +71,7 @@ namespace DMX2
|
|||
Gtk.Rc.ParseString (reader.ReadToEnd ());
|
||||
|
||||
// Force l'instanciation du handle midi.
|
||||
IntPtr ptr = MidiEventProvider.MidiSeqHandle.Handle;
|
||||
//IntPtr ptr = MidiEventProvider.MidiSeqHandle.Handle;
|
||||
|
||||
// Creation de la fenetre principale
|
||||
MainWindow win = new MainWindow ();
|
||||
|
|
@ -76,6 +79,8 @@ namespace DMX2
|
|||
if(fullscreen) win.ToggleFullscreen();
|
||||
if(aguibtn) win.AfficheBoutonACGUI();
|
||||
|
||||
if (openfile!=null) win.OpenFile(openfile);
|
||||
|
||||
// Gestion des erreurs non traitées dans l'interface
|
||||
GLib.ExceptionManager.UnhandledException += HandleUnhandledException;
|
||||
|
||||
|
|
|
|||
|
|
@ -438,41 +438,39 @@ namespace DMX2
|
|||
return;
|
||||
}
|
||||
|
||||
FileInfo openFile = new FileInfo (fcd.Filename);
|
||||
FileInfo file = new FileInfo (fcd.Filename);
|
||||
fcd.Destroy ();
|
||||
if (!openFile.Exists)
|
||||
OpenFile (file);
|
||||
}
|
||||
|
||||
public void OpenFile (FileInfo file)
|
||||
{
|
||||
if (!file.Exists)
|
||||
return;
|
||||
|
||||
System.Xml.XmlDocument doc;
|
||||
|
||||
try {
|
||||
using(FileStream stream = openFile.OpenRead())
|
||||
{
|
||||
doc = new System.Xml.XmlDocument();
|
||||
doc.Load(stream);
|
||||
stream.Close();
|
||||
using (FileStream stream = file.OpenRead ()) {
|
||||
doc = new System.Xml.XmlDocument ();
|
||||
doc.Load (stream);
|
||||
stream.Close ();
|
||||
}
|
||||
|
||||
Conduite cond = new Conduite(doc);
|
||||
if (cond==null)
|
||||
{
|
||||
// TODO Message erreur au chargement
|
||||
return;
|
||||
}
|
||||
new Conduite (doc);
|
||||
|
||||
conduiteFile = openFile;
|
||||
lastSaveHash = doc.InnerXml.GetHashCode();
|
||||
|
||||
} catch (IOException) {
|
||||
conduiteFile = file;
|
||||
lastSaveHash = doc.InnerXml.GetHashCode ();
|
||||
}
|
||||
|
||||
foreach (Sequenceur s in Conduite.Courante.Sequenceurs)
|
||||
catch (Exception) {
|
||||
//TODO : display error
|
||||
Conduite.Courante.Dispose();
|
||||
return;
|
||||
}
|
||||
foreach (Sequenceur s in Conduite.Courante.Sequenceurs)
|
||||
AddSeqUI (s);
|
||||
|
||||
MajWidgets();
|
||||
NextUpdateFull();
|
||||
}
|
||||
|
||||
MajWidgets ();
|
||||
NextUpdateFull ();
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Gestion des Circuits
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<target-gtk-version>2.12</target-gtk-version>
|
||||
</configuration>
|
||||
<import>
|
||||
<widget-library name="../bin/Release/DMX-2.0.exe" internal="true" />
|
||||
<widget-library name="../bin/Debug/DMX-2.0.exe" internal="true" />
|
||||
</import>
|
||||
<icon-factory>
|
||||
<icon-set id="tirettes">
|
||||
|
|
|
|||
Loading…
Reference in a new issue