From 0cd01f441ac19a9a2ca0111b07997eb6b82872aa Mon Sep 17 00:00:00 2001 From: Tsu Jan Date: Thu, 8 Oct 2020 10:50:59 +0330 Subject: Wrapped the text of connecting error label Because it can be long. Also, replaced `\n` with `
` because the former had no effect with HTML texts. Fixes https://github.com/lxqt/pavucontrol-qt/issues/165 --- src/mainwindow.ui | 6 ++++++ src/pavucontrol.cc | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 8880dcc..dd9c528 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -349,6 +349,12 @@ Qt::AlignCenter + + true + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + diff --git a/src/pavucontrol.cc b/src/pavucontrol.cc index 5456baa..f012d08 100644 --- a/src/pavucontrol.cc +++ b/src/pavucontrol.cc @@ -619,11 +619,11 @@ gboolean connect_to_pulse(gpointer userdata) { w->setConnectingMessage(); if (pa_context_connect(context, nullptr, PA_CONTEXT_NOFAIL, nullptr) < 0) { if (pa_context_errno(context) == PA_ERR_INVALID) { - w->setConnectingMessage(QObject::tr("Connection to PulseAudio failed. Automatic retry in 5s\n\n" - "In this case this is likely because PULSE_SERVER in the Environment/X11 Root Window Properties\n" - "or default-server in client.conf is misconfigured.\n" - "This situation can also arrise when PulseAudio crashed and left stale details in the X11 Root Window.\n" - "If this is the case, then PulseAudio should autospawn again, or if this is not configured you should\n" + w->setConnectingMessage(QObject::tr("Connection to PulseAudio failed. Automatic retry in 5s.

" + "In this case this is likely because PULSE_SERVER in the Environment/X11 Root Window Properties" + "or default-server in client.conf is misconfigured.
" + "This situation can also arrise when PulseAudio crashed and left stale details in the X11 Root Window.
" + "If this is the case, then PulseAudio should autospawn again, or if this is not configured you should" "run start-pulseaudio-x11 manually.").toUtf8().constData()); reconnect_timeout = 5; } -- cgit v1.2.3-55-g7522