mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2024-12-24 00:33:02 +03:00
Code

Font editors has been fixed

Browse Source
This commit is contained in:
Arin Alexander 2018-07-11 13:29:12 +03:00
parent 449c9a47bd
commit 90ec21d2ab
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
limereport/items/editors/lrfonteditorwidget.cpp
View File

@ -158,7 +158,6 @@ void FontEditorWidgetForPage::slotFontAttribsChanged(bool value)
#ifdef HAVE_REPORT_DESIGNER
void FontEditorWidgetForDesigner::initEditor()
{
FontEditorWidget::initEditor();
connect(m_reportEditor,SIGNAL(itemPropertyChanged(QString,QString,QVariant,QVariant)),
this,SLOT(slotPropertyChanged(QString,QString,QVariant,QVariant)));
}

4
limereport/items/editors/lrfonteditorwidget.h
View File

@ -51,7 +51,7 @@ public:
protected:
void setItemEvent(BaseDesignIntf *item);
QFontComboBox* fontNameEditor(){return m_fontNameEditor;}
virtual void initEditor();
void initEditor();
protected slots:
virtual void slotFontChanged(const QFont&);
virtual void slotFontSizeChanged(const QString& value);
@ -94,7 +94,7 @@ class FontEditorWidgetForDesigner : public FontEditorWidget{
Q_OBJECT
public:
explicit FontEditorWidgetForDesigner(ReportDesignWidget* reportEditor, const QString &title, QWidget *parent = 0)
: FontEditorWidget(title, parent), m_reportEditor(reportEditor){}
: FontEditorWidget(title, parent), m_reportEditor(reportEditor){initEditor();}
protected:
void initEditor();

1
limereport/items/editors/lrtextalignmenteditorwidget.cpp
View File

@ -197,7 +197,6 @@ void TextAlignmentEditorWidgetForPage::slotTextVAttribsChanged(bool value)
#ifdef HAVE_REPORT_DESIGNER
void TextAlignmentEditorWidgetForDesigner::initEditor()
{
TextAlignmentEditorWidget::initEditor();
connect(m_reportEditor,SIGNAL(itemPropertyChanged(QString,QString,QVariant,QVariant)),
this,SLOT(slotPropertyChanged(QString,QString,QVariant,QVariant)));

4
limereport/items/editors/lrtextalignmenteditorwidget.h
View File

@ -45,7 +45,7 @@ public:
int flag() const;
protected:
void setItemEvent(BaseDesignIntf *item);
virtual void initEditor();
void initEditor();
bool m_textAttibutesIsChanging;
private:
void updateValues(const Qt::Alignment& align);
@ -84,7 +84,7 @@ class TextAlignmentEditorWidgetForDesigner: public TextAlignmentEditorWidget{
Q_OBJECT
public:
TextAlignmentEditorWidgetForDesigner(ReportDesignWidget* reportEditor, const QString &title, QWidget *parent = 0)
:TextAlignmentEditorWidget(title, parent), m_reportEditor(reportEditor){}
:TextAlignmentEditorWidget(title, parent), m_reportEditor(reportEditor){initEditor();}
protected:
void initEditor();
protected slots:

2
limereport/items/lrtextitem.cpp
View File

@ -971,7 +971,7 @@ void TextItem::setTextItemFont(QFont value)
if (font()!=value){
QFont oldValue = font();
setFont(value);
update();
if (!isLoading()) update();
notify("font",oldValue,value);
}
}

6
limereport/lrbasedesignintf.cpp
View File

@ -164,8 +164,10 @@ QFont BaseDesignIntf::font() const
void BaseDesignIntf::setFont(QFont &font)
{
m_font = font;
update();
if (m_font != font){
m_font = font;
if (!isLoading()) update();
}
}
qreal BaseDesignIntf::width() const

2
limereport/lrreportengine.cpp
View File

@ -480,7 +480,7 @@ void ReportEnginePrivate::printToFile(const QString &fileName)
bool ReportEnginePrivate::printToPDF(const QString &fileName)
{
return exportReport("PDF");
return exportReport("PDF", fileName);
}
bool ReportEnginePrivate::exportReport(QString exporterName, const QString &fileName, const QMap<QString, QVariant> &params)