Skip to content

Commit

Permalink
Preferences: Update manual links
Browse files Browse the repository at this point in the history
We now have a proper section in the manual for track behaviors and
spectrogram settings. Update the help buttons in the appropriate
preference panels to refer to these sections in the manual.

Note: Effect manual pages remain unchanged as they are not yet
documented. They will be documented later.

Signed-off-by: Avery King <[email protected]>
(cherry picked from commit 0b54198)
  • Loading branch information
Avery King committed Dec 27, 2024
1 parent 226351d commit 09b9346
Show file tree
Hide file tree
Showing 16 changed files with 33 additions and 33 deletions.
4 changes: 2 additions & 2 deletions libraries/lib-files/FileException.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ wxString FileException::ErrorHelpUrl() const
switch (cause) {
case Cause::Open:
case Cause::Read:
return "Error:_Opening_or_reading_file";
return "Editing_Part_2#a-file-failed-to-open-or-be-read-from";
break;
case Cause::Write:
case Cause::Rename:
return "Error:_Disk_full_or_not_writable";
return "Editing_part_2#your-disk-is-full-or-not-writable";
default:
break;
}
Expand Down
4 changes: 2 additions & 2 deletions libraries/lib-files/TempDirectory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ wxString TempDirectory::TempDir()
XO("Unsuitable"),
XO("The temporary files directory is on a FAT formatted drive.\n"
"Resetting to default location."),
"Error:_Unsuitable_drive"
"Editing_Part_2#fat32-drives"
);

path = DefaultTempDir();
Expand Down Expand Up @@ -120,7 +120,7 @@ bool TempDirectory::FATFilesystemDenied( const FilePath &path,
GenericUI::ShowErrorDialog( placement,
XO("Unsuitable"),
XO("%s\n\nFor tips on suitable drives, click the help button.").Format(msg),
"Error:_Unsuitable_drive"
"Editing_Part_2.html#fat32-drives"
);

return true;
Expand Down
2 changes: 1 addition & 1 deletion src/DBConnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ void DBConnection::CheckpointThread(sqlite3 *db, const FilePath &fileName)
GuardedCall(
[&message, rc] {
throw SimpleMessageBoxException{ rc != SQLITE_FULL ? ExceptionType::Internal : ExceptionType::BadEnvironment,
message, XO("Warning"), "Error:_Disk_full_or_not_writable" }; },
message, XO("Warning"), "Editing_Part_2#your-disk-is-full-or-not-writable" }; },
SimpleGuard<void>{},
[this](TenacityException * e) {
// This executes in the main thread.
Expand Down
16 changes: 8 additions & 8 deletions src/ProjectFileIO.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ ProjectFileIO::ProjectFileIO(TenacityProject &project)
XO("There is very little free disk space left on %s\n"
"Please select a bigger temporary directory location in\n"
"Directories Preferences.").Format( volume ),
"Error:_Disk_full_or_not_writable"
"Editing_Part_2#your-disk-is-full-or-not-writable"
);
}
}
Expand Down Expand Up @@ -542,7 +542,7 @@ DBConnection &ProjectFileIO::GetConnection()
ExceptionType::Internal,
XO("Failed to open the project's database"),
XO("Warning"),
"Error:_Disk_full_or_not_writable"
"Editing_Part_2#your-disk-is-full-or-not-writable"
};
}
}
Expand Down Expand Up @@ -1344,7 +1344,7 @@ bool ProjectFileIO::RenameOrWarn(const FilePath &src, const FilePath &dst)
"The disk might be full or isn't writable.\n"
"For tips on freeing up space, click the help button.")
.Format(dst),
"Error:_Disk_full_or_not_writable"
"Editing_Part_2#your-disk-is-full-or-not-writable"
);
return false;
}
Expand Down Expand Up @@ -2178,7 +2178,7 @@ bool ProjectFileIO::SaveProject(
XO(
"The project's database failed to reopen, "
"possibly because of limited space on the storage device."),
"Error:_Disk_full_or_not_writable"
"Editing_Part_2#your-disk-is-full-or-not-writable"
);
wxCommandEvent evt{ EVT_RECONNECTION_FAILURE };
mProject.ProcessEvent(evt);
Expand All @@ -2200,7 +2200,7 @@ bool ProjectFileIO::SaveProject(
ShowError( {},
XO("Error Saving Project"),
FileException::WriteFailureMessage(fileName),
"Error:_Disk_full_or_not_writable"
"Editing_Part_2#your-disk-is-full-or-not-writable"
);
return false;
}
Expand Down Expand Up @@ -2256,7 +2256,7 @@ bool ProjectFileIO::SaveProject(
XO("Error Saving Project"),
XO("The project failed to open, possibly due to limited space\n"
"on the storage device.\n\n%s").Format(GetLastError()),
"Error:_Disk_full_or_not_writable");
"Editing_Part_2#your-disk-is-full-or-not-writable");

newConn = nullptr;

Expand All @@ -2278,7 +2278,7 @@ bool ProjectFileIO::SaveProject(
XO("Error Saving Project"),
XO("Unable to remove autosave information, possibly due to limited space\n"
"on the storage device.\n\n%s").Format(GetLastError()),
"Error:_Disk_full_or_not_writable");
"Editing_Part_2#your-disk-is-full-or-not-writable");

newConn = nullptr;

Expand Down Expand Up @@ -2320,7 +2320,7 @@ bool ProjectFileIO::SaveProject(
ShowError( {},
XO("Error Saving Project"),
FileException::WriteFailureMessage(fileName),
"Error:_Disk_full_or_not_writable"
"Editing_Part_2#your-disk-is-full-or-not-writable"
);
return false;
}
Expand Down
10 changes: 5 additions & 5 deletions src/ProjectFileManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ bool ProjectFileManager::DoSave(const FilePath & fileName, const bool fromSaveAs
XO("Insufficient Disk Space"),
XO("The project size exceeds the available free space on the target disk.\n\n"
"Please select a different disk with more free space."),
"Error:_Disk_full_or_not_writable"
"Editing_Part_2#your-disk-is-full-or-not-writable"
);

return false;
Expand All @@ -342,7 +342,7 @@ bool ProjectFileManager::DoSave(const FilePath & fileName, const bool fromSaveAs
GenericUI::ShowErrorDialog( *ProjectFramePlacement( &proj ),
XO("Error Saving Project"),
XO("The project exceeds the maximum size of 4GB when writing to a FAT32 formatted filesystem."),
"Error:_Unsuitable_drive"
"Editing_Part_2#fat32-drives"
);
return false;
}
Expand All @@ -358,7 +358,7 @@ bool ProjectFileManager::DoSave(const FilePath & fileName, const bool fromSaveAs
ShowErrorDialog( *ProjectFramePlacement( &proj ),
XO("Error Saving Project"),
FileException::WriteFailureMessage(fileName),
"Error:_Disk_full_or_not_writable",
"Editing_Part_2#your-disk-is-full-or-not-writable",
ErrorDialogOptions{ ErrorDialogType::ModalErrorReport } );
}
return false;
Expand Down Expand Up @@ -658,7 +658,7 @@ bool ProjectFileManager::SaveCopy(const FilePath &fileName /* = wxT("") */)
XO("Insufficient Disk Space"),
XO("The project size exceeds the available free space on the target disk.\n\n"
"Please select a different disk with more free space."),
"Error:_Unsuitable_drive"
"Editing_Part_2#your-disk-is-full-or-not-writable"
);

continue;
Expand All @@ -672,7 +672,7 @@ bool ProjectFileManager::SaveCopy(const FilePath &fileName /* = wxT("") */)
GenericUI::ShowErrorDialog( *ProjectFramePlacement( &project ),
XO("Error Saving Project"),
XO("The project exceeds the maximum size of 4GB when writing to a FAT32 formatted filesystem."),
"Error:_Unsuitable_drive"
"Editing_Part_2#fat32-drives"
);

if (project.mBatchMode)
Expand Down
2 changes: 1 addition & 1 deletion src/ProjectHistory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ namespace {
ExceptionType::Internal,
XO("Automatic database backup failed."),
XO("Warning"),
"Error:_Disk_full_or_not_writable"
"Editing_Part_2#your-disk-is-full-or-not-writable"
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/SqliteSampleBlock.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ DBConnection *SqliteSampleBlock::Conn() const
ExceptionType::Internal,
XO("Connection to project file is null"),
XO("Warning"),
"Error:_Disk_full_or_not_writable"
"Editing_Part_2#your-disk-is-full-or-not-writable"
};
}
return pConnection.get();
Expand Down
2 changes: 1 addition & 1 deletion src/TenacityFileConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ void TenacityFileConfig::Warn()
OpenInDefaultBrowser("https://" +
HelpSystem::HelpHostname +
HelpSystem::HelpServerHomeDir +
"Error:_Audacity_settings_file_unwritable");
"Preferences#inaccessible-or-unwritable-preferences");
break;

case wxID_CANCEL:
Expand Down
2 changes: 1 addition & 1 deletion src/WaveClip.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1740,7 +1740,7 @@ void WaveClip::Resample(int rate, ProgressDialog *progress)
ExceptionType::Internal,
XO("Resampling failed."),
XO("Warning"),
"Error:_Resampling"
"Editing_Part_2#resampling-fails"
};
else
{
Expand Down
6 changes: 3 additions & 3 deletions src/WaveTrack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1513,7 +1513,7 @@ void WaveTrack::PasteWaveTrack(double t0, const WaveTrack* other)
ExceptionType::BadUserAction,
XO("There is not enough room available to paste the selection"),
XO("Warning"),
"Error:_Insufficient_space_in_track"
"Editing_Part_2#insufficient-track-space"
};
}
}
Expand All @@ -1533,7 +1533,7 @@ void WaveTrack::PasteWaveTrack(double t0, const WaveTrack* other)
ExceptionType::BadUserAction,
XO("There is not enough room available to paste the selection"),
XO("Warning"),
"Error:_Insufficient_space_in_track"
"Editing_Part_2#insufficient-track-space"
};

for (const auto& clip : other->mClips)
Expand Down Expand Up @@ -2642,7 +2642,7 @@ void WaveTrack::ExpandCutLine(double cutLinePosition, double* cutlineStart,
ExceptionType::BadUserAction,
XO("There is not enough room available to expand the cut line"),
XO("Warning"),
"Error:_Insufficient_space_in_track"
"Editing_Part_2#insufficient-track-space"
};
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/export/Export.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1333,7 +1333,7 @@ void ShowExportErrorDialog(wxString ErrorCode,
ShowErrorDialog( {},
caption,
message.Format( ErrorCode ),
"Error:_Unable_to_export", // URL.
"Editing_Part_2#your-disk-is-full-or-not-writable", // URL.
ErrorDialogOptions{ ErrorDialogType::ModalErrorReport } );
}

Expand All @@ -1342,7 +1342,7 @@ void ShowDiskFullExportErrorDialog(const wxFileNameWrapper &fileName)
GenericUI::ShowErrorDialog( {},
XO("Warning"),
FileException::WriteFailureMessage(fileName),
"Error:_Disk_full_or_not_writable"
"Editing_Part_2#your-disk-is-full-or-not-writable"
);
}

Expand Down
2 changes: 1 addition & 1 deletion src/import/RawAudioGuess.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ static void Extract(bool bits16,
ExceptionType::BadUserAction,
XO("Bad data size. Could not import audio"),
XO("Warning"),
"Error:_Importing_raw_audio"
"Importing_and_Exporting#errors-while-importing-raw-data"
};

size_t dataSize = (size_t)dataSizeIn;
Expand Down
4 changes: 2 additions & 2 deletions src/menus/EditMenus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ void OnPaste(const CommandContext &context)
ExceptionType::BadUserAction,
XO("Pasting one type of track into another is not allowed."),
XO("Warning"),
"Error:_Copying_or_Pasting"
"Editing_Part_2#cutting-copying-and-pasting"
};

// We should need this check only each time we visit the leading
Expand Down Expand Up @@ -544,7 +544,7 @@ void OnPaste(const CommandContext &context)
ExceptionType::BadUserAction,
XO("Copying stereo audio into a mono track is not allowed."),
XO("Warning"),
"Error:_Copying_or_Pasting"
"Editing_Part_2#pasting-stereo-clips-into-mono-tracks"
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/prefs/SpectrumPrefs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ ManualPageID SpectrumPrefs::HelpPageName()
// return mWt
// ? "Spectrogram_Settings"
// : "Spectrograms_Preferences";
return "Preferences#tracks";
return "Preferences#spectrograms";
}

enum {
Expand Down
2 changes: 1 addition & 1 deletion src/prefs/TracksBehaviorsPrefs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ TranslatableString TracksBehaviorsPrefs::GetDescription()

ManualPageID TracksBehaviorsPrefs::HelpPageName()
{
return "Preferences#tracks";
return "Preferences#tracks-behaviors";
}

void TracksBehaviorsPrefs::Populate()
Expand Down
2 changes: 1 addition & 1 deletion src/widgets/UnwritableLocationErrorDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,5 @@ void UnwritableLocationErrorDialog::OnOk(wxCommandEvent&)

void UnwritableLocationErrorDialog::OnError(wxCommandEvent&)
{
HelpSystem::ShowHelp(this, "Error:_Disk_full_or_not_writable", false);
HelpSystem::ShowHelp(this, "Editing_Part_2#your-disk-is-full-or-not-writable", false);
}

0 comments on commit 09b9346

Please sign in to comment.