mirror of
https://github.com/python-LimeReport/LimeReport.git
synced 2024-12-24 12:34:39 +03:00
Font editors has been fixed
This commit is contained in:
parent
449c9a47bd
commit
90ec21d2ab
@ -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)));
|
||||
}
|
||||
|
@ -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();
|
||||
|
@ -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)));
|
||||
|
||||
|
@ -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:
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
@ -164,8 +164,10 @@ QFont BaseDesignIntf::font() const
|
||||
|
||||
void BaseDesignIntf::setFont(QFont &font)
|
||||
{
|
||||
if (m_font != font){
|
||||
m_font = font;
|
||||
update();
|
||||
if (!isLoading()) update();
|
||||
}
|
||||
}
|
||||
|
||||
qreal BaseDesignIntf::width() const
|
||||
|
@ -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> ¶ms)
|
||||
|
Loading…
Reference in New Issue
Block a user