From 6344467474c72c432ea609febb28ef3154752541 Mon Sep 17 00:00:00 2001
From: Maarten Bosma <maarten@bosma.de>
Date: Tue, 3 Jan 2006 00:12:35 +0000
Subject: [PATCH] Add some Apps and change tree version to the bare one.

svn path=/trunk/; revision=20540
---
 rosapps/packmgr/cmd-line/main.c              |  2 +-
 rosapps/packmgr/gui/main.c                   |  2 +-
 rosapps/packmgr/tree/7zip.inst.rps           |  9 ++++++++
 rosapps/packmgr/tree/7zip.xml                |  7 ++++++
 rosapps/packmgr/tree/abiword.inst.rps        |  5 ++---
 rosapps/packmgr/tree/abiword.xml             |  8 +++----
 rosapps/packmgr/tree/firefox.inst.rps        |  9 ++++++++
 rosapps/packmgr/tree/firefox.xml             |  7 ++++++
 rosapps/packmgr/tree/irfanview.inst.rps      |  8 +++++++
 rosapps/packmgr/tree/irfanview.xml           |  7 ++++++
 rosapps/packmgr/tree/mozcontrol.xml          | 11 +++++++---
 rosapps/packmgr/tree/mozillacontrol.inst.rps |  3 +--
 rosapps/packmgr/tree/mplayer.inst.rps        |  2 ++
 rosapps/packmgr/tree/mplayer.xml             | 13 +++++++++++
 rosapps/packmgr/tree/openoffice.inst.rps     |  1 +
 rosapps/packmgr/tree/openoffice.xml          |  7 ++++++
 rosapps/packmgr/tree/putty.inst.rps          |  4 ++++
 rosapps/packmgr/tree/putty.xml               |  7 ++++++
 rosapps/packmgr/tree/rosbe.inst.rps          |  8 +++++++
 rosapps/packmgr/tree/rosbe.xml               |  7 ++++++
 rosapps/packmgr/tree/tiny.inst.rps           |  2 ++
 rosapps/packmgr/tree/tiny.xml                |  7 ++++++
 rosapps/packmgr/tree/tree.xml                | 23 +++++++++++++++-----
 rosapps/packmgr/tree/tree_bare.xml           | 12 ++++++++--
 rosapps/packmgr/tree/tree_withsubs.xml       |  1 +
 rosapps/packmgr/tree/tuxpaint.inst.rps       |  9 ++++++++
 rosapps/packmgr/tree/tuxpaint.xml            |  7 ++++++
 27 files changed, 167 insertions(+), 21 deletions(-)
 create mode 100644 rosapps/packmgr/tree/7zip.inst.rps
 create mode 100644 rosapps/packmgr/tree/7zip.xml
 create mode 100644 rosapps/packmgr/tree/firefox.inst.rps
 create mode 100644 rosapps/packmgr/tree/firefox.xml
 create mode 100644 rosapps/packmgr/tree/irfanview.inst.rps
 create mode 100644 rosapps/packmgr/tree/irfanview.xml
 create mode 100644 rosapps/packmgr/tree/mplayer.inst.rps
 create mode 100644 rosapps/packmgr/tree/mplayer.xml
 create mode 100644 rosapps/packmgr/tree/openoffice.inst.rps
 create mode 100644 rosapps/packmgr/tree/openoffice.xml
 create mode 100644 rosapps/packmgr/tree/putty.inst.rps
 create mode 100644 rosapps/packmgr/tree/putty.xml
 create mode 100644 rosapps/packmgr/tree/rosbe.inst.rps
 create mode 100644 rosapps/packmgr/tree/rosbe.xml
 create mode 100644 rosapps/packmgr/tree/tiny.inst.rps
 create mode 100644 rosapps/packmgr/tree/tiny.xml
 create mode 100644 rosapps/packmgr/tree/tuxpaint.inst.rps
 create mode 100644 rosapps/packmgr/tree/tuxpaint.xml

diff --git a/rosapps/packmgr/cmd-line/main.c b/rosapps/packmgr/cmd-line/main.c
index 946046c9b19..b9e37d7d6c4 100644
--- a/rosapps/packmgr/cmd-line/main.c
+++ b/rosapps/packmgr/cmd-line/main.c
@@ -185,7 +185,7 @@ int Show (void)
 	WCHAR errbuf[2000];
 
 	// load the tree
