mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-07 13:23:59 +03:00
Code Activity

1.1.1

Browse Source
This commit is contained in:
Sergey Popovichev
2016-02-17 10:18:19 +03:00
parent 1e8f2f79c7
commit 81d855f52c
59 changed files with 1180 additions and 1647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/databrowser/lrdatabrowser.cpp
View File

@@ -83,10 +83,10 @@ void DataBrowser::slotAddConnection()
{
ConnectionDialog *connectionEdit = new ConnectionDialog(this,0,this);
connectionEdit->setAttribute(Qt::WA_DeleteOnClose,true);
#if defined(WIN32) || defined(WIN64)
connectionEdit->setWindowModality(Qt::ApplicationModal);
#else
#ifdef Q_OS_MAC
connectionEdit->setWindowModality(Qt::WindowModal);
#else
connectionEdit->setWindowModality(Qt::ApplicationModal);
#endif
//connect(connectionEdit,SIGNAL(finished(int)),this,SLOT(slotConnectionEditFinished(int)));
//connect(connectionEdit,SIGNAL(conectionRegistred(QString)),this,SLOT(slotConnectionRegistred(QString)));
@@ -146,10 +146,10 @@ void DataBrowser::slotAddDataSource()
{
SQLEditDialog *sqlEdit = new SQLEditDialog(this,m_report->dataManager(),SQLEditDialog::AddMode);
sqlEdit->setAttribute(Qt::WA_DeleteOnClose,true);
#if defined(WIN64) || defined(WIN32)
sqlEdit->setWindowModality(Qt::ApplicationModal);
#else
#ifdef Q_OS_MAC
sqlEdit->setWindowModality(Qt::WindowModal);
#else
sqlEdit->setWindowModality(Qt::ApplicationModal);
#endif
sqlEdit->setSettings(settings());
sqlEdit->setDataSources(m_report->dataManager());
@@ -345,10 +345,10 @@ void DataBrowser::slotEditDatasource()
closeDataWindow(getDatasourceName());
SQLEditDialog *sqlEdit = new SQLEditDialog(this,m_report->dataManager(),SQLEditDialog::EditMode);
sqlEdit->setAttribute(Qt::WA_DeleteOnClose);
#if defined(WIN32) || defined(WIN64)
sqlEdit->setWindowModality(Qt::ApplicationModal);
#else
#ifdef Q_OS_MAC
sqlEdit->setWindowModality(Qt::WindowModal);
#else
sqlEdit->setWindowModality(Qt::ApplicationModal);
#endif
sqlEdit->setSettings(settings());
sqlEdit->setDataSources(m_report->dataManager(),getDatasourceName());
@@ -467,10 +467,10 @@ void DataBrowser::slotChangeConnection()
this
);
connectionEdit->setAttribute(Qt::WA_DeleteOnClose,true);
#if defined(WIN32) || defined(WIN64)
connectionEdit->setWindowModality(Qt::ApplicationModal);
#else
#ifdef Q_OS_MAC
connectionEdit->setWindowModality(Qt::WindowModal);
#else
connectionEdit->setWindowModality(Qt::ApplicationModal);
#endif
//connect(connectionEdit,SIGNAL(finished(int)),this,SLOT(slotConnectionEditFinished(int)));
connectionEdit->exec();
@@ -632,10 +632,10 @@ void DataBrowser::on_dataTree_currentItemChanged(QTreeWidgetItem *current, QTree
void LimeReport::DataBrowser::on_addVariable_clicked()
{
LRVariableDialog dialog(this);
#if defined(WIN32) || defined(WIN64)
dialog.setWindowModality(Qt::ApplicationModal);
#else
#ifdef Q_OS_MAC
dialog.setWindowModality(Qt::WindowModal);
#else
dialog.setWindowModality(Qt::ApplicationModal);
#endif
dialog.setVariableContainer(m_report->dataManager());
connect(&dialog,SIGNAL(signalVariableAccepted(QString)),this,SLOT(slotVariableEditorAccept(QString)));
@@ -648,10 +648,10 @@ void DataBrowser::on_editVariable_clicked()
if (!getVariable().isEmpty())
{
LRVariableDialog dialog(this);
#if defined(WIN32) || defined(WIN64)
dialog.setWindowModality(Qt::ApplicationModal);
#else
#ifdef Q_OS_MAC
dialog.setWindowModality(Qt::WindowModal);
#else
dialog.setWindowModality(Qt::ApplicationModal);
#endif
dialog.setVariableContainer(m_report->dataManager());
QString varName = getVariable();