nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-15 05:32:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add parent widget to AddPerspective dialog to stop it being hidden

Browse Source 
raise doesn't fix the issue on Windows
This commit is contained in:
Alejandro Martinez
2021-07-08 18:24:47 -03:00
parent c4d6ee065e
commit 39a7e67085
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Gui/MainWindow.cpp
View File

@@ -1478,7 +1478,7 @@ MainWindow::perspectiveSelected(int index)
{ {
QString name; QString name;
QString expression; QString expression;
AddPerspectiveDialog *dialog= new AddPerspectiveDialog(currentTab->context, name, expression, current->type); AddPerspectiveDialog *dialog= new AddPerspectiveDialog(this, currentTab->context, name, expression, current->type);
int ret= dialog->exec(); int ret= dialog->exec();
delete dialog; delete dialog;
if (ret == QDialog::Accepted && name != "") { if (ret == QDialog::Accepted && name != "") {

7
src/Gui/Perspective.cpp
View File

@@ -1743,8 +1743,8 @@ ImportChartDialog::cancelClicked()
accept(); accept();
} }
AddPerspectiveDialog::AddPerspectiveDialog(Context *context, QString &name, QString &expression, int type, bool edit) : AddPerspectiveDialog::AddPerspectiveDialog(QWidget *parent, Context *context, QString &name, QString &expression, int type, bool edit) :
context(context), name(name), expression(expression), type(type) QDialog(parent), context(context), name(name), expression(expression), type(type)
{ {
setWindowFlags(windowFlags()); setWindowFlags(windowFlags());
if (edit) setWindowTitle(tr("Edit Perspective")); if (edit) setWindowTitle(tr("Edit Perspective"));
@@ -1780,9 +1780,6 @@ AddPerspectiveDialog::AddPerspectiveDialog(Context *context, QString &name, QStr
connect(add, SIGNAL(clicked()), this, SLOT(addClicked())); connect(add, SIGNAL(clicked()), this, SLOT(addClicked()));
connect(cancel, SIGNAL(clicked()), this, SLOT(cancelClicked())); connect(cancel, SIGNAL(clicked()), this, SLOT(cancelClicked()));
// want on top
raise();
} }
void void

2
src/Gui/Perspective.h
View File

@@ -242,7 +242,7 @@ class AddPerspectiveDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
AddPerspectiveDialog(Context *context, QString &name, QString &expression, int type, bool edit=false); AddPerspectiveDialog(QWidget *parent, Context *context, QString &name, QString &expression, int type, bool edit=false);
protected: protected:
QLineEdit *nameEdit; QLineEdit *nameEdit;

4
src/Gui/PerspectiveDialog.cpp
View File

@@ -233,7 +233,7 @@ PerspectiveDialog::editPerspectiveClicked()
Perspective *editing = tabView->perspectives_[index]; Perspective *editing = tabView->perspectives_[index];
QString expression=editing->expression(); QString expression=editing->expression();
AddPerspectiveDialog *dialog= new AddPerspectiveDialog(tabView->context, editing->title_, expression, tabView->type, true); AddPerspectiveDialog *dialog= new AddPerspectiveDialog(this, tabView->context, editing->title_, expression, tabView->type, true);
int ret= dialog->exec(); int ret= dialog->exec();
delete dialog; delete dialog;
if (ret == QDialog::Accepted) { if (ret == QDialog::Accepted) {
@@ -249,7 +249,7 @@ PerspectiveDialog::addPerspectiveClicked()
{ {
QString name; QString name;
QString expression; QString expression;
AddPerspectiveDialog *dialog= new AddPerspectiveDialog(tabView->context, name, expression, tabView->type); AddPerspectiveDialog *dialog= new AddPerspectiveDialog(this, tabView->context, name, expression, tabView->type);
int ret= dialog->exec(); int ret= dialog->exec();
delete dialog; delete dialog;
if (ret == QDialog::Accepted && name != "") { if (ret == QDialog::Accepted && name != "") {