From 6fb34ebf5780dfb3ccaa2830c9d81f4bb1b2e602 Mon Sep 17 00:00:00 2001 From: LoudSnorer Date: Sat, 14 Oct 2023 20:13:50 -0400 Subject: [PATCH] Added Graphic Hint feature. revamped savedlayout code. --- oscar/daily.cpp | 11 +- oscar/daily.h | 1 + oscar/daily.ui | 14 ++ oscar/overview.cpp | 11 +- oscar/overview.h | 1 + oscar/overview.ui | 14 ++ oscar/saveGraphLayoutSettings.cpp | 373 ++++++++++++++++++++---------- oscar/saveGraphLayoutSettings.h | 60 +++-- oscar/test_macros.h | 26 ++- 9 files changed, 355 insertions(+), 156 deletions(-) diff --git a/oscar/daily.cpp b/oscar/daily.cpp index 0b457c02..bc67b993 100644 --- a/oscar/daily.cpp +++ b/oscar/daily.cpp @@ -2799,12 +2799,21 @@ void Daily::on_splitter_2_splitterMoved(int, int) AppSetting->setDailyPanelWidth(size); } +void Daily::on_graphHelp_clicked() { + if (!saveGraphLayoutSettings) { + saveGraphLayoutSettings= new SaveGraphLayoutSettings("daily",this); + } + if (saveGraphLayoutSettings) { + saveGraphLayoutSettings->hintHelp(); + } +} + void Daily::on_layout_clicked() { if (!saveGraphLayoutSettings) { saveGraphLayoutSettings= new SaveGraphLayoutSettings("daily",this); } if (saveGraphLayoutSettings) { - saveGraphLayoutSettings->menu(GraphView); + saveGraphLayoutSettings->triggerLayout(GraphView); } } diff --git a/oscar/daily.h b/oscar/daily.h index 073479fc..8dbec54e 100644 --- a/oscar/daily.h +++ b/oscar/daily.h @@ -277,6 +277,7 @@ private slots: void on_splitter_2_splitterMoved(int pos, int index); void on_layout_clicked(); + void on_graphHelp_clicked(); protected: virtual void showEvent(QShowEvent *); diff --git a/oscar/daily.ui b/oscar/daily.ui index 3c1648a5..5f25a538 100644 --- a/oscar/daily.ui +++ b/oscar/daily.ui @@ -1509,6 +1509,20 @@ QSlider::handle:horizontal { + + + + Hint + + + + :/icons/question_mark.png:/icons/question_mark.png + + + Graphing Help + + + diff --git a/oscar/overview.cpp b/oscar/overview.cpp index d2f73c97..653bf2f2 100644 --- a/oscar/overview.cpp +++ b/oscar/overview.cpp @@ -937,12 +937,21 @@ void Overview::updateCube() } } +void Overview::on_graphHelp_clicked() { + if (!saveGraphLayoutSettings) { + saveGraphLayoutSettings= new SaveGraphLayoutSettings("overview",this); + } + if (saveGraphLayoutSettings) { + saveGraphLayoutSettings->hintHelp(); + } +} + void Overview::on_layout_clicked() { if (!saveGraphLayoutSettings) { saveGraphLayoutSettings= new SaveGraphLayoutSettings("overview",this); } if (saveGraphLayoutSettings) { - saveGraphLayoutSettings->menu(GraphView); + saveGraphLayoutSettings->triggerLayout(GraphView); } } diff --git a/oscar/overview.h b/oscar/overview.h index 9108442a..4e67cdf5 100644 --- a/oscar/overview.h +++ b/oscar/overview.h @@ -144,6 +144,7 @@ class Overview : public QWidget void setGraphText (); void on_layout_clicked(); + void on_graphHelp_clicked(); private: void CreateAllGraphs(); diff --git a/oscar/overview.ui b/oscar/overview.ui index 7fa49802..8e511b9c 100644 --- a/oscar/overview.ui +++ b/oscar/overview.ui @@ -224,6 +224,20 @@ QToolButton:pressed { + + + + Hint + + + + :/icons/question_mark.png:/icons/question_mark.png + + + Graphing Help + + + diff --git a/oscar/saveGraphLayoutSettings.cpp b/oscar/saveGraphLayoutSettings.cpp index f240c4c3..d8090be0 100644 --- a/oscar/saveGraphLayoutSettings.cpp +++ b/oscar/saveGraphLayoutSettings.cpp @@ -11,19 +11,24 @@ #include #include +#include +#include +#include +#include +#include #include #include #include #include "SleepLib/profiles.h" #include "saveGraphLayoutSettings.h" -#define USE_FRAMELESS_WINDOW + + +#define USE_FRAMELESS_WINDOW_off #define USE_PROFILE_SPECIFIC_FOLDERoff // off implies saved layouts worked for all profiles. SaveGraphLayoutSettings::SaveGraphLayoutSettings(QString title,QWidget* parent) : parent(parent),title(title) { - fontSizeIncrease = 1; - helpFontSizeIncrease = 1; createSaveFolder(); if (dir==nullptr) return; dir->setFilter(QDir::Files | QDir::Readable | QDir::Writable | QDir::NoSymLinks); @@ -33,16 +38,15 @@ SaveGraphLayoutSettings::SaveGraphLayoutSettings(QString title,QWidget* parent) createMenu() ; - menuDialog->connect(menuAddFullBtn, SIGNAL(clicked()), this, SLOT (addFull_feature() )); - menuDialog->connect(menuAddBtn, SIGNAL(clicked()), this, SLOT (add_feature() )); - menuDialog->connect(menuRestoreBtn, SIGNAL(clicked()), this, SLOT (restore_feature() )); - menuDialog->connect(menuUpdateBtn, SIGNAL(clicked()), this, SLOT (update_feature() )); - menuDialog->connect(menuRenameBtn, SIGNAL(clicked()), this, SLOT (rename_feature() )); - menuDialog->connect(menuDeleteBtn, SIGNAL(clicked()), this, SLOT (delete_feature() )); - menuDialog->connect(menuHelpBtn, SIGNAL(clicked()), this, SLOT (help_feature() )); - menuDialog->connect(menuExitBtn, SIGNAL(clicked()), this, SLOT (exit() )); - menuDialog->connect(menuList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*) )); - menuDialog->connect(menuList, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged() )); + menu.dialog->connect(menuAddFullBtn, SIGNAL(clicked()), this, SLOT (addFull_feature() )); + menu.dialog->connect(menuAddBtn, SIGNAL(clicked()), this, SLOT (add_feature() )); + menu.dialog->connect(menuRestoreBtn, SIGNAL(clicked()), this, SLOT (restore_feature() )); + menu.dialog->connect(menuUpdateBtn, SIGNAL(clicked()), this, SLOT (update_feature() )); + menu.dialog->connect(menuRenameBtn, SIGNAL(clicked()), this, SLOT (rename_feature() )); + menu.dialog->connect(menuDeleteBtn, SIGNAL(clicked()), this, SLOT (delete_feature() )); + menu.dialog->connect(menuHelpBtn, SIGNAL(clicked()), this, SLOT (help_feature() )); + menu.dialog->connect(menuList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*) )); + menu.dialog->connect(menuList, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged() )); @@ -55,16 +59,15 @@ SaveGraphLayoutSettings::~SaveGraphLayoutSettings() { if (dir==nullptr) {return;} - 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(menuRenameBtn, SIGNAL(clicked()), this, SLOT (rename_feature() )); - menuDialog->disconnect(menuDeleteBtn, SIGNAL(clicked()), this, SLOT (delete_feature() )); - menuDialog->disconnect(menuExitBtn, SIGNAL(clicked()), this, SLOT (exit() )); - menuDialog->disconnect(menuHelpBtn, SIGNAL(clicked()), this, SLOT (help_feature() )); - menuDialog->disconnect(menuList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*) )); - menuDialog->disconnect(menuList, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged() )); + menu.dialog->disconnect(menuAddFullBtn, SIGNAL(clicked()), this, SLOT (addFull_feature() )); + menu.dialog->disconnect(menuAddBtn, SIGNAL(clicked()), this, SLOT (add_feature() )); + menu.dialog->disconnect(menuRestoreBtn, SIGNAL(clicked()), this, SLOT (restore_feature() )); + menu.dialog->disconnect(menuUpdateBtn, SIGNAL(clicked()), this, SLOT (update_feature() )); + menu.dialog->disconnect(menuRenameBtn, SIGNAL(clicked()), this, SLOT (rename_feature() )); + menu.dialog->disconnect(menuDeleteBtn, SIGNAL(clicked()), this, SLOT (delete_feature() )); + menu.dialog->disconnect(menuHelpBtn, SIGNAL(clicked()), this, SLOT (help_feature() )); + menu.dialog->disconnect(menuList, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(itemChanged(QListWidgetItem*) )); + menu.dialog->disconnect(menuList, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelectionChanged() )); helpDestructor(); @@ -97,7 +100,7 @@ void SaveGraphLayoutSettings::createSaveFolder() { QDir* tmpDir = new QDir(dirName); if (!tmpDir->exists()) { QDir* baseDir=new QDir(baseName); - if (!baseDir->exists()) { + if (!baseDir->exists()) { // Base folder does not exist - terminate return ; } @@ -118,11 +121,13 @@ void SaveGraphLayoutSettings::createSaveFolder() { QPushButton* SaveGraphLayoutSettings::menuBtn(QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip) { return newBtnRtn(menuLayoutButtons, name, icon, style, hPolicy,tooltip) ; } -QPushButton* SaveGraphLayoutSettings::helpBtn(QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip) { - return newBtnRtn(helpLayoutButtons, name, icon, style, hPolicy,tooltip) ; -} + +//QPushButton* SaveGraphLayoutSettings::helpBtn(QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip) { + //return newBtnRtn(menuLayoutButtons, name, icon, style, hPolicy,tooltip) ; +//} + QPushButton* SaveGraphLayoutSettings::newBtnRtn(QHBoxLayout* layout,QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip) { - QPushButton* button = new QPushButton(name, menuDialog); + QPushButton* button = new QPushButton(name, menu.dialog); button->setIcon(*icon); button->setStyleSheet(style); button->setSizePolicy(hPolicy,QSizePolicy::Fixed); @@ -155,31 +160,19 @@ void SaveGraphLayoutSettings::createStyleSheets() { "vertical-align:top;" "}" ; - styleDialog= - "QDialog { " - "border: 3px solid black;" - "}"; + styleDialog= QString ( R"( QDialog { border: 3px solid black; } )") ; } void SaveGraphLayoutSettings::createMenu() { - - menuListFont =*defaultfont; - menuListFont.setPointSize(fontSizeIncrease+menuListFont.pointSize()); - + if(menu.dialog) return; + initDialog(menu,tr("Manage Save Layout Settings") ); createStyleSheets(); - #ifdef USE_FRAMELESS_WINDOW - menuDialog= new QDialog(parent, Qt::FramelessWindowHint); - menuDialog->setSizeGripEnabled(true); // allows lower right hand corner to resize dialog - #else - menuDialog= new QDialog(parent, Qt::WindowTitleHint | Qt::WindowCloseButtonHint|Qt::WindowSystemMenuHint); - menuDialog->setWindowTitle(tr("Manage Save Layout Settings")) ; - #endif - menuDialog->setStyleSheet(styleDialog); + QString styleDialog( R"( QDialog { border: 3px solid black; } )") ; + menu.dialog->setStyleSheet(styleDialog); - menuLayout = new QVBoxLayout(menuDialog); menuLayoutButtons = new QHBoxLayout(); menuAddFullBtn = menuBtn(tr("Add" ),m_icon_add , styleOff ,QSizePolicy::Minimum, tr("Add Feature inhibited. The maximum number of Items has been exceeded.") ); @@ -189,66 +182,147 @@ void SaveGraphLayoutSettings::createMenu() { menuUpdateBtn = menuBtn(tr("Update" ),m_icon_update , styleOn ,QSizePolicy::Minimum, tr("Updates the selection with current settings.")); menuDeleteBtn = menuBtn(tr("Delete" ),m_icon_delete , styleOn ,QSizePolicy::Minimum, tr("Deletes the selection.")); menuHelpBtn = menuBtn("" ,m_icon_help , styleOn ,QSizePolicy::Fixed , tr("Expanded Help menu.")); - menuExitBtn = menuBtn("" ,m_icon_exit , styleExit,QSizePolicy::Fixed , tr("Exits the Layout menu.")); - #ifndef USE_FRAMELESS_WINDOW - menuExitBtn->hide(); - #endif - - menuList = new QListWidget(menuDialog); + menuList = new QListWidget(menu.dialog); menuList->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); menuList->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOn); - menuList->setFont(menuListFont); + menuList->setFont(menu.font); - menuLayout->addLayout(menuLayoutButtons); - menuLayout->addWidget(menuList, 1); + menu.layout->addLayout(menuLayoutButtons); + menu.layout->addWidget(menuList, 1); //menuList->setSizePolicy(QSizePolicy::Preferred,QSizePolicy::Preferred); menuList->setSizePolicy(QSizePolicy::Minimum,QSizePolicy::Minimum); - - }; +void HelpData::setDialog(QWidget* parent,QString windowsTitle) { + if (dialog) return; + open=false; + #ifdef USE_FRAMELESS_WINDOW + dialog= new QDialog(parent, Qt::FramelessWindowHint); + title.setText(QString("

%1

").arg(windowsTitle) ); + headerLayout = new QHBoxLayout(); + #else + dialog = new QDialog(nullptr, Qt::WindowTitleHint | Qt::WindowCloseButtonHint|Qt::WindowSystemMenuHint); + dialog->setWindowTitle(windowsTitle) ; + dialog->setWindowModality(Qt::WindowModal); + dialog->setStyleSheet(QString ( "QDialog { border: 3px solid black; }")); + #endif + Q_UNUSED(parent); + font = QApplication::font(); + fontBold = font; + fontBold.setWeight(QFont::Bold); + layout = new QVBoxLayout(dialog); +} + +void SaveGraphLayoutSettings::initDialog( + HelpData & aHelp + , QString title + ) { + if(aHelp.dialog) return; + aHelp.setDialog(parent,title); + #ifdef USE_FRAMELESS_WINDOW + aHelp.headerLayout->addWidget(&aHelp.title); + aHelp.exitBtn = newBtnRtn(aHelp.headerLayout, "", m_icon_exit, styleExit , QSizePolicy::Fixed, tr("Exits the dialog menu.")) ; + aHelp.layout->addLayout(aHelp.headerLayout); + #endif + // YXXXXXXXXXXXXXXXXXXX + // dialog->setFont(font) ; + aHelp.dialog->setSizeGripEnabled(true); // allows lower right hand corner to resize dialog + aHelp.dialog->setStyleSheet(QString ( "QDialog { border: 3px solid black; }")); +} + void SaveGraphLayoutSettings::createHelp() { - if(helpDialog) return; + createHelp(help, tr("Help Menu - Manage Layout Settings"), helpInfo()); + if (help.exitBtn) help.dialog->connect(help.exitBtn, SIGNAL(clicked()), this, SLOT (help_exit_feature() )); +}; - helpDialog= new QDialog(parent, Qt::FramelessWindowHint); - helpDialog->setStyleSheet(styleDialog); - menuDialog->setSizeGripEnabled(true); // allows lower right hand corner to resize dialog +void SaveGraphLayoutSettings::createHelp(HelpData & ahelp , QString title , QString text) { + if(ahelp.dialog) return; + initDialog(ahelp,title ); - QFont helpInfoFont = menuListFont; - helpInfoFont.setPointSize(helpFontSizeIncrease+helpInfoFont.pointSize()); - - QFont helpInfoLabelFont = helpInfoFont; - helpInfoLabelFont.setPointSize(fontSizeIncrease+ helpInfoFont.pointSize()); - - QLabel* helpInfoHeaderLabel = new QLabel("helpInfoHeaderLabel",parent); - helpInfoHeaderLabel->setText(QString( tr("

Help Menu - Manage Layout Settings

"))); - helpInfoHeaderLabel->setFont(helpInfoLabelFont); - - QLabel* helpInfoLabel = new QLabel("helpInfo",parent); - helpInfoLabel->setFont(helpInfoFont); - helpInfoLabel->setText(helpInfo()) ; - - helpLayoutButtons = new QHBoxLayout(); - helpLayoutButtons->addWidget(helpInfoHeaderLabel); - helpInfoExitBtn= helpBtn("" ,m_icon_return , styleOn ,QSizePolicy::Fixed , tr("Exits the help menu.")); - helpExitBtn = helpBtn("" ,m_icon_exit , styleExit,QSizePolicy::Fixed , tr("Exits the dialog menu.")); - - QVBoxLayout* helpLayout = new QVBoxLayout(helpDialog); - helpLayout->addLayout(helpLayoutButtons); - helpLayout->addWidget(helpInfoLabel, 1); - - helpDialog->connect(helpInfoExitBtn,SIGNAL(clicked()), this, SLOT (help_off_feature() )); - helpDialog->connect(helpExitBtn, SIGNAL(clicked()), this, SLOT (help_exit_feature() )); + ahelp.label = new QLabel(parent); + ahelp.label->setFont(ahelp.font); + ahelp.label->setText(text) ; + ahelp.layout->addWidget(ahelp.label, 1); } void SaveGraphLayoutSettings::helpDestructor() { - if(!helpDialog) return; - helpDialog->disconnect(helpInfoExitBtn,SIGNAL(clicked()), this, SLOT (help_off_feature() )); - helpDialog->disconnect(helpExitBtn, SIGNAL(clicked()), this, SLOT (help_exit_feature() )); + closeHelp(); + closeHint(); + closeMenu(); + if (hint.exitBtn) hint.dialog->disconnect(hint.exitBtn, SIGNAL(clicked()), this, SLOT ( closeHint() )); + if (help.exitBtn) help.dialog->disconnect(help.exitBtn, SIGNAL(clicked()), this, SLOT ( closeHelp() )); + if (menu.exitBtn) menu.dialog->disconnect(menu.exitBtn, SIGNAL(clicked()), this, SLOT ( help_exit_feature() )); +} + +#define TABLES QString(R"( )") +#define TABLEE QString(R"(
)") +#define CENTERS QString(R"(

)") +#define CENTERE QString(R"(

)") +#define BREAK QString(R"(
)") +#define PARAS QString(R"(

)") +#define PARAE QString(R"(

)") +#define ROWS QString(R"( )") +#define ROWE QString(R"( )") +#define COLS QString(R"( )") +#define COLE QString(R"( )") +#define CSEP QString(R"( )") + +QString SaveGraphLayoutSettings::hintInfo() { + +QStringList strList; + + strList + << CENTERS << "" + << tr("Basic Hints") + << "" << CENTERE + << TABLES + << ROWS << COLS << "" << QString(tr("Key Sequence")) << "" << CSEP << "" << QString(tr("Description")) << "" << COLE << ROWE + << ROWS << COLS << QString(tr("MouseWheel")) << CSEP << QString(tr("Scrolls unpinned Graphs")) << COLE << ROWE + << ROWS << COLS << QString(tr("Ctrl + MouseWheel")) << CSEP << QString(tr("Zooms Time Selection")) << COLE << ROWE + << ROWS << COLS << QString(tr("LeftMouse dragDrop")) << CSEP << QString(tr("Defines Time Selection")) << COLE << ROWE + << ROWS << COLS << QString(tr("RightMouse dragDrop")) << CSEP << QString(tr("Moves Time Selection")) << COLE << ROWE + << ROWS << COLS << QString(tr("Ctrl + (right/left)MouseClick")) << CSEP << QString(tr("Zooms Time Selection")) << COLE << ROWE + << ROWS << COLS << QString(tr(" (right/left)MouseClick")) << CSEP << QString(tr("Moves Time Selection")) << COLE << ROWE + << BREAK + << ROWS << COLS << QString(tr("(right/left) Arrow (Ctrl => faster)")) << CSEP << QString(tr("Moves Time Selection")) << COLE << ROWE + << ROWS << COLS << QString(tr("Up/Down Arrow")) << CSEP << QString(tr("Scrolls graphs")) << COLE << ROWE + << ROWS << COLS << QString(tr("Up/Down Arrow+Focus")) << CSEP << QString(tr("Zooms graphs")) << COLE << ROWE + << TABLEE + << CENTERS << "" + << tr("Graph Layout Hints") + << "" << CENTERE + << TABLES + << ROWS << COLS << QString(tr("Double Click Graph Title")) << CSEP << QString(tr("Toggles Pinning")) << COLE << ROWE + << ROWS << COLS << QString(tr("Daily:Double Click Y-axis label")) << CSEP << QString(tr("Toggle Time Selection Auto Zoom")) << COLE << ROWE + << ROWS << COLS << QString(tr("DragDrop Graph Title")) << CSEP << QString(tr("Reorders Graph layout")) << COLE << ROWE + << ROWS << COLS << QString(tr("DragDrop graph’s bottom line")) << CSEP << QString(tr("Changes Size of Graphs")) << COLE << ROWE + << ROWS << COLS << QString(tr("Layout Button (next to Graph Button)")) << CSEP << QString(tr("Save / Restore Graph Layouts")) << COLE << ROWE + << TABLEE + << CENTERS << "" + << tr("Daily Graph Hints") + << "" << CENTERE + << TABLES + << ROWS << COLS << QString(tr("Click on date")) << CSEP << QString(tr("Toggle Calendar on/off")) << COLE << ROWE + << ROWS << COLS << QString(tr("Detailed: Click on colored event")) << CSEP << QString(tr("Jump to event tab with event opened")) << COLE << ROWE + << ROWS << COLS << QString(tr("Detailed: Click on a session (at bottom)")) << CSEP << QString(tr("Toggle session disable / enable session")) << COLE << ROWE + << ROWS << COLS << QString(tr("Event: Click on an event")) << CSEP << QString(tr("Time Selection 3 min before event 20 sec after")) << COLE << ROWE + << ROWS << COLS << QString(tr("Bookmark")) << CSEP << QString(tr("Save current Time Selection")) << COLE << ROWE + << ROWS << COLS << QString(tr("Search Tab")) << CSEP << QString(tr("Search data base")) << COLE << ROWE + << TABLEE + << CENTERS << "" + << tr("Miscellaneous Hints") + << "" << CENTERE + << TABLES + << ROWS << COLS << QString(tr("OverView: Shift Click on a date")) << CSEP << QString(tr("Jumps to date in the Daily Tab")) << COLE << ROWE + << ROWS << COLS << QString(tr("Daily: Event (bottom left corner) ")) << CSEP << QString(tr("Select Events to view")) << COLE << ROWE + << ROWS << COLS << QString(tr("Graph / Chart (bottom right corner)")) << CSEP << QString(tr("Selects graphs to view")) << COLE << ROWE + << TABLEE + ; +return strList.join("\n"); } QString SaveGraphLayoutSettings::helpInfo() { @@ -273,14 +347,15 @@ QStringList strList; <") <
") + <") + < ") < ") < ") < ") -< ") <") @@ -378,7 +453,7 @@ bool SaveGraphLayoutSettings::confirmAction(QString top ,QString bottom,QIcon* i QString topText=QString("

%1

").arg(top); QString bottomText=QString("

%1

").arg(bottom); - QMessageBox msgBox(menuDialog); + QMessageBox msgBox(menu.dialog); msgBox.setText(topText); msgBox.setInformativeText(bottomText); if (icon!=nullptr) { @@ -389,7 +464,7 @@ bool SaveGraphLayoutSettings::confirmAction(QString top ,QString bottom,QIcon* i msgBox.setDefaultButton(adefault); msgBox.setWindowFlag(Qt::FramelessWindowHint,true); - msgBox.setStyleSheet(calculateStyleMessageBox(&menuListFont,top,bottom)); + msgBox.setStyleSheet(calculateStyleMessageBox(&menu.font,top,bottom)); // displaywidgets((QWidget*)&msgBox); bool ret= msgBox.exec()==success; @@ -397,11 +472,11 @@ bool SaveGraphLayoutSettings::confirmAction(QString top ,QString bottom,QIcon* i } #else bool SaveGraphLayoutSettings::confirmAction(QString name ,QString question,QIcon* icon,QMessageBox::StandardButtons flags , QMessageBox::StandardButton adefault, QMessageBox::StandardButton success) { -//bool SaveGraphLayoutSettings::confirmAction(QString name,QString question,QIcon* icon) +//bool SaveGraphLayoutSettings::confirmAction(QString name,QString question,QIcon* icon) Q_UNUSED(flags); Q_UNUSED(adefault); Q_UNUSED(success); - QMessageBox msgBox(menuDialog); + QMessageBox msgBox(menu.dialog); msgBox.setText(question); if (icon!=nullptr) { msgBox.setIconPixmap(icon->pixmap(QSize(50,50))); @@ -503,7 +578,7 @@ void SaveGraphLayoutSettings::restore_feature() { if (!verifyItem(item, tr("No Item Selected") , m_icon_restore)) return ; QString fileName = item->data(fileNameRole).toString(); loadSettings(fileName); - exit(); + closeMenu(); }; void SaveGraphLayoutSettings::rename_feature() { @@ -516,20 +591,22 @@ void SaveGraphLayoutSettings::rename_feature() { } void SaveGraphLayoutSettings::help_exit_feature() { - helpDialog->close(); - exit(); -} - -void SaveGraphLayoutSettings::help_off_feature() { - helpDialog->close(); + closeMenu(); + closeHelp(); } void SaveGraphLayoutSettings::help_feature() { initminMenuListSize(); createHelp(); - if(!helpDialog) return; - helpDialog->raise(); - helpDialog->exec(); + if(!help.dialog) return; + if (help.open) { + closeHelp(); + return; + } + help.dialog->raise(); + help.open=true; + help.dialog->exec(); + help.open=false; manageButtonApperance(); } @@ -591,7 +668,7 @@ void SaveGraphLayoutSettings::itemSelectionChanged() void SaveGraphLayoutSettings::initminMenuListSize() { if (minMenuDialogSize.width()==0) { - menuDialogSize = menuDialog->size(); + menuDialogSize = menu.dialog->size(); minMenuDialogSize = menuDialogSize; menuListSize = menuList->size(); @@ -639,31 +716,31 @@ bool SaveGraphLayoutSettings::sizeEqual(const QSize AA , const QSize BB ) { void SaveGraphLayoutSettings::resizeMenu() { - if (minMenuDialogSize.width()==0) return; + if (minMenuDialogSize.width()==0) return; QSize newSize = calculateMenuDialogSize(); newSize.setWidth ( newSize.width()); - menuDialogSize = menuDialog->size(); + menuDialogSize = menu.dialog->size(); if ( sizeEqual(newSize , menuDialogSize)) { - // no work to do + // no work to do return; }; if ( menuDialogSize.width() < newSize.width() ) { - menuDialog->setMinimumWidth(newSize.width()); - menuDialog->setMaximumWidth(QWIDGETSIZE_MAX); + menu.dialog->setMinimumWidth(newSize.width()); + menu.dialog->setMaximumWidth(QWIDGETSIZE_MAX); } else if ( menuDialogSize.width() > newSize.width() ) { - menuDialog->setMaximumWidth(newSize.width()); - menuDialog->setMinimumWidth(newSize.width()); + menu.dialog->setMaximumWidth(newSize.width()); + menu.dialog->setMinimumWidth(newSize.width()); } if ( menuDialogSize.height() < newSize.height() ) { - menuDialog->setMinimumHeight(newSize.height()); - menuDialog->setMaximumHeight(QWIDGETSIZE_MAX); + menu.dialog->setMinimumHeight(newSize.height()); + menu.dialog->setMaximumHeight(QWIDGETSIZE_MAX); } else if ( menuDialogSize.height() > newSize.height() ) { - menuDialog->setMaximumHeight(newSize.height()); - menuDialog->setMinimumHeight(newSize.height()); + menu.dialog->setMaximumHeight(newSize.height()); + menu.dialog->setMinimumHeight(newSize.height()); } menuDialogSize = newSize; } @@ -672,7 +749,7 @@ QSize SaveGraphLayoutSettings::calculateMenuDialogSize() { if (menuDialogSize.width()==0) return QSize(0,0); QListWidgetItem* item; widestItem=nullptr; - QFontMetrics fm = QFontMetrics(menuListFont); + QFontMetrics fm = QFontMetrics(menu.font); // account for scrollbars. QSize returnValue = QSize( 0 , fm.height() ); // add an extra space at the bottom. width didn't work @@ -751,24 +828,73 @@ QListWidgetItem* SaveGraphLayoutSettings::updateFileList(QString find) { } -void SaveGraphLayoutSettings::exit() { - menuDialog->close(); +void SaveGraphLayoutSettings::closeHelp() { + if (help.open) { + help.dialog->close(); + } } -void SaveGraphLayoutSettings::menu(gGraphView* graphView) { +void SaveGraphLayoutSettings::closeHint() { + if (hint.open) { + hint.dialog->close(); + } +} + +void SaveGraphLayoutSettings::closeMenu() { + closeHelp(); + closeHint(); + if (menu.open) { + menu.dialog->close(); + } +} + +void SaveGraphLayoutSettings::triggerLayout(gGraphView* graphView) { if (dir==nullptr) { //const char* err=qPrintable(QString("Cannot find directory %1").arg(dirName)); //qWarning(err); return; } + if (menu.open) { + closeMenu(); + return; + } this->graphView=graphView; updateFileList(); manageButtonApperance(); - menuDialog->raise(); - menuDialog->exec(); - exit(); + menu.dialog->raise(); + menu.open=true; + menu.dialog->exec(); + menu.open=false; + closeMenu(); } +QSize textsize(QFont font ,QString text) { + return QFontMetrics(font).size(0 , text); +} + +void SaveGraphLayoutSettings::createHint() { + createHelp(hint, tr("Graph Short-Cuts Help"), hintInfo()); + if (hint.exitBtn) { + hint.dialog->connect(hint.exitBtn, SIGNAL(clicked()), this, SLOT (closeHint())); + } +}; + +void SaveGraphLayoutSettings::hintHelp() { + if (hint.open) { + hint.dialog->close(); + return; + } + createHint(); + if (!hint.dialog) return; + + hint.dialog->raise(); + hint.dialog->show(); + hint.open=true; + hint.dialog->exec(); + hint.open=false; +} + + //==================================================================================================== //==================================================================================================== // Descriptions map class with file storage @@ -847,4 +973,3 @@ void DescriptionMap::load() { عذرا ، لا يمكن تحديد موقع ملف. #endif - diff --git a/oscar/saveGraphLayoutSettings.h b/oscar/saveGraphLayoutSettings.h index 174a8a47..3df8bfc2 100644 --- a/oscar/saveGraphLayoutSettings.h +++ b/oscar/saveGraphLayoutSettings.h @@ -39,14 +39,41 @@ private: const QChar delimiter = QChar(':'); }; +class HelpData { +public: + void setDialog(QString windowsTitle); + void setDialog(QWidget*,QString windowsTitle ); + void finishInit(); + + QLabel title ; + QLabel message ; + + QDialog*dialog = nullptr; + bool open = false; + QVBoxLayout* layout =nullptr; + + QFont font ; + QFont fontBold ; + QLabel* label ; + + // For frameless + QPushButton* exitBtn=nullptr; + QHBoxLayout* headerLayout=nullptr; + +}; + class SaveGraphLayoutSettings : public QWidget { Q_OBJECT public: SaveGraphLayoutSettings(QString title, QWidget* parent) ; ~SaveGraphLayoutSettings(); - void menu(gGraphView* graphView); + void triggerLayout(gGraphView* graphView); + void hintHelp(); protected: + HelpData hint; + HelpData help; + HelpData menu; QIcon* m_icon_return = new QIcon(":/icons/return.png"); QIcon* m_icon_help = new QIcon(":/icons/question_mark.png"); QIcon* m_icon_exit = new QIcon(":/icons/exit.png"); @@ -63,7 +90,6 @@ private: const static int maxDescriptionLen = 80; const QString fileBaseName = QString("layout"); const int fileNameRole = Qt::UserRole; - int fontSizeIncrease = 0; int horizontalWidthAdjustment=60; // this seem to make menu size changes work. Testing says it is 60 but what causes it is unknown. QSize minMenuListSize = QSize(0,0); @@ -85,9 +111,9 @@ private: QWidget* parent; const QString title; gGraphView* graphView = nullptr; - QFont menuListFont; - QDialog* menuDialog; + void createHint(); + QString hintInfo(); QListWidget* menuList; QPushButton* menuAddFullBtn; // Must be first item for workaround. @@ -96,23 +122,15 @@ private: QPushButton* menuRestoreBtn; QPushButton* menuUpdateBtn; QPushButton* menuRenameBtn; - QPushButton* menuExitBtn; QPushButton* menuHelpBtn; - - QVBoxLayout* menuLayout; QHBoxLayout* menuLayoutButtons; void createHelp(); + void createHelp(HelpData & help , QString title , QString text); + void initDialog(HelpData & help , QString title ); void helpDestructor(); QString helpInfo(); - QDialog* helpDialog=nullptr; - QPushButton* helpInfoExitBtn=nullptr; - QPushButton* helpExitBtn=nullptr; - int helpFontSizeIncrease = 0; - QHBoxLayout* helpLayoutButtons = nullptr; - - QDir* dir = nullptr; QString dirName; @@ -129,9 +147,9 @@ private: void looksOn(QPushButton* button,bool on); DescriptionMap* descriptionMap; bool confirmAction(QString name,QString question,QIcon* icon, - QMessageBox::StandardButtons flags = (QMessageBox::Cancel|QMessageBox::Yes) , - QMessageBox::StandardButton adefault = QMessageBox::Cancel, - QMessageBox::StandardButton success = QMessageBox::Yes + QMessageBox::StandardButtons flags = (QMessageBox::Cancel|QMessageBox::Yes) , + QMessageBox::StandardButton adefault = QMessageBox::Cancel, + QMessageBox::StandardButton success = QMessageBox::Yes ); bool verifyItem(QListWidgetItem* item,QString name,QIcon* icon) ; @@ -145,7 +163,6 @@ private: void createSaveFolder(); QPushButton* newBtnRtn(QHBoxLayout*, QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip); QPushButton* menuBtn( QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip); - QPushButton* helpBtn( QString name, QIcon* icon, QString style,QSizePolicy::Policy hPolicy,QString tooltip); void manageButtonApperance(); void resizeMenu(); @@ -154,6 +171,8 @@ private: void writeSettings(QString filename); void loadSettings(QString filename); void deleteSettings(QString filename); + void closeMenu(); + void closeHelp(); public slots: private slots: @@ -163,13 +182,12 @@ private slots: void rename_feature(); void update_feature(); void help_feature(); - void help_off_feature(); void help_exit_feature(); void delete_feature(); - void exit(); - void itemChanged(QListWidgetItem *item); void itemSelectionChanged(); + + void closeHint(); }; diff --git a/oscar/test_macros.h b/oscar/test_macros.h index 401fc0ec..da42e074 100644 --- a/oscar/test_macros.h +++ b/oscar/test_macros.h @@ -38,13 +38,18 @@ To turn off the the test macros. #include #include +#define DEBUGI qInfo().noquote() << "INFO;" +#define DEBUGD qInfo().noquote() << "DEBUG;" #define DEBUGQ qDebug().noquote() #define DEBUGW qWarning().noquote() -#define DEBUGL DEBUGQ <