Author: cwittich
Date: Sat Jan 19 14:52:29 2008
New Revision: 31883
URL:
http://svn.reactos.org/svn/reactos?rev=31883&view=rev
Log:
ask before installing dependecies
Modified:
trunk/rosapps/downloader/lang/de-DE.rc
trunk/rosapps/downloader/lang/en-US.rc
trunk/rosapps/downloader/lang/es-ES.rc
trunk/rosapps/downloader/lang/fr-FR.rc
trunk/rosapps/downloader/lang/id-ID.rc
trunk/rosapps/downloader/lang/it-IT.rc
trunk/rosapps/downloader/lang/ru-RU.rc
trunk/rosapps/downloader/lang/uk-UA.rc
trunk/rosapps/downloader/main.c
trunk/rosapps/downloader/resources.h
Modified: trunk/rosapps/downloader/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/de-DE.rc?r…
==============================================================================
--- trunk/rosapps/downloader/lang/de-DE.rc (original)
+++ trunk/rosapps/downloader/lang/de-DE.rc Sat Jan 19 14:52:29 2008
@@ -54,6 +54,7 @@
IDS_DOWNLOAD_FOLDER "Downloader"
IDS_UNABLECREATE_FOLDER "Es konnte kein Ordner mit diesem Namen erstellt
werden!"
IDS_UPDATE_URL "http://svn.reactos.org"
+ IDS_INSTALL_DEP "%s wird benötigt um %s ausführen zu können. Soll %s jetzt
installiert werden?"
TTT_HELPBUTTON, "Hilfe über den Downloader"
TTT_UPDATEBUTTON, "Noch nicht vorhanden"
TTT_PROFBUTTON, "Konfiguriert den Downloader"
Modified: trunk/rosapps/downloader/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/en-US.rc?r…
==============================================================================
--- trunk/rosapps/downloader/lang/en-US.rc (original)
+++ trunk/rosapps/downloader/lang/en-US.rc Sat Jan 19 14:52:29 2008
@@ -54,6 +54,7 @@
IDS_DOWNLOAD_FOLDER "Downloader"
IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!"
IDS_UPDATE_URL "http://svn.reactos.org"
+ IDS_INSTALL_DEP "%s is required to run %s. Should %s be installed now?"
TTT_HELPBUTTON, "Get help about the downloader"
TTT_UPDATEBUTTON, "Not yet available"
TTT_PROFBUTTON, "Let you configure the downloader"
Modified: trunk/rosapps/downloader/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/es-ES.rc?r…
==============================================================================
--- trunk/rosapps/downloader/lang/es-ES.rc (original)
+++ trunk/rosapps/downloader/lang/es-ES.rc Sat Jan 19 14:52:29 2008
@@ -59,6 +59,7 @@
IDS_DOWNLOAD_FOLDER "Downloader"
IDS_UNABLECREATE_FOLDER "¡Imposible crear una carpeta con este nombre!"
IDS_UPDATE_URL "http://svn.reactos.org"
+ IDS_INSTALL_DEP "%s is required to run %s. Should %s be installed now?"
TTT_HELPBUTTON, "Obtenga ayuda acerca de Downloader"
TTT_UPDATEBUTTON, "No disponible todavía"
TTT_PROFBUTTON, "Le permite configurar Downloader"
Modified: trunk/rosapps/downloader/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/fr-FR.rc?r…
==============================================================================
--- trunk/rosapps/downloader/lang/fr-FR.rc (original)
+++ trunk/rosapps/downloader/lang/fr-FR.rc Sat Jan 19 14:52:29 2008
@@ -54,6 +54,7 @@
IDS_DOWNLOAD_FOLDER "Downloader"
IDS_UNABLECREATE_FOLDER "Échec lors du répertoire avec ce nom !"
IDS_UPDATE_URL "http://svn.reactos.org"
+ IDS_INSTALL_DEP "%s is required to run %s. Should %s be installed now?"
TTT_HELPBUTTON, "Obtenez de l'aide à propros du téléchargeur"
TTT_UPDATEBUTTON, "Pas encore disponible"
TTT_PROFBUTTON, "Vous permet de configurer le téléchargeur"
Modified: trunk/rosapps/downloader/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/id-ID.rc?r…
==============================================================================
--- trunk/rosapps/downloader/lang/id-ID.rc (original)
+++ trunk/rosapps/downloader/lang/id-ID.rc Sat Jan 19 14:52:29 2008
@@ -54,6 +54,7 @@
IDS_DOWNLOAD_FOLDER "Downloader"
IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!"
IDS_UPDATE_URL "http://svn.reactos.org"
+ IDS_INSTALL_DEP "%s is required to run %s. Should %s be installed now?"
TTT_HELPBUTTON, "Get help about the downloader"
TTT_UPDATEBUTTON, "Not yet available"
TTT_PROFBUTTON, "Let you configure the downloader"
Modified: trunk/rosapps/downloader/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/it-IT.rc?r…
==============================================================================
--- trunk/rosapps/downloader/lang/it-IT.rc (original)
+++ trunk/rosapps/downloader/lang/it-IT.rc Sat Jan 19 14:52:29 2008
@@ -54,6 +54,7 @@
IDS_DOWNLOAD_FOLDER "Downloader"
IDS_UNABLECREATE_FOLDER "Unable to create a folder with this name!"
IDS_UPDATE_URL "http://svn.reactos.org"
+ IDS_INSTALL_DEP "%s is required to run %s. Should %s be installed now?"
TTT_HELPBUTTON, "Get help about the downloader"
TTT_UPDATEBUTTON, "Not yet available"
TTT_PROFBUTTON, "Let you configure the downloader"
Modified: trunk/rosapps/downloader/lang/ru-RU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/ru-RU.rc?r…
==============================================================================
--- trunk/rosapps/downloader/lang/ru-RU.rc (original)
+++ trunk/rosapps/downloader/lang/ru-RU.rc Sat Jan 19 14:52:29 2008
@@ -56,6 +56,7 @@
IDS_DOWNLOAD_FOLDER "Ñêà÷àòü!"
IDS_UNABLECREATE_FOLDER "Íå óäàëîñü ñîçäàòü ïàïêó ñ òàêèì èìåíåì!"
IDS_UPDATE_URL "http://svn.reactos.org"
+ IDS_INSTALL_DEP "%s is required to run %s. Should %s be installed now?"
TTT_HELPBUTTON, "Get help about the downloader"
TTT_UPDATEBUTTON, "Not yet available"
TTT_PROFBUTTON, "Let you configure the downloader"
Modified: trunk/rosapps/downloader/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/lang/uk-UA.rc?r…
==============================================================================
--- trunk/rosapps/downloader/lang/uk-UA.rc (original)
+++ trunk/rosapps/downloader/lang/uk-UA.rc Sat Jan 19 14:52:29 2008
@@ -62,6 +62,7 @@
IDS_DOWNLOAD_FOLDER "Downloader"
IDS_UNABLECREATE_FOLDER "Íå âäàëîñÿ ñòâîðèòè ïàïêó ç òàêèì ³ì'ÿì!"
IDS_UPDATE_URL "http://svn.reactos.org"
+ IDS_INSTALL_DEP "%s is required to run %s. Should %s be installed now?"
TTT_HELPBUTTON, "Îòðèìàéòè äîïîìîãó ïðî downloader"
TTT_UPDATEBUTTON, "Ïîêè ùî íå äîñòóïíî"
TTT_PROFBUTTON, "Íàëàøòóâàòè downloader"
Modified: trunk/rosapps/downloader/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/main.c?rev=3188…
==============================================================================
--- trunk/rosapps/downloader/main.c (original)
+++ trunk/rosapps/downloader/main.c Sat Jan 19 14:52:29 2008
@@ -668,6 +668,9 @@
{
static RECT DescriptionRect;
struct Application* AppToInstall;
+ WCHAR InstallDep[260];
+ WCHAR InstallDepBuffer[260];
+ WCHAR Title[260];
switch (Message)
{
@@ -720,7 +723,13 @@
SelectedApplication = GetDependency(SelectedApplication->Depends);
if (!IsApplicationInstalled(SelectedApplication))
{
- DialogBoxW(GetModuleHandle(NULL), MAKEINTRESOURCEW(IDD_DOWNLOAD), 0,
DownloadProc);
+ LoadString(GetModuleHandle(NULL), IDS_INSTALL_DEP, InstallDep, sizeof(InstallDep)
/ sizeof(WCHAR));
+ LoadString(GetModuleHandle(NULL), IDS_WINDOW_TITLE, Title, sizeof(Title) /
sizeof(WCHAR));
+ _snwprintf(InstallDepBuffer, sizeof(InstallDepBuffer) / sizeof(WCHAR),
InstallDep, SelectedApplication->Name, AppToInstall->Name,
SelectedApplication->Name);
+ if (MessageBox(hwnd, InstallDepBuffer, Title, MB_YESNO | MB_ICONINFORMATION) ==
IDYES)
+ {
+ DialogBoxW(GetModuleHandle(NULL), MAKEINTRESOURCEW(IDD_DOWNLOAD), 0,
DownloadProc);
+ }
}
SelectedApplication = AppToInstall;
}
Modified: trunk/rosapps/downloader/resources.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/resources.h?rev…
==============================================================================
--- trunk/rosapps/downloader/resources.h (original)
+++ trunk/rosapps/downloader/resources.h Sat Jan 19 14:52:29 2008
@@ -57,6 +57,7 @@
#define IDS_DOWNLOAD_FOLDER 24
#define IDS_UNABLECREATE_FOLDER 25
#define IDS_UPDATE_URL 26
+#define IDS_INSTALL_DEP 27
#define TTT_HELPBUTTON 50
#define TTT_UPDATEBUTTON 51