Deleted: trunk/rosapps/packmgr/cmd-line/options.xml
Deleted: trunk/rosapps/packmgr/gui/options.xml
Modified: trunk/rosapps/packmgr/gui/res/blank.ico
Modified: trunk/rosapps/packmgr/lib/cz.rc
Modified: trunk/rosapps/packmgr/lib/en.rc
Modified: trunk/rosapps/packmgr/lib/es.rc
Modified: trunk/rosapps/packmgr/lib/log.cpp
Modified: trunk/rosapps/packmgr/lib/options.cpp
Modified: trunk/rosapps/packmgr/lib/package.rc
--- trunk/rosapps/packmgr/cmd-line/options.xml 2005-05-16 10:30:13 UTC (rev 15331)
+++ trunk/rosapps/packmgr/cmd-line/options.xml 2005-05-16 10:53:46 UTC (rev 15332)
@@ -1,3 +0,0 @@
-<options>
- <source>http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/tree/</source>
-</options>
\ No newline at end of file
--- trunk/rosapps/packmgr/gui/options.xml 2005-05-16 10:30:13 UTC (rev 15331)
+++ trunk/rosapps/packmgr/gui/options.xml 2005-05-16 10:53:46 UTC (rev 15332)
@@ -1,3 +0,0 @@
-<options>
- <source>http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/tree/</source>
-</options>
\ No newline at end of file
--- trunk/rosapps/packmgr/lib/cz.rc 2005-05-16 10:30:13 UTC (rev 15331)
+++ trunk/rosapps/packmgr/lib/cz.rc 2005-05-16 10:53:46 UTC (rev 15332)
@@ -20,4 +20,6 @@
ERR_READY "Zvolili jste si instalaci %d balÝÞk·. Aby jste je nainstalovali je t°eba abyste p°eÞetli a souhlasili s jejich licencemi. \n\nChcete nadßle pokraÞovat ?"
END
+123 RCDATA "options.xml"
+
/* EOF */
--- trunk/rosapps/packmgr/lib/en.rc 2005-05-16 10:30:13 UTC (rev 15331)
+++ trunk/rosapps/packmgr/lib/en.rc 2005-05-16 10:53:46 UTC (rev 15332)
@@ -20,4 +20,6 @@
ERR_READY "You choosen to install %d package(s). To install them you have to read and agree with each of thier licences. \n\nDo you want still want to ?"
END
+123 RCDATA "options.xml"
+
/* EOF */
--- trunk/rosapps/packmgr/lib/es.rc 2005-05-16 10:30:13 UTC (rev 15331)
+++ trunk/rosapps/packmgr/lib/es.rc 2005-05-16 10:53:46 UTC (rev 15332)
@@ -20,4 +20,6 @@
ERR_READY "You choosen to install %d package(s). To install them you have to read and agree with each of thier licences.\n\n Do you want still want to ?"
END
+123 RCDATA "options.xml"
+
/* EOF */
--- trunk/rosapps/packmgr/lib/log.cpp 2005-05-16 10:30:13 UTC (rev 15331)
+++ trunk/rosapps/packmgr/lib/log.cpp 2005-05-16 10:53:46 UTC (rev 15332)
@@ -34,7 +34,7 @@
LogCreated = true;
//HTML Header
- fputs("<html><head><title>Logfile</title></head><body>", file);
+ fputs("<html><head><title>Logfile</title></head><body>\n", file);
// date and time
time_t now;
@@ -53,15 +53,19 @@
KERNEL_VERSION_MINOR,
KERNEL_VERSION_PATCH_LEVEL);
- fputs("<h2>ReactOS Package Manager - Log File</h2><br>\n", file);
- fputs("WARNING: This is still pre-alpha software.<br>\n", file);
+ // write the head
+ fputs("<h2>ReactOS Package Manager - Log File</h2>\n", file);
+ //fputs("WARNING: This is still pre-alpha software.<br>\n", file);
fputs("Date: ", file);
fputs(GTime, file);
fputs("<br>\n", file);
+ fputs("Version: ", file);
fputs(version, file);
fputs("<br>\n", file);
+
+ fputs("OS: ", file);
fputs(versionos, file);
fputs("<br>\n", file);
}
@@ -84,11 +88,11 @@
time_t now;
now = time(NULL);
- strftime(GTime,sizeof GTime,"%I:%M:%S %p ",localtime(&now));
+ strftime(GTime,sizeof GTime,"%I:%M:%S %p",localtime(&now));
fputs("<b>", file);
fputs(GTime, file);
- fputs("</b>", file);
+ fputs("</b> ", file);
fputs(message, file);
fclose(file);
--- trunk/rosapps/packmgr/lib/options.cpp 2005-05-16 10:30:13 UTC (rev 15331)
+++ trunk/rosapps/packmgr/lib/options.cpp 2005-05-16 10:53:46 UTC (rev 15332)
@@ -14,7 +14,9 @@
#include "log.h"
#include "expat.h"
+#include <fstream>
+
int PML_XmlDownload (pTree tree, const char* url, void* usrdata,
XML_StartElementHandler start, XML_EndElementHandler end, XML_CharacterDataHandler text) ;
@@ -53,16 +55,39 @@
}
+ // ! ! ! F I X M E ! ! ! //
+/*
int CreateOptions (TREE* tree)
{
-// string source;
+ ofstream file ("options.xml");
-// ifstream file ("help.txt", ios_base::in);
- Log("* Creating options,xml");
+ Log("* Creating options.xml from Resources");
+ HRSRC hres = FindResource(GetModuleHandle(L"package"), MAKEINTRESOURCE(123), RT_RCDATA);
+ if (!hres)
+ {
+ Log("! ERROR: Could not load it !");
+ return ERR_GENERIC;
+ }
+
+ MessageBox(0,(WCHAR*)LockResource(LoadResource(NULL, hres)), 0, 0); // is empty
+ //file << (WCHAR*)LockResource(LoadResource(NULL, hres));
+
return ERR_OK;
}
+*/
+char* PML_Download (pTree, const char* url, const char* server, const char* filename);
+
+int CreateOptions (TREE* tree)
+{
+ Log("* Load options.xml from the Internet (Temporary Hack)");
+
+ CopyFileA( PML_Download(tree, "http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/gui/options.xml", NULL, "options.xml"), "options.xml", TRUE);
+
+ return ERR_OK;
+}
+
int LoadOptions (TREE* tree)
{
int error;
--- trunk/rosapps/packmgr/lib/package.rc 2005-05-16 10:30:13 UTC (rev 15331)
+++ trunk/rosapps/packmgr/lib/package.rc 2005-05-16 10:53:46 UTC (rev 15332)
@@ -11,6 +11,7 @@
/* Language specific */
#include "en.rc"
+#include "de.rc"
#include "cz.rc"
#include "es.rc"