mirror of
https://github.com/fralx/LimeReport.git
synced 2025-11-25 08:28:06 +03:00
Finish 1.4.86
# Conflicts: # include/lrpreviewreportwidget.h # include/lrreportengine.h # limereport/lrpreviewreportwidget.cpp # limereport/lrpreviewreportwidget.h # limereport/lrreportengine.cpp # limereport/lrreportengine.h # limereport/lrreportengine_p.h
This commit is contained in:
@@ -255,7 +255,22 @@ void PreviewReportWindow::showEvent(QShowEvent *)
|
||||
{
|
||||
m_fontEditor->setVisible(ui->actionEdit_Mode->isChecked());
|
||||
m_textAlignmentEditor->setVisible(ui->actionEdit_Mode->isChecked());
|
||||
switch (m_previewScaleType) {
|
||||
case FitWidth:
|
||||
m_previewReportWidget->fitWidth();
|
||||
break;
|
||||
case FitPage:
|
||||
m_previewReportWidget->fitPage();
|
||||
break;
|
||||
case OneToOne:
|
||||
m_previewReportWidget->setScalePercent(100);
|
||||
break;
|
||||
case Percents:
|
||||
m_previewReportWidget->setScalePercent(m_previewScalePercent);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
void PreviewReportWindow::selectStateIcon()
|
||||
{
|
||||
if (ui->toolBar->isHidden()){
|
||||
@@ -335,6 +350,18 @@ void PreviewReportWindow::initPercentCombobox()
|
||||
m_scalePercent->setCurrentIndex(4);
|
||||
}
|
||||
|
||||
ScaleType PreviewReportWindow::previewScaleType() const
|
||||
{
|
||||
return m_previewScaleType;
|
||||
}
|
||||
|
||||
void PreviewReportWindow::setPreviewScaleType(const ScaleType &previewScaleType, int percent)
|
||||
{
|
||||
m_previewScaleType = previewScaleType;
|
||||
m_previewScalePercent = percent;
|
||||
m_previewReportWidget->setScaleType(previewScaleType, percent);
|
||||
}
|
||||
|
||||
void PreviewReportWindow::on_actionSaveToFile_triggered()
|
||||
{
|
||||
m_previewReportWidget->saveToFile();
|
||||
|
||||
Reference in New Issue
Block a user