Skip to content

Commit

Permalink
Branding
Browse files Browse the repository at this point in the history
  • Loading branch information
K4sum1 committed Aug 22, 2024
1 parent 63d07df commit b7fcc52
Show file tree
Hide file tree
Showing 36 changed files with 196 additions and 212 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,14 @@ jobs:
$env:Path += ";C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin"
msbuild win\cs\build.xml /t:x64 /p:PfxFile=$env:SigningCertificate /p:PfxPwd=${{ secrets.HandBrakeTeam_pfx_pwd }} /p:SignTimestampServer=http://time.certum.pl/
- name: Upload HandBrake exe Installer
- name: Upload StickShift exe Installer
uses: actions/upload-artifact@v4
with:
name: HandBrake-x86_64-Win_GUI-EXE
path: win/CS/HandBrakeWPF/bin/publish/HandBrake-Nightly-x86_64-Win_GUI.exe
name: StickShift-1.7.4-x86_64-Win_GUI-EXE
path: win/CS/HandBrakeWPF/bin/publish/StickShift-1.7.4-x86_64-Win_GUI.exe

- name: Upload HandBrake msi Installer
- name: Upload StickShift msi Installer
uses: actions/upload-artifact@v4
with:
name: HandBrake-x86_64-Win_GUI-MSI
path: win/CS/HandBrakeWPF/bin/publish/HandBrake-Nightly-x86_64-Win_GUI.msi
name: StickShift-1.7.4-x86_64-Win_GUI-MSI
path: win/CS/HandBrakeWPF/bin/publish/StickShift-1.7.4-x86_64-Win_GUI.msi
32 changes: 8 additions & 24 deletions README.markdown
Original file line number Diff line number Diff line change
@@ -1,36 +1,18 @@
# HandBrake [![macOS Build](https://github.com/HandBrake/HandBrake/workflows/macOS%20build/badge.svg)](https://github.com/HandBrake/HandBrake/actions?query=workflow%3A%22macOS+build%22) [![Windows Build](https://github.com/HandBrake/HandBrake/workflows/Windows%20Build/badge.svg)](https://github.com/HandBrake/HandBrake/actions?query=workflow%3A%22Windows+Build%22) [![Linux Build](https://github.com/HandBrake/HandBrake/workflows/Linux%20Build/badge.svg)](https://github.com/HandBrake/HandBrake/actions?query=workflow%3A%22Linux+Build%22)
# StickShift [![Windows Build](https://github.com/K4sum1/StickShift/workflows/Windows%20Build/badge.svg)](https://github.com/K4sum1/StickShift/actions?query=workflow%3A%22Windows+Build%22)


HandBrake is an open-source video transcoder available for Linux, Mac, and Windows, licensed under the [GNU General Public License (GPL) Version 2](LICENSE).
StickShift is a fork of the HandBrake open-source video transcoder for Windows 7, licensed under the [GNU General Public License (GPL) Version 2](LICENSE).

HandBrake takes videos you already have and makes new ones that work on your mobile phone, tablet, TV media player, game console, computer, or web browser—nearly anything that supports modern video formats.
StickShift takes videos you already have and makes new ones that work on your mobile phone, tablet, TV media player, game console, computer, or web browser—nearly anything that supports modern video formats.

HandBrake works with most common video files and formats, including ones created by consumer and professional video cameras, mobile devices such as phones and tablets, game and computer screen recordings, and DVD and Blu-ray discs. HandBrake leverages tools such as FFmpeg, x264, and x265 to create new MP4 or MKV video files from these *Sources*.
StickShift works with most common video files and formats, including ones created by consumer and professional video cameras, mobile devices such as phones and tablets, game and computer screen recordings, and DVD and Blu-ray discs. StickShift leverages tools such as FFmpeg, x264, and x265 to create new MP4 or MKV video files from these *Sources*.

