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.2.1

Browse Source
This commit is contained in:
Sergey Popovichev
2016-02-17 10:19:50 +03:00
parent 81d855f52c
commit 0a16bed249
55 changed files with 906 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/databrowser/lrdatabrowser.cpp
View File

@@ -192,7 +192,7 @@ void DataBrowser::updateDataTree()
} else item->setIcon(0,QIcon(":/databrowser/images/table_error"));
} catch(ReportError& exception) {
} catch(ReportError& /*exception*/) {
item->setIcon(0,QIcon(":/databrowser/images/table_error"));
//qDebug()<<exception.what();
}
@@ -414,6 +414,8 @@ QDockWidget *DataBrowser::createDataWindow(QString datasourceName)
//TODO: exception or message ?
try {
IDataSourceHolder* holder = m_report->dataManager()->dataSourceHolder(datasourceName);
if (holder) holder->update();
IDataSource* datasource = m_report->dataManager()->dataSource(datasourceName);
if (datasource){
tableView->setModel(datasource->model());
@@ -594,6 +596,7 @@ void DataBrowser::addConnectionDesc(ConnectionDesc *connection)
void DataBrowser::changeConnectionDesc(ConnectionDesc *connection)
{
Q_UNUSED(connection)
if (connection->autoconnect()) m_report->dataManager()->connectConnection(connection->name());
updateDataTree();
}

4
src/databrowser/lrdatabrowsertree.cpp
View File

@@ -38,10 +38,10 @@ QMimeData *DataBrowserTree::mimeData(const QList<QTreeWidgetItem *> items) const
{
QMimeData* result = QTreeWidget::mimeData(items);
if (items.at(0)->type()==Row){
result->setText("$D{"+items.at(0)->parent()->text(0)+"."+items.at(0)->data(0,Qt::DisplayRole).toString()+"}");
result->setText("field:$D{"+items.at(0)->parent()->text(0)+"."+items.at(0)->data(0,Qt::DisplayRole).toString()+"}");
}
if (items.at(0)->type()==Variable){
result->setText("$V{"+items.at(0)->text(0)+"}");
result->setText("variable:$V{"+items.at(0)->text(0)+"}");
}
return result;
}

2
src/databrowser/lrsqleditdialog.cpp
View File

@@ -296,7 +296,7 @@ void SQLEditDialog::slotPreviewData()
QMessageBox::critical(this,tr("Attention"),tr("Connection is not specified"));
return;
}
m_previewModel = m_datasources->previewSQL(ui->cbbConnection->currentText(),ui->textEditSQL->toPlainText());
m_previewModel = m_datasources->previewSQL(ui->cbbConnection->currentText(),ui->textEditSQL->toPlainText(),ui->leMaster->text());
if (m_previewModel){
ui->tvPreview->setModel(m_previewModel.data());
ui->gbDataPreview->setVisible(true);