mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2024-12-23 20:22:58 +03:00
Some service signals have been renamed.
This commit is contained in:
parent
9f00119fbc
commit
693e45d6d7
@ -38,13 +38,13 @@ int main(int argc, char *argv[])
|
|||||||
if (a.arguments().count()>1){
|
if (a.arguments().count()>1){
|
||||||
report.loadFromFile(a.arguments().at(1));
|
report.loadFromFile(a.arguments().at(1));
|
||||||
}
|
}
|
||||||
QObject::connect(&report, SIGNAL(getAvailableLanguages(QList<QLocale::Language>*)),
|
QObject::connect(&report, SIGNAL(getAvailableDesignerLanguages(QList<QLocale::Language>*)),
|
||||||
&manager, SLOT(getAvailableLanguages(QList<QLocale::Language>*)));
|
&manager, SLOT(getAvailableLanguages(QList<QLocale::Language>*)));
|
||||||
|
|
||||||
QObject::connect(&report, SIGNAL(getCurrentDefaultLanguage()),
|
QObject::connect(&report, SIGNAL(getCurrentDefaultDesignerLanguage()),
|
||||||
&manager, SLOT(getCurrentDefaultLanguage()));
|
&manager, SLOT(getCurrentDefaultLanguage()));
|
||||||
|
|
||||||
QObject::connect(&report, SIGNAL(currentDefaultLanguageChanged(QLocale::Language)),
|
QObject::connect(&report, SIGNAL(currentDefaultDesignerLanguageChanged(QLocale::Language)),
|
||||||
&manager, SLOT(currentDefaultLanguageChanged(QLocale::Language)));
|
&manager, SLOT(currentDefaultLanguageChanged(QLocale::Language)));
|
||||||
|
|
||||||
report.designReport();
|
report.designReport();
|
||||||
|
@ -220,9 +220,9 @@ signals:
|
|||||||
void loadFinished();
|
void loadFinished();
|
||||||
void printedToPDF(QString fileName);
|
void printedToPDF(QString fileName);
|
||||||
|
|
||||||
void getAvailableLanguages(QList<QLocale::Language>* languages);
|
void getAvailableDesignerLanguages(QList<QLocale::Language>* languages);
|
||||||
void currentDefaultLanguageChanged(QLocale::Language);
|
void currentDefaultDesignerLanguageChanged(QLocale::Language);
|
||||||
QLocale::Language getCurrentDefaultLanguage();
|
QLocale::Language getCurrentDefaultDesignerLanguage();
|
||||||
|
|
||||||
void externalPaint(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem*);
|
void externalPaint(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem*);
|
||||||
|
|
||||||
|
@ -1080,20 +1080,20 @@ QList<QLocale::Language> ReportEnginePrivate::designerLanguages()
|
|||||||
{
|
{
|
||||||
|
|
||||||
QList<QLocale::Language> result;
|
QList<QLocale::Language> result;
|
||||||
emit getAvailableLanguages(&result);
|
emit getAvailableDesignerLanguages(&result);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
QLocale::Language ReportEnginePrivate::currentDesignerLanguage()
|
QLocale::Language ReportEnginePrivate::currentDesignerLanguage()
|
||||||
{
|
{
|
||||||
QLocale::Language result = emit getCurrentDefaultLanguage();
|
QLocale::Language result = emit getCurrentDefaultDesignerLanguage();
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ReportEnginePrivate::setCurrentDesignerLanguage(QLocale::Language language)
|
void ReportEnginePrivate::setCurrentDesignerLanguage(QLocale::Language language)
|
||||||
{
|
{
|
||||||
m_currentDesignerLanguage = language;
|
m_currentDesignerLanguage = language;
|
||||||
emit currentDefaultLanguageChanged(language);
|
emit currentDefaultDesignerLanguageChanged(language);
|
||||||
}
|
}
|
||||||
|
|
||||||
QString ReportEnginePrivate::styleSheet() const
|
QString ReportEnginePrivate::styleSheet() const
|
||||||
@ -1387,12 +1387,12 @@ ReportEngine::ReportEngine(QObject *parent)
|
|||||||
connect(d, SIGNAL(cleared()), this, SIGNAL(cleared()));
|
connect(d, SIGNAL(cleared()), this, SIGNAL(cleared()));
|
||||||
connect(d, SIGNAL(printedToPDF(QString)), this, SIGNAL(printedToPDF(QString)));
|
connect(d, SIGNAL(printedToPDF(QString)), this, SIGNAL(printedToPDF(QString)));
|
||||||
|
|
||||||
connect(d, SIGNAL(getAvailableLanguages(QList<QLocale::Language>*)),
|
connect(d, SIGNAL(getAvailableDesignerLanguages(QList<QLocale::Language>*)),
|
||||||
this, SIGNAL(getAvailableLanguages(QList<QLocale::Language>*)));
|
this, SIGNAL(getAvailableDesignerLanguages(QList<QLocale::Language>*)));
|
||||||
connect(d, SIGNAL(currentDefaultLanguageChanged(QLocale::Language)),
|
connect(d, SIGNAL(currentDefaultDesignerLanguageChanged(QLocale::Language)),
|
||||||
this, SIGNAL(currentDefaultLanguageChanged(QLocale::Language)));
|
this, SIGNAL(currentDefaultDesignerLanguageChanged(QLocale::Language)));
|
||||||
connect(d, SIGNAL(getCurrentDefaultLanguage()),
|
connect(d, SIGNAL(getCurrentDefaultDesignerLanguage()),
|
||||||
this, SIGNAL(getCurrentDefaultLanguage()));
|
this, SIGNAL(getCurrentDefaultDesignerLanguage()));
|
||||||
|
|
||||||
connect(d, SIGNAL(externalPaint(const QString&, QPainter*, const QStyleOptionGraphicsItem*)),
|
connect(d, SIGNAL(externalPaint(const QString&, QPainter*, const QStyleOptionGraphicsItem*)),
|
||||||
this, SIGNAL(externalPaint(const QString&, QPainter*, const QStyleOptionGraphicsItem*)));
|
this, SIGNAL(externalPaint(const QString&, QPainter*, const QStyleOptionGraphicsItem*)));
|
||||||
|
@ -220,9 +220,9 @@ signals:
|
|||||||
void loadFinished();
|
void loadFinished();
|
||||||
void printedToPDF(QString fileName);
|
void printedToPDF(QString fileName);
|
||||||
|
|
||||||
void getAvailableLanguages(QList<QLocale::Language>* languages);
|
void getAvailableDesignerLanguages(QList<QLocale::Language>* languages);
|
||||||
void currentDefaultLanguageChanged(QLocale::Language);
|
void currentDefaultDesignerLanguageChanged(QLocale::Language);
|
||||||
QLocale::Language getCurrentDefaultLanguage();
|
QLocale::Language getCurrentDefaultDesignerLanguage();
|
||||||
|
|
||||||
void externalPaint(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem*);
|
void externalPaint(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem*);
|
||||||
|
|
||||||
|
@ -263,9 +263,9 @@ signals:
|
|||||||
void loadFinished();
|
void loadFinished();
|
||||||
void printedToPDF(QString fileName);
|
void printedToPDF(QString fileName);
|
||||||
|
|
||||||
void getAvailableLanguages(QList<QLocale::Language>* languages);
|
void getAvailableDesignerLanguages(QList<QLocale::Language>* languages);
|
||||||
void currentDefaultLanguageChanged(QLocale::Language);
|
void currentDefaultDesignerLanguageChanged(QLocale::Language);
|
||||||
QLocale::Language getCurrentDefaultLanguage();
|
QLocale::Language getCurrentDefaultDesignerLanguage();
|
||||||
void externalPaint(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem*);
|
void externalPaint(const QString& objectName, QPainter* painter, const QStyleOptionGraphicsItem*);
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
Loading…
Reference in New Issue
Block a user