-	error = PML_LoadTree (&tree, "tree.xml", NULL);
+	error = PML_LoadTree (&tree, "tree_bare.xml", NULL);
 	if(error)
 	{
 		wprintf(PML_TransError(error, errbuf, sizeof(errbuf)/sizeof(WCHAR)));
diff --git a/rosapps/packmgr/gui/main.c b/rosapps/packmgr/gui/main.c
index d0332b14200..3878edc9728 100644
--- a/rosapps/packmgr/gui/main.c
+++ b/rosapps/packmgr/gui/main.c
@@ -75,7 +75,7 @@ int WINAPI WinMain (HINSTANCE hinst, HINSTANCE hPrevInstance, PSTR szCmdLine, in
 	UpdateWindow(hwnd);
 
 	// Load the tree
-	int error = PML_LoadTree(&tree, "tree.xml", AddItem);
+	int error = PML_LoadTree(&tree, "tree_bare.xml", AddItem);
 	
 	if(error)
 	{
diff --git a/rosapps/packmgr/tree/7zip.inst.rps b/rosapps/packmgr/tree/7zip.inst.rps
new file mode 100644
index 00000000000..ab6cb137c2f
--- /dev/null
+++ b/rosapps/packmgr/tree/7zip.inst.rps
@@ -0,0 +1,9 @@
+Sub Main
+  ' ToDo: Choose from different mirrors
+  download "http://prdownloads.sourceforge.net/sevenzip/7z432.exe?use_mirror=ovh", "7z432.exe"
+End Sub
+
+Sub After
+  shell 7z432.exe
+  ' ToDo: Delete 7z432.exe
+End Sub
\ No newline at end of file
diff --git a/rosapps/packmgr/tree/7zip.xml b/rosapps/packmgr/tree/7zip.xml
new file mode 100644
index 00000000000..8788212c454
--- /dev/null
+++ b/rosapps/packmgr/tree/7zip.xml
@@ -0,0 +1,7 @@
+<package>
+  <name>7Zip</name>
+  <version>4.32</version>
+  <description>Utility to create and open zip, tar, rar and other archive files.</description>
+  <scripts inst="7zip.inst.rps"/>
+</package>
+
diff --git a/rosapps/packmgr/tree/abiword.inst.rps b/rosapps/packmgr/tree/abiword.inst.rps
index 40cd3b96b55..7ec0460f9e1 100644
--- a/rosapps/packmgr/tree/abiword.inst.rps
+++ b/rosapps/packmgr/tree/abiword.inst.rps
@@ -1,9 +1,8 @@
-'Install rutine for abiword
-
 Sub Main     
-  download ("http://www.abisource.com/downloads/abiword/2.2.5/Windows/abiword-setup-2.2.5.exe", "abisetup.exe")
+  download "http://www.abiword.org/downloads/abiword/2.4.1/Windows/abiword-setup-2.4.1.exe", "abisetup.exe"
 End Sub
 
 Sub After
   shell abisetup.exe
+  ' ToDo: Delete abisetup.exe
 End Sub
\ No newline at end of file
diff --git a/rosapps/packmgr/tree/abiword.xml b/rosapps/packmgr/tree/abiword.xml
index 40acfc30eb4..ae8af577f90 100644
--- a/rosapps/packmgr/tree/abiword.xml
+++ b/rosapps/packmgr/tree/abiword.xml
@@ -1,7 +1,7 @@
 <package>
-<name>AbiWord</name>
-<description>Currently it's definitely the best word processor running under ReactOS.</description>
-<scripts inst="abiword.inst.rps" srcinst="abiword.inst.rps"/>
- 
+  <name>AbiWord</name>
+  <version>2.4.1</version>
+  <description>Word processor.</description>
+  <scripts inst="abiword.inst.rps"/>
 </package>
 
diff --git a/rosapps/packmgr/tree/firefox.inst.rps b/rosapps/packmgr/tree/firefox.inst.rps
new file mode 100644
index 00000000000..0f77251838a
--- /dev/null
+++ b/rosapps/packmgr/tree/firefox.inst.rps
@@ -0,0 +1,9 @@
+Sub Main
+  ' ToDo: Choose from different mirrors
+  download ("http://download.mozilla.org/?lang=de&product=firefox-1.5&os=win", "firefoxinstaller.exe")
+End Sub
+
+Sub After
+  shell "firefoxinstaller.exe"
+  ' ToDo: Delete firefoxinstaller.exe
+End Sub
\ No newline at end of file
diff --git a/rosapps/packmgr/tree/firefox.xml b/rosapps/packmgr/tree/firefox.xml
new file mode 100644
index 00000000000..4ee7c4c1bb2
--- /dev/null
+++ b/rosapps/packmgr/tree/firefox.xml
@@ -0,0 +1,7 @@
+<package>
+  <name>Firefox</name>
+  <version>1.5</version>
+  <description>The famous OpenSource webbroswer.</description>
+  <scripts inst="firefox.inst.rps"/>
+</package>
+
diff --git a/rosapps/packmgr/tree/irfanview.inst.rps b/rosapps/packmgr/tree/irfanview.inst.rps
new file mode 100644
index 00000000000..e403569b9fa
--- /dev/null
+++ b/rosapps/packmgr/tree/irfanview.inst.rps
@@ -0,0 +1,8 @@
+Sub Main
+  ' ToDo: Choose from different mirrors
+  download ("http://www.aeicomputertech.com/_downloads/iview398.exe", "iview398.exe")
+End Sub
+
+Sub After
+  shell iview398.exe
+End Sub
\ No newline at end of file
diff --git a/rosapps/packmgr/tree/irfanview.xml b/rosapps/packmgr/tree/irfanview.xml
new file mode 100644
index 00000000000..7d51ac2cbe7
--- /dev/null
+++ b/rosapps/packmgr/tree/irfanview.xml
@@ -0,0 +1,7 @@
+<package>
+  <name>IrfanView</name>
+  <version>3.98</version>
+  <description>Viewer for all kinds of graphics.</description>
+  <scripts inst="irfanview.inst.rps"/>
+</package>
+
diff --git a/rosapps/packmgr/tree/mozcontrol.xml b/rosapps/packmgr/tree/mozcontrol.xml
index 7c5981aff30..8a18751b9c5 100644
--- a/rosapps/packmgr/tree/mozcontrol.xml
+++ b/rosapps/packmgr/tree/mozcontrol.xml
@@ -1,6 +1,11 @@
+<!--
+Not in use since reactos can download it itself now.
+-->
+
 <package>
-  <name>MozillaControl</name>
-  <description>Provide the Gekko Engine for ReactOS.</description>
-  <scripts inst="mozillacontrol.inst.rps" srcinst="mozillacontrol.inst.rps"/>
+  <name>Mozilla Control</name>
+  <version>1.6</version>
+  <description>Provides the Gekko Engine for ReactOS.</description>
+  <scripts inst="mozillacontrol.inst.rps"/>
 </package>
 
diff --git a/rosapps/packmgr/tree/mozillacontrol.inst.rps b/rosapps/packmgr/tree/mozillacontrol.inst.rps
index 096e2a4a632..f58f74c0bcb 100644
--- a/rosapps/packmgr/tree/mozillacontrol.inst.rps
+++ b/rosapps/packmgr/tree/mozillacontrol.inst.rps
@@ -1,5 +1,4 @@
-'Install rutine for Mozilla Control 1.6
-
+' Not in use anymore because reactos can download it without Package Manager
 Sub Main
   download ("http://www.iol.ie/~locka/mozilla/MozillaControl16.exe", "mozillacontrol16.exe")
 End Sub
diff --git a/rosapps/packmgr/tree/mplayer.inst.rps b/rosapps/packmgr/tree/mplayer.inst.rps
new file mode 100644
index 00000000000..cde73bc07d3
--- /dev/null
+++ b/rosapps/packmgr/tree/mplayer.inst.rps
@@ -0,0 +1,2 @@
+' ToDo: Find the best from all the installers and frontends
+' or add zip support for http://www1.mplayerhq.hu/MPlayer/releases/win32/old/MPlayer-mingw32-1.0pre7.zip
\ No newline at end of file
diff --git a/rosapps/packmgr/tree/mplayer.xml b/rosapps/packmgr/tree/mplayer.xml
new file mode 100644
index 00000000000..9603e4de271
--- /dev/null
+++ b/rosapps/packmgr/tree/mplayer.xml
@@ -0,0 +1,13 @@
+<!--
+ToDo: 
+Chhose the right one from all the installer and GUI fronend packages
+or add zip support for the official distro
+-->
+
+<package>
+  <name>mPlayer</name>
+  <version>1.0 pre7</version>
+  <description>Commandline Media Player which works under ReactOs.</description>
+  <scripts inst="mplayer.inst.rps"/>
+</package>
+
diff --git a/rosapps/packmgr/tree/openoffice.inst.rps b/rosapps/packmgr/tree/openoffice.inst.rps
new file mode 100644
index 00000000000..7f60738dd05
--- /dev/null
+++ b/rosapps/packmgr/tree/openoffice.inst.rps
@@ -0,0 +1 @@
+' ToDo: Implment Zip unpacking
\ No newline at end of file
diff --git a/rosapps/packmgr/tree/openoffice.xml b/rosapps/packmgr/tree/openoffice.xml
new file mode 100644
index 00000000000..3e43b67e0cd
--- /dev/null
+++ b/rosapps/packmgr/tree/openoffice.xml
@@ -0,0 +1,7 @@
+<package>
+  <name>OpenOffice 1</name>
+  <version>1.1.5</version>
+  <description>OpenSource replacement for Microsoft Office.</description>
+  <scripts inst="openoffice.inst.rps"/>
+</package>
+
diff --git a/rosapps/packmgr/tree/putty.inst.rps b/rosapps/packmgr/tree/putty.inst.rps
new file mode 100644
index 00000000000..59dff6ce7d9
--- /dev/null
+++ b/rosapps/packmgr/tree/putty.inst.rps
@@ -0,0 +1,4 @@
+Sub Main
+  ' ToDo: Download putty.exe to programm files
+  download ("http://the.earth.li/~sgtatham/putty/latest/x86/putty.exe", "putty.exe")
+End Sub
\ No newline at end of file
diff --git a/rosapps/packmgr/tree/putty.xml b/rosapps/packmgr/tree/putty.xml
new file mode 100644
index 00000000000..147faa5b874
--- /dev/null
+++ b/rosapps/packmgr/tree/putty.xml
@@ -0,0 +1,7 @@
+<package>
+  <name>Putty</name>
+  <version>beta 0.58</version>
+  <description>SSH and Telnet client.</description>
+  <scripts inst="putty.inst.rps"/>
+</package>
+
diff --git a/rosapps/packmgr/tree/rosbe.inst.rps b/rosapps/packmgr/tree/rosbe.inst.rps
new file mode 100644
index 00000000000..1071b976738
--- /dev/null
+++ b/rosapps/packmgr/tree/rosbe.inst.rps
@@ -0,0 +1,8 @@
+Sub Main
+  download ("http://blight.reactos.at/reactos-be/ReactOS%20Build%20Environment%200.1-3.4.2.exe", "rosbe01.exe")
+End Sub
+
+Sub After
+  shell rosbe01.exe
+  ' ToDo: Delete rosbe01.exe
+End Sub
\ No newline at end of file
diff --git a/rosapps/packmgr/tree/rosbe.xml b/rosapps/packmgr/tree/rosbe.xml
new file mode 100644
index 00000000000..cc64b2558c9
--- /dev/null
+++ b/rosapps/packmgr/tree/rosbe.xml
@@ -0,0 +1,7 @@
+<package>
+  <name>Build Envirement</name>
+  <version>0.1</version>
+  <description>Allows you to build the ReactOS Source. For more instructions see our wiki.</description>
+  <scripts inst="rosbe.inst.rps"/>
+</package>
+
diff --git a/rosapps/packmgr/tree/tiny.inst.rps b/rosapps/packmgr/tree/tiny.inst.rps
new file mode 100644
index 00000000000..0c78fe3b2a3
--- /dev/null
+++ b/rosapps/packmgr/tree/tiny.inst.rps
@@ -0,0 +1,2 @@
+' ToDo: Implement Unzipping
+' http://www.ritlabs.com/download/tinyweb/tinyweb.zip
\ No newline at end of file
diff --git a/rosapps/packmgr/tree/tiny.xml b/rosapps/packmgr/tree/tiny.xml
new file mode 100644
index 00000000000..7a6d613b6df
--- /dev/null
+++ b/rosapps/packmgr/tree/tiny.xml
@@ -0,0 +1,7 @@
+<package>
+  <name>Ritlab Tiny Webserver</name>
+  <version>1.93</version>
+  <description>This is a simple webserver running under ReactOs.</description>
+  <scripts inst="tiny.inst.rps"/>
+</package>
+
diff --git a/rosapps/packmgr/tree/tree.xml b/rosapps/packmgr/tree/tree.xml
index 9cd07cab652..245e0a9a29c 100644
--- a/rosapps/packmgr/tree/tree.xml
+++ b/rosapps/packmgr/tree/tree.xml
@@ -1,15 +1,28 @@
 <tree>
   <node name="Internet and Network" icon="5">
-    <node name="Mozilla Control" file="mozcontrol.xml"/>
+	<node name="Firefox" file="firebox.xml"/>
+    <!--<node name="Mozilla Control" file="mozcontrol.xml"/>-->
+	<node name="Putty" file="putty.xml"/>
+	<node name="Tiny Webserver" file="tiny.xml"/>
   </node>
   <node name="Office" icon="6">
     <node name="AbiWord" file="abiword.xml"/>
+	<!--<node name="OpenOffice 1" file="openoffice.xml"/>--> <!-- Needs Zip support -->
+  </node>
+  <node name="Graphics" icon="7">
+	<node name="IrfanView" file="irfanview.xml"/>
+	<node name="TuxPaint" file="tuxpaint.xml"/>
+  </node>
+  <node name="Multimedia" icon="8">
+	<!--<node name="mPlayer" file="mplayer.xml"/>--> <!-- ToDo: Choose a good one from all the installers and frondends -->
+  <node>
+  <node name="Development" icon="9">
+	<node name="Build Envirment" file="rosbe.xml"/>
   </node>
-  <node name="Graphics" icon="7"/>
-  <node name="Multimedia" icon="8"/>
-  <node name="Development" icon="9"/>
   <node name="Games and Fun" icon="10"/>
-  <node name="Tools" icon="11"/>
+  <node name="Tools" icon="11">
+	<node name="7Zip" file="7zip.xml"/>
+  </node>
   <node name="Others" icon="12"/>
   <node name="Installed Programms" icon="13"/>
 </tree>
\ No newline at end of file
diff --git a/rosapps/packmgr/tree/tree_bare.xml b/rosapps/packmgr/tree/tree_bare.xml
index 3e4cd5f8026..98331b7205e 100644
--- a/rosapps/packmgr/tree/tree_bare.xml
+++ b/rosapps/packmgr/tree/tree_bare.xml
@@ -1,4 +1,12 @@
 <tree>
-	<node name="Mozilla Control" file="mozcontrol.xml"/>
-	<node name="AbiWord" file="abiword.xml"/>
+	<node name="7Zip" file="7zip.xml"/>
+    <node name="AbiWord" file="abiword.xml"/>
+	<node name="Build Envirment" file="rosbe.xml"/>
+	<node name="Firefox" file="firebox.xml"/>
+	<node name="IrfanView" file="irfanview.xml"/>
+	<!--<node name="mPlayer" file="mplayer.xml"/>--> <!-- ToDo: Choose a good one from all the installers and frondends -->
+	<!--<node name="OpenOffice 1" file="openoffice.xml"/>--> <!-- Needs Zip support -->
+	<node name="Putty" file="putty.xml"/>
+	<node name="TuxPaint" file="tuxpaint.xml"/>
+	<node name="Tiny Webserver" file="tiny.xml"/>
 </tree>
\ No newline at end of file
diff --git a/rosapps/packmgr/tree/tree_withsubs.xml b/rosapps/packmgr/tree/tree_withsubs.xml
index 71dfba573ca..e03124effda 100644
--- a/rosapps/packmgr/tree/tree_withsubs.xml
+++ b/rosapps/packmgr/tree/tree_withsubs.xml
@@ -1,4 +1,5 @@
 <tree>
+  <node name="Warning: Not up to date"/>
   <node name="Internet and Network" icon="5">
     <node name="Browser" icon="5">
       <node name="MozillaControl" file="mozcontrol.xml"/>
diff --git a/rosapps/packmgr/tree/tuxpaint.inst.rps b/rosapps/packmgr/tree/tuxpaint.inst.rps
new file mode 100644
index 00000000000..3742d75f066
--- /dev/null
+++ b/rosapps/packmgr/tree/tuxpaint.inst.rps
@@ -0,0 +1,9 @@
+Sub Main
+  ' ToDo: Pick a mirror
+  download ("http://switch.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.15-2-win32-installer.exe", "tuxpaint-inst.exe")
+End Sub
+
+Sub After
+  shell tuxpaint-inst.exe
+  ' ToDo: delete tuxpaint-inst.exe
+End Sub
\ No newline at end of file
diff --git a/rosapps/packmgr/tree/tuxpaint.xml b/rosapps/packmgr/tree/tuxpaint.xml
new file mode 100644
index 00000000000..a2e65ada7f5
--- /dev/null
+++ b/rosapps/packmgr/tree/tuxpaint.xml
@@ -0,0 +1,7 @@
+<package>
+  <name>TuxPaint</name>
+  <version>0.9.15-2</version>
+  <description>An open source bitmap graphics editor geared towards young children.</description>
+  <scripts inst="tuxpaint.inst.rps"/>
+</package>
+
-- 
2.17.1