Merge pull request #166 from lxqt/connecting_label

Wrapped the text of connecting error label

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 @@
      <property name="alignment">
       <set>Qt::AlignCenter</set>
      </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+     </property>
     </widget>
    </item>
   </layout>
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.<br><br>"
+                "In this case this is likely because PULSE_SERVER in the Environment/X11 Root Window Properties"
+                "or default-server in client.conf is misconfigured.<br>"
+                "This situation can also arrise when PulseAudio crashed and left stale details in the X11 Root Window.<br>"
+                "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;
         }