diff --git a/CMakeLists.txt b/CMakeLists.txt index a4fee5eae..82ec32dae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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} ) diff --git a/cmake-proxies/cmake-modules/Package.cmake b/cmake-proxies/cmake-modules/Package.cmake index 38fee26e2..c0f7eab9f 100644 --- a/cmake-proxies/cmake-modules/Package.cmake +++ b/cmake-proxies/cmake-modules/Package.cmake @@ -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}") diff --git a/images/tenacity.svg b/images/tenacity.svg index a62f5be9a..e82b5aa73 100644 --- a/images/tenacity.svg +++ b/images/tenacity.svg @@ -1,167 +1,60 @@ + + - - - - - - - image/svg+xml - - - - - Audacity development team - - - - - Aaron Spike - - - 2009-06-14 - - - + xmlns:svg="http://www.w3.org/2000/svg"> - - - - - - - - - - - - - - - - - - - + id="defs2232"> + + + + + + - - S + + + + diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp index 6a72682b4..52f440941 100644 --- a/src/AboutDialog.cpp +++ b/src/AboutDialog.cpp @@ -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("


") /* 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]]
") + << wxT("[[https://codeberg.org/tenacityteam/tenacity/|https://codeberg.org/tenacityteam/tenacity]]
") /* i18n-hint A copyright symbol substitutes the 1st %s and Tenacity's name substitues the 2nd. */ diff --git a/src/HelpText.cpp b/src/HelpText.cpp index 791c540e7..2d1b86d3a 100644 --- a/src/HelpText.cpp +++ b/src/HelpText.cpp @@ -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("") + 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("

  • ") << 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("
  • ") << wxT("") - << XO("More: Visit our [[https://github.com/tenacity/tenacity/wiki|Wiki]] for tips, tricks, extra tutorials and effects plug-ins.") + << XO("More: Visit our [[https://codeberg.org/tenacityteam/tenacity/wiki|Wiki]] for tips, tricks, extra tutorials and effects plug-ins.") << wxT("

    "); auto result = o.GetString(); @@ -332,7 +332,7 @@ const wxString VerCheckHtml() wxTextOutputStream s(o); s << "
    [[" - << "https://github.com/tenacity/tenacity/releases|" + << "https://codeberg.org/tenacityteam/tenacity/releases|" << XO("View latest stable release") << "]]
    \n"; return o.GetString(); diff --git a/src/SplashDialog.cpp b/src/SplashDialog.cpp index 9c5032179..5ff1ceaae 100644 --- a/src/SplashDialog.cpp +++ b/src/SplashDialog.cpp @@ -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 ) diff --git a/win/Inno_Setup_Wizard/tenacity.iss.in b/win/Inno_Setup_Wizard/tenacity.iss.in index 6d13b1ce0..04b782e3e 100644 --- a/win/Inno_Setup_Wizard/tenacity.iss.in +++ b/win/Inno_Setup_Wizard/tenacity.iss.in @@ -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@