Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 11:12:36 +01:00
Code Issues Projects Releases Wiki Activity

cosmetics

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@822 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
XhmikosR 2011-11-29 21:11:07 +00:00
parent 46a3ae3d98
commit 10373b982a
2 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
installer/Subtitle_Edit_installer.iss
View File

@ -31,8 +31,7 @@
#endif #endif
#define installer_build_number "25" #define app_copyright "Copyright © 2001-2011, Nikse"
#define app_copyright "Copyright © 2001-2011, Nikse"
; If you don't define "localize", i.e. comment out the following line then no translations ; If you don't define "localize", i.e. comment out the following line then no translations
; for SubtitleEdit or the installer itself will be included in the installer ; for SubtitleEdit or the installer itself will be included in the installer
#define localize #define localize
@ -55,7 +54,6 @@
; The following app_version is for 3 digit releases, one of the two must be uncommented at a time ; The following app_version is for 3 digit releases, one of the two must be uncommented at a time
#define app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerBuild) #define app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerBuild)
#define installer_build_date GetDateTimeString('mmm, d yyyy', '', '')
#define quick_launch "{userappdata}\Microsoft\Internet Explorer\Quick Launch" #define quick_launch "{userappdata}\Microsoft\Internet Explorer\Quick Launch"
@ -129,7 +127,7 @@ Name: sv; MessagesFile: Languages\Swedish.isl
[Messages] [Messages]
BeveledLabel=Subtitle Edit {#app_version} by Nikse - Setup v{#installer_build_number} built on {#installer_build_date} BeveledLabel=Subtitle Edit {#app_version} by Nikse
SetupAppTitle=Setup - Subtitle Edit SetupAppTitle=Setup - Subtitle Edit
SetupWindowTitle=Setup - Subtitle Edit SetupWindowTitle=Setup - Subtitle Edit
@ -322,9 +320,9 @@ external 'IsModuleLoaded@{app}\psvince.dll stdcall uninstallonly';
// Check if Subtitle Edit's settings exist // Check if Subtitle Edit's settings exist
function SettingsExistCheck(): Boolean; function SettingsExistCheck(): Boolean;
begin begin
if FileExists(ExpandConstant('{userappdata}\Subtitle Edit\Settings.xml')) then begin if FileExists(ExpandConstant('{userappdata}\Subtitle Edit\Settings.xml')) then
Result := True; Result := True
end else else
Result := False; Result := False;
end; end;
@ -379,12 +377,10 @@ end;
function ShouldSkipPage(PageID: Integer): Boolean; function ShouldSkipPage(PageID: Integer): Boolean;
begin begin
// Hide the license page // Hide the license page
if IsUpgrade() and (PageID = wpLicense) then begin if IsUpgrade() and (PageID = wpLicense) then
Result := True; Result := True
end else
else begin
Result := False; Result := False;
end;
end; end;
@ -455,9 +451,8 @@ begin
iMsgBoxResult := SuppressibleMsgBox(CustomMessage('msg_AppIsRunning'), mbError, MB_OKCANCEL, IDCANCEL); iMsgBoxResult := SuppressibleMsgBox(CustomMessage('msg_AppIsRunning'), mbError, MB_OKCANCEL, IDCANCEL);
end; end;
if iMsgBoxResult = IDCANCEL then begin if iMsgBoxResult = IDCANCEL then
Result := False; Result := False;
end;
// Check if .NET Framework 2.0 is installed and if not offer to download it // Check if .NET Framework 2.0 is installed and if not offer to download it
try try
@ -495,9 +490,8 @@ begin
iMsgBoxResult := SuppressibleMsgBox(CustomMessage('msg_AppIsRunningUninstall'), mbError, MB_OKCANCEL, IDCANCEL); iMsgBoxResult := SuppressibleMsgBox(CustomMessage('msg_AppIsRunningUninstall'), mbError, MB_OKCANCEL, IDCANCEL);
end; end;
if iMsgBoxResult = IDCANCEL then begin if iMsgBoxResult = IDCANCEL then
Result := False; Result := False;
end;
// Unload the psvince.dll in order to be uninstalled // Unload the psvince.dll in order to be uninstalled
UnloadDLL(ExpandConstant('{app}\psvince.dll')); UnloadDLL(ExpandConstant('{app}\psvince.dll'));

12
src/Properties/Manifest.manifest
View File

@ -22,22 +22,18 @@
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security> <security>
<requestedPrivileges> <requestedPrivileges>
<requestedExecutionLevel <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
level="asInvoker"
uiAccess="false"
/>
</requestedPrivileges> </requestedPrivileges>
</security> </security>
</trustInfo> </trustInfo>
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application> <application>
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" /> <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" /> <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
</application> </application>
</compatibility> </compatibility>
<asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"> <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<asmv3:windowsSettings <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
<dpiAware>true</dpiAware> <dpiAware>true</dpiAware>
</asmv3:windowsSettings> </asmv3:windowsSettings>
</asmv3:application> </asmv3:application>