Fix invalid branding

* Corrected our reverse DNS naming to org.tenacityaudio.Tenacity in some
  places.

* Update links, some to GitHub and some to Codeberg (which are
  non-functional but should be in the future).

* Updated InnoSetup files which also contained invalid branding.

Signed-off-by: Avery King <avery98@pm.me>
This commit is contained in:
Avery King
2022-11-23 17:45:13 -08:00
parent 2e64448b43
commit c97042cc7f
7 changed files with 66 additions and 173 deletions

View File

@@ -578,7 +578,7 @@ else()
endif()
# Define Application ID
set( APP_ID "io.github.tenacity.Saucedacity" )
set( APP_ID "org.tenacityaudio.Tenacity" )
# Create short and full version strings
set( AUDACITY_DIST_VERSION ${AUDACITY_VERSION}.${AUDACITY_RELEASE}.${AUDACITY_REVISION} )

View File

@@ -2,7 +2,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR "${AUDACITY_VERSION}") # X
set(CPACK_PACKAGE_VERSION_MINOR "${AUDACITY_RELEASE}") # Y
set(CPACK_PACKAGE_VERSION_PATCH "${AUDACITY_REVISION}") # Z
set(CPACK_PACKAGE_VENDOR "Saucedacity")
set(CPACK_PACKAGE_HOMEPAGE_URL "https://tenacity.github.io")
set(CPACK_PACKAGE_HOMEPAGE_URL "https://tenacityaudio.org")
# X.Y.Z-alpha-20210615
set(CPACK_PACKAGE_VERSION "${AUDACITY_VERSION}.${AUDACITY_RELEASE}.${AUDACITY_REVISION}${AUDACITY_SUFFIX}")

View File

