From fdb5405e2c363aedda1335db4b07b6597c1402ad Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Tue, 23 Dec 2025 09:29:03 -0500 Subject: [PATCH] refactor: use system color for hyperlinks --- src/lib/gui/Messages.cpp | 15 +++++++-------- src/lib/gui/Styles.h | 4 ---- translations/deskflow_es.ts | 24 ++++++++++++------------ translations/deskflow_it.ts | 24 ++++++++++++------------ translations/deskflow_ja.ts | 24 ++++++++++++------------ translations/deskflow_ru.ts | 24 ++++++++++++------------ translations/deskflow_zh_CN.ts | 24 ++++++++++++------------ 7 files changed, 67 insertions(+), 72 deletions(-) diff --git a/src/lib/gui/Messages.cpp b/src/lib/gui/Messages.cpp index b7b5753c9..de6d6f996 100644 --- a/src/lib/gui/Messages.cpp +++ b/src/lib/gui/Messages.cpp @@ -7,7 +7,6 @@ #include "Messages.h" #include "Logger.h" -#include "Styles.h" #include "VersionInfo.h" #include "common/Enums.h" @@ -42,10 +41,10 @@ void showErrorDialog(const QString &message, const QString &fileLine, QtMsgType auto errorType = QtFatalMsg ? QObject::tr("fatal error") : QObject::tr("error"); auto title = QStringLiteral("%1 %2").arg(kAppName, errorType); auto text = QObject::tr( - R"(

Please report a bug)" - " and copy/paste the following error:

v%3\n%4\n%5
" + R"(

Please report a bug)" + " and copy/paste the following error:

v%2\n%3\n%4
" ) - .arg(kUrlHelp, kColorSecondary, kVersion, message, fileLine); + .arg(kUrlHelp, kVersion, message, fileLine); if (type == QtFatalMsg) { text.prepend(QObject::tr("

Sorry, a fatal error has occurred and the application must now exit.

\n")); @@ -122,9 +121,9 @@ void showCloseReminder(QWidget *parent) message.append( QObject::tr( "

On Linux systems using GNOME 3, the notification area might be disabled. " - R"(You may need to enable an extension to see the %3 tray icon.

)" + R"(You may need to enable an extension to see the %2 tray icon.

)" ) - .arg(kUrlGnomeTrayFix, kStyleLink, kAppName) + .arg(kUrlGnomeTrayFix, kAppName) ); #endif @@ -292,10 +291,10 @@ void showWaylandLibraryError(QWidget *parent) "

Please either switch to X from your login screen or use a build " "that uses the correct libraries.

" "

If you think this is incorrect, please " - R"(report a bug.

)" + R"(report a bug.

)" "

Please check the logs for more information.

" ) - .arg(kAppName, kUrlHelp, kColorSecondary) + .arg(kAppName, kUrlHelp) ); } diff --git a/src/lib/gui/Styles.h b/src/lib/gui/Styles.h index ce857e7d1..74044b859 100644 --- a/src/lib/gui/Styles.h +++ b/src/lib/gui/Styles.h @@ -10,12 +10,8 @@ namespace deskflow::gui { -const auto kColorSecondary = "#4285f4"; const auto kColorError = "#ec4c47"; -const auto kStyleLink = // - QStringLiteral("color: %1").arg(kColorSecondary); - const auto kStyleLineEditErrorBorder = QStringLiteral("border: 1px solid %1; border-radius: 2px; padding: 2px;").arg(kColorError); diff --git a/translations/deskflow_es.ts b/translations/deskflow_es.ts index 15541f092..b95e67c10 100644 --- a/translations/deskflow_es.ts +++ b/translations/deskflow_es.ts @@ -559,14 +559,6 @@ Nombres válidos: error error - - <p>Please <a href="%1" style="color: %2">report a bug</a> and copy/paste the following error:</p><pre>v%3 -%4 -%5</pre> - <p>Por favor, <a href="%1" style="color: %2">informa de un error</a> y copia y pega el siguiente error:</p><pre>v%3 -%4 -%5</pre> - <p>Sorry, a fatal error has occurred and the application must now exit.</p> @@ -584,8 +576,16 @@ Nombres válidos: <p>%1 seguirá ejecutándose en segundo plano y se podrá acceder a él mediante el icono %1 en el área de notificaciones del sistema. Esta configuración se puede desactivar.</p> - <p>On Linux systems using GNOME 3, the notification area might be disabled. You may need to <a href="%1" %2>enable an extension</a> to see the %3 tray icon.</p> - <p>En sistemas Linux que usan GNOME 3, el área de notificaciones podría estar deshabilitada. Quizás necesite <a href="%1" %2>habilitar una extensión</a> para ver el icono de la bandeja %3.</p> + <p>Please <a href="%1">report a bug</a> and copy/paste the following error:</p><pre>v%2 +%3 +%4</pre> + <p>Por favor, <a href="%1">informa de un error</a> y copia y pega el siguiente error:</p><pre>v%2 +%3 +%4</pre> + + + <p>On Linux systems using GNOME 3, the notification area might be disabled. You may need to <a href="%1">enable an extension</a> to see the %2 tray icon.</p> + <p>En sistemas Linux que usan GNOME 3, el área de notificaciones podría estar deshabilitada. Quizás necesite <a href="%1">habilitar una extensión</a> para ver el icono de la bandeja %2.</p> %1 Server @@ -680,8 +680,8 @@ Nombres válidos: <p>Las configuraciones son de solo lectura porque solo tiene acceso de lectura al archivo:</p><p>%1</p> - <p>Sorry, while this version of %1 does support Wayland, this build was not linked with one or more of the required libraries.</p><p>Please either switch to X from your login screen or use a build that uses the correct libraries.</p><p>If you think this is incorrect, please <a href="%2" style="color: %3">report a bug</a>.</p><p>Please check the logs for more information.</p> - <p>Lo sentimos, aunque esta versión de %1 es compatible con Wayland, esta compilación no se vinculó con una o más de las bibliotecas requeridas.</p><p>Cambie a X desde su pantalla de inicio de sesión o use una compilación que use las bibliotecas correctas.</p><p>Si cree que esto es incorrecto, <a href="%2" style="color: %3">informe un error</a>.</p><p>Consulte los registros para obtener más información.</p> + <p>Sorry, while this version of %1 does support Wayland, this build was not linked with one or more of the required libraries.</p><p>Please either switch to X from your login screen or use a build that uses the correct libraries.</p><p>If you think this is incorrect, please <a href="%2">report a bug</a>.</p><p>Please check the logs for more information.</p> + <p>Lo sentimos, aunque esta versión de %1 es compatible con Wayland, esta compilación no se vinculó con una o más de las bibliotecas requeridas.</p><p>Cambie a X desde su pantalla de inicio de sesión o use una compilación que use las bibliotecas correctas.</p><p>Si cree que esto es incorrecto, <a href="%2">informe un error</a>.</p><p>Consulte los registros para obtener más información.</p> No thanks diff --git a/translations/deskflow_it.ts b/translations/deskflow_it.ts index 67b93a1b0..34b47f4da 100644 --- a/translations/deskflow_it.ts +++ b/translations/deskflow_it.ts @@ -559,14 +559,6 @@ Nomi validi: error errore - - <p>Please <a href="%1" style="color: %2">report a bug</a> and copy/paste the following error:</p><pre>v%3 -%4 -%5</pre> - <p>Per favore <a href="%1" style="color: %2">segnala un bug</a> e copia/incolla il seguente errore:</p><pre>v%3 -%4 -%5</pre> - <p>Sorry, a fatal error has occurred and the application must now exit.</p> @@ -584,8 +576,16 @@ Nomi validi: <p>%1 continuerà a essere eseguito in background e sarà accessibile tramite l'icona %1 nell'area di notifica del sistema. Questa impostazione può essere disabilitata.</p> - <p>On Linux systems using GNOME 3, the notification area might be disabled. You may need to <a href="%1" %2>enable an extension</a> to see the %3 tray icon.</p> - <p>Sui sistemi Linux che utilizzano GNOME 3, l'area di notifica potrebbe essere disabilitata. Potrebbe essere necessario <a href="%1" %2>abilitare un'estensione</a> per visualizzare l'icona del vassoio %3.</p> + <p>Please <a href="%1">report a bug</a> and copy/paste the following error:</p><pre>v%2 +%3 +%4</pre> + <p>Per favore <a href="%1">segnala un bug</a> e copia/incolla il seguente errore:</p><pre>v%2 +%3 +%4</pre> + + + <p>On Linux systems using GNOME 3, the notification area might be disabled. You may need to <a href="%1">enable an extension</a> to see the %2 tray icon.</p> + <p>Sui sistemi Linux che utilizzano GNOME 3, l'area di notifica potrebbe essere disabilitata. Potrebbe essere necessario <a href="%1">abilitare un'estensione</a> per visualizzare l'icona del vassoio %2.</p> %1 Server @@ -680,8 +680,8 @@ Nomi validi: <p>Le impostazioni sono di sola lettura perché hai solo accesso in lettura al file:</p><p>%1</p> - <p>Sorry, while this version of %1 does support Wayland, this build was not linked with one or more of the required libraries.</p><p>Please either switch to X from your login screen or use a build that uses the correct libraries.</p><p>If you think this is incorrect, please <a href="%2" style="color: %3">report a bug</a>.</p><p>Please check the logs for more information.</p> - <p>Siamo spiacenti, sebbene questa versione di %1 supporti Wayland, questa build non è stata collegata a una o più librerie richieste.</p><p>Passa a X dalla schermata di accesso o usa una build che utilizzi le librerie corrette.</p><p>Se ritieni che ciò sia errato, <a href="%2" style="color: %3">segnala un bug</a>.</p><p>Controlla i log per maggiori informazioni.</p> + <p>Sorry, while this version of %1 does support Wayland, this build was not linked with one or more of the required libraries.</p><p>Please either switch to X from your login screen or use a build that uses the correct libraries.</p><p>If you think this is incorrect, please <a href="%2">report a bug</a>.</p><p>Please check the logs for more information.</p> + <p>Siamo spiacenti, sebbene questa versione di %1 supporti Wayland, questa build non è stata collegata a una o più librerie richieste.</p><p>Passa a X dalla schermata di accesso o usa una build che utilizzi le librerie corrette.</p><p>Se ritieni che ciò sia errato, <a href="%2">segnala un bug</a>.</p><p>Controlla i log per maggiori informazioni.</p> No thanks diff --git a/translations/deskflow_ja.ts b/translations/deskflow_ja.ts index 5fcedf7a5..fbea4c3d8 100644 --- a/translations/deskflow_ja.ts +++ b/translations/deskflow_ja.ts @@ -558,14 +558,6 @@ Valid names: error エラー - - <p>Please <a href="%1" style="color: %2">report a bug</a> and copy/paste the following error:</p><pre>v%3 -%4 -%5</pre> - <p><a href="%1" style="color: %2">バグレポート</a>して以下のエラーをコピー＆ペーストしてください:</p><pre>v%3 -%4 -%5</pre> - <p>Sorry, a fatal error has occurred and the application must now exit.</p> @@ -585,8 +577,16 @@ Valid names: <p>%1 はバックグラウンドで引き続き実行され、システム通知領域の %1 アイコンからアクセスできます。この設定は無効にできます。</p> - <p>On Linux systems using GNOME 3, the notification area might be disabled. You may need to <a href="%1" %2>enable an extension</a> to see the %3 tray icon.</p> - <p>GNOME 3 を使用している Linux システムでは、通知領域が無効化されていることがあります。その場合は %3 トレイアイコンを表示するために<a href="%1" %2>拡張機能の有効化</a>が必要かもしれません。</p> + <p>Please <a href="%1">report a bug</a> and copy/paste the following error:</p><pre>v%2 +%3 +%4</pre> + <p><a href="%1">バグレポート</a>して以下のエラーをコピー＆ペーストしてください:</p><pre>v%2 +%3 +%4</pre> + + + <p>On Linux systems using GNOME 3, the notification area might be disabled. You may need to <a href="%1">enable an extension</a> to see the %2 tray icon.</p> + <p>GNOME 3 を使用している Linux システムでは、通知領域が無効化されていることがあります。その場合は %2 トレイアイコンを表示するために<a href="%1">拡張機能の有効化</a>が必要かもしれません。</p> %1 Server @@ -681,8 +681,8 @@ Valid names: <p>以下のファイルへの書き込み権限がないため、設定は読み取り専用です:</p><p>%1</p> - <p>Sorry, while this version of %1 does support Wayland, this build was not linked with one or more of the required libraries.</p><p>Please either switch to X from your login screen or use a build that uses the correct libraries.</p><p>If you think this is incorrect, please <a href="%2" style="color: %3">report a bug</a>.</p><p>Please check the logs for more information.</p> - <p>申し訳ありません、このバージョンの %1 は Wayland に対応していますが、このビルドには必要なライブラリがリンクされていません。</p><p>ログイン画面から X に切り替えるか、正しいライブラリをリンクしたビルドを使用してください。</p><p>もしこの説明が正しくないと思われる場合は、<a href="%2" style="color: %3">バグレポート</a>してください。</p><p>詳細はログを確認してください。</p> + <p>Sorry, while this version of %1 does support Wayland, this build was not linked with one or more of the required libraries.</p><p>Please either switch to X from your login screen or use a build that uses the correct libraries.</p><p>If you think this is incorrect, please <a href="%2">report a bug</a>.</p><p>Please check the logs for more information.</p> + <p>申し訳ありません、このバージョンの %1 は Wayland に対応していますが、このビルドには必要なライブラリがリンクされていません。</p><p>ログイン画面から X に切り替えるか、正しいライブラリをリンクしたビルドを使用してください。</p><p>もしこの説明が正しくないと思われる場合は、<a href="%2">バグレポート</a>してください。</p><p>詳細はログを確認してください。</p> No thanks diff --git a/translations/deskflow_ru.ts b/translations/deskflow_ru.ts index e50540237..8637879bb 100644 --- a/translations/deskflow_ru.ts +++ b/translations/deskflow_ru.ts @@ -562,14 +562,6 @@ Valid names: error ошибка - - <p>Please <a href="%1" style="color: %2">report a bug</a> and copy/paste the following error:</p><pre>v%3 -%4 -%5</pre> - <p>Пожалуйста <a href="%1" style="color: %2">сообщите об ошибке</a>и скопируйте/вставьте следующее сообщение об ошибке:</p><pre>v%3 -%4 -%5</pre> - <p>Sorry, a fatal error has occurred and the application must now exit.</p> @@ -587,8 +579,16 @@ Valid names: <p>%1 продолжит работу в фоновом режиме и может быть развернуто через %1 иконку на вашей панели уведомлений. Эту настройку можно отключить.</p> - <p>On Linux systems using GNOME 3, the notification area might be disabled. You may need to <a href="%1" %2>enable an extension</a> to see the %3 tray icon.</p> - <p>На Linux (пингвинчики) системах, использующих GNOME 3, панель уведомлений может быть отключена. Вам может понадобиться <a href="%1" %2>подключить расширение</a>, чтобы увидеть %3 иконку.</p> + <p>Please <a href="%1">report a bug</a> and copy/paste the following error:</p><pre>v%2 +%3 +%4</pre> + <p>Пожалуйста <a href="%1">сообщите об ошибке</a>и скопируйте/вставьте следующее сообщение об ошибке:</p><pre>v%2 +%3 +%4</pre> + + + <p>On Linux systems using GNOME 3, the notification area might be disabled. You may need to <a href="%1">enable an extension</a> to see the %2 tray icon.</p> + <p>На Linux (пингвинчики) системах, использующих GNOME 3, панель уведомлений может быть отключена. Вам может понадобиться <a href="%1">подключить расширение</a>, чтобы увидеть %2 иконку.</p> %1 Server @@ -683,8 +683,8 @@ Valid names: <p>Вам разрешено только чтение настроек из-за ограничения доступа к файлу:</p><p>%1</p> - <p>Sorry, while this version of %1 does support Wayland, this build was not linked with one or more of the required libraries.</p><p>Please either switch to X from your login screen or use a build that uses the correct libraries.</p><p>If you think this is incorrect, please <a href="%2" style="color: %3">report a bug</a>.</p><p>Please check the logs for more information.</p> - <p>Извините, пока эта версия %1 поддерживает Wayland, эта сборка не связана с одной или несколькими необходимыми библиотеками.</p><p>Пожалуйста, либо перейдите в X, либо используйте сборку, которая поддерживает необходимые библиотеки.</p><p>Если Вы считаете, что это не работает, пожалуйста <a href="%2" style="color: %3">сообщите о баге</a>.</p><p>Проверьте лог для большей информации.</p> + <p>Sorry, while this version of %1 does support Wayland, this build was not linked with one or more of the required libraries.</p><p>Please either switch to X from your login screen or use a build that uses the correct libraries.</p><p>If you think this is incorrect, please <a href="%2">report a bug</a>.</p><p>Please check the logs for more information.</p> + <p>Извините, пока эта версия %1 поддерживает Wayland, эта сборка не связана с одной или несколькими необходимыми библиотеками.</p><p>Пожалуйста, либо перейдите в X, либо используйте сборку, которая поддерживает необходимые библиотеки.</p><p>Если Вы считаете, что это не работает, пожалуйста <a href="%2">сообщите о баге</a>.</p><p>Проверьте лог для большей информации.</p> No thanks diff --git a/translations/deskflow_zh_CN.ts b/translations/deskflow_zh_CN.ts index 38d1e3aa7..fb328d505 100644 --- a/translations/deskflow_zh_CN.ts +++ b/translations/deskflow_zh_CN.ts @@ -558,14 +558,6 @@ Valid names: error 错误 - - <p>Please <a href="%1" style="color: %2">report a bug</a> and copy/paste the following error:</p><pre>v%3 -%4 -%5</pre> - <p>请 <a href="%1" style="color: %2">报告 Bug</a> 并复制/粘贴以下错误：</p><pre>v%3 -%4 -%5</pre> - <p>Sorry, a fatal error has occurred and the application must now exit.</p> @@ -585,8 +577,16 @@ Valid names: <p>%1 将在后台继续运行，可通过系统通知区域的 %1 图标访问。此设置可以禁用。</p> - <p>On Linux systems using GNOME 3, the notification area might be disabled. You may need to <a href="%1" %2>enable an extension</a> to see the %3 tray icon.</p> - <p>在使用 GNOME 3 的 Linux 系统上，通知区域可能被禁用。您可能需要 <a href="%1" %2>启用扩展</a> 才能看到 %3 托盘图标。</p> + <p>Please <a href="%1">report a bug</a> and copy/paste the following error:</p><pre>v%2 +%3 +%4</pre> + <p>请 <a href="%1">报告 Bug</a> 并复制/粘贴以下错误：</p><pre>v%2 +%3 +%4</pre> + + + <p>On Linux systems using GNOME 3, the notification area might be disabled. You may need to <a href="%1">enable an extension</a> to see the %2 tray icon.</p> + <p>在使用 GNOME 3 的 Linux 系统上，通知区域可能被禁用。您可能需要 <a href="%1">启用扩展</a> 才能看到 %2 托盘图标。</p> %1 Server @@ -681,8 +681,8 @@ Valid names: <p>设置是只读的，因为您对该文件只有读取权限：</p><p>%1</p> - <p>Sorry, while this version of %1 does support Wayland, this build was not linked with one or more of the required libraries.</p><p>Please either switch to X from your login screen or use a build that uses the correct libraries.</p><p>If you think this is incorrect, please <a href="%2" style="color: %3">report a bug</a>.</p><p>Please check the logs for more information.</p> - <p>抱歉，虽然此版本的 %1 支持 Wayland，但此构建版本未链接一个或多个所需的库。</p><p>请从登录屏幕切换到 X，或者使用链接了正确库的构建版本。</p><p>如果您认为存在问题，请 <a href="%2" style="color: %3">报告 Bug</a>。</p><p>请查看日志以获取更多信息。</p> + <p>Sorry, while this version of %1 does support Wayland, this build was not linked with one or more of the required libraries.</p><p>Please either switch to X from your login screen or use a build that uses the correct libraries.</p><p>If you think this is incorrect, please <a href="%2">report a bug</a>.</p><p>Please check the logs for more information.</p> + <p>抱歉，虽然此版本的 %1 支持 Wayland，但此构建版本未链接一个或多个所需的库。</p><p>请从登录屏幕切换到 X，或者使用链接了正确库的构建版本。</p><p>如果您认为存在问题，请 <a href="%2">报告 Bug</a>。</p><p>请查看日志以获取更多信息。</p> No thanks