Skip to content

Commit

Permalink
Attempt to rebrand
Browse files Browse the repository at this point in the history
  • Loading branch information
K4sum1 committed Apr 26, 2024
1 parent 4bde313 commit 43d4edd
Show file tree
Hide file tree
Showing 20 changed files with 114 additions and 114 deletions.
10 changes: 5 additions & 5 deletions win/CS/HandBrake.App.Core/HandBrake.App.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<TargetFramework>net6.0</TargetFramework>
<FileVersion>1.7.4.0</FileVersion>
<Version>1.7.4</Version>
<Authors>HandBrake Team</Authors>
<Description>HandBrake is an open-source, GPL-licensed, multiplatform,video transcoder.</Description>
<Copyright>Copyright © 2003-2023 HandBrake Team</Copyright>
<PackageProjectUrl>https://handbrake.fr</PackageProjectUrl>
<RepositoryUrl>https://github.com/HandBrake/HandBrake</RepositoryUrl>
<Authors>Eclipse Community</Authors>
<Description>StickShift is an open-source, GPL-licensed, multiplatform, video transcoder.</Description>
<Copyright>Copyright © 2003-2024 Eclipse Community</Copyright>
<PackageProjectUrl>https://eclipse.cx/projects/stickshift.htm</PackageProjectUrl>
<RepositoryUrl>https://github.com/Eclipse-Community/StickShift</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>Video Transcoder</PackageTags>
<Platforms>AnyCPU</Platforms>
Expand Down
4 changes: 2 additions & 2 deletions win/CS/HandBrake.App.Core/Settings.StyleCop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
</Rule>
</Rules>
<AnalyzerSettings>
<StringProperty Name="CompanyName">HandBrake Project (https://handbrake.fr)</StringProperty>
<StringProperty Name="Copyright">This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.</StringProperty>
<StringProperty Name="CompanyName">Eclipse Community</StringProperty>
<StringProperty Name="Copyright">This file is part of the StickShift source code - It may be used under the terms of the GNU General Public License.</StringProperty>
</AnalyzerSettings>
</Analyzer>
</Analyzers>
Expand Down
2 changes: 1 addition & 1 deletion win/CS/HandBrake.Installer/HandBrake.Installer.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ProductVersion>3.10</ProductVersion>
<ProjectGuid>02684a37-c3e0-43f6-a4f0-2465afedd6df</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>HandBrake</OutputName>
<OutputName>StickShift</OutputName>
<OutputType>Package</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
Expand Down
28 changes: 14 additions & 14 deletions win/CS/HandBrake.Installer/Product.wxs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
// <copyright project="HandBrake.Installer" team="HandBrake Project (http://handbrake.fr)">
// <copyright project="HandBrake.Installer" team="Eclipse Community">
// This file is part of the HandBrake source code - It may be used under the terms of the MIT License.
// This project is NOT included under the HandBrake applications GPLv2 license.
// </copyright>
Expand All @@ -11,19 +11,19 @@

<?if $(var.Configuration)=Debug ?>
<?define msiProductId = "fd19ef0e-77c4-47a6-b1e4-4cea0b3a4c94" ?>
<?define productName = "HandBrake Nightly" ?>
<?define installDir = "Nightly" ?>
<?define productName = "StickShift" ?>
<?define installDir = "StickShift" ?>
<?define ToastActivatorCLSID = "" ?>
<?define packagePath = "..\HandBrakeWPF\bin\publish" ?>
<?else ?>
<?define msiProductId = "fd19ef0e-77c4-47a6-b1e4-4cea0b3a4c93" ?>
<?define productName = "HandBrake" ?>
<?define installDir = "HandBrake" ?>
<?define productName = "StickShift" ?>
<?define installDir = "StickShift" ?>
<?define ToastActivatorCLSID = "" ?>
<?define packagePath = "..\HandBrakeWPF\bin\publish" ?>
<?endif ?>

<Product Id="$(var.msiProductId)" Name="$(var.productName)" Language="1033" Version="1.6.1.0" Manufacturer="HandBrake Team" UpgradeCode="$(var.msiProductId)">
<Product Id="$(var.msiProductId)" Name="$(var.productName)" Language="1033" Version="1.6.1.0" Manufacturer="Eclipse Community" UpgradeCode="$(var.msiProductId)">
<Package InstallerVersion="200" Platform="x64" Compressed="yes" InstallScope="perMachine" />

<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
Expand All @@ -33,8 +33,8 @@
<Icon Id="ProductIcon" SourceFile="..\HandBrakeWPF\handbrakepineapple.ico"/>

<Property Id="ARPPRODUCTICON" Value="ProductIcon"/>
<Property Id="ARPHELPLINK" Value="https://www.handbrake.fr/docs"/>
<Property Id="ARPURLINFOABOUT" Value="https://www.handbrake.fr"/>
<Property Id="ARPHELPLINK" Value="https://github.com/Eclipse-Community/StickShift/issues"/>
<Property Id="ARPURLINFOABOUT" Value="https://eclipse.cx/projects/stickshift.htm"/>
<Property Id="ARPNOREPAIR" Value="1"/>
<Property Id="WIXUI_INSTALLDIR" Value="APPDIR" />

Expand All @@ -52,13 +52,13 @@
<Directory Id="TARGETDIR" Name="SourceDir">

<Directory Id="ProgramFiles64Folder">
<Directory Id="INSTALLDIR" Name="HandBrakeTeam">
<Directory Id="INSTALLDIR" Name="StickShift">
<Directory Id="APPDIR" Name="$(var.installDir)">

<Component Win64="yes" Id="ApplicationFiles" Guid="cbae29e7-6d39-49bb-8c76-0305c3d42181">
<!-- Core Application -->
<File Source="$(var.packagePath)\HandBrake.exe" />
<File Source="$(var.packagePath)\HandBrake.Worker.exe" />
<File Source="$(var.packagePath)\StickShift.exe" />
<File Source="$(var.packagePath)\StickShift.Worker.exe" />
<File Source="$(var.packagePath)\hb.dll"/>
<File Source="$(var.packagePath)\portable.ini.template"/>
</Component>
Expand All @@ -78,17 +78,17 @@
<Component Id="AppShortcuts" Win64="yes">

<!-- Shortcuts for the shell -->
<Shortcut Id="SCUT_Shortcuts_Shell" Name="$(var.productName)" Target="[#HandBrake.exe]" WorkingDirectory="APPLICATIONROOTDIRECTORY">
<Shortcut Id="SCUT_Shortcuts_Shell" Name="$(var.productName)" Target="[#StickShift.exe]" WorkingDirectory="APPLICATIONROOTDIRECTORY">
<!--AUMID-->
<ShortcutProperty Key="System.AppUserModel.ID" Value="HandBrakeTeam.$(var.productName)"/>
<ShortcutProperty Key="System.AppUserModel.ID" Value="StickShift.$(var.productName)"/>
<!--COM CLSID-->
<ShortcutProperty Key="System.AppUserModel.ToastActivatorCLSID" Value="{cbae29e7-6d39-49bb-8c76-0305c3d42181}"/>
</Shortcut>

<!-- Uninstall shortcut -->
<Shortcut Id="SCUT_Shortcuts_Uninstall" Name="Uninstall $(var.productName)" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]"/>
<RemoveFolder Id="REMOVE_Shortcuts" On="uninstall" />
<RegistryValue Root="HKCU" Key="Software\HandBakeTeam\$(var.installDir)" Name="installedShortcut" Type="integer" Value="1" KeyPath="yes" />
<RegistryValue Root="HKCU" Key="Software\StickShift\$(var.installDir)" Name="installedShortcut" Type="integer" Value="1" KeyPath="yes" />

