mirror of
https://github.com/cookiengineer/audacity
synced 2025-12-02 06:40:12 +01:00
Rename project in many places; Replace Most Project Logos; Refactor About Tenacity... Dialog (#276)
Add `locale/en.po` file. Add English to `locale/LINGUAS` list. Partially duplicate `msgid`s to `msgstr`s in English locale enable eventual key `msgid` changes Replace former project name with Tenacity in English locale. Replace former project website with Tenacity compatible usages in English locale. Modify `AboutDialog.h` by renaming variables. Modify `AboutDialog.cpp` by replacing usage of pre-fork name in Strings. Modify AddBuildInfoRow methods to be static in About dialog. Make License text const in About dialog. Make pre-fork credits different in About dialog. Begin adding Tenacity specific credits Macros starting with `__` are reserved, so I removed the `__` on the About Dialog guard macro. Remove `AboutDialog::` from usage of `Role` in `AboutDialog.h` Refactor overly long generator method into separate methods in `AboutDialog.(h|cpp)` Begin adding Tenacity developer information Cleanup layout of `AboutDialog.h` and `AboutDialog.cpp` Add `safedelete` macro to compliment odd `safenew` macro Add `enum` to `ShuttleGui.cpp` to make it more clear what `Prop` method is doing. Remove a ton of pointless and/or redunant `#ifdef` usage Remove pointless singleton in AboutDialog Make AboutDialog modal on MacOS Fix reference type use of `auto` in `AudacityApp` b/c it makes unintentional copy. Update XPM and PNG images using Tenacity assets Update ICO images using Tenacity assets. Fix Windows resource script that improperly used `winuser.h` import. Add `*.aps` to gitignore to prevent IDE RC pre-load file from being committed. Add default values for pre-processor constants in `tenacity.rc`. Make changes needed for `Tenacity.exe` binary Add 8x8 PNG to Windows ICO files Replace project name in various CMake and CPack file. Replace project name in various directory structures. Replace project name in various OS-specific build files. Replace project name in various documentation files. Update the PO and POT files using the script. Fix places where a `.desktop` file was used on Linux. Replace title of project windows. Make splash screen click through to `tenacityaudio.org`. Remove ® from `AboutDialog.cpp` Modify copyright message in `AboutDialog.cpp` Signed-off-by: Emily Mabrey <emilymabrey93@gmail.com>
This commit is contained in:
@@ -9,13 +9,13 @@ fi
|
||||
|
||||
export LD_LIBRARY_PATH="${APPDIR}/lib:${LD_LIBRARY_PATH}"
|
||||
|
||||
export AUDACITY_PATH="${AUDACITY_PATH}:${APPDIR}/share/audacity"
|
||||
export AUDACITY_PATH="${AUDACITY_PATH}:${APPDIR}/share/tenacity"
|
||||
export AUDACITY_MODULES_PATH="${AUDACITY_MODULES_PATH}:${APPDIR}/lib/modules"
|
||||
|
||||
function help()
|
||||
{
|
||||
# Normal audacity help
|
||||
"${APPDIR}/bin/audacity" --help
|
||||
"${APPDIR}/bin/tenacity" --help
|
||||
# Special options handled by this script
|
||||
cat >&2 <<EOF
|
||||
--readme display README
|
||||
@@ -34,19 +34,19 @@ case "$1" in
|
||||
help
|
||||
;;
|
||||
--readme )
|
||||
exec less "${APPDIR}/share/doc/audacity/README.txt"
|
||||
exec less "${APPDIR}/share/doc/tenacity/README.txt"
|
||||
;;
|
||||
--license )
|
||||
exec less "${APPDIR}/share/doc/audacity/LICENSE.txt"
|
||||
exec less "${APPDIR}/share/doc/tenacity/LICENSE.txt"
|
||||
;;
|
||||
--man|--manual|--manpage )
|
||||
exec man "${APPDIR}/share/man/man1/audacity.1"
|
||||
exec man "${APPDIR}/share/man/man1/tenacity.1"
|
||||
;;
|
||||
--check-depends|--check-dependencies )
|
||||
exec bash "${APPDIR}/bin/check_dependencies"
|
||||
;;
|
||||
* )
|
||||
# Other arguments go to Audacity
|
||||
exec "${APPDIR}/bin/audacity" "$@"
|
||||
exec "${APPDIR}/bin/tenacity" "$@"
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -6,9 +6,9 @@ LABEL version="3.0"
|
||||
|
||||
RUN apt-get update && apt-get install -y dos2unix
|
||||
|
||||
WORKDIR /audacity
|
||||
WORKDIR /tenacity
|
||||
|
||||
COPY ["dependencies.sh", "/audacity/"]
|
||||
COPY ["dependencies.sh", "/tenacity/"]
|
||||
# pkg-config is so broken
|
||||
COPY ["pkgconfig/*", "/usr/local/lib/pkgconfig/"]
|
||||
|
||||
@@ -17,7 +17,7 @@ RUN dos2unix dependencies.sh && \
|
||||
|
||||
RUN ["bash", "-ex", "dependencies.sh"]
|
||||
|
||||
COPY ["entrypoint.sh", "/audacity/"]
|
||||
COPY ["entrypoint.sh", "/tenacity/"]
|
||||
RUN dos2unix entrypoint.sh
|
||||
|
||||
CMD ["bash", "-ex", "./entrypoint.sh"]
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
conan --version
|
||||
|
||||
if [ ! -d "audacity" ]
|
||||
if [ ! -d "tenacity" ]
|
||||
then
|
||||
git clone https://github.com/audacity/audacity
|
||||
git clone https://github.com/tenacityteam/tenacity
|
||||
fi
|
||||
|
||||
mkdir -p build
|
||||
@@ -41,7 +41,7 @@ cmake_options=(
|
||||
-Daudacity_use_curl=system
|
||||
)
|
||||
|
||||
cmake "${cmake_options[@]}" ../audacity
|
||||
cmake "${cmake_options[@]}" ../tenacity
|
||||
|
||||
exit_status=$?
|
||||
|
||||
|
||||
@@ -79,9 +79,9 @@ linuxdeploy --list-plugins
|
||||
#============================================================================
|
||||
|
||||
ln -sf --no-dereference . "${appdir}/usr"
|
||||
ln -sf share/applications/audacity.desktop "${appdir}/audacity.desktop"
|
||||
ln -sf share/icons/hicolor/scalable/apps/audacity.svg "${appdir}/audacity.svg"
|
||||
ln -sf share/icons/hicolor/scalable/apps/audacity.svg "${appdir}/.DirIcon"
|
||||
ln -sf share/applications/tenacity.desktop "${appdir}/tenacity.desktop"
|
||||
ln -sf share/icons/hicolor/scalable/apps/tenacity.svg "${appdir}/tenacity.svg"
|
||||
ln -sf share/icons/hicolor/scalable/apps/tenacity.svg "${appdir}/.DirIcon"
|
||||
|
||||
#============================================================================
|
||||
# Bundle dependencies
|
||||
@@ -89,7 +89,7 @@ ln -sf share/icons/hicolor/scalable/apps/audacity.svg "${appdir}/.DirIcon"
|
||||
|
||||
# HACK: Some wxWidget libraries depend on themselves. Add
|
||||
# them to LD_LIBRARY_PATH so that linuxdeploy can find them.
|
||||
export LD_LIBRARY_PATH="${appdir}/usr/lib/audacity:${LD_LIBRARY_PATH-}"
|
||||
export LD_LIBRARY_PATH="${appdir}/usr/lib/tenacity:${LD_LIBRARY_PATH-}"
|
||||
|
||||
linuxdeploy --appdir "${appdir}" # add all shared library dependencies
|
||||
|
||||
|
||||
6
linux/audacity.sh → linux/tenacity.sh
Executable file → Normal file
6
linux/audacity.sh → linux/tenacity.sh
Executable file → Normal file
@@ -1,10 +1,10 @@
|
||||
#!/bin/sh
|
||||
|
||||
lib="${0%/*}/lib/audacity"
|
||||
share="${0%/*}/share/audacity"
|
||||
lib="${0%/*}/lib/tenacity"
|
||||
share="${0%/*}/share/tenacity"
|
||||
|
||||
export LD_LIBRARY_PATH="${lib}:${LD_LIBRARY_PATH}"
|
||||
export AUDACITY_MODULES_PATH="${AUDACITY_MODULES_PATH}:${lib}/modules"
|
||||
export AUDACITY_PATH="${AUDACITY_PATH}:${share}"
|
||||
|
||||
exec "${0%/*}/bin/audacity" "$@"
|
||||
exec "${0%/*}/bin/tenacity" "$@"
|
||||
Reference in New Issue
Block a user