Add folder for saved Layouts

oscar/Graphs/gGraphView.cpp

@@ -3513,13 +3513,20 @@ void gGraphView::SaveDefaultSettings() {
     m_default_graphs = m_graphs;
 }
 
-const quint32 gvmagic = 0x41756728;
+const quint32 gvmagic = 0x41756728;   //'Aug('
 const quint16 gvversion = 4;
 
-void gGraphView::SaveSettings(QString title)
+QString gGraphView::settingsFilename (QString title,QString folderName, QString ext) {
+    if (folderName.size()==0) {
+        folderName = p_profile->Get("{DataFolder}/");
+    }
+    return folderName+title.toLower()+ext;
+}
+
+void gGraphView::SaveSettings(QString title,QString folderName)
 {
     qDebug() << "Saving" << title << "settings";
-    QString filename = p_profile->Get("{DataFolder}/") + title.toLower() + ".shg";
+    QString filename=settingsFilename(title,folderName) ;
     QFile f(filename);
     f.open(QFile::WriteOnly);
     QDataStream out(&f);
@@ -3571,9 +3578,10 @@ template <class T> inline void hashMerge(T & a, const T & b)
 }
 
 
-bool gGraphView::LoadSettings(QString title)
+bool gGraphView::LoadSettings(QString title,QString folderName)
 {
-    QString filename = p_profile->Get("{DataFolder}/") + title.toLower() + ".shg";
+    //qDebug() << "Loading" << title << "settings";
+    QString filename=settingsFilename (title,folderName) ;
     QFile f(filename);
 
     if (!f.exists()) {

oscar/Graphs/gGraphView.h

@@ -396,11 +396,13 @@ class gGraphView
     //! \brief Supplies time range to all graph objects in linked group, refreshing if requested
     void SetXBounds(qint64 minx, qint64 maxx, short group = 0, bool refresh = true);
 
+    QString settingsFilename (QString title,QString folderName="" ,QString ext=".shg");
+
     //! \brief Saves the current graph order, heights, min & Max Y values to disk
-    void SaveSettings(QString title);
+    void SaveSettings(QString title,QString folderName="");
 
     //! \brief Loads the current graph order, heights, min & max Y values from disk
-    bool LoadSettings(QString title);
+    bool LoadSettings(QString title,QString folderName="");
 
     //! \brief Saves the current (initial) graph order, heights, min & Max Y values for future recovery
     void SaveDefaultSettings();

oscar/Resources.qrc

@@ -65,5 +65,6 @@
         <file>icons/restore.png</file>
         <file>icons/trash_can.png</file>
         <file>icons/update.png</file>
+        <file>icons/cog.png</file>
     </qresource>
 </RCC>

oscar/overview.cpp

@@ -944,3 +944,5 @@ void Overview::on_layout_clicked() {
     }
 }
 
+
+

oscar/saveGraphLayoutSettings.cpp

@@ -1,4 +1,4 @@
-/* backup graph settiongs Implementation
+/* user graph settings Implementation
  *
  * Copyright (c) 2019-2022 The OSCAR Team
  * Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
@@ -7,93 +7,118 @@
  * License. See the file COPYING in the main directory of the source code
  * for more details. */
 
-#define BACKUPMENUHEADER_OFF
+#define TEST_MACROS_ENABLED
-#define MESSAGEBOXHEADER_OFF
-
-#define TEST_MACROS_ENABLED_OFF
 #include <test_macros.h>
 
 #include <QMessageBox>
 #include <QAbstractButton>
 #include <QPixmap>
 #include <QSize>
+#include <QChar>
 #include "SleepLib/profiles.h"
 #include "saveGraphLayoutSettings.h"
 
 
-
 SaveGraphLayoutSettings::SaveGraphLayoutSettings(QString title,QWidget* parent) : parent(parent),title(title)
 {
-    // Initialize directory accesses to profile files.
+    createSaveFolder();
-    QString dirname = p_profile->Get("{DataFolder}/");
+    if (dir==nullptr) return;
-    dir = new QDir(dirname);
-    if (!dir->exists()) {
-        //qWarning (QString("Cannot find the directory %1").arg(dirname));
-        return ;
-    }
     dir->setFilter(QDir::Files | QDir::Readable | QDir::Writable | QDir::NoSymLinks);
 
+    QString descFileName = dirName+title.toLower()+".descriptions.txt";
+    descriptionMap = new DescriptionMap (dir,descFileName);
+
     createMenu() ;
-    QString descFileName = QString("%1.%2").arg(title).arg("descriptions.txt");
-    backupDescriptions = new BackupDescriptions (dir,descFileName);
 
-    backupDialog->connect(backupaddFullBtn,     SIGNAL(clicked()), this, SLOT (addFull_feature()  ));
+    menuDialog->connect(menuAddFullBtn,     SIGNAL(clicked()), this, SLOT (addFull_feature()  ));
-    backupDialog->connect(backupAddBtn,    SIGNAL(clicked()), this, SLOT (add_feature()  ));
+    menuDialog->connect(menuAddBtn,    SIGNAL(clicked()), this, SLOT (add_feature()  ));
-    backupDialog->connect(backupRestoreBtn, SIGNAL(clicked()), this, SLOT (restore_feature()  ));
+    menuDialog->connect(menuRestoreBtn, SIGNAL(clicked()), this, SLOT (restore_feature()  ));
-    backupDialog->connect(backupUpdateBtn,  SIGNAL(clicked()), this, SLOT (update_feature()  ));
+    menuDialog->connect(menuUpdateBtn,  SIGNAL(clicked()), this, SLOT (update_feature()  ));
-    backupDialog->connect(backupRenameBtn,  SIGNAL(clicked()), this, SLOT (rename_feature()  ));
+    menuDialog->connect(menuRenameBtn,  SIGNAL(clicked()), this, SLOT (rename_feature()  ));
-    backupDialog->connect(backupDeleteBtn,  SIGNAL(clicked()), this, SLOT (delete_feature()  ));
+    menuDialog->connect(menuDeleteBtn,  SIGNAL(clicked()), this, SLOT (delete_feature()  ));
-#ifndef BACKUPMENUHEADER
+    menuDialog->connect(menuExitBtn,    SIGNAL(clicked()), this, SLOT (exit()  ));
-    backupDialog->connect(backupExitBtn,    SIGNAL(clicked()), this, SLOT (exit()  ));
-#endif
 
-    backupDialog->connect(backuplist, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*)   ));
+    menuDialog->connect(menulist, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*)   ));
-    backupDialog->connect(backuplist, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged()   ));
+    menuDialog->connect(menulist, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged()   ));
 
     singleLineRe = new QRegularExpression( QString("^\\s*([^\\r\\n]{0,%1})").arg(1+maxDescriptionLen) );
