ui-common: Append to existing error window (up to 10 lines). Closes: …

…#1147

src/ui-common/dialogs-qt.cc

@@ -21,12 +21,33 @@
 
 #include <libaudcore/i18n.h>
 #include <libaudqt/libaudqt.h>
+#include <QAbstractButton>
+
+static QMessageBox * create_message_box (QMessageBox::Icon icon,
+ const QString & title, const QString & message, QWidget * parent)
+{
+    auto msgbox = new QMessageBox (icon, title, message, QMessageBox::Close, parent);
+    msgbox->setAttribute (Qt::WA_DeleteOnClose);
+    msgbox->setTextInteractionFlags (Qt::TextSelectableByMouse);
+    msgbox->button (QMessageBox::Close)->setText (audqt::translate_str (N_("_Close")));
+    return msgbox;
+}
+
+static void add_message (QMessageBox * msgbox, QString message)
+{
+    QString old = msgbox->text ();
+    if (old.count (QChar::LineFeed) >= 9)
+        message = _("\n(Further messages have been hidden.)");
+    if (! old.contains (message))
+        msgbox->setText (old + QChar::LineFeed + message);
+}
 
 void DialogWindows::create_progress ()
 {
     if (! m_progress)
     {
         m_progress = new QMessageBox (m_parent);
+        m_progress->setAttribute (Qt::WA_DeleteOnClose);
         m_progress->setIcon (QMessageBox::Information);
         m_progress->setWindowTitle (_("Working ..."));
         m_progress->setWindowModality (Qt::WindowModal);
@@ -35,12 +56,22 @@ void DialogWindows::create_progress ()
 
 void DialogWindows::show_error (const char * message)
 {
-    audqt::simple_message (_("Error"), message, QMessageBox::Critical);
+    if (m_error)
+        add_message (m_error, message);
+    else
+        m_error = create_message_box (QMessageBox::Critical, _("Error"), message, m_parent);
+
+    m_error->show ();
 }
 
 void DialogWindows::show_info (const char * message)
 {
-    audqt::simple_message (_("Information"), message, QMessageBox::Information);
+    if (m_info)
+        add_message (m_info, message);
+    else
+        m_info = create_message_box (QMessageBox::Information, _("Information"), message, m_parent);
+
+    m_info->show ();
 }
 
 void DialogWindows::show_progress (const char * message)

src/ui-common/dialogs-qt.h

@@ -21,6 +21,7 @@
 #define DIALOG_WINDOWS_H
 
 #include <libaudcore/hook.h>
+#include <QPointer>
 
 class QMessageBox;
 class QWidget;
@@ -33,7 +34,7 @@ class DialogWindows
 
 private:
     QWidget * m_parent;
-    QMessageBox * m_progress = nullptr;
+    QPointer<QMessageBox> m_progress, m_info, m_error;
 
     void create_progress ();
     void show_error (const char * message);