new: replace notify mssages with a messageBox that expires.

notify messages are now appear on linux systems.
     ability to stop timer and quickly dismiss the messaheBox.
     ability to revert to previous notification in preferences

oscar/SleepLib/appsettings.cpp

@@ -52,6 +52,7 @@ AppWideSetting::AppWideSetting(Preferences *pref) : PrefSettings(pref)
     initPref(STR_US_AutoLaunchImport, false);
     m_cacheSessions = initPref(STR_IS_CacheSessions, false).toBool();
     initPref(STR_US_RemoveCardReminder, true);
+    initPref(STR_US_NotifyMessagBoxOption, true);
     initPref(STR_US_DontAskWhenSavingScreenshots, false);
     m_profileName = initPref(STR_GEN_Profile, "").toString();
     initPref(STR_GEN_AutoOpenLastUsed, true);

oscar/SleepLib/appsettings.h

@@ -63,6 +63,7 @@ const QString STR_US_OpenTabAtStart = "OpenTabAtStart";
 const QString STR_US_OpenTabAfterImport = "OpenTabAfterImport";
 const QString STR_US_AutoLaunchImport = "AutoLaunchImport";
 const QString STR_US_RemoveCardReminder = "RemoveCardReminder";
+const QString STR_US_NotifyMessagBoxOption = "NotifyMessagBoxOption";
 const QString STR_US_DontAskWhenSavingScreenshots = "DontAskWhenSavingScreenshots";
 const QString STR_US_ShowPersonalData = "ShowPersonalData";
 const QString STR_IS_CacheSessions = "MemoryHog";
@@ -164,6 +165,7 @@ public:
   int openTabAtStart() const { return getPref(STR_US_OpenTabAtStart).toInt(); }
   int openTabAfterImport() const { return getPref(STR_US_OpenTabAfterImport).toInt(); }
   bool removeCardReminder() const { return getPref(STR_US_RemoveCardReminder).toBool(); }
+  bool notifyMessagBoxOption() const { return getPref(STR_US_NotifyMessagBoxOption).toBool(); }
   bool dontAskWhenSavingScreenshots() const { return getPref(STR_US_DontAskWhenSavingScreenshots).toBool(); }
   bool autoOpenLastUsed() const { return getPref(STR_GEN_AutoOpenLastUsed).toBool(); }
   inline const QString & language() const { return m_language; }
@@ -224,6 +226,7 @@ public:
   void setOpenTabAtStart(int idx) { setPref(STR_US_OpenTabAtStart, idx); }
   void setOpenTabAfterImport(int idx) { setPref(STR_US_OpenTabAfterImport, idx); }
   void setRemoveCardReminder(bool b) { setPref(STR_US_RemoveCardReminder, b); }
+  void setNotifyMessagBoxOption(bool b) { setPref(STR_US_NotifyMessagBoxOption, b); }
   void setDontAskWhenSavingScreenshots(bool b) { setPref(STR_US_DontAskWhenSavingScreenshots, b); }
   void setShowPersonalData(bool b) { setPref(STR_US_ShowPersonalData, b); }
 

oscar/mainwindow.cpp

@@ -45,6 +45,7 @@
 #include "version.h"
 #include "SleepLib/appsettings.h"       // defines for REMSTAR_M_SUPPORT
 #include "SleepLib/journal.h"
+#include "notifyMessageBox.h"
 
 
 // Custom loaders that don't autoscan..