-    backupFileNumRe = new QRegularExpression( QString("backup(\\d+)(.shg)?$") );
+    fileNumRe = new QRegularExpression( QString("%1(\\d+)(.shg)?$").arg(baseName) );
-    parseFilenameRe = new QRegularExpression(QString("^(%1[.](backup(\\d*)))[.]shg$").arg(title));
+    parseFilenameRe = new QRegularExpression(QString("^(%1[.](%2(\\d*)))[.]shg$").arg(title).arg(baseName));
 }
 
 SaveGraphLayoutSettings::~SaveGraphLayoutSettings()
 {
-    backupDialog->disconnect(backupaddFullBtn,     SIGNAL(clicked()), this, SLOT (addFull_feature()  ));
-    backupDialog->disconnect(backupAddBtn,    SIGNAL(clicked()), this, SLOT (add_feature()  ));
-    backupDialog->disconnect(backupRestoreBtn, SIGNAL(clicked()), this, SLOT (restore_feature()  ));
-    backupDialog->disconnect(backupUpdateBtn,  SIGNAL(clicked()), this, SLOT (update_feature()  ));
-    backupDialog->disconnect(backupDeleteBtn,  SIGNAL(clicked()), this, SLOT (delete_feature()  ));
-    backupDialog->disconnect(backupRenameBtn,  SIGNAL(clicked()), this, SLOT (rename_feature()  ));
-#ifndef BACKUPMENUHEADER
-    backupDialog->disconnect(backupExitBtn,    SIGNAL(clicked()), this, SLOT (exit()  ));
-#endif
 
-    backupDialog->disconnect(backuplist, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*)   ));
+    if (dir==nullptr) {return;}
-    backupDialog->disconnect(backuplist, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged()   ));
+    menuDialog->disconnect(menuAddFullBtn,     SIGNAL(clicked()), this, SLOT (addFull_feature()  ));
+    menuDialog->disconnect(menuAddBtn,    SIGNAL(clicked()), this, SLOT (add_feature()  ));
+    menuDialog->disconnect(menuRestoreBtn, SIGNAL(clicked()), this, SLOT (restore_feature()  ));
+    menuDialog->disconnect(menuUpdateBtn,  SIGNAL(clicked()), this, SLOT (update_feature()  ));
+    menuDialog->disconnect(menuDeleteBtn,  SIGNAL(clicked()), this, SLOT (delete_feature()  ));
+    menuDialog->disconnect(menuRenameBtn,  SIGNAL(clicked()), this, SLOT (rename_feature()  ));
+    menuDialog->disconnect(menuExitBtn,    SIGNAL(clicked()), this, SLOT (exit()  ));
 
-    delete  backupDescriptions;
+    menuDialog->disconnect(menulist, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*)   ));
+    menuDialog->disconnect(menulist, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged()   ));
 
+    delete descriptionMap;
     delete singleLineRe;
-    delete backupFileNumRe;
+    delete fileNumRe;
     delete parseFilenameRe;
 }
 
+void SaveGraphLayoutSettings::createSaveFolder() {
+    // Insure that the save folder exists
+    // Get the directory name for the save files
+    QString layoutFileFolder = "savedGraphLayoutSettings/";
+
+    #if 0
+    // home directory for the current  profile.
+    QString baseName = p_profile->Get("{DataFolder}/");
+
+    #else
+    // home directory for all profiles.
+    // allows settings to be shared accross profiles.
+    QString baseName = p_pref->Get("{home}/");
+
+    #endif
+
+    dirName = baseName+layoutFileFolder;
+
+    // Check if the save folder exists
+    QDir* tmpDir = new QDir(dirName);
+    if (!tmpDir->exists()) {
+        QDir* baseDir=new QDir(baseName);
+        if (!baseDir->exists()) { 
+            // Base folder does not exist - terminate
+            return ;
+        }
+        // saved Setting folder does not exist. make it
+        if (!baseDir->mkdir(dirName)) {
+            // Did not create the folder.
+            return ;
+        }
+        tmpDir = new QDir(dirName);
+        // double check if save folder exists or not.
+        if (!tmpDir->exists()) {
+            return ;
+        }
+    }
+    dir=tmpDir;
+}
+
 void SaveGraphLayoutSettings::createMenu() {
     styleOn=        calculateStyle(true,false);
     styleOff=       calculateStyle(false,false);
     styleExitBtn=calculateStyle(true,true);
-            //"background:transparent;"
-            //"background-color:yellow;"
     styleMessageBox=
             "QMessageBox   { "
                 "background-color:yellow;"
                 "color:black;"
-                //"font: 24px ;"
-                //"padding: 4px;"
                 "border: 2px solid black;"
                 "text-align: center;"
             "}"
             "QPushButton   { "
-                //"font: 24px ;"
                 "color:black;"
             "}"
             ;
@@ -104,90 +129,76 @@ void SaveGraphLayoutSettings::createMenu() {
             "}";
 
 
-    backupDialog= new QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint|Qt::WindowSystemMenuHint);
+    menuDialog= new QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint|Qt::WindowSystemMenuHint);
-#ifndef BACKUPMENUHEADER
+    menuDialog->setWindowFlag(Qt::FramelessWindowHint);
-    backupDialog->setWindowFlag(Qt::FramelessWindowHint);
-#else
-    backupDialog->setWindowTitle(tr("Backup Files Management"));
-#endif
 
-    backupaddFullBtn   =new QPushButton("Add", parent);
+    menuAddFullBtn   =new QPushButton("Add", parent);
-    backupAddBtn  =new QPushButton(tr("Add"), parent);
+    menuAddBtn  =new QPushButton(tr("Add"), parent);
-    backupRestoreBtn = new QPushButton(tr("Restore"), parent);
+    menuRestoreBtn = new QPushButton(tr("Restore"), parent);
-    backupUpdateBtn = new QPushButton(tr("Update"), parent);
+    menuUpdateBtn = new QPushButton(tr("Update"), parent);
-    backupRenameBtn = new QPushButton(tr("Rename"), parent);
+    menuRenameBtn = new QPushButton(tr("Rename"), parent);
-    backupDeleteBtn = new QPushButton(tr("Delete"), parent);
+    menuDeleteBtn = new QPushButton(tr("Delete"), parent);
-#ifndef BACKUPMENUHEADER
+    menuExitBtn = new QPushButton(*m_icon_exit,tr(""),parent);
-    backupExitBtn = new QPushButton(*m_icon_exit,tr(""),parent);
-#endif
 
-    backuplist=new QListWidget();
+    menulist=new QListWidget(menuDialog);
-    backuplist->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
+    menulist->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
 
-    backupLayout = new QVBoxLayout(backupDialog);
+    menuLayout = new QVBoxLayout(menuDialog);
-    layout1 = new QHBoxLayout();
+    menuLayout1 = new QHBoxLayout();
-    layout2 = new QVBoxLayout();
+    menuLayout2 = new QVBoxLayout();
-    layout2->setMargin(6);
+    menuLayout2->setMargin(6);
-    backupLayout->addLayout(layout1);
+    menuLayout->addLayout(menuLayout1);
-    backupLayout->addLayout(layout2);
+    menuLayout->addLayout(menuLayout2);
 
-    layout1->addWidget(backupaddFullBtn);
+    menuLayout1->addWidget(menuAddFullBtn);
-    layout1->addWidget(backupAddBtn);
+    menuLayout1->addWidget(menuAddBtn);
-    layout1->addWidget(backupRestoreBtn);
+    menuLayout1->addWidget(menuRestoreBtn);
-    layout1->addWidget(backupRenameBtn);
+    menuLayout1->addWidget(menuRenameBtn);
-    layout1->addWidget(backupUpdateBtn);
+    menuLayout1->addWidget(menuUpdateBtn);
-    layout1->addWidget(backupDeleteBtn);
+    menuLayout1->addWidget(menuDeleteBtn);
-#ifndef BACKUPMENUHEADER
+    menuLayout1->addWidget(menuExitBtn);
-    layout1->addWidget(backupExitBtn);
+    menuLayout2->addWidget(menulist, 1);
-#endif
-    layout2->addWidget(backuplist, 1);
 /*TRANSLATION*/
-    backupaddFullBtn->      setToolTip(tr("Add has been inhibited. The maximum number of backups have been exceeded. "));
+    menuAddFullBtn->      setToolTip(tr("Add Feature inhibited. The maximum number has been exceeded."));
-    backupAddBtn->          setToolTip(tr("Adds new Backup with current settings."));
+    menuAddBtn->          setToolTip(tr("Save current settings."));
-    backupRestoreBtn->      setToolTip(tr("Restores settings from the selected Backup."));
+    menuRestoreBtn->      setToolTip(tr("Restores saved settings."));
-    backupRenameBtn->       setToolTip(tr("Rename the selected Backup. Must edit existing name then press enter."));
+    menuRenameBtn->       setToolTip(tr("Renames the selection. Must edit existing name then press enter."));
-    backupUpdateBtn->       setToolTip(tr("Update the selected Backup with current settings."));
+    menuUpdateBtn->       setToolTip(tr("Updates the selection with current settings."));
-    backupDeleteBtn->       setToolTip(tr("Delete the selected Backup."));
+    menuDeleteBtn->       setToolTip(tr("Delete the selection."));
-#ifndef BACKUPMENUHEADER
+    menuExitBtn->         setToolTip(tr("Closes the dialog menu.  Returns to previous menu."));
-    backupExitBtn->         setToolTip(tr("Closes the dialog menu.  Returns to previous menu."));
-#endif
 
-    backupDialog->setStyleSheet(styleDialog);
+    menuDialog->setStyleSheet(styleDialog);
-    backupaddFullBtn->setStyleSheet(styleOff);
+    menuAddFullBtn->setStyleSheet(styleOff);
-    backupAddBtn->setStyleSheet(styleOn);
+    menuAddBtn->setStyleSheet(styleOn);
-    backupRestoreBtn->setStyleSheet(styleOn);
+    menuRestoreBtn->setStyleSheet(styleOn);
-    backupUpdateBtn->setStyleSheet(styleOn);
+    menuUpdateBtn->setStyleSheet(styleOn);
-    backupRenameBtn->setStyleSheet(styleOn);
+    menuRenameBtn->setStyleSheet(styleOn);
-    backupDeleteBtn->setStyleSheet(styleOn);
+    menuDeleteBtn->setStyleSheet(styleOn);
-#ifndef BACKUPMENUHEADER
+    menuExitBtn->setStyleSheet( styleExitBtn );
-    backupExitBtn->setStyleSheet( styleExitBtn );
-#endif
 
 
-    backupaddFullBtn->setIcon(*m_icon_add  );
+    menuAddFullBtn->setIcon(*m_icon_add  );
-    backupAddBtn->setIcon(*m_icon_add  );
+    menuAddBtn->setIcon(*m_icon_add  );
-    backupRestoreBtn->setIcon(*m_icon_restore  );
+    menuRestoreBtn->setIcon(*m_icon_restore  );
-    backupRenameBtn->setIcon(*m_icon_rename  );
+    menuRenameBtn->setIcon(*m_icon_rename  );
-    backupUpdateBtn->setIcon(*m_icon_update  );
+    menuUpdateBtn->setIcon(*m_icon_update  );
-    backupDeleteBtn->setIcon(*m_icon_delete  );
+    menuDeleteBtn->setIcon(*m_icon_delete  );
-    backupDeleteBtn->setIcon(*m_icon_delete  );
+    menuDeleteBtn->setIcon(*m_icon_delete  );
 
 
     int timeout = AppSetting->tooltipTimeout();
-    backupaddFullBtn->setToolTipDuration(timeout);
+    menuAddFullBtn->setToolTipDuration(timeout);
-    backupAddBtn->setToolTipDuration(timeout);
+    menuAddBtn->setToolTipDuration(timeout);
-    backupRestoreBtn->setToolTipDuration(timeout);
+    menuRestoreBtn->setToolTipDuration(timeout);
-    backupUpdateBtn->setToolTipDuration(timeout);
+    menuUpdateBtn->setToolTipDuration(timeout);
-    backupRenameBtn->setToolTipDuration(timeout);
+    menuRenameBtn->setToolTipDuration(timeout);
-    backupDeleteBtn->setToolTipDuration(timeout);
+    menuDeleteBtn->setToolTipDuration(timeout);
-#ifndef BACKUPMENUHEADER
+    menuExitBtn->setToolTipDuration(timeout);
-    backupExitBtn->setToolTipDuration(timeout);
-#endif
 
 };
 
 bool SaveGraphLayoutSettings::confirmAction(QString name,QString question,QIcon* icon) {
-    QMessageBox msgBox;
+    QMessageBox msgBox(menuDialog);
     msgBox.setText(question);
     if (icon!=nullptr) {
         msgBox.setIconPixmap(icon->pixmap(QSize(50,50)));
@@ -196,15 +207,10 @@ bool SaveGraphLayoutSettings::confirmAction(QString name,QString question,QIcon*
     msgBox.setStandardButtons(QMessageBox::Cancel | QMessageBox::Yes );
     msgBox.setDefaultButton(QMessageBox::Cancel);
     msgBox.setStyleSheet(styleMessageBox);
-
+    msgBox.setWindowFlag(Qt::FramelessWindowHint,true);
-    #ifdef MESSAGEBOXHEADER
-        msgBox.setWindowTitle(name);
-    #else
-        Q_UNUSED(name);
-        msgBox.setWindowFlag(Qt::FramelessWindowHint,true);
-    #endif
 
     return (msgBox.exec()==QMessageBox::Yes);
+    Q_UNUSED(name);
 
 }
 
@@ -238,100 +244,91 @@ void SaveGraphLayoutSettings::looksOn(QPushButton* button,bool on){
 }
 
 void SaveGraphLayoutSettings::enableButtons(bool enable) {
-    looksOn(backupUpdateBtn,enable);
+    looksOn(menuUpdateBtn,enable);
-    looksOn(backupRestoreBtn,enable);
+    looksOn(menuRestoreBtn,enable);
-    looksOn(backupDeleteBtn,enable);
+    looksOn(menuDeleteBtn,enable);
-    looksOn(backupRenameBtn,enable);
+    looksOn(menuRenameBtn,enable);
-    if (unusedBackupNum<0) {  // check if at Maximum limit
+    if (nextNumToUse<0) {  // check if at Maximum limit
-        backupAddBtn->hide();
+        menuAddBtn->hide();
-        backupaddFullBtn->show();
+        menuAddFullBtn->show();
     } else {
-        backupaddFullBtn->hide();
+        menuAddFullBtn->hide();
-        backupAddBtn->show();
+        menuAddBtn->show();
     }
 }
 
+void SaveGraphLayoutSettings::add_feature() {
+    if(!graphView) return;
+    QString fileName = QString("%1%2").arg(baseName).arg(nextNumToUse,fileNumMaxLength,10,QLatin1Char('0'));
+    writeSettings(fileName);
+    // create a default description - use formatted datetime.
+    QString desc=QDateTime::currentDateTime().toString();
+    descriptionMap->add(fileName,desc);
+    descriptionMap->save();
+    QListWidgetItem* item = updateFileList( fileName);
+    if (item!=nullptr) {
+        menulist->setCurrentItem(item,QItemSelectionModel::ClearAndSelect);
+        menulist->editItem(item);
+    }
+}
+
+void SaveGraphLayoutSettings::addFull_feature() {
+    QMessageBox msgBox(menuDialog);
+    msgBox.setText(tr("Maximum number exceeded."));
+    msgBox.setStandardButtons(QMessageBox::Cancel);
+    msgBox.setDefaultButton(QMessageBox::Cancel);
+    msgBox.setWindowFlag(Qt::FramelessWindowHint,true);
+    msgBox.setStyleSheet(styleMessageBox);
+    msgBox.setIconPixmap(m_icon_addFull->pixmap(QSize(50,50)));
+    msgBox.exec();
+}
+
 void SaveGraphLayoutSettings::update_feature() {
     if(!graphView) return;
-    QListWidgetItem *	item=backuplist->currentItem();
+    QListWidgetItem *	item=menulist->currentItem();
-    if (!item) return;
     if(!confirmAction( item->text(), tr("Ok to Update?") , m_icon_update) ) return;
-    QString backupName = item->data(backupFileName).toString();
+    QString fileName = item->data(fileNameRole).toString();
-    QString name = QString("%1.%2").arg(title).arg(backupName);
+    writeSettings(fileName);
-    graphView->SaveSettings(name);
 };
 
 void SaveGraphLayoutSettings::restore_feature() {
     if(!graphView) return;
-    QListWidgetItem *	item=backuplist->currentItem();
+    QListWidgetItem *	item=menulist->currentItem();
     if (!item) return;
-    QString backupName = item->data(backupFileName).toString();
+    QString fileName = item->data(fileNameRole).toString();
-    QString name = QString("%1.%2").arg(title).arg(backupName);
+    loadSettings(fileName);
-    graphView->LoadSettings(name);
     exit();
 };
 
 void SaveGraphLayoutSettings::rename_feature() {
     if(!graphView) return;
-    QListWidgetItem *	item=backuplist->currentItem();
+    QListWidgetItem *	item=menulist->currentItem();
     if (!item) return;
-    backuplist->editItem(item);
+    menulist->editItem(item);
     // SaveGraphLayoutSettings::itemChanged(QListWidgetItem *item) is called when edit changes the entry.
     // itemChanged will update the description map
 }
 
 void SaveGraphLayoutSettings::delete_feature() {
     if(!graphView) return;
-    QListWidgetItem *	item=backuplist->currentItem();
+    QListWidgetItem *	item=menulist->currentItem();
     if (!item) return;
-
     if(!confirmAction(item->text(),  tr("Ok To Delete?") ,m_icon_delete) ) return;
 
-    QString backupName = item->data(backupFileName).toString();
+    QString fileName = item->data(fileNameRole).toString();
-    backupDescriptions->remove(backupName);
+    descriptionMap->remove(fileName);
-    backupDescriptions->save();
+    descriptionMap->save();
-    QString relFileName=QString("%1.%2.shg").arg(title).arg(backupName);
+    deleteSettings(fileName);
-    dir->remove(relFileName);
     delete item;
-    unusedBackupNum=backupNum(backupName);
+    if (nextNumToUse<0) {
-    enableButtons(true);
+        nextNumToUse=fileNum(fileName);
-}
-
-void SaveGraphLayoutSettings::addFull_feature() {
-    QMessageBox msgBox;
-    msgBox.setText(tr("Maximum number of Backups exceeded."));
-    msgBox.setStandardButtons(QMessageBox::Cancel);
-    msgBox.setDefaultButton(QMessageBox::Cancel);
-#ifdef MESSAGEBOXHEADER
-    msgBox.setWindowTitle(tr("Maximum Files Exceeded"));
-#else
-    msgBox.setWindowFlag(Qt::FramelessWindowHint,true);
-#endif
-    msgBox.setStyleSheet(styleMessageBox);
-    msgBox.setIconPixmap(m_icon_addFull->pixmap(QSize(50,50)));
-    msgBox.exec();
-}
-
-void SaveGraphLayoutSettings::add_feature() {
-    if(!graphView) return;
-
-    QString backupName = QString("%2%3").arg("backup").arg(unusedBackupNum,backupNumMaxLength,10,QLatin1Char('0'));
-    QString name = QString("%1.%2").arg(title).arg(backupName);
-    graphView->SaveSettings(name);
-    // create a default description - use formatted datetime.
-    QString desc=QDateTime::currentDateTime().toString();
-    backupDescriptions->add(backupName,desc);
-    backupDescriptions->save();
-    QListWidgetItem* item = updateFileList( backupName);
-    if (item!=nullptr) {
-        backuplist->setCurrentItem(item,QItemSelectionModel::ClearAndSelect);
-        backuplist->editItem(item);
     }
+    enableButtons(true);
 }
 
 void SaveGraphLayoutSettings::itemChanged(QListWidgetItem *item)
 {
-    QString backupName=item->data(backupFileName).toString();
+    QString fileName=item->data(fileNameRole).toString();
     QString desc= item->text();
 
     // use only the first line in a multiline string. Can be set using cut and paste
@@ -349,10 +346,10 @@ void SaveGraphLayoutSettings::itemChanged(QListWidgetItem *item)
     }
     if (desc.length() <=0) {
         // returns name back to previous saved name
-        desc=backupDescriptions->get(backupName);
+        desc=descriptionMap->get(fileName);
     } else {
-        backupDescriptions->add(backupName,desc);
+        descriptionMap->add(fileName,desc);
-        backupDescriptions->save();
+        descriptionMap->save();
     }
     item->setText(desc);
 }
@@ -362,8 +359,21 @@ void SaveGraphLayoutSettings::itemSelectionChanged()
     enableButtons(true);
 }
 
-int SaveGraphLayoutSettings::backupNum(QString backupName) {
+void SaveGraphLayoutSettings::writeSettings(QString filename) {
-    QRegularExpressionMatch match = backupFileNumRe->match(backupName);
+    graphView->SaveSettings(title+"."+filename,dirName);
+};
+
+void SaveGraphLayoutSettings::loadSettings(QString filename) {
+    graphView->LoadSettings(title+"."+filename,dirName);
+};
+
+void SaveGraphLayoutSettings::deleteSettings(QString filename) {
+    QString fileName=graphView->settingsFilename (title+"."+filename,dirName) ;
+    dir->remove(fileName);
+};
+
+int SaveGraphLayoutSettings::fileNum(QString fileName) {
+    QRegularExpressionMatch match = fileNumRe->match(fileName);
     int value=-1;
     if (match.hasMatch()) {
         value=match.captured(1).toInt();
@@ -372,7 +382,6 @@ int SaveGraphLayoutSettings::backupNum(QString backupName) {
 }
 
 QListWidgetItem* SaveGraphLayoutSettings::updateFileList(QString find) {
-    Q_UNUSED(find);
     QListWidgetItem* ret=nullptr;
     enableButtons(false);
     dir->refresh();
@@ -382,112 +391,119 @@ QListWidgetItem* SaveGraphLayoutSettings::updateFileList(QString find) {
 
     int row=0;
     int count=0;
-    backuplist->clear();
+    menulist->clear();
-    unusedBackupNum=-1;
+    nextNumToUse=-1;
-    backupDescriptions->load();
+    descriptionMap->load();
     for (int i = 0; i < filelist.size(); ++i) {
         QFileInfo fileInfo = filelist.at(i);
         QString fileName = fileInfo.fileName();
         QRegularExpressionMatch match = parseFilenameRe->match(fileName);
         if (match.hasMatch()) {
             if (match.lastCapturedIndex()==3) {
-                QString backupName=match.captured(2);
+                QString fileName=match.captured(2);
-                int backupNum=match.captured(3).toInt();
+                if (nextNumToUse<0) {
-                // find an available backup name(number);
+                    // check if an entry is availavle to use
-                if (backupNum!=count) {
+                    int fileNum=match.captured(3).toInt();
-                   if (unusedBackupNum<0) unusedBackupNum=count;
+                    // find an available file name(number);
+                    if (fileNum!=count) {
+                       nextNumToUse=count;
+                    }
                 }
                 count++;
 
-                QListWidgetItem *item = new QListWidgetItem(backupDescriptions->get(backupName));
+                QListWidgetItem *item = new QListWidgetItem(descriptionMap->get(fileName));
-                item->setData(backupFileName,backupName);
+                item->setData(fileNameRole,fileName);
                 item->setFlags(item->flags() | Qt::ItemIsEditable);
-                backuplist->insertItem(row,item);
+                menulist->insertItem(row,item);
-                //DEBUGF Q(count) Q(backupName) Q(item->text());
                 row++;
-                if (find!=nullptr && backupName==find) {
+                if (find!=nullptr && fileName==find) {
                     ret=item;
                 }
             }
         }
     }
-    if (unusedBackupNum<0) { // check if there is an existing empty slot
+    if (nextNumToUse<0) { // check if there is an existing empty slot
         // if not then the next available slot is at the end. CHeck if at max files.
         if (count<maxFiles) {
             // a slot is available
-            unusedBackupNum=count;
+            nextNumToUse=count;
         }
     }
     enableButtons(false);
-    backuplist->sortItems();
+    menulist->sortItems();
     return ret;
 }
 
 
 void SaveGraphLayoutSettings::exit() {
-    backupDialog->close();
+    menuDialog->close();
 }
 
 void SaveGraphLayoutSettings::menu(gGraphView* graphView) {
+    if (dir==nullptr) {
+        //const char* err=qPrintable(QString("Cannot find directory %1").arg(dirName));
+        //qWarning(err);
+        return;
+    }
     this->graphView=graphView;
     updateFileList();
-    backupDialog->raise();
+    menuDialog->raise();
-    backupDialog->exec();
+    menuDialog->exec();
     exit();
 }
 
 //====================================================================================================
 //====================================================================================================
-// Backup Descriptions map class with file backup
+// Descriptions map class with file storage
 
-BackupDescriptions::BackupDescriptions(QDir* dir, QString _filename)
+DescriptionMap::DescriptionMap(QDir* dir, QString _filename)
 {
     filename  = dir->absoluteFilePath(_filename);
-    parseDescriptionsRe = new QRegularExpression("^\\s*(\\w+):(.*)$");
+    parseDescriptionsRe = new QRegularExpression(QString("^\\s*(\\w+)%1(.*)$").arg(delimiter) );
 };
 
-BackupDescriptions::~BackupDescriptions() {
+DescriptionMap::~DescriptionMap() {
     delete parseDescriptionsRe;
 };
 
-void BackupDescriptions::add(QString key,QString desc) {
+void DescriptionMap::add(QString key,QString desc) {
     descriptions.insert(key,desc);
 };
 
-void BackupDescriptions::remove(QString key) {
+void DescriptionMap::remove(QString key) {
     descriptions.remove(key);
 }
-QString BackupDescriptions::get(QString key) {
+QString DescriptionMap::get(QString key) {
     QString ret =descriptions.value(key,key);
     return ret;
 }
 
-void BackupDescriptions::save() {
+void DescriptionMap::save() {
     QFile file(filename);
     file.open(QFile::WriteOnly);
     QTextStream out(&file);
-
     QMapIterator<QString, QString>it(descriptions);
     while (it.hasNext()) {
         it.next();
-        QString line=QString("%1:%2\n").arg(it.key()).arg(it.value());
+        QString line=QString("%1%2%3\n").arg(it.key()).arg(delimiter).arg(it.value());
         out <<line;
     }
     file.close();
 }
 
-void BackupDescriptions::load() {
+void DescriptionMap::load() {
     QString line;
     QFile file(filename);
+    descriptions.clear();
+    if (!file.exists()) return;
     file.open(QFile::ReadOnly);
     QTextStream instr(&file);
-    descriptions.clear();
     while (instr.readLineInto(&line)) {
         QRegularExpressionMatch match = parseDescriptionsRe->match(line);
         if (match.hasMatch()) {
-            QString backupName = match.captured(1);
+            QString fileName = match.captured(1);
             QString desc = match.captured(2);
-            add(backupName,desc);
+            add(fileName,desc);
         } else {
             DEBUGF QQ("MATCH ERROR",line);
         }
@@ -553,19 +569,19 @@ switch (ret) {
     عذرا ، لا يمكن تحديد موقع ملف.
 
 
-    backupDialog->connect(backuplist, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(itemActivated(QListWidgetItem*)   ));
+    menuDialog->connect(menulist, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(itemActivated(QListWidgetItem*)   ));
-    backupDialog->connect(backuplist, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(itemDoubleClicked(QListWidgetItem*)   ));
+    menuDialog->connect(menulist, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(itemDoubleClicked(QListWidgetItem*)   ));
-    backupDialog->connect(backuplist, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(itemClicked(QListWidgetItem*)   ));
+    menuDialog->connect(menulist, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(itemClicked(QListWidgetItem*)   ));
-    backupDialog->connect(backuplist, SIGNAL(itemEntered(QListWidgetItem*)), this, SLOT(itemEntered(QListWidgetItem*)   ));
+    menuDialog->connect(menulist, SIGNAL(itemEntered(QListWidgetItem*)), this, SLOT(itemEntered(QListWidgetItem*)   ));
-    backupDialog->connect(backuplist, SIGNAL(itemPressed(QListWidgetItem*)), this, SLOT(itemEntered(QListWidgetItem*)   ));
+    menuDialog->connect(menulist, SIGNAL(itemPressed(QListWidgetItem*)), this, SLOT(itemEntered(QListWidgetItem*)   ));
 
 
 
-    backupDialog->disconnect(backuplist, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(itemActivated(QListWidgetItem*)   ));
+    menuDialog->disconnect(menulist, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(itemActivated(QListWidgetItem*)   ));
-    backupDialog->disconnect(backuplist, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(itemDoubleClicked(QListWidgetItem*)   ));
+    menuDialog->disconnect(menulist, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(itemDoubleClicked(QListWidgetItem*)   ));
-    backupDialog->disconnect(backuplist, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(itemClicked(QListWidgetItem*)   ));
+    menuDialog->disconnect(menulist, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(itemClicked(QListWidgetItem*)   ));
-    backupDialog->disconnect(backuplist, SIGNAL(itemEntered(QListWidgetItem*)), this, SLOT(itemEntered(QListWidgetItem*)   ));
+    menuDialog->disconnect(menulist, SIGNAL(itemEntered(QListWidgetItem*)), this, SLOT(itemEntered(QListWidgetItem*)   ));
-    backupDialog->disconnect(backuplist, SIGNAL(itemPressed(QListWidgetItem*)), this, SLOT(itemEntered(QListWidgetItem*)   ));
+    menuDialog->disconnect(menulist, SIGNAL(itemPressed(QListWidgetItem*)), this, SLOT(itemEntered(QListWidgetItem*)   ));
 
 
 void SaveGraphLayoutSettings::itemActivated(QListWidgetItem *item)

oscar/saveGraphLayoutSettings.h

@@ -7,8 +7,8 @@
  * License. See the file COPYING in the main directory of the source code
  * for more details. */
 
-#ifndef BACKUPFILES_H
+#ifndef SAVEGRAPHLAYOUTSETTINGS_H
-#define BACKUPFILES_H
+#define SAVEGRAPHLAYOUTSETTINGS_H
 
 #include <QWidget>
 #include <QHBoxLayout>
@@ -21,11 +21,11 @@
 #include <QDir>
 #include "Graphs/gGraphView.h"
 
-class BackupDescriptions
+class DescriptionMap
 {
 public:
-    BackupDescriptions(QDir* dir, QString filename) ;
+    DescriptionMap(QDir* dir, QString filename) ;
-    virtual ~BackupDescriptions();
+    virtual ~DescriptionMap();
     void add(QString key,QString desc);
     void remove(QString key);
     QString get(QString key);
@@ -35,13 +35,14 @@ private:
     QString filename;
     QMap <QString,QString> descriptions;
     const QRegularExpression* parseDescriptionsRe;
+    QChar delimiter = QChar(177);
 };
 
 class SaveGraphLayoutSettings : public QWidget
 {
 	Q_OBJECT
 public:
-    explicit SaveGraphLayoutSettings(QString title , QWidget* parent) ;
+    SaveGraphLayoutSettings(QString title, QWidget* parent) ;
     ~SaveGraphLayoutSettings();
     void menu(gGraphView* graphView);
 protected:
@@ -54,12 +55,13 @@ protected:
     QIcon*  m_icon_addFull      = new QIcon(":/icons/brick-wall.png");
 
 private:
-    const static int backupNumMaxLength=3;
+    const static int fileNumMaxLength=3;
-    const static int maxFiles=10;     // Max supported design limited is 1000 - based on backupName has has 3 numeric digits backupNumMaxLength=3.
+    const static int maxFiles=20;     // Max supported design limited is 1000 - based on layoutName has has 3 numeric digits fileNumMaxLength=3.
-    const static int maxDescriptionLen=60;
+    const static int maxDescriptionLen=80;
+    const QString baseName=QString("layout");
 
     const QRegularExpression* singleLineRe;
-    const QRegularExpression* backupFileNumRe;
+    const QRegularExpression* fileNumRe;
     const QRegularExpression* parseFilenameRe;
 
 
@@ -67,25 +69,25 @@ private:
     const   QString     title;
     gGraphView*         graphView=nullptr;
 
-    // backup widget
+    QDialog*     menuDialog;
-    QDialog*     backupDialog;
+    QListWidget* menulist;
-    QListWidget* backuplist;
 
-    QPushButton* backupaddFullBtn;   // Must be first item for workaround.
+    QPushButton* menuAddFullBtn;   // Must be first item for workaround.
-    QPushButton* backupAddBtn;
+    QPushButton* menuAddBtn;
-    QPushButton* backupDeleteBtn;
+    QPushButton* menuDeleteBtn;
-    QPushButton* backupRestoreBtn;
+    QPushButton* menuRestoreBtn;
-    QPushButton* backupUpdateBtn;
+    QPushButton* menuUpdateBtn;
-    QPushButton* backupRenameBtn;
+    QPushButton* menuRenameBtn;
-    QPushButton* backupExitBtn;
+    QPushButton* menuExitBtn;
 
-    QVBoxLayout* backupLayout;
+    QVBoxLayout* menuLayout;
-    QHBoxLayout* layout1;
+    QHBoxLayout* menuLayout1;
-    QVBoxLayout* layout2;
+    QVBoxLayout* menuLayout2;
 
-    QDir*   dir;
+    QDir*   dir=nullptr;
-    int     unusedBackupNum;
+    QString dirName;
-    QListWidgetItem* updateFileList(QString findi=QString());
+    int     nextNumToUse;
+    QListWidgetItem* updateFileList(QString find=QString());
     QString styleOn;
     QString styleOff;
     QString styleExitBtn;
@@ -93,15 +95,19 @@ private:
     QString styleDialog;
     QString calculateStyle(bool on,bool border);
     void    looksOn(QPushButton* button,bool on);
-    BackupDescriptions* backupDescriptions;
+    DescriptionMap* descriptionMap;
     bool    confirmAction(QString name,QString question,QIcon* icon);
 
     void    createMenu();
+    void    createSaveFolder();
     void    enableButtons(bool enable);
     void    add_featurertn();
 
-    const int backupFileName = Qt::UserRole;
+    const int fileNameRole = Qt::UserRole;
-    int     backupNum(QString backupName);
+    int     fileNum(QString fileName);
+    void    writeSettings(QString filename);
+    void    loadSettings(QString filename);
+    void    deleteSettings(QString filename);
 
 public slots:
 private slots:
@@ -118,4 +124,5 @@ private slots:
 };
 
 
-#endif // BACKUPFILES_H
+#endif // SAVEGRAPHLAYOUTSETTINGS_H
+