Make uninstaller use vista.pas

Wording changes


git-svn-id: http://svn.dmdirc.com/trunk@4180 00569f92-eb28-0410-84fd-f71c24880f

installer/windows/Uninstaller.dpr

@@ -1,11 +1,66 @@
 program Uninstaller;
-{$MODE Delphi}
-{$APPTYPE GUI}
+{$IFDEF FPC}
+	{$MODE Delphi}
+{$ENDIF}
+// Use this instead of {$APPTYPE XXX}
+// APP_XXX is the same as {$APPTYPE XXX}
+// Defaults to console
+// This is a work-around for a bug in FPC Cross Compiling to windows in delphi
+// mode (IsConsole is always true)
+{$DEFINE APP_GUI}
 
-uses Windows, SysUtils, classes, registry, Vista;
+// This block actually does the work for the above work-around
+{$IFDEF APP_GUI}
+	{$APPTYPE GUI}
+{$ELSE}
+	{$IFDEF APP_FS}
+		{$APPTYPE FS}
+	{$ELSE}
+		{$IFDEF APP_TOOL}
+			{$DEFINE APP_CONSOLE}
+			{$APPTYPE TOOL}
+		{$ELSE}
+			{$DEFINE APP_CONSOLE}
+			{$APPTYPE CONSOLE}
+		{$ENDIF}
+	{$ENDIF}
+{$ENDIF}
+
+uses Windows, SysUtils, registry, Vista;
 
 {$R uninstall.res}
 
+procedure dowriteln(line: String);
+begin
+	if IsConsole then writeln(line);
+end;
+
+procedure dowrite(line: String);
+begin
+	if IsConsole then write(line);
+end;
+
+function askQuestion(Question: String): boolean;
+begin
+	Result := TaskDialog(0, 'DMDirc Uninstaller', 'Question', Question, TD_ICON_QUESTION, TD_BUTTON_YES + TD_BUTTON_NO) = mrYes;
+end;
+
+procedure showError(context: String; ErrorMessage: String; addFooter: boolean = true);
+begin
+	if addFooter then begin
+		ErrorMessage := ErrorMessage+#13#10;
+		ErrorMessage := ErrorMessage+#13#10+'If you feel this is incorrect, or you require some further assistance,';
+		ErrorMessage := ErrorMessage+#13#10+'please feel free to contact us.';
+	end;
+	
+	TaskDialog(0, 'DMDirc Setup', context, ErrorMessage, TD_ICON_ERROR, TD_BUTTON_OK, true);
+end;
+
+procedure showmessage(message: String; context:String = 'Information');
+begin
+	TaskDialog(0, 'DMDirc Uninstaller', context, message, TD_ICON_INFORMATION, TD_BUTTON_OK);
+end;
+
 function GetTempDirectory(): String;
 var
 	buf: array[0..MAX_PATH] of Char;
@@ -150,15 +205,15 @@ begin
 			end;
 		end;
 		
-		MessageBox(0, PChar('DMDirc has been uninstalled from "'+InstallDir+'".'), 'DMDirc Uninstaller', MB_OK);
+		showmessage('DMDirc has been uninstalled from "'+InstallDir+'".', 'Uninstall Successful');
 	end
-	else if MessageBox(0, PChar('This will uninstall DMDirc.'+#13#10+#13#10+'Do you want to continue?'), 'DMDirc Uninstaller', MB_YESNO) = IDYES then begin
+	else if askQuestion('This will uninstall DMDirc.'+#13#10+#13#10+'Do you want to continue?') then begin
 		if (ExecAndWait('java -jar ' + ExtractFileDir(paramstr(0)) + '\DMDirc.jar -k', true) <> 0) then begin
 			TempDir := GetTempDirectory;
 			CopyFile(pchar(paramstr(0)), pchar(TempDir+'/uninstall.exe'), false);
 			Launch(TempDir+'/uninstall.exe '+ExtractFileDir(paramstr(0))+'\');
 		end else begin
-			MessageBox(0, PChar('Uninstall Aborted - DMDirc is still running.'+#13#10+'Please close DMDirc before continuing'), 'DMDirc Uninstaller', MB_OK + MB_ICONEXCLAMATION);
+			showError('Uninstall Aborted - DMDirc is still running.', 'Please close DMDirc before continuing')
 		end;
 	end;
 end.

installer/windows/makeInstallerWindows.sh

@@ -391,6 +391,7 @@ if [ ! -e "${lazarusDir}/lcl" ]; then
 fi;
 
 compilerFlags="-Sd -Twin32 ${compilerFlags}";
+extraFlags=""
 if [ ! -e "Setup.exe"  -o "${compileSetup}" = "true" ]; then
 	echo "Setup.exe does not exist. Lets try and compile it."
 	if [ "${FPC}" = "" ]; then
@@ -475,7 +476,7 @@ fi
 ${FPC} ${compilerFlags} ${3}Uninstaller.dpr
 if [ -e "Uninstaller.exe" ]; then
 	FILES="${FILES} Uninstaller.exe"
-	DELETEFILES="${DELETEFILES} Uninstaller.exe"
+#	DELETEFILES="${DELETEFILES} Uninstaller.exe"
 fi
 
 # Add wget to allow downloading jre

launcher/windows/DMDirc.dpr

@@ -10,7 +10,7 @@ uses Windows, SysUtils, classes, StrUtils, Vista;
 
 function askQuestion(Question: String): boolean;
 begin
-	Result := TaskDialog(0, 'DMDirc Setup', 'Question', Question, TD_ICON_QUESTION, TD_BUTTON_YES + TD_BUTTON_NO) = mrYes;
+	Result := TaskDialog(0, 'DMDirc', 'Question', Question, TD_ICON_QUESTION, TD_BUTTON_YES + TD_BUTTON_NO) = mrYes;
 end;
 
 procedure showError(ErrorMessage: String; addFooter: boolean = true);
@@ -21,12 +21,12 @@ begin
 		ErrorMessage := ErrorMessage+#13#10+'please feel free to contact us.';
 	end;
 	
-	TaskDialog(0, 'DMDirc Setup', 'Sorry, setup is unable to continue', ErrorMessage, TD_ICON_ERROR, TD_BUTTON_OK, true);
+	TaskDialog(0, 'DMDirc', 'There was an error starting DMDirc', ErrorMessage, TD_ICON_ERROR, TD_BUTTON_OK, false, false);
 end;
 
 procedure showmessage(message: String; context:String = 'Information');
 begin
-	TaskDialog(0, 'DMDirc Setup', context, message, TD_ICON_INFORMATION, TD_BUTTON_OK);
+	TaskDialog(0, 'DMDirc', context, message, TD_ICON_INFORMATION, TD_BUTTON_OK);
 end;
 
 
@@ -132,7 +132,7 @@ begin
 			errorMessage := 'No JVM is currently installed.';
 			errorMessage := errorMessage+#13#10;
 			errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from:';
-			errorMessage := errorMessage+#13#10+'http://jdl.sun.com/webapps/getjava/BrowserRedirect';
+			errorMessage := errorMessage+#13#10+'http://java.com/';
 			errorMessage := errorMessage+#13#10;
 			errorMessage := errorMessage+#13#10+'If you feel this is incorrect, or you require some further assistance,';
 			errorMessage := errorMessage+#13#10+'please feel free to contact us.';
@@ -147,7 +147,7 @@ begin
 				errorMessage := 'The currently installed version of java is not compatible with DMDirc.';
 				errorMessage := errorMessage+#13#10;
 				errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from:';
-				errorMessage := errorMessage+#13#10+'http://jdl.sun.com/webapps/getjava/BrowserRedirect';
+				errorMessage := errorMessage+#13#10+'http://java.com/';
 				errorMessage := errorMessage+#13#10;
 				errorMessage := errorMessage+#13#10+'If you feel this is incorrect, or you require some further assistance,';
 				errorMessage := errorMessage+#13#10+'please feel free to contact us.';

launcher/windows/DMDircUpdater.dpr

@@ -8,7 +8,7 @@ uses Windows, SysUtils, classes, StrUtils, Vista;
 
 function askQuestion(Question: String): boolean;
 begin
-	Result := TaskDialog(0, 'DMDirc Setup', 'Question', Question, TD_ICON_QUESTION, TD_BUTTON_YES + TD_BUTTON_NO) = mrYes;
+	Result := TaskDialog(0, 'DMDirc Updater', 'Question', Question, TD_ICON_QUESTION, TD_BUTTON_YES + TD_BUTTON_NO) = mrYes;
 end;
 
 procedure showError(ErrorMessage: String; addFooter: boolean = true);
@@ -19,12 +19,12 @@ begin
 		ErrorMessage := ErrorMessage+#13#10+'please feel free to contact us.';
 	end;
 	
-	TaskDialog(0, 'DMDirc Setup', 'Sorry, setup is unable to continue', ErrorMessage, TD_ICON_ERROR, TD_BUTTON_OK, true);
+	TaskDialog(0, 'DMDirc Updater', 'There was an error starting DMDirc', ErrorMessage, TD_ICON_ERROR, TD_BUTTON_OK, false, false);
 end;
 
 procedure showmessage(message: String; context:String = 'Information');
 begin
-	TaskDialog(0, 'DMDirc Setup', context, message, TD_ICON_INFORMATION, TD_BUTTON_OK);
+	TaskDialog(0, 'DMDirc Updater', context, message, TD_ICON_INFORMATION, TD_BUTTON_OK);
 end;
 
 // Run an application and don't wait for it to finish.