iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move custom 'exec' into dialog - required for overlay scrollbars

Browse Source
This commit is contained in:
craig.p.drummond
2013-03-14 19:31:01 +00:00
committed by craig.p.drummond
parent 72e847ea28
commit 4c01b70835
3 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
support/dialog.cpp
View File

@@ -22,6 +22,24 @@
*/
#include "dialog.h"
#ifdef ENABLE_OVERLAYSCROLLBARS
int Dialog::exec()
{
QWidget *win=parentWidget() ? parentWidget()->window() : 0;
bool wasGl=win ? win->testAttribute(Qt::WA_GroupLeader) : false;
if (win && !wasGl) {
win->setAttribute(Qt::WA_GroupLeader, true);
}
int rv=QDialog::exec();
if (win && !wasGl) {
win->setAttribute(Qt::WA_GroupLeader, false);
}
return rv;
}
#endif
#ifndef ENABLE_KDE_SUPPORT
#include "icon.h"
#include <QDialogButtonBox>
#include <QPushButton>
@@ -211,3 +229,4 @@ QAbstractButton *Dialog::getButton(ButtonCode button)
}
return b;
}
#endif

14
support/dialog.h
View File

@@ -24,13 +24,23 @@
#ifndef DIALOG_H
#define DIALOG_H
#include "config.h"
#ifdef ENABLE_KDE_SUPPORT
#include <KDE/KDialog>
#ifdef ENABLE_OVERLAYSCROLLBARS
struct Dialog : public KDialog {
Dialog(QWidget *parent) : KDialog(parent) { }
int exec();
};
#else
typedef KDialog Dialog;
#endif
typedef KGuiItem GuiItem;
#else
#include <QDialog>
#include <QMap>
#include <QDebug>
struct GuiItem {
GuiItem(const QString &t=QString(), const QString &i=QString())
@@ -100,6 +110,10 @@ public:
return mw;
}
#ifdef ENABLE_OVERLAYSCROLLBARS
int exec();
#endif
private Q_SLOTS:
void buttonPressed(QAbstractButton *button);

9
support/messagebox.cpp
View File

@@ -25,6 +25,7 @@
#include "icon.h"
#include "dialog.h"
#include "localize.h"
#include "config.h"
#include <QGridLayout>
#include <QLabel>
#include <QListWidget>
@@ -94,13 +95,5 @@ void MessageBox::errorListEx(QWidget *parent, const QString &message, const QStr
lay->addWidget(list, 1, 0, 1, 2);
list->insertItems(0, strlist);
dlg->setMainWidget(wid);
QWidget *win=parent ? parent->window() : 0;
bool wasGl=win ? win->testAttribute(Qt::WA_GroupLeader) : false;
if (win && !wasGl) {
win->setAttribute(Qt::WA_GroupLeader, true);
}
dlg->exec();
if (win && !wasGl) {
win->setAttribute(Qt::WA_GroupLeader, false);
}
}