mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-04-02 15:33:46 +03:00
Code

fix settings option

Browse Source
This commit is contained in:
Sanych 2024-01-15 11:46:31 +03:00
parent af8e44cd83
commit de4b6861aa
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/lrreportdesignwidget.cpp
View File

@ -99,7 +99,7 @@ ReportDesignWidget::ReportDesignWidget(ReportEnginePrivateInterface* report, QSe
m_zoomer = new GraphicsViewZoomer(activeView()); m_zoomer = new GraphicsViewZoomer(activeView());
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
m_defaultFont = QFont("Arial",10); m_defaultFont = QFont("Arial",20);
#else #else
m_defaultFont = qApp->font(); m_defaultFont = qApp->font();
m_defaultFont.setPointSize(m_defaultFont.pointSize()*0.7); m_defaultFont.setPointSize(m_defaultFont.pointSize()*0.7);

4
limereport/lrreportdesignwindow.cpp
View File

@ -850,7 +850,7 @@ void ReportDesignWindow::addRecentFile(const QString &fileName)
void ReportDesignWindow::restoreSetting() void ReportDesignWindow::restoreSetting()
{ {
qDebug() << "limereport restoreSetting" << m_ownedSettings; qDebug() << "limereport restoreSetting" << settings()->fileName();
settings()->beginGroup("DesignerWindow"); settings()->beginGroup("DesignerWindow");
QVariant v = settings()->value("Geometry"); QVariant v = settings()->value("Geometry");
if (v.isValid()){ if (v.isValid()){
@ -994,7 +994,7 @@ QSettings*ReportDesignWindow::settings()
void ReportDesignWindow::saveSettings() void ReportDesignWindow::saveSettings()
{ {
qDebug() << "limereport saveSettings" << m_ownedSettings; qDebug() << "limereport saveSettings" << settings()->fileName();
writeState(); writeState();
} }

6
limereport/lrreportengine.cpp
View File

@ -78,8 +78,6 @@
namespace LimeReport{ namespace LimeReport{
QSettings* ReportEngine::m_settings = 0;
ReportEnginePrivate::ReportEnginePrivate(QObject *parent) : ReportEnginePrivate::ReportEnginePrivate(QObject *parent) :
QObject(parent), m_preparedPagesManager(new PreparedPages(&m_preparedPages)), m_fileName(""), m_settings(0), m_ownedSettings(false), 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), m_printer(new QPrinter(QPrinter::HighResolution)), m_printerSelected(false),
@ -1500,12 +1498,16 @@ void ReportEngine::designReport()
ReportDesignWindowInterface* ReportEngine::getDesignerWindow() ReportDesignWindowInterface* ReportEngine::getDesignerWindow()
{ {
Q_D(ReportEngine); Q_D(ReportEngine);
if (m_settings)
d->setSettings(m_settings);
return d->getDesignerWindow(); return d->getDesignerWindow();
} }
PreviewReportWidget* ReportEngine::createPreviewWidget(QWidget *parent) PreviewReportWidget* ReportEngine::createPreviewWidget(QWidget *parent)
{ {
Q_D(ReportEngine); Q_D(ReportEngine);
if (m_settings)
d->setSettings(m_settings);
return d->createPreviewWidget(parent); return d->createPreviewWidget(parent);
} }

4
limereport/lrreportengine.h
View File

@ -148,7 +148,7 @@ class LIMEREPORT_EXPORT ReportEngine : public QObject{
friend class PreviewReportWidget; friend class PreviewReportWidget;
friend class TranslationEditor; friend class TranslationEditor;
public: public:
static void setSettings(QSettings *value){m_settings=value;} void setSettings(QSettings *value){m_settings=value;}
public: public:
explicit ReportEngine(QObject *parent = 0); explicit ReportEngine(QObject *parent = 0);
~ReportEngine(); ~ReportEngine();
@ -243,7 +243,7 @@ protected:
ReportEngine(ReportEnginePrivate &dd, QObject * parent=0); ReportEngine(ReportEnginePrivate &dd, QObject * parent=0);
private: private:
Q_DECLARE_PRIVATE(ReportEngine) Q_DECLARE_PRIVATE(ReportEngine)
static QSettings* m_settings; QSettings* m_settings;
bool m_showDesignerModal; bool m_showDesignerModal;
}; };