From 29c664951fd0d4a52bc5d78efa4b507f16ecf58a Mon Sep 17 00:00:00 2001
From: tchernobog <tchernobog@3ecf2c5c-341e-0410-92b4-d18e462d057c>
Date: Thu, 14 Sep 2006 23:34:12 +0000
Subject: [PATCH] - Add desktop file - Delete old leftovers from first xmlsave
 implementation - Move valid dtd to xmlsave

git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@1166 3ecf2c5c-341e-0410-92b4-d18e462d057c
---
 Makefile.am                             |  6 +++++
 data/example-preferences.xml            | 27 --------------------
 data/example-snapshot.xsgp              | 33 -------------------------
 data/preferences.dtd                    | 29 ----------------------
 data/sgpemv2.desktop                    | 15 +++++++++++
 plugins/pyloader/Makefile.am            |  2 +-
 plugins/xmlsave/Makefile.am             |  5 +++-
 {data => plugins/xmlsave/src}/sgpem.dtd |  0
 8 files changed, 26 insertions(+), 91 deletions(-)
 delete mode 100644 data/example-preferences.xml
 delete mode 100644 data/example-snapshot.xsgp
 delete mode 100644 data/preferences.dtd
 create mode 100644 data/sgpemv2.desktop
 rename {data => plugins/xmlsave/src}/sgpem.dtd (100%)

diff --git a/Makefile.am b/Makefile.am
index 15fd2ad..eda03a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,8 @@ examplesdir = $(sharedir)/examples
 policiesdir = $(sharedir)/policies
 plugindir = $(sharedir)/plugins
 gladedir = $(sharedir)/glade
+
+applicationsdir = @datadir@/applications
 localedir = @datadir@/locale
 aclocaldir = @datadir@/aclocal
 
@@ -106,6 +108,10 @@ MAINTAINERCLEANFILES += doc/API
 pkgconfdir = $(libdir)/pkgconfig
 pkgconf_DATA = config/sgpemv2.pc
 
+applications_DATA = data/sgpemv2.desktop
+
+EXTRA_DIST += $(applications_DATA)
+
 # ############################################################
 #
 # documentation
diff --git a/data/example-preferences.xml b/data/example-preferences.xml
deleted file mode 100644
index e054ef7..0000000
--- a/data/example-preferences.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE sgpem SYSTEM "preferences.dtd">
-<sgpem>
-    <recents>
-        <recent order="recent1" name="caio">Ultimo file aperto</recent>
-        <recent order="recent2" name="tullio">Penultimo file aperto</recent>
-        <recent order="recent3" name="sempronio">Terzultimo file aperto</recent>
-    </recents>
-    <layout>
-        <window id="mainwnd" geometry="0.0 0.0 100.0 100.0"/>
-        <window id="processeswnd" geometry="0.0 0.0 20.0 50.0"/>
-        <window id="resourceswnd" geometry="0.0 50.0 20.0 50.0"/>
-        <window id="schewnd" geometry="20.0 0.0 80.0 100.0"/>
-    </layout>
-    <preferences>
-        <default-speed>100</default-speed>
-        <modules>
-            <module id="python-sjf" />
-            <module id="python-rr" enabled="true" />
-            <module id="python-ocio" enabled="false" />
-        </modules>
-    </preferences>
-</sgpem>
-
-<!-- This file is for test only.
-     Handwrited to test DTD and for data example.
-     Validated with: xmllint  -->
\ No newline at end of file
diff --git a/data/example-snapshot.xsgp b/data/example-snapshot.xsgp
deleted file mode 100644
index a9359a0..0000000
--- a/data/example-snapshot.xsgp
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE sgpem SYSTEM "sgpem.dtd">
-<sgpem>
-  <resources>
-    <resource name="Resource 1" id="reskey2" arrival-time="0" how-many="1" pre-emptible="false"/>
-    <resource name="Invalid? Resource &lt;n&gt; 1" id="reskey3" arrival-time="0" how-many="1" pre-emptible="false"/>
-  </resources>
-  <schedulables>
-    <process name="Process 1" priority="2" arrival-time="0">
-      <threads>
-        <thread name="Process 1 - Thread 1" priority="6" arrival-delta="2" lasts-for="0">
-          <requests>
-            <request arrival-time="3">
-              <subrequest resource="2" how-many="2" lasts-for="5"/>
-            </request>
-          </requests>
-        </thread>
-        <thread name="Process 1 - Thread 2" priority="5" arrival-delta="3" lasts-for="0">
-          <requests/>
-        </thread>
-      </threads>
-    </process>
-    <process name="Process 2" priority="3" arrival-time="7">
-      <threads/>
-    </process>
-    <process name="Process 3" priority="1" arrival-time="9">
-      <threads/>
-    </process>
-    <process name="Invalid? &lt;process/&gt; &amp;3 or\4" priority="1" arrival-time="9">
-      <threads/>
-    </process>
-  </schedulables>
-</sgpem>
diff --git a/data/preferences.dtd b/data/preferences.dtd
deleted file mode 100644
index 2086279..0000000
--- a/data/preferences.dtd
+++ /dev/null
@@ -1,29 +0,0 @@
-<!ELEMENT sgpem (recents, layout?, preferences) >
-<!ENTITY % text "#PCDATA">
-
-<!-- Ricorda i file piu' recenti -->
-<!ELEMENT recents (recent)*>
-<!ELEMENT recent (%text;)>
-<!ATTLIST recent 
-     order ID #REQUIRED
-     name CDATA #IMPLIED>
-
-<!ELEMENT layout (window)+>
-<!ELEMENT window EMPTY>
-<!-- 
-     attribute 'geometry' is: “x y width height”. All 
-     values are percentuals of the screen size 
--->
-<!ATTLIST window
-     id ID #REQUIRED
-     geometry NMTOKENS #REQUIRED>
-
-<!-- Altre preferenze -->
-<!ELEMENT preferences (default-speed, modules)>
-<!ELEMENT default-speed (%text;)>
-<!ELEMENT modules (module)*>
-<!ELEMENT module EMPTY>
-<!ATTLIST module
-     id ID #REQUIRED
-     enabled (true | false) "false">
- 
diff --git a/data/sgpemv2.desktop b/data/sgpemv2.desktop
new file mode 100644
index 0000000..f59ab07
--- /dev/null
+++ b/data/sgpemv2.desktop
@@ -0,0 +1,15 @@
+Type=Application
+Version=0.9
+Name=SGPEMv2
+Categories=Education;Engineering;GTK
+
+GenericName=Process Scheduling Simulator
+GenericName[it]=Simulatore della Gestione dei Processi
+
+Comment=An educational software showing process scheduling in a simulated operating system
+Comment[it]=Un programma educativo che mostra la gestione dei processi in un sistema operativo simulato
+
+Icon=scc-sgpemv2
+
+Exec=sgpemv2 '%f'
+Terminal=false
diff --git a/plugins/pyloader/Makefile.am b/plugins/pyloader/Makefile.am
index cc2e591..917ce79 100644
--- a/plugins/pyloader/Makefile.am
+++ b/plugins/pyloader/Makefile.am
@@ -75,7 +75,7 @@ libpyloader_la_CPPFLAGS = \
                -DLOCALEDIR="\"$(localedir)\"" \
                $(PYTHON_CPPFLAGS) \
                $(GLIBMM_CFLAGS) \
-	       $(SGPEMV2_CFLAGS)
+               $(SGPEMV2_CFLAGS)
 libpyloader_la_CXXFLAGS = \
                $(VISIB_HIDDEN)
 libpyloader_la_LIBADD = \
diff --git a/plugins/xmlsave/Makefile.am b/plugins/xmlsave/Makefile.am
index afc8bff..4123e75 100644
--- a/plugins/xmlsave/Makefile.am
+++ b/plugins/xmlsave/Makefile.am
@@ -60,6 +60,9 @@ EXTRA_DIST += \
 	gettext.h \
 	$(macros)
 
+# dtds
+EXTRA_DIST += src/sgpem.dtd
+
 # ############################################################
 #
 # source : libxmlsave.la
@@ -74,7 +77,7 @@ libxmlsave_la_CPPFLAGS = \
                -DLOCALEDIR="\"$(localedir)\"" \
                $(LIBXML2_CFLAGS) \
                $(GLIBMM_CFLAGS) \
-	       $(SGPEMV2_CFLAGS)
+	             $(SGPEMV2_CFLAGS)
 libxmlsave_la_CXXFLAGS = \
                $(VISIB_HIDDEN)
 libxmlsave_la_LIBADD = \
diff --git a/data/sgpem.dtd b/plugins/xmlsave/src/sgpem.dtd
similarity index 100%
rename from data/sgpem.dtd
rename to plugins/xmlsave/src/sgpem.dtd