@@ -1,167 +1,60 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
style="display:inline"
id="svg2"
height="128"
width="128"
version="1.0"
sodipodi:docname="tenacity.svg"
inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
width="64"
height="64"
viewBox="0 0 16.933333 16.933334"
version="1.1"
id="svg2235"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<sodipodi:namedview
id="namedview22"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
showgrid="true"
inkscape:zoom="6.5136277"
inkscape:cx="71.388791"
inkscape:cy="77.376237"
inkscape:window-width="1547"
inkscape:window-height="749"
inkscape:window-x="285"
inkscape:window-y="163"
inkscape:window-maximized="0"
inkscape:current-layer="svg2"
objecttolerance="20"
guidetolerance="10000">
<inkscape:grid
type="xygrid"
id="grid169" />
</sodipodi:namedview>
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<cc:license
rdf:resource="GPL v2 or later" />
<dc:rights>
<cc:Agent>
<dc:title>Audacity development team</dc:title>
</cc:Agent>
</dc:rights>
<dc:creator>
<cc:Agent>
<dc:title>Aaron Spike</dc:title>
</cc:Agent>
</dc:creator>
<dc:date>2009-06-14</dc:date>
</cc:Work>
</rdf:RDF>
</metadata>
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs5">
<clipPath
id="clipPath3126">
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="path3128"
d="m 30,94 2,2 3,10 1,-12 3,15 0,-19 2,5 3,14 0,-19 2,2 3,17 3,-23 6.615678,25.91971 L 59,96 l 2,-6 2,25 6,-25 2,21 5,-22 5,24 1,-18 3,-6 1,23 5,-22 3,10 1,-9 3,6 0,-19 -3,8 L 94,69 92,82 90,78 89,64 84,83 83,79 80,49 77,75 75,83 71,56 67,79 65,85 64,43.695313 58,90 52,48 49,84 47,80 45,56 44,80 41,87 39,63 37,82 34,77 34,91 30,76 30,94 Z" />
</clipPath>
<clipPath
id="clipPath2798">
<path
style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:18.98999977;marker:none;enable-background:accumulate"
id="path2800"
d="M 64,6.875 C 50.736931,6.8749995 38.641338,11.015795 29.71875,17.96875 20.796162,24.921705 15.000001,34.870138 15,45.9375 l 0,4 C 6.141206,54.425978 -2.65625e-7,66.200002 0,80 c 3.5e-7,17.663999 10.049452,32 23,32 l 0,-66.0625 c 1e-6,-8.28809 4.289844,-15.915956 11.65625,-21.65625 C 42.022656,18.540956 52.424603,14.875 64,14.875 c 11.575394,0 21.977345,3.665955 29.34375,9.40625 C 100.71016,30.021545 105,37.649411 105,45.9375 L 105,112 c 12.95055,0 23,-14.336001 23,-32 0,-13.799998 -6.14121,-25.574022 -15,-30.0625 l 0,-4 C 113,34.870138 107.20384,24.921705 98.28125,17.96875 89.358662,11.015795 77.263067,6.8750003 64,6.875 Z M 26,49 l 0,63 c 2,0 4,-1 5,-3 l 0,-58 c -1,-1 -3,-2 -5,-2 z m 76,0 c -2,0 -4,1 -5,2 l 0,58 c 1,2 3,3 5,3 l 0,-63 z" />
</clipPath>
<filter
id="filter10749"
style="color-interpolation-filters:sRGB"
x="-0.25757873"
y="-0.23542933"
width="1.5151575"
height="1.4708587">
<feMorphology
id="feMorphology10751"
result="result0"
in="SourceGraphic"
radius="4" />
<feGaussianBlur
id="feGaussianBlur10753"
result="result91"
stdDeviation="8"
in="result0" />
<feComposite
id="feComposite10755"
in2="result91"
in="SourceGraphic"
operator="in" />
</filter>
<filter
id="filter10809"
style="color-interpolation-filters:sRGB"
x="-0.028125"
y="-0.034244946"
width="1.05625"
height="1.0684899">
<feGaussianBlur
id="feGaussianBlur10811"
result="blur"
stdDeviation="1.5"
in="SourceGraphic" />
<feDiffuseLighting
id="feDiffuseLighting10813"
result="diffuse"
lighting-color="#ffffff"
surfaceScale="10"
diffuseConstant="1">
<feDistantLight
id="feDistantLight10815"
azimuth="90"
elevation="25" />
</feDiffuseLighting>
<feComposite
k4="0"
k3="0"
k2="0"
id="feComposite10817"
result="composite1"
k1="1"
operator="arithmetic"
in2="diffuse"
in="diffuse" />
<feComposite
k4="0"
k2="0"
id="feComposite10819"
result="composite2"
k3="1"
operator="arithmetic"
k1="0.886275"
in2="SourceGraphic"
in="composite1" />
</filter>
id="defs2232">
<linearGradient
xlink:href="#linearGradient135126"
id="linearGradient70771"
x1="13.410914"
y1="89.657997"
x2="36.958832"
y2="66.110077"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient135126">
<stop
style="stop-color:#e93c17;stop-opacity:1"
offset="0"
id="stop135122" />
<stop
style="stop-color:#ca153e;stop-opacity:1"
offset="1"
id="stop135124" />
</linearGradient>
<linearGradient
xlink:href="#linearGradient135126"
id="linearGradient89893"
gradientUnits="userSpaceOnUse"
gradientTransform="translate(-4.9571544e-6)"
x1="36.958832"
y1="66.110077"
x2="13.410914"
y2="89.657997" />
</defs>
<ellipse
style="fill:#ffffff;stroke-width:0.984626;fill-opacity:1"
id="path877"
cx="64.017288"
cy="64.002983"
rx="63.996212"
ry="64.005211"
inkscape:label="path877" />
<text
xml:space="preserve"
style="font-style:normal;font-weight:normal;font-size:85.1908px;line-height:1.25;font-family:sans-serif;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.12977"
x="39.228909"
y="96.196373"
id="text6218"><tspan
x="39.228909"
y="96.196373"
style="stroke-width:2.12977"
id="tspan1537">S</tspan></text>
<rect
style="fill:#ffffff;stroke:none;stroke-width:0.132292;paint-order:markers fill stroke"
id="rect850"
width="15.291777"
height="14.933552"
x="0.80888873"
y="0.9899658" />
<g
id="g5951"
transform="matrix(0.71910108,0,0,0.71910108,-9.6438049,-47.539832)"
style="fill:url(#linearGradient70771);fill-opacity:1">
<path
id="rect1657-4-6-1-4-10-2-6"
style="fill:url(#linearGradient89893);fill-opacity:1;stroke-width:0.0636518;paint-order:markers fill stroke"
d="m 16.354404,66.110083 c -1.617931,0 -2.943487,1.325543 -2.943487,2.943487 v 17.660939 c 0,0.677907 0.234349,1.303066 0.623769,1.80231 0.540007,0.692304 1.379688,1.141182 2.319718,1.141182 h 17.66094 c 1.617937,0 2.943491,-1.325549 2.943491,-2.943492 v -17.66094 c 0,-0.651264 -0.215491,-1.252715 -0.577776,-1.741948 v -0.0029 c -0.0029,-0.0039 -0.0055,-0.0078 -0.0089,-0.01168 -0.0095,-0.0128 -0.01891,-0.02503 -0.02893,-0.03726 -0.0067,-0.0083 -0.01335,-0.01725 -0.02003,-0.02559 -0.02002,-0.02559 -0.04227,-0.05006 -0.06325,-0.07476 -0.541343,-0.639745 -1.347338,-1.049194 -2.244986,-1.049194 z m 0,1.471743 h 17.66094 c 0.828062,0 1.471743,0.643682 1.471743,1.471744 v 7.358726 H 31.071852 V 73.468805 H 28.128366 V 69.05357 h -2.943493 v 5.886983 h -2.943491 v -2.943491 h -2.943487 v 4.415234 H 14.88266 V 69.05357 c 0,-0.828062 0.643682,-1.471744 1.471744,-1.471744 z M 14.88266,79.355787 h 4.415235 v 4.415235 h 2.943487 V 80.82753 h 2.943491 v 5.886979 h 2.943493 v -4.415237 h 2.943486 v -2.943486 h 2.207617 2.207618 v 7.358722 c 0,0.828063 -0.643681,1.471749 -1.471743,1.471749 h -17.66094 c -0.828062,0 -1.471744,-0.643688 -1.471744,-1.471749 z" />
</g>
</svg>

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

