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

Signals renaming fixed

Browse Source
This commit is contained in:
Arin Alexander
2018-05-31 18:49:57 +03:00
parent 8d8bea869e
commit 353712864a
7 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
limereport/scriptbrowser/lrscriptbrowser.cpp
View File

@@ -54,13 +54,13 @@ ScriptBrowser::~ScriptBrowser()
delete ui;
}
void ScriptBrowser::setReportEditor(ReportDesignWidget* report)
void ScriptBrowser::setReportEditor(ReportDesignWidget* designerWidget)
{
m_report=report;
connect(m_report,SIGNAL(cleared()),this,SLOT(slotClear()));
connect(m_report,SIGNAL(loaded()),this,SLOT(slotUpdate()));
m_designerWidget=designerWidget;
connect(m_designerWidget,SIGNAL(cleared()),this,SLOT(slotClear()));
connect(m_designerWidget,SIGNAL(loadFinished()),this,SLOT(slotUpdate()));
#ifdef HAVE_UI_LOADER
connect(m_report->scriptContext(), SIGNAL(dialogAdded(QString)), this, SLOT(slotDialogAdded(QString)));
connect(m_designerWidget->scriptContext(), SIGNAL(dialogAdded(QString)), this, SLOT(slotDialogAdded(QString)));
#endif
updateFunctionTree();
}
@@ -163,9 +163,9 @@ void ScriptBrowser::on_tbAddDialog_clicked()
QWidget* widget = loader.load(&file);
QDialog* dialog = dynamic_cast<QDialog*>(widget);
if (dialog){
if (!m_report->scriptContext()->containsDialog(dialog->objectName())){
if (!m_designerWidget->scriptContext()->containsDialog(dialog->objectName())){
file.seek(0);
m_report->scriptContext()->addDialog(dialog->objectName(),file.readAll());
m_designerWidget->scriptContext()->addDialog(dialog->objectName(),file.readAll());
//updateDialogsTree();
} else {
QMessageBox::critical(this,tr("Error"),tr("Dialog with name: %1 already exists").arg(dialog->objectName()));
@@ -186,14 +186,14 @@ void ScriptBrowser::on_tbAddDialog_clicked()
void ScriptBrowser::on_tbRunDialog_clicked()
{
if (ui->twDialogs->currentItem()&& ui->twDialogs->currentItem()->parent()==0){
m_report->scriptContext()->previewDialog(ui->twDialogs->currentItem()->text(0));
m_designerWidget->scriptContext()->previewDialog(ui->twDialogs->currentItem()->text(0));
}
}
void ScriptBrowser::on_tbDeleteDialog_clicked()
{
if (ui->twDialogs->currentItem()&& ui->twDialogs->currentItem()->parent()==0){
m_report->scriptContext()->deleteDialog(ui->twDialogs->currentItem()->text(0));
m_designerWidget->scriptContext()->deleteDialog(ui->twDialogs->currentItem()->text(0));
updateDialogsTree();
}
}

6
limereport/scriptbrowser/lrscriptbrowser.h
View File

@@ -48,8 +48,8 @@ class ScriptBrowser : public QWidget
public:
explicit ScriptBrowser(QWidget *parent = 0);
~ScriptBrowser();
void setReportEditor(LimeReport::ReportDesignWidget* report);
inline ReportDesignWidget* reportEditor(){return m_report;}
void setReportEditor(LimeReport::ReportDesignWidget* designerWidget);
inline ReportDesignWidget* reportEditor(){return m_designerWidget;}
void updateFunctionTree();
#ifdef HAVE_UI_LOADER
void updateDialogsTree();
@@ -71,7 +71,7 @@ private slots:
private:
Ui::ScriptBrowser *ui;
ReportDesignWidget* m_report;
ReportDesignWidget* m_designerWidget;
};
} // namespace LimeReport