mirror of
https://github.com/fralx/LimeReport.git
synced 2025-04-01 07:03:43 +03:00
fix settings option
This commit is contained in:
parent
af8e44cd83
commit
de4b6861aa
@ -99,7 +99,7 @@ ReportDesignWidget::ReportDesignWidget(ReportEnginePrivateInterface* report, QSe
|
||||
m_zoomer = new GraphicsViewZoomer(activeView());
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
m_defaultFont = QFont("Arial",10);
|
||||
m_defaultFont = QFont("Arial",20);
|
||||
#else
|
||||
m_defaultFont = qApp->font();
|
||||
m_defaultFont.setPointSize(m_defaultFont.pointSize()*0.7);
|
||||
|
@ -850,7 +850,7 @@ void ReportDesignWindow::addRecentFile(const QString &fileName)
|
||||
|
||||
void ReportDesignWindow::restoreSetting()
|
||||
{
|
||||
qDebug() << "limereport restoreSetting" << m_ownedSettings;
|
||||
qDebug() << "limereport restoreSetting" << settings()->fileName();
|
||||
settings()->beginGroup("DesignerWindow");
|
||||
QVariant v = settings()->value("Geometry");
|
||||
if (v.isValid()){
|
||||
@ -994,7 +994,7 @@ QSettings*ReportDesignWindow::settings()
|
||||
|
||||
void ReportDesignWindow::saveSettings()
|
||||
{
|
||||
qDebug() << "limereport saveSettings" << m_ownedSettings;
|
||||
qDebug() << "limereport saveSettings" << settings()->fileName();
|
||||
writeState();
|
||||
}
|
||||
|
||||
|
@ -78,8 +78,6 @@
|
||||
|
||||
namespace LimeReport{
|
||||
|
||||
QSettings* ReportEngine::m_settings = 0;
|
||||
|
||||
ReportEnginePrivate::ReportEnginePrivate(QObject *parent) :
|
||||
QObject(parent), m_preparedPagesManager(new PreparedPages(&m_preparedPages)), m_fileName(""), m_settings(0), m_ownedSettings(false),
|
||||
m_printer(new QPrinter(QPrinter::HighResolution)), m_printerSelected(false),
|
||||
@ -1500,12 +1498,16 @@ void ReportEngine::designReport()
|
||||
ReportDesignWindowInterface* ReportEngine::getDesignerWindow()
|
||||
{
|
||||
Q_D(ReportEngine);
|
||||
if (m_settings)
|
||||
d->setSettings(m_settings);
|
||||
return d->getDesignerWindow();
|
||||
}
|
||||
|
||||
PreviewReportWidget* ReportEngine::createPreviewWidget(QWidget *parent)
|
||||
{
|
||||
Q_D(ReportEngine);
|
||||
if (m_settings)
|
||||
d->setSettings(m_settings);
|
||||
return d->createPreviewWidget(parent);
|
||||
}
|
||||
|
||||
|
@ -148,7 +148,7 @@ class LIMEREPORT_EXPORT ReportEngine : public QObject{
|
||||
friend class PreviewReportWidget;
|
||||
friend class TranslationEditor;
|
||||
public:
|
||||
static void setSettings(QSettings *value){m_settings=value;}
|
||||
void setSettings(QSettings *value){m_settings=value;}
|
||||
public:
|
||||
explicit ReportEngine(QObject *parent = 0);
|
||||
~ReportEngine();
|
||||
@ -243,7 +243,7 @@ protected:
|
||||
ReportEngine(ReportEnginePrivate &dd, QObject * parent=0);
|
||||
private:
|
||||
Q_DECLARE_PRIVATE(ReportEngine)
|
||||
static QSettings* m_settings;
|
||||
QSettings* m_settings;
|
||||
bool m_showDesignerModal;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user