@@ -328,11 +329,11 @@ void MainWindow::EnableTabs(bool b)
 
 void MainWindow::Notify(QString s, QString title, int ms)
 {
+    QString msg = s;
     if (title.isEmpty()) {
         title = STR_TR_OSCAR + " " + getVersion().displayString();
     }
-    if (systray) {
-        QString msg = s;
+    if (systray && !AppSetting->notifyMessagBoxOption()) {
 
 #ifdef Q_OS_UNIX
         // GNOME3's systray hides the last line of the displayed Qt message.
@@ -346,6 +347,8 @@ void MainWindow::Notify(QString s, QString title, int ms)
 #endif
 
         systray->showMessage(title, msg, QSystemTrayIcon::Information, ms);
+    } else {
+        createNotifyMessageBox(this, title , msg, (ms+999)/1000);
     }
 }
 
@@ -2326,8 +2329,11 @@ void MainWindow::importNonCPAP(MachineLoader &loader)
         if (res < 0) {
             // res is used as an index to an array and will cause a crash if not handled.
             // Negative numbers indicate a problem with the file format or the file does not exist.
-            QMessageBox::information(this, STR_MessageBox_Information,
-                tr("There was a problem parsing %1 Data File: %2").arg(name, files[0]),QMessageBox::Ok);
+            //QString fileName = QFileInfo(files[0]).fileName();
+            QString msg = QString(tr("There was a problem parsing %1 \nData File: %2") 
+                .arg(name, QFileInfo( files[0]).fileName() ) );
+            //QString msg = QString(tr("There was a problem parsing %1 \nData File: %2") .arg(name, fileName) );
+            Notify(msg,"",20*1000 /* convert sec to ms */);
         } else
         if (res == 0) {
             Notify(tr("There was a problem opening %1 Data File: %2").arg(name, files[0]));

oscar/notifyMessageBox.cpp

@@ -0,0 +1,159 @@
+/* Daily Panel
+ *
+ * Copyright (c) 2019-2024 The OSCAR Team
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of the source code
+ * for more details. */
+
+#include "NotifyMessageBox.h"
+
+#define TEST_MACROS_ENABLEDoff
+#include <test_macros.h>
+
+
+int defaultTimeoutSeconds = 6 ;
+//QString defaultTimeoutMessage = QObject::tr("Notifcation expires in %1 seconds.\nTo Dismiss: Press Escape or Enter.");
+//QString timeoutStoppedMessage = QObject::tr("Timer Stopped.\nTo Dismiss: Press Escape or Enter.");
+QString defaultTimeoutMessage = QObject::tr("Notifcation expires in %1 seconds.");
+QString timeoutStoppedMessage = QObject::tr("");
+
+    NotifyMessageBox::NotifyMessageBox(const QString& title, const QString& message, int timeoutSeconds,  const QString& timeoutMessage, QWidget* parent)
+        : QObject(parent), m_title(title), m_message(message), m_timeoutSeconds(timeoutSeconds), m_timeoutMessage(timeoutMessage), m_state(nmb_init)
+    {
+        if (timeoutSeconds<defaultTimeoutSeconds) m_timeoutSeconds=defaultTimeoutSeconds;
+        if ( timeoutMessage.isEmpty() ) m_timeoutMessage = defaultTimeoutMessage;
+        setupTimer();
+
+    }
+
+    NotifyMessageBox::~NotifyMessageBox() 
+    {
+    };
+
+    void NotifyMessageBox::setupMessageBox()
+    {
+        m_msgBox = new QMessageBox(QMessageBox::Information,m_title,m_message);
+        //QFont boldFont;
+        //boldFont.setBold(true);
+        //m_msgBox->setFont(boldFont);
+        m_msgBox->setWindowTitle(m_title);
+        m_msgBox->setText(m_message);
+
+        #ifndef STOPTIMER
+            m_msgBox->setStandardButtons(QMessageBox::Ok);
+        #else 
+
+            // Set action as the default button
+            QPushButton *terminateB = m_msgBox->addButton("Dismiss", QMessageBox::RejectRole);
+            m_msgBox->setDefaultButton(terminateB);
+            connect(m_msgBox, SIGNAL(rejected()), this, SLOT(onTerminate()));
+            if (m_state == nmb_stopped) {
+                m_msgBox->setInformativeText(timeoutStoppedMessage);
+            } else {
+                m_msgBox->setInformativeText(m_timeoutMessage.arg(m_timeoutSeconds));
+                m_msgBox->addButton("Stop Timer", QMessageBox::AcceptRole);
+                m_msgBox->setEscapeButton(QMessageBox::Cancel);
+                connect(m_msgBox, SIGNAL(accepted()), this, SLOT(onStop()));
+            }
+
+        #endif
+        m_msgBox->show();
+        m_msgBox->raise();
+    }
+
+
+#if defined(STOPTIMER)
+    void NotifyMessageBox::onStop()
+    {
+        m_msgBox->close();
+        m_state = nmb_stopped;
+        setupMessageBox();
+    }
+
+    void NotifyMessageBox::onTerminate()
+    {
+        releaseResources();
+    }
+#endif
+
+    void NotifyMessageBox::onTimeout()
+    {
+        switch (m_state) {
+            case nmb_init:
+                m_timer->setInterval(1000);
+                setupMessageBox();
+                m_state = nmb_running;
+                break;
+            case nmb_running:
+                m_timer->setInterval(1000);
+                m_timeoutSeconds--;
+                if (m_timeoutSeconds == 0) {
+                    m_state = nmb_stopped;
+                    releaseResources();
+                } else {
+                    m_msgBox->setInformativeText(m_timeoutMessage.arg(m_timeoutSeconds));
+                }
+                break;
+            default:
+            case nmb_stopped:
+                break;
+        }
+    }
+
+    void NotifyMessageBox::setupTimer()
+    {
+        #if defined(STOPTIMER)
+        m_timer = new QTimer(this);
+        m_timer->setInterval(1);
+        m_timer->setSingleShot(false);
+
+        connect(m_timer, &QTimer::timeout, this, &NotifyMessageBox::onTimeout);
+        m_timer->start();
+        #endif
+    }
+
+
+    void NotifyMessageBox::releaseResources()
+    {
+        m_msgBox->close();
+#if defined(STOPTIMER)
+        m_timer->deleteLater();
+#endif
+    }
+
+    NotifyMessageBox* createNotifyMessageBox(
+        const QString& title, 
+        const QString& message, 
+        int timeoutSeconds, 
+        const QString& timeoutMessage, 
+        QWidget* parent)
+    {
+        NotifyMessageBox* msgBox = new NotifyMessageBox(title, message, timeoutSeconds, timeoutMessage,  parent);
+        return msgBox;
+    }
+
+NotifyMessageBox* createNotifyMessageBox (
+        QWidget* parent ,
+        const QString& title, 
+        const QString& message, 
+        int timeoutSeconds ,
+        const QString& timeoutMessage 
+        ) {
+            return createNotifyMessageBox(title, message, timeoutSeconds, timeoutMessage,  parent);
+        };
+#if 0
+NotifyMessageBox* createNotifyMessageBox (
+        QWidget* parent ,
+        const QString& title, 
+        const QString& message, 
+        enum QMessageBox::Icon msgIcon,
+        int timeoutSeconds ,
+        const QString& timeoutMessage 
+        ) {
+            return createNotifyMessageBox(title, message, timeoutSeconds, timeoutMessage,  parent);
+        };
+#endif
+
+
+

oscar/notifyMessageBox.h

@@ -0,0 +1,94 @@
+/* search  GUI Headers
+ *
+ * Copyright (c) 2024-2024 The OSCAR Team
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file COPYING in the main directory of the source code
+ * for more details. */
+
+#ifndef NOTIFYMESSAGEBOX_H
+#define NOTIFYMESSAGEBOX_H
+
+#define STOPTIMER
+
+#include <QMessageBox>
+#include <QFont>
+#include <QDebug>
+
+#ifdef STOPTIMER
+#include <QTimer>
+#include <QPushButton>
+#endif
+
+
+
+
+class NotifyMessageBox : public QObject
+{
+    Q_OBJECT
+
+public:
+enum NMB_STATE { nmb_init, nmb_running, nmb_stopped };
+    NotifyMessageBox(const QString& title, 
+        const QString& message, 
+        int timeoutSeconds = 0 , 
+        const QString& timeoutMessage = "" , 
+        QWidget* parent = nullptr);
+    virtual ~NotifyMessageBox();
+
+private:
+    void setupMessageBox();
+    void setupTimer();
+
+private slots:
+    void releaseResources();
+
+    void onTimeout();
+#if defined(STOPTIMER)
+    void onStop() ;
+    void onTerminate() ;
+#endif
+
+private:
+    QWidget* m_parent;
+    QString m_title;
+    QString m_message;
+    QMessageBox* m_msgBox;
+    int     m_timeoutSeconds;
+    QString m_timeoutMessage;
+    NMB_STATE m_state = nmb_init;
+#if defined(STOPTIMER)
+    QTimer* m_timer;
+    QPushButton *stopB ;
+    QPushButton *terminateB ;
+#endif
+};
+
+
+NotifyMessageBox* createNotifyMessageBox (
+        QWidget* parent ,
+        const QString& title, 
+        const QString& message, 
+        int timeoutSeconds = 0 ,
+        const QString& timeoutMessage = "" ) ;
+
+#if 0
+NotifyMessageBox* createNotifyMessageBox (
+        const QString& title, 
+        const QString& message, 
+        int timeoutSeconds = 0 , 
+        const QString& timeoutMessage = "" , 
+        QWidget* parent = nullptr);
+
+NotifyMessageBox* createNotifyMessageBox (
+        const QString& title, 
+        const QString& message, 
+        int timeoutSeconds = 0 , 
+        enum QMessageBox::Icon msgIcon = 
+        const QString& timeoutMessage = "" , 
+        QWidget* parent = nullptr);
+#endif
+
+#endif // NOTIFYMESSAGEBOX_H
+
+

oscar/oscar.pro

@@ -255,6 +255,7 @@ lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,12) {
 
 SOURCES += \
     checkupdates.cpp \
+    notifyMessageBox.cpp \
     highresolution.cpp \
     Graphs/gGraph.cpp \
     Graphs/gGraphView.cpp \
@@ -365,6 +366,7 @@ QMAKE_EXTRA_COMPILERS += optimize
 
 HEADERS  += \
     checkupdates.h \
+    notifyMessageBox.h \
     highresolution.h \
     dailySearchTab.h \
     daily.h \

oscar/preferencesdialog.cpp

@@ -289,6 +289,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
 //  ui->enableMultithreading->setChecked(AppSetting->multithreading());
     ui->enableMultithreading->setVisible(false);
     ui->removeCardNotificationCheckbox->setChecked(AppSetting->removeCardReminder());
+    ui->notifyMessageBoxCheckbox->setChecked(AppSetting->notifyMessagBoxOption());
     ui->dontAskWhenSavingScreenshotsCheckbox->setChecked(AppSetting->dontAskWhenSavingScreenshots());
     ui->cacheSessionData->setChecked(AppSetting->cacheSessions());
     ui->preloadSummaries->setChecked(profile->session->preloadSummaries());
@@ -890,6 +891,7 @@ bool PreferencesDialog::Save()
     profile->general->setShowUnknownFlags(ui->showUnknownFlags->isChecked());
     AppSetting->setMultithreading(ui->enableMultithreading->isChecked());
     AppSetting->setRemoveCardReminder(ui->removeCardNotificationCheckbox->isChecked());
+    AppSetting->setNotifyMessagBoxOption(ui->notifyMessageBoxCheckbox->isChecked());
     AppSetting->setDontAskWhenSavingScreenshots(ui->dontAskWhenSavingScreenshotsCheckbox->isChecked());
 
     AppSetting->setCacheSessions(ui->cacheSessionData->isChecked());

oscar/preferencesdialog.ui

@@ -2148,6 +2148,13 @@ Mainly affects the importer.</string>
                 </widget>
                </item>
                <item row="3" column="1">
+                <widget class="QCheckBox" name="notifyMessageBoxCheckbox">
+                 <property name="text">
+                  <string>Use MessageBox to display Notifications</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="4" column="1">
                 <widget class="QCheckBox" name="dontAskWhenSavingScreenshotsCheckbox">
                  <property name="text">
                   <string>Always save screenshots in the OSCAR Data folder</string>