@@ -58,7 +58,7 @@ hold information about one contributor to Audacity.
#endif
#ifdef REV_LONG
#define REV_IDENT wxString( "[[https://github.com/tenacity/tenacity/commit/" )+ REV_LONG + "|" + wxString( REV_LONG ).Left(6) + "]] of " + REV_TIME
#define REV_IDENT wxString( "[[https://github.com/tenacityteam/tenacity/commit/" )+ REV_LONG + "|" + wxString( REV_LONG ).Left(6) + "]] of " + REV_TIME
#else
#define REV_IDENT (XO("No revision identifier was provided").Translation())
#endif
@@ -494,7 +494,7 @@ void AboutDialog::PopulateAudacityPage( ShuttleGui & S )
<< wxT("<p><br>")
/* i18n-hint: The program's name substitutes for %s */
<< XO("%s website: ").Format( ProgramName )
<< wxT("[[https://github.com/tenacity/tenacity/|https://github.com/tenacity/tenacity]]<br>")
<< wxT("[[https://codeberg.org/tenacityteam/tenacity/|https://codeberg.org/tenacityteam/tenacity]]<br>")
/* i18n-hint A copyright symbol substitutes the 1st %s and Tenacity's
name substitues the 2nd. */

View File

@@ -59,7 +59,7 @@ static wxString InnerLink( const wxString &Key, const wxString& Text )
static wxString WikiLink( const wxString &Page, const wxString& Text )
{
return wxString(wxT("")) +
wxT("<a href='https://github.com/tenacity/tenacity/wiki/") +
wxT("<a href='https://codeberg.org/tenacityteam/tenacity/wiki/") +
Page +
wxT("'>") +
Text +
@@ -234,10 +234,10 @@ static wxString HelpTextBuiltIn( const wxString & Key )
" [[help:Main_Page|Audacity Manual]] - if not installed locally, [[https://manual.audacityteam.org/|view online]]")
<< wxT("</li><li>")
<< XO(
" [[https://github.com/tenacity/tenacity/discussions|Discussions (on GitHub)]] - ask your question directly, online.")
" [[https://github.com/tenacitytenacity/tenacity/discussions|Discussions (on GitHub)]] - ask your question directly, online.")
<< wxT("</li></ul></p><p>")
<< wxT("<b>")
<< XO("More:</b> Visit our [[https://github.com/tenacity/tenacity/wiki|Wiki]] for tips, tricks, extra tutorials and effects plug-ins.")
<< XO("More:</b> Visit our [[https://codeberg.org/tenacityteam/tenacity/wiki|Wiki]] for tips, tricks, extra tutorials and effects plug-ins.")
<< wxT("</p>");
auto result = o.GetString();
@@ -332,7 +332,7 @@ const wxString VerCheckHtml()
wxTextOutputStream s(o);
s
<< "<center>[["
<< "https://github.com/tenacity/tenacity/releases|"
<< "https://codeberg.org/tenacityteam/tenacity/releases|"
<< XO("View latest stable release")
<< "]]</center>\n";
return o.GetString();

View File

@@ -100,7 +100,7 @@ SplashDialog::SplashDialog(wxWindow * parent)
void SplashDialog::OnChar(wxMouseEvent &event)
{
if ( event.ShiftDown() && event.ControlDown() )
wxLaunchDefaultBrowser("https://tenacity.github.io");
wxLaunchDefaultBrowser("https://tenacityaudio.org");
}
void SplashDialog::Populate( ShuttleGui & S )

View File

@@ -41,9 +41,9 @@ AppVerName=Saucedacity {#AppVersion}
; Specify AppVersion as well, so it appears in the Add/Remove Programs entry.
AppVersion={#AppVersion}
AppPublisher="Saucedacity Team"
AppPublisherURL=https://tenacity.github.io
AppSupportURL=https://github.com/tenacity/tenacity/issues
AppUpdatesURL=https://github.com/tenacity/tenacity/releases
AppPublisherURL=https://tenacityaudio.org
AppSupportURL=https://codeberg.org/tenacityteam/tenacity/issues
AppUpdatesURL=https://codeberg.org/tenacityteam/tenacity/releases
ChangesAssociations=yes
@INSTALLER_X64_MODE@