For information on downloading, building/installing, and using HandBrake, see the official [HandBrake Documentation](https://handbrake.fr/docs).
For information on downloading, building/installing, and using StickShift, see the official [HandBrake Documentation](https://handbrake.fr/docs) for now.


## Community Support

Visit the [HandBrake Community Forums](https://forum.handbrake.fr/).

For information on HandBrake's community support channels, please see [Community Support](https://handbrake.fr/docs/en/latest/help/community-support.html).

Our [community rules](https://forum.handbrake.fr/app.php/rules) and [code of conduct](https://github.com/HandBrake/HandBrake/blob/master/CODE_OF_CONDUCT.md) apply to both our site and GitHub.


## Contributing

We welcome most contributions. While it is our goal to allow everyone to contribute, contributions not meeting the project's goals or standards may be rejected.

Please read our [guide to contributing](https://handbrake.fr/docs/en/latest/contributing/contribute.html). This will provide you with all the information you need to start contributing to the project.

## Translations

We are now accepting translations via [Transifex](https://www.transifex.com/HandBrakeProject/public)

Please read our [Translations Guide](https://github.com/HandBrake/HandBrake/blob/master/TRANSLATION.markdown) and follow the instructions if you are interested in joining the translation effort.

For now just use issues. Might get an Eclipse post up sometime idk.

## Additional Information

Expand All @@ -40,6 +22,8 @@ Please read our [Translations Guide](https://github.com/HandBrake/HandBrake/blob

## Special Thanks

[archeYR](https://github.com/archeYR) for [HandBrake-w81](https://github.com/archeYR/HandBrake-w81)

<a href="https://www.macstadium.com/"><img width="200" alt="MacStadium" src="https://uploads-ssl.webflow.com/5ac3c046c82724970fc60918/5c019d917bba312af7553b49_MacStadium-developerlogo.png"></a>

and to many others who have contributed! [Thanks](THANKS.markdown)
Binary file modified graphics/Logo/HandBrake-v1-128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified graphics/Logo/HandBrake-v2-1658×1721.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion gtk/data/fr.handbrake.ghb.desktop.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Desktop Entry]
Name=HandBrake
Name=StickShift
GenericName=Media Transcoder
Comment=Transcodes DVD, Blu-ray, and other media
Exec=ghb %f
Expand Down
22 changes: 11 additions & 11 deletions gtk/data/fr.handbrake.ghb.metainfo.xml.in.in
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2018-2024 John Stebbins <your@email.com> -->
<!-- Copyright 2018-2024 Eclipse Community <webmaster@eclipse.cx> -->
<component type="desktop-application">
<id>fr.handbrake.ghb</id>
<translation type="gettext">ghb</translation>
<developer_name>HandBrake Team</developer_name>
<update_contact>jstebbins.hb_AT_gmail.com</update_contact>
<launchable type="desktop-id">fr.handbrake.ghb.desktop</launchable>
<developer_name>Eclipse Community</developer_name>
<update_contact>webmaster_AT_eclipse.cx</update_contact>
<launchable type="desktop-id">fr.handbrake.ghb/desktop</launchable>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0</project_license>
<name>HandBrake</name>
<name>StickShift</name>
<summary>Video Transcoder</summary>

<description>
<p>HandBrake is a tool for converting video from nearly any format to a selection of modern, widely supported codecs.</p>
<p>Reasons you'll love Handbrake:</p>
<p>StickShift is a tool for converting video from nearly any format to a selection of modern, widely supported codecs.</p>
<p>Reasons you'll love StickShift:</p>
<ul>
<li>Convert video from nearly any format</li>
<li>Free and Open Source</li>
<li>Multi-Platform (Windows, Mac and Linux)</li>
<li>Supports Windows 7</li>
</ul>
</description>

<url type="homepage">https://handbrake.fr/</url>
<url type="help">https://handbrake.fr/docs/</url>
<url type="bugtracker">https://github.com/HandBrake/HandBrake/issues</url>
<url type="homepage">https://eclipse.cx/projects/stickshift.htm</url>
<url type="help">https://eclipse.cx/projects/stickshift.htm/</url>
<url type="bugtracker">https://github.com/Eclipse-Community/StickShift/issues</url>
<url type="translate">https://www.transifex.com/HandBrakeProject/</url>

<screenshots>
Expand Down
14 changes: 7 additions & 7 deletions gtk/ghb.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Summary: A program to transcode DVDs and other sources to MPEG-4

Group: Applications/Multimedia
License: GPLv2
URL: http://handbrake.fr/
URL: https://eclipse.cx/projects/stickshift.htm
Source0: %{name}-%{version}.tar.bz2
Prefix: %{_prefix}
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Expand All @@ -18,8 +18,8 @@ Requires: gtk3, coreutils
%define debug_package %{nil}

%description
HandBrake is an open-source, GPL-licensed, multi-platform, multi-threaded
transcoder, available for MacOS X, Linux and Windows.
StickShift is an open-source, GPL-licensed, multi-platform, multi-threaded
transcoder, available for Windows 7.

%package gui
Summary: A program to transcode DVDs and other sources to MPEG-4
Expand All @@ -30,12 +30,12 @@ Summary: A program to transcode DVDs and other sources to MPEG-4
Group: Applications/Multimedia

%description gui
HandBrake is an open-source, GPL-licensed, multi-platform, multi-threaded
transcoder, available for MacOS X, Linux and Windows.
StickShift is an open-source, GPL-licensed, multi-platform, multi-threaded
transcoder, available for Windows 7.

%description cli
HandBrake is an open-source, GPL-licensed, multi-platform, multi-threaded
transcoder, available for MacOS X, Linux and Windows.
StickShift is an open-source, GPL-licensed, multi-platform, multi-threaded
transcoder, available for Windows 7.

%prep
%setup -q
Expand Down
Binary file modified gtk/icons/128x128/apps/fr.handbrake.ghb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gtk/icons/256x256/apps/fr.handbrake.ghb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gtk/icons/32x32/apps/fr.handbrake.ghb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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>net8.0</TargetFramework>
<FileVersion>1.8.2.0</FileVersion>
<Version>1.8.2</Version>
<Authors>HandBrake Team</Authors>
<Description>HandBrake is an open-source, GPL-licensed, multiplatform,video transcoder.</Description>
<Copyright>Copyright © 2003-2024 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
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.
Binary file modified win/CS/HandBrake.Installer/gfx/banner.bmp
Binary file not shown.
Binary file modified win/CS/HandBrake.Installer/gfx/dialog.bmp
Binary file not shown.
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>net8.0</TargetFramework>
<FileVersion>1.8.2.0</FileVersion>
<Version>1.8.2</Version>
<Authors>HandBrake Team</Authors>
<Description>HandBrake is an open-source, GPL-licensed, multiplatform,video transcoder.</Description>
<Copyright>Copyright © 2003-2024 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
Loading

0 comments on commit b7fcc52

Please sign in to comment.