Modified image proc demo, changed to general demo submenu

diff --git a/imageproc_demo/imageproc_demo.desktop b/demo_apps/demo_imageproc/demo_imageproc.desktop
similarity index 60%
rename from imageproc_demo/imageproc_demo.desktop
rename to demo_apps/demo_imageproc/demo_imageproc.desktop
index 585e2ea669880ca473c54bac9c9e34d9c5565eb8..a9690b8b73752d1a6ad93f77bf96eece38f79eec 100644 (file)
--- a/imageproc_demo/imageproc_demo.desktop
+++ b/demo_apps/demo_imageproc/demo_imageproc.desktop
@@ -4,8 +4,8 @@ Name=Image Processing Demo
 GenericName=Image Processing Demo
 Icon=/usr/share/matrix-gui-2.0/apps/images/imageproc-icon.png
 Type=Application
 GenericName=Image Processing Demo
 Icon=/usr/share/matrix-gui-2.0/apps/images/imageproc-icon.png
 Type=Application

-Exec=/usr/share/matrix-gui-2.0/apps/imageproc_demo/imageproc_demo.sh
+Exec=/usr/share/matrix-gui-2.0/apps/demo_imageproc/demo_imageproc.sh

 Categories=imageproc
 ProgramType=console
 Categories=imageproc
 ProgramType=console

-X-MATRIX-Description=/usr/share/matrix-gui-2.0/apps/imageproc_demo/desc_imageproc_demo.html
+X-MATRIX-Description=/usr/share/matrix-gui-2.0/apps/demo_imageproc/desc_demo_imageproc.html

 X-MATRIX-DisplayPriority=1
 X-MATRIX-DisplayPriority=1

diff --git a/imageproc_demo/imageproc_demo.sh b/demo_apps/demo_imageproc/demo_imageproc.sh
similarity index 93%
rename from imageproc_demo/imageproc_demo.sh
rename to demo_apps/demo_imageproc/demo_imageproc.sh
index f4afb6fa6b64bb1efd74c3f24d42b9334152b56c..50a2cb47bb6c1c513c2232ced315ed0651272630 100644 (file)
--- a/imageproc_demo/imageproc_demo.sh
+++ b/demo_apps/demo_imageproc/demo_imageproc.sh
@@ -34,6 +34,6 @@
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
 #  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 

-/usr/share/matrix-gui-2.0/apps/imageproc_demo/run_dsp.sh $2> /dev/null
+/usr/share/matrix-gui-2.0/apps/demo_imageproc/run_dsp.sh $2> /dev/null

 
 

-cat /usr/share/matrix-gui-2.0/apps/imageproc_demo/imageproc_demo.html
+cat /usr/share/matrix-gui-2.0/apps/demo_imageproc/demo_imageproc.html

diff --git a/imageproc_demo/desc_imageproc_demo.html b/demo_apps/demo_imageproc/desc_demo_imageproc.html
similarity index 100%
rename from imageproc_demo/desc_imageproc_demo.html
rename to demo_apps/demo_imageproc/desc_demo_imageproc.html

diff --git a/imageproc_demo/run_dsp.sh b/demo_apps/demo_imageproc/run_dsp.sh
similarity index 92%
rename from imageproc_demo/run_dsp.sh
rename to demo_apps/demo_imageproc/run_dsp.sh
index ac1e45abcc4fa265aad1c101c0088f5d2ea3968d..f89be14c3f0bf8f5ec4ef5365ca4f0447ac47062 100644 (file)
--- a/imageproc_demo/run_dsp.sh
+++ b/demo_apps/demo_imageproc/run_dsp.sh
@@ -1,4 +1,4 @@
-export SLAVE_DIR=/usr/share/matrix-gui-2.0/apps/imageproc_demo/bin
+export SLAVE_DIR=/usr/share/matrix-gui-2.0/apps/demo_imageproc/bin

 
 mpmcl reset dsp0
 mpmcl reset dsp1
 
 mpmcl reset dsp0
 mpmcl reset dsp1

diff --git a/imageproc_submenu/imageproc.desktop b/demos_submenu/imageproc.desktop
similarity index 55%
rename from imageproc_submenu/imageproc.desktop
rename to demos_submenu/imageproc.desktop
index 580abfad475c13b2cf129cb0586ea7a72bff32c6..eca50e5b2822c06b497579bd45fb46728ffc83d4 100644 (file)
--- a/imageproc_submenu/imageproc.desktop
+++ b/demos_submenu/imageproc.desktop
@@ -1,7 +1,7 @@
 #!/usr/bin/env xdg-open
 [Desktop Entry]
 #!/usr/bin/env xdg-open
 [Desktop Entry]

-Name=Image Processing Demo
-GenericName=Image Processing Demo
+Name=Demonstrations
+GenericName=Demonstrations

 Icon=/usr/share/matrix-gui-2.0/apps/images/imageproc-icon.png
 Type=Directory
 Icon=/usr/share/matrix-gui-2.0/apps/images/imageproc-icon.png
 Type=Directory

-X-MATRIX-CategoryTarget=imageproc
+X-MATRIX-CategoryTarget=demonstrations