mirror of
https://github.com/fwbuilder/fwbuilder
synced 2026-09-16 18:14:40 +02:00
Help and Tutorial dialogs are now not modal and not top-level. They can be minimized, but not maximized. All tests passe. (fixed #1655).
This commit is contained in:
@@ -31,15 +31,38 @@
|
||||
|
||||
#include <QDebug>
|
||||
#include <QFile>
|
||||
#include "FWBApplication.h"
|
||||
|
||||
TutorialDialog * TutorialDialog::dialog = NULL;
|
||||
|
||||
TutorialDialog::TutorialDialog(QString tutorial, QWidget *parent) :
|
||||
QDialog(parent),
|
||||
QDialog(NULL),
|
||||
ui(new Ui::TutorialDialog_q)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
this->setWindowFlags(Qt::Dialog | Qt::WindowMinimizeButtonHint | Qt::WindowStaysOnTopHint | Qt::WindowCloseButtonHint);
|
||||
setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint | Qt::WindowMinimizeButtonHint);
|
||||
ui->contents->setOpenExternalLinks(true);
|
||||
|
||||
dialog = this;
|
||||
this->initializeTutorial(tutorial);
|
||||
}
|
||||
|
||||
void TutorialDialog::showTutorial(QString tutorial)
|
||||
{
|
||||
if (dialog != NULL)
|
||||
{
|
||||
dialog->initializeTutorial(tutorial);
|
||||
dialog->showNormal();
|
||||
dialog->raise();
|
||||
}
|
||||
else
|
||||
{
|
||||
(new TutorialDialog(tutorial))->show();
|
||||
}
|
||||
}
|
||||
|
||||
void TutorialDialog::initializeTutorial(QString tutorial)
|
||||
{
|
||||
this->tutorial = tutorial;
|
||||
doc = new QTextDocument(this);
|
||||
|
||||
@@ -54,17 +77,11 @@ TutorialDialog::TutorialDialog(QString tutorial, QWidget *parent) :
|
||||
}
|
||||
ui->contents->setDocument(doc);
|
||||
currentPage = 0;
|
||||
//this->setWindowModality(Qt::ApplicationModal);
|
||||
showPage(currentPage);
|
||||
|
||||
wfl->registerTutorialViewing(tutorial);
|
||||
}
|
||||
|
||||
void TutorialDialog::resizeEvent(QResizeEvent *)
|
||||
{
|
||||
// ui->contents->setMaximumWidth(ui->scrollArea->viewport()->width());
|
||||
}
|
||||
|
||||
TutorialDialog::~TutorialDialog()
|
||||
{
|
||||
delete ui;
|
||||
|
||||
Reference in New Issue
Block a user