Skip to content

Help menu: use north-east arrow as hyperlink suffix #3708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daschuer merged 3 commits into from
Mar 20, 2021
Merged

Help menu: use north-east arrow as hyperlink suffix #3708

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fafbc77
Help menu: use north-east arrow as hyperlink icon
ronso0 Mar 19, 2021
1ba21ef
Help menu: don't show hyperlink icon on macOS
ronso0 Mar 19, 2021
7b02ab0
Help menu: use hyperlink icon only when directing to online manual
ronso0 Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions src/widget/wmainmenubar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,13 @@ void WMainMenuBar::initialize() {
// HELP MENU
QMenu* pHelpMenu = new QMenu(tr("&Help"), this);

QString externalLinkSuffix = " =>";
QString externalLinkSuffix;
#ifndef __APPLE__
// According to Apple's Human Interface Guidelines devs are encouraged
// to not use custom icons in menus.
// https://developer.apple.com/design/human-interface-guidelines/macos/menus/menu-anatomy/
externalLinkSuffix = QChar(' ') + QChar(0x2197); // north-east arrow
#endif

QString supportTitle = tr("&Community Support") + externalLinkSuffix;
QString supportText = tr("Get help with Mixxx");
Expand All @@ -535,6 +541,7 @@ void WMainMenuBar::initialize() {
QDir resourceDir(m_pConfig->getResourcePath());
// Default to the mixxx.org hosted version of the manual.
QUrl qManualUrl(MIXXX_MANUAL_URL);
QString manualSuffix;
#if defined(__APPLE__)
// FIXME: We don't include the PDF manual in the bundle on OSX.
// Default to the web-hosted version.
Expand All @@ -543,18 +550,23 @@ void WMainMenuBar::initialize() {
if (resourceDir.exists(MIXXX_MANUAL_FILENAME)) {
qManualUrl = QUrl::fromLocalFile(
resourceDir.absoluteFilePath(MIXXX_MANUAL_FILENAME));
} else {
manualSuffix = externalLinkSuffix;
}
#elif defined(__LINUX__)
// On GNU/Linux, the manual is installed to e.g. /usr/share/mixxx/doc/
// On GNU/Linux, the manual is installed to e.g. /usr/share/doc/mixxx/
if (resourceDir.cd("../doc/mixxx") && resourceDir.exists(MIXXX_MANUAL_FILENAME)) {
qManualUrl = QUrl::fromLocalFile(
resourceDir.absoluteFilePath(MIXXX_MANUAL_FILENAME));
} else {
manualSuffix = externalLinkSuffix;
}
#else
// No idea, default to the mixxx.org hosted version.
manualSuffix = externalLinkSuffix;
#endif

QString manualTitle = tr("&User Manual") + externalLinkSuffix;
QString manualTitle = tr("&User Manual") + manualSuffix;
QString manualText = tr("Read the Mixxx user manual.");
auto* pHelpManual = new QAction(manualTitle, this);
pHelpManual->setStatusTip(manualText);
Expand Down