</Component>
</DirectoryRef>
Expand Down
2 changes: 1 addition & 1 deletion win/CS/HandBrake.Installer/Readme.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
HandBrake Defaults to using the NSIS installer to generate the exe installers.
StickShift Defaults to using the NSIS installer to generate the exe installers.
HandBrake.Installer is not currently the primary installer. It is intended for the sys-admin audience only.
10 changes: 5 additions & 5 deletions win/CS/HandBrake.Interop/HandBrake.Interop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<TargetFramework>net6.0</TargetFramework>
<FileVersion>1.7.4.0</FileVersion>
<Version>1.7.4</Version>
<Authors>HandBrake Team</Authors>
<Description>HandBrake is an open-source, GPL-licensed, multiplatform,video transcoder.</Description>
<Copyright>Copyright © 2003-2023 HandBrake Team</Copyright>
<PackageProjectUrl>https://handbrake.fr</PackageProjectUrl>
<RepositoryUrl>https://github.com/HandBrake/HandBrake</RepositoryUrl>
<Authors>Eclipse Community</Authors>
<Description>StickShift is an open-source, GPL-licensed, multiplatform, video transcoder.</Description>
<Copyright>Copyright © 2003-2023 Eclipse Community</Copyright>
<PackageProjectUrl>https://eclipse.cx/projects/stickshift.htm</PackageProjectUrl>
<RepositoryUrl>https://github.com/Eclipse-Community/StickShift</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>Video Transcoder</PackageTags>
<Platforms>AnyCPU</Platforms>
Expand Down
4 changes: 2 additions & 2 deletions win/CS/HandBrake.Interop/Settings.StyleCop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
</Rule>
</Rules>
<AnalyzerSettings>
<StringProperty Name="CompanyName">HandBrake Project (https://handbrake.fr)</StringProperty>
<StringProperty Name="Copyright">This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.</StringProperty>
<StringProperty Name="CompanyName">Eclipse Community</StringProperty>
<StringProperty Name="Copyright">This file is part of the StickShift source code - It may be used under the terms of the GNU General Public License.</StringProperty>
</AnalyzerSettings>
</Analyzer>
</Analyzers>
Expand Down
48 changes: 24 additions & 24 deletions win/CS/HandBrake.Nsis.Installer/Installer64.nsi
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/* Resources.Designer.cs $
This file is part of the HandBrake source code.
Homepage: <http://HandBrake.fr/>.
This file is part of the StickShift source code.
Homepage: <https://eclipse.cx/projects/stickshift.htm>.
It may be used under the terms of the GNU General Public License. */

!define PRODUCT_NAME "HandBrake"
!define PRODUCT_NAME "StickShift"
!define PRODUCT_VERSION "1.7.4"
!define PRODUCT_VERSION_NUMBER "1.7.4"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\HandBrake.exe"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\StickShift.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM"

Expand All @@ -27,7 +27,7 @@ ManifestDPIAware true
!define MUI_LICENSEPAGE_TEXT_BOTTOM "You are now aware of your rights. Click Next to continue."

!define MUI_WELCOMEFINISHPAGE_BITMAP "InstallerBackground.bmp"
!define MUI_TEXT_WELCOME_INFO_TEXT "Setup will guide you through the installation of HandBrake.$\r$\n$\r$\nIt is recommended you close any running instances of HandBrake before running setup.$\r$\n$\r$\nWARNING: Before updating, please make sure that there are no pending encodes in the Queue. Please make sure you have backed up any presets and made a note of your settings.$\r$\n$\r$\nHandBrake requires Microsoft .NET *Desktop* Runtime 6. If this is not installed, you will be prompted to install it when you first run the app."
!define MUI_TEXT_WELCOME_INFO_TEXT "Setup will guide you through the installation of StickShift.$\r$\n$\r$\nIt is recommended you close any running instances of StickShift before running setup.$\r$\n$\r$\nWARNING: Before updating, please make sure that there are no pending encodes in the Queue. Please make sure you have backed up any presets and made a note of your settings.$\r$\n$\r$\nStickShift requires Microsoft .NET *Desktop* Runtime 6. If this is not installed, you will be prompted to install it when you first run the app."
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_TEXT "Create desktop shortcut (all users)"
!define MUI_FINISHPAGE_RUN_FUNCTION "desktopShortcut"
Expand All @@ -41,7 +41,7 @@ ManifestDPIAware true
; Instfiles page
!insertmacro MUI_PAGE_INSTFILES
; Finish page
;!define MUI_FINISHPAGE_RUN "$INSTDIR\HandBrake.exe"
;!define MUI_FINISHPAGE_RUN "$INSTDIR\StickShift.exe"
!insertmacro MUI_PAGE_FINISH

; Uninstaller pages
Expand All @@ -53,14 +53,14 @@ ManifestDPIAware true
; MUI end ------

Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-x86_64-Win_GUI.exe"
OutFile "StickShift-${PRODUCT_VERSION_NUMBER}-x86_64-Win_GUI.exe"

!include WordFunc.nsh
!insertmacro VersionCompare
!include LogicLib.nsh
!include x64.nsh

InstallDir "$PROGRAMFILES64\HandBrake"
InstallDir "$PROGRAMFILES64\StickShift"
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
ShowInstDetails show
ShowUnInstDetails show
Expand All @@ -80,7 +80,7 @@ Function .onInit
Abort

${IfNot} ${RunningX64}
MessageBox MB_OK "HandBrake requires a 64bit version of Windows to install. Your system has a 32bit version of Windows."
MessageBox MB_OK "StickShift requires a 64bit version of Windows to install. Your system has a 32bit version of Windows."
Quit
${EndIf}

Expand All @@ -106,7 +106,7 @@ Function .onInit
done:
FunctionEnd

Section "HandBrake" SectionApp
Section "StickShift" SectionApp
SetOutPath "$INSTDIR"
SetOverwrite ifnewer
SectionIn RO ; Read only, always installed
Expand All @@ -123,20 +123,20 @@ Section "HandBrake" SectionApp

; Start Menu Shortcut for All users.
SetShellVarContext all
CreateDirectory "$SMPROGRAMS\HandBrake"
CreateShortCut "$SMPROGRAMS\HandBrake\HandBrake.lnk" "$INSTDIR\HandBrake.exe"
CreateDirectory "$SMPROGRAMS\StickShift"
CreateShortCut "$SMPROGRAMS\StickShift\StickShift.lnk" "$INSTDIR\StickShift.exe"
SectionEnd

Section -AdditionalIcons
CreateShortCut "$SMPROGRAMS\HandBrake\Uninstall.lnk" "$INSTDIR\uninst.exe"
CreateShortCut "$SMPROGRAMS\StickShift\Uninstall.lnk" "$INSTDIR\uninst.exe"
SectionEnd

Section -Post
WriteUninstaller "$INSTDIR\uninst.exe"
WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\HandBrake.exe"
WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\StickShift.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\HandBrake.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\StickShift.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
SectionEnd

Expand Down Expand Up @@ -164,25 +164,25 @@ Section Uninstall

RMDir "$INSTDIR"

Delete "$SMPROGRAMS\HandBrake\Uninstall.lnk"
Delete "$DESKTOP\HandBrake.lnk"
Delete "$SMPROGRAMS\HandBrake\HandBrake.lnk"
RMDir "$SMPROGRAMS\HandBrake"
Delete "$SMPROGRAMS\StickShift\Uninstall.lnk"
Delete "$DESKTOP\StickShift.lnk"
Delete "$SMPROGRAMS\StickShift\StickShift.lnk"
RMDir "$SMPROGRAMS\StickShift"
RMDir "$INSTDIR"

DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"

SetShellVarContext all
Delete "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk"
Delete "$SMPROGRAMS\HandBrake Nightly\HandBrake Nightly.lnk"
RMDir "$SMPROGRAMS\HandBrake Nightly"
Delete "$DESKTOP\HandBrake Nightly.lnk"
Delete "$SMPROGRAMS\StickShift\Uninstall.lnk"
Delete "$SMPROGRAMS\StickShift\StickShift.lnk"
RMDir "$SMPROGRAMS\StickShift"
Delete "$DESKTOP\StickShift.lnk"

SetAutoClose true
SectionEnd

Function "desktopShortcut"
SetShellVarContext all
CreateShortCut "$DESKTOP\HandBrake.lnk" "$INSTDIR\HandBrake.exe"
CreateShortCut "$DESKTOP\StickShift.lnk" "$INSTDIR\StickShift.exe"
FunctionEnd
Loading

0 comments on commit 43d4edd

Please sign in to comment.