Implementation of global messages

Jamulus.pro

@@ -359,6 +359,7 @@ FORMS_GUI = src/aboutdlgbase.ui \
 HEADERS += src/buffer.h \
     src/channel.h \
     src/global.h \
+    src/messages.h \
     src/protocol.h \
     src/recorder/jamcontroller.h \
     src/threadpool.h \
@@ -470,6 +471,7 @@ HEADERS_OPUS_X86 = libs/opus/celt/x86/celt_lpc_sse.h \
 SOURCES += src/buffer.cpp \
     src/channel.cpp \
     src/main.cpp \
+    src/messages.cpp \
     src/protocol.cpp \
     src/recorder/jamcontroller.cpp \
     src/server.cpp \

src/main.cpp

@@ -26,9 +26,9 @@
 #include <QDir>
 #include <iostream>
 #include "global.h"
+#include "messages.h"
 #ifndef HEADLESS
 #    include <QApplication>
-#    include <QMessageBox>
 #    include "serverdlg.h"
 #    ifndef SERVER_ONLY
 #        include "clientdlg.h"
@@ -901,6 +901,9 @@ int main ( int argc, char** argv )
                                        bEnableIPv6,
                                        nullptr );
 
+                // initialise message boxes
+                CMessages::init ( &ClientDlg, strClientName.isEmpty() ? QString ( APP_NAME ) : QString ( APP_NAME ) + " " + strClientName );
+
                 // show dialog
                 ClientDlg.show();
                 pApp->exec();
@@ -911,6 +914,9 @@ int main ( int argc, char** argv )
                 // only start application without using the GUI
                 qInfo() << qUtf8Printable ( GetVersionAndNameStr ( false ) );
 
+                // initialise message boxes
+                CMessages::init ( NULL, strClientName.isEmpty() ? QString ( APP_NAME ) : QString ( APP_NAME ) + " " + strClientName );
+
                 pApp->exec();
             }
         }
@@ -961,6 +967,9 @@ int main ( int argc, char** argv )
                 // GUI object for the server
                 CServerDlg ServerDlg ( &Server, &Settings, bStartMinimized, nullptr );
 
+                // initialise message boxes
+                CMessages::init ( &ServerDlg, strClientName.isEmpty() ? QString ( APP_NAME ) : QString ( APP_NAME ) + " " + strClientName );
+
                 // show dialog (if not the minimized flag is set)
                 if ( !bStartMinimized )
                 {
@@ -982,6 +991,9 @@ int main ( int argc, char** argv )
                     Server.SetDirectoryType ( AT_CUSTOM );
                 }
 
+                // initialise message boxes
+                CMessages::init ( NULL, strClientName.isEmpty() ? QString ( APP_NAME ) : QString ( APP_NAME ) + " " + strClientName );
+
                 pApp->exec();
             }
         }
@@ -990,17 +1002,10 @@ int main ( int argc, char** argv )
     catch ( const CGenErr& generr )
     {
         // show generic error
-#ifndef HEADLESS
-        if ( bUseGUI )
-        {
-            QMessageBox::critical ( nullptr, APP_NAME, generr.GetErrorText(), "Quit", nullptr );
-        }
-        else
+        CMessages::ShowError ( generr.GetErrorText() );
+#ifdef HEADLESS
+        exit ( 1 );
 #endif
-        {
-            qCritical() << qUtf8Printable ( QString ( "%1: %2" ).arg ( APP_NAME ).arg ( generr.GetErrorText() ) );
-            exit ( 1 );
-        }
     }
 
 #if defined( Q_OS_MACX )

src/messages.cpp

@@ -0,0 +1,58 @@
+/******************************************************************************\
+ * Copyright (c) 2022
+ *
+ * Author(s):
+ *  Peter Goderie (pgScorpio)
+ *
+ ******************************************************************************
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ *
+\******************************************************************************/
+
+#include "messages.h"
+
+tMainform* CMessages::pMainForm = NULL;
+QString    CMessages::strMainFormName;
+
+/******************************************************************************\
+* Message Boxes                                                                *
+\******************************************************************************/
+void CMessages::ShowError ( QString strError )
+{
+#ifndef HEADLESS
+    QMessageBox::critical ( pMainForm, strMainFormName + ": " + QObject::tr ( "Error" ), strError, QObject::tr ( "Ok" ), nullptr );
+#else
+    qCritical() << "Error: " << strError.toLocal8Bit().data();
+#endif
+}
+
+void CMessages::ShowWarning ( QString strWarning )
+{
+#ifndef HEADLESS
+    QMessageBox::warning ( pMainForm, strMainFormName + ": " + QObject::tr ( "Warning" ), strWarning, QObject::tr ( "Ok" ), nullptr );
+#else
+    qWarning() << "Warning: " << strWarning.toLocal8Bit().data();
+#endif
+}
+
+void CMessages::ShowInfo ( QString strInfo )
+{
+#ifndef HEADLESS
+    QMessageBox::information ( pMainForm, strMainFormName + ": " + QObject::tr ( "Information" ), strInfo, QObject::tr ( "Ok" ), nullptr );
+#else
+    qInfo() << "Info: " << strInfo.toLocal8Bit().data();
+#endif
+}

src/messages.h

@@ -0,0 +1,47 @@
+#pragma once
+
+/******************************************************************************\
+ * Copyright (c) 2022
+ * Author(s):
+ *  Peter Goderie (pgScorpio)
+ *
+ *  Use this static class to show basic Error, Warning and Info messages
+ *
+ *  For own created special message boxes you should always use
+ *      CMessages::MainForm() as parent parameter
+ *  and CMessages::MainFormName() as base of the title parameter
+\******************************************************************************/
+
+#include <QString>
+#ifndef HEADLESS
+#    include <QMessageBox>
+#    define tMainform QDialog
+#else
+#    include <QDebug>
+#    define tMainform void
+#endif
+
+// html text macro's (for use in message texts)
+#define htmlBold( T ) "<b>" + T + "</b>"
+#define htmlNewLine() "<br>"
+
+class CMessages
+{
+protected:
+    static tMainform* pMainForm;
+    static QString    strMainFormName;
+
+public:
+    static void init ( tMainform* theMainForm, QString theMainFormName )
+    {
+        pMainForm       = theMainForm;
+        strMainFormName = theMainFormName;
+    }
+
+    static tMainform*     MainForm() { return pMainForm; }
+    static const QString& MainFormName() { return strMainFormName; }
+
+    static void ShowError ( QString strError );
+    static void ShowWarning ( QString strWarning );
+    static void ShowInfo ( QString strInfo );
+};

src/util.cpp

@@ -495,6 +495,7 @@ CAboutDlg::CAboutDlg ( QWidget* parent ) : CBaseDlg ( parent )
         "<p>RobyDati (<a href=\"https://github.com/RobyDati\">RobyDati</a>)</p>"
         "<p>Rob-NY (<a href=\"https://github.com/Rob-NY\">Rob-NY</a>)</p>"
         "<p>Thai Pangsakulyanont (<a href=\"https://github.com/dtinth\">dtinth</a>)</p>"
+        "<p>Peter Goderie (<a href=\"https://github.com/pgScorpio\">pgScorpio</a>)</p>"
         "<br>" +
         tr ( "For details on the contributions check out the %1" )
             .arg ( "<a href=\"https://github.com/jamulussoftware/jamulus/graphs/contributors\">" + tr ( "Github Contributors list" ) + "</a>." ) );