python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2024-12-24 12:34:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

All settings are merged in one place

Browse Source
This commit is contained in:
Arin Alexander 2019-01-29 23:18:24 +03:00
parent 91a1798bf0
commit b81de4680c
15 changed files with 393 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/lrglobal.h
View File

@ -95,6 +95,7 @@ namespace Const{
const int SCENE_MARGIN = 50; const int SCENE_MARGIN = 50;
const QString FUNCTION_MANAGER_NAME = "LimeReport"; const QString FUNCTION_MANAGER_NAME = "LimeReport";
const QString EOW("~!@#$%^&*()+{}|:\"<>?,/;'[]\\-="); const QString EOW("~!@#$%^&*()+{}|:\"<>?,/;'[]\\-=");
const int DEFAULT_TAB_INDENTION = 4;
} }
QString extractClassName(QString className); QString extractClassName(QString className);

45
limereport/items/lrtextitemeditor.cpp
View File

@ -118,8 +118,6 @@ void TextItemEditor::initUI()
{ {
QStringList dataWords; QStringList dataWords;
ui->toolButton->setChecked(false);
ui->gbSettings->setVisible(false);
LimeReport::DataSourceManager* dm = m_page->datasourceManager(); LimeReport::DataSourceManager* dm = m_page->datasourceManager();
LimeReport::ScriptEngineManager& se = LimeReport::ScriptEngineManager::instance(); LimeReport::ScriptEngineManager& se = LimeReport::ScriptEngineManager::instance();
se.setDataManager(dm); se.setDataManager(dm);
@ -152,13 +150,19 @@ void TextItemEditor::readSetting()
if (v.isValid()){ if (v.isValid()){
ui->codeEditor->restoreState(v.toByteArray()); ui->codeEditor->restoreState(v.toByteArray());
} }
settings()->endGroup();
QVariant fontName = settings()->value("FontName"); settings()->beginGroup("ScriptEditor");
QVariant fontName = settings()->value("DefaultFontName");
if (fontName.isValid()){ if (fontName.isValid()){
QVariant fontSize = settings()->value("FontSize"); QVariant fontSize = settings()->value("DefaultFontSize");
ui->codeEditor->setEditorFont(QFont(fontName.toString(),fontSize.toInt())); ui->codeEditor->setEditorFont(QFont(fontName.toString(),fontSize.toInt()));
ui->editorFont->setCurrentFont(ui->codeEditor->editorFont()); }
ui->editorFontSize->setValue(fontSize.toInt());
QVariant tabIndention = settings()->value("TabIndention");
if (tabIndention.isValid()){
ui->codeEditor->setTabIndention(tabIndention.toInt());
} else {
ui->codeEditor->setTabIndention(LimeReport::Const::DEFAULT_TAB_INDENTION);
} }
settings()->endGroup(); settings()->endGroup();
@ -175,33 +179,6 @@ void TextItemEditor::writeSetting()
} }
} }
void TextItemEditor::on_editorFont_currentFontChanged(const QFont &f)
{
if (m_isReadingSetting) return;
QFont tmp = f;
tmp.setPointSize(ui->editorFontSize->value());
ui->codeEditor->setEditorFont(tmp);
settings()->beginGroup("TextItemEditor");
settings()->setValue("FontName",ui->codeEditor->editorFont().family());
settings()->setValue("FontSize",ui->editorFontSize->value());
settings()->endGroup();
}
void TextItemEditor::on_editorFontSize_valueChanged(int arg1)
{
if (m_isReadingSetting) return;
ui->codeEditor->setEditorFont(QFont(ui->codeEditor->editorFont().family(),arg1));
settings()->beginGroup("TextItemEditor");
settings()->setValue("FontName",ui->codeEditor->editorFont().family());
settings()->setValue("FontSize",ui->editorFontSize->value());
settings()->endGroup();
}
void TextItemEditor::on_toolButton_clicked(bool checked)
{
ui->gbSettings->setVisible(checked);
}
void TextItemEditor::slotSplitterMoved(int, int) void TextItemEditor::slotSplitterMoved(int, int)
{ {
writeSetting(); writeSetting();

5
limereport/items/lrtextitemeditor.h
View File

@ -69,7 +69,7 @@ public:
QSettings* settings=0, QWidget *parent = 0); QSettings* settings=0, QWidget *parent = 0);
~TextItemEditor(); ~TextItemEditor();
void setSettings(QSettings* value); void setSettings(QSettings* value);
QSettings* settings(); QSettings* settings();
protected: protected:
void resizeEvent(QResizeEvent *); void resizeEvent(QResizeEvent *);
void moveEvent(QMoveEvent *); void moveEvent(QMoveEvent *);
@ -78,9 +78,6 @@ protected:
private slots: private slots:
void on_pbOk_clicked(); void on_pbOk_clicked();
void on_pbCancel_clicked(); void on_pbCancel_clicked();
void on_editorFont_currentFontChanged(const QFont &f);
void on_editorFontSize_valueChanged(int arg1);
void on_toolButton_clicked(bool checked);
void slotSplitterMoved(int, int); void slotSplitterMoved(int, int);
private: private:
void initUI(); void initUI();

67
limereport/items/lrtextitemeditor.ui
View File

@ -17,7 +17,7 @@
<string>Text Item Editor</string> <string>Text Item Editor</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset> <iconset resource="items.qrc">
<normaloff>:/items/images/insert-text_3.png</normaloff>:/items/images/insert-text_3.png</iconset> <normaloff>:/items/images/insert-text_3.png</normaloff>:/items/images/insert-text_3.png</iconset>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
@ -58,68 +58,8 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="gbSettings">
<property name="title">
<string>Editor settings</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Editor font</string>
</property>
</widget>
</item>
<item>
<widget class="QFontComboBox" name="editorFont"/>
</item>
<item>
<widget class="QSpinBox" name="editorFontSize">
<property name="value">
<number>11</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QToolButton" name="toolButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset>
<normaloff>:/items/images/settings.png</normaloff>:/items/images/settings.png</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
@ -169,6 +109,9 @@
<tabstop>pbOk</tabstop> <tabstop>pbOk</tabstop>
<tabstop>pbCancel</tabstop> <tabstop>pbCancel</tabstop>
</tabstops> </tabstops>
<resources/> <resources>
<include location="items.qrc"/>
<include location="items.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

1
limereport/lrglobal.h
View File

@ -95,6 +95,7 @@ namespace Const{
const int SCENE_MARGIN = 50; const int SCENE_MARGIN = 50;
const QString FUNCTION_MANAGER_NAME = "LimeReport"; const QString FUNCTION_MANAGER_NAME = "LimeReport";
const QString EOW("~!@#$%^&*()+{}|:\"<>?,/;'[]\\-="); const QString EOW("~!@#$%^&*()+{}|:\"<>?,/;'[]\\-=");
const int DEFAULT_TAB_INDENTION = 4;
} }
QString extractClassName(QString className); QString extractClassName(QString className);

38
limereport/lrreportdesignwidget.cpp
View File

@ -51,12 +51,13 @@ namespace LimeReport {
// ReportDesignIntf // ReportDesignIntf
ReportDesignWidget::ReportDesignWidget(ReportEnginePrivateInterface* report, QMainWindow *mainWindow, QWidget *parent) : ReportDesignWidget::ReportDesignWidget(ReportEnginePrivateInterface* report, QSettings* settings, QMainWindow *mainWindow, QWidget *parent) :
QWidget(parent), QWidget(parent),
#ifdef HAVE_QTDESIGNER_INTEGRATION #ifdef HAVE_QTDESIGNER_INTEGRATION
m_dialogDesignerManager(new DialogDesignerManager(this)), m_dialogDesignerManager(new DialogDesignerManager(this)),
#endif #endif
m_mainWindow(mainWindow), m_verticalGridStep(10), m_horizontalGridStep(10), m_useGrid(false), m_dialogChanged(false), m_useDarkTheme(false) m_mainWindow(mainWindow), m_verticalGridStep(10), m_horizontalGridStep(10), m_useGrid(false),
m_dialogChanged(false), m_useDarkTheme(false), m_settings(settings)
{ {
#ifdef HAVE_QT4 #ifdef HAVE_QT4
m_tabWidget = new LimeReportTabWidget(this); m_tabWidget = new LimeReportTabWidget(this);
@ -205,41 +206,55 @@ void ReportDesignWidget::applySettings()
parentWidget()->setStyleSheet(""); parentWidget()->setStyleSheet("");
m_report->setStyleSheet(""); m_report->setStyleSheet("");
} }
if (m_settings){
m_settings->beginGroup("ScriptEditor");
QVariant v = m_settings->value("DefaultFontName");
if (v.isValid()){
QVariant fontSize = m_settings->value("DefaultFontSize");
m_scriptEditor->setEditorFont(QFont(v.toString(),fontSize.toInt()));
}
v = m_settings->value("TabIndention");
if (v.isValid()){
m_scriptEditor->setTabIndention(v.toInt());
}
m_settings->endGroup();
}
} }
void ReportDesignWidget::loadState(QSettings* settings) void ReportDesignWidget::loadState()
{ {
settings->beginGroup("DesignerWidget"); m_settings->beginGroup("DesignerWidget");
QVariant v = settings->value("hGridStep"); QVariant v = m_settings->value("hGridStep");
if (v.isValid()){ if (v.isValid()){
m_horizontalGridStep = v.toInt(); m_horizontalGridStep = v.toInt();
} }
v = settings->value("vGridStep"); v = m_settings->value("vGridStep");
if (v.isValid()){ if (v.isValid()){
m_verticalGridStep = v.toInt(); m_verticalGridStep = v.toInt();
} }
v = settings->value("defaultFont"); v = m_settings->value("defaultFont");
if (v.isValid()){ if (v.isValid()){
m_defaultFont = v.value<QFont>(); m_defaultFont = v.value<QFont>();
} }
v = settings->value("useGrid"); v = m_settings->value("useGrid");
if (v.isValid()){ if (v.isValid()){
m_useGrid = v.toBool(); m_useGrid = v.toBool();
} }
v = settings->value("useDarkTheme"); v = m_settings->value("useDarkTheme");
if (v.isValid()){ if (v.isValid()){
m_useDarkTheme = v.toBool(); m_useDarkTheme = v.toBool();
} }
v = settings->value("ScriptEditorState"); v = m_settings->value("ScriptEditorState");
if (v.isValid()){ if (v.isValid()){
m_scriptEditor->restoreState(v.toByteArray()); m_scriptEditor->restoreState(v.toByteArray());
} }
settings->endGroup(); m_settings->endGroup();
applySettings(); applySettings();
} }
@ -720,6 +735,7 @@ void ReportDesignWidget::deleteCurrentPage()
void ReportDesignWidget::editSetting() void ReportDesignWidget::editSetting()
{ {
SettingDialog setting(this); SettingDialog setting(this);
setting.setSettings(m_settings);
setting.setVerticalGridStep(m_verticalGridStep); setting.setVerticalGridStep(m_verticalGridStep);
setting.setHorizontalGridStep(m_horizontalGridStep); setting.setHorizontalGridStep(m_horizontalGridStep);
setting.setDefaultFont(m_defaultFont); setting.setDefaultFont(m_defaultFont);

6
limereport/lrreportdesignwidget.h
View File

@ -84,7 +84,8 @@ public:
Translations, Translations,
TabTypeCount TabTypeCount
}; };
ReportDesignWidget(ReportEnginePrivateInterface* report, QMainWindow *mainWindow, QWidget *parent = 0); ReportDesignWidget(ReportEnginePrivateInterface* report, QSettings* settings,
QMainWindow *mainWindow, QWidget *parent = 0);
~ReportDesignWidget(); ~ReportDesignWidget();
void createStartPage(); void createStartPage();
void clear(); void clear();
@ -112,7 +113,7 @@ public:
bool emitSaveReportAs(); bool emitSaveReportAs();
bool emitLoadReport(); bool emitLoadReport();
void saveState(QSettings *settings); void saveState(QSettings *settings);
void loadState(QSettings *settings); void loadState();
void applySettings(); void applySettings();
void applyUseGrid(); void applyUseGrid();
bool useGrid(){ return m_useGrid;} bool useGrid(){ return m_useGrid;}
@ -227,6 +228,7 @@ private:
bool m_useMagnet; bool m_useMagnet;
bool m_dialogChanged; bool m_dialogChanged;
bool m_useDarkTheme; bool m_useDarkTheme;
QSettings* m_settings;
}; };
} // namespace LimeReport } // namespace LimeReport

4
limereport/lrreportdesignwindow.cpp
View File

@ -472,7 +472,7 @@ void ReportDesignWindow::createMainMenu()
void ReportDesignWindow::initReportEditor(ReportEnginePrivateInterface* report) void ReportDesignWindow::initReportEditor(ReportEnginePrivateInterface* report)
{ {
m_reportDesignWidget=new ReportDesignWidget(report,this,this); m_reportDesignWidget=new ReportDesignWidget(report, m_settings, this,this);
setCentralWidget(m_reportDesignWidget); setCentralWidget(m_reportDesignWidget);
connect(m_reportDesignWidget,SIGNAL(itemSelected(LimeReport::BaseDesignIntf*)), connect(m_reportDesignWidget,SIGNAL(itemSelected(LimeReport::BaseDesignIntf*)),
this,SLOT(slotItemSelected(LimeReport::BaseDesignIntf*))); this,SLOT(slotItemSelected(LimeReport::BaseDesignIntf*)));
@ -822,7 +822,7 @@ void ReportDesignWindow::restoreSetting()
} }
settings()->endGroup(); settings()->endGroup();
m_reportDesignWidget->loadState(settings()); m_reportDesignWidget->loadState();
m_useGridAction->setChecked(m_reportDesignWidget->useGrid()); m_useGridAction->setChecked(m_reportDesignWidget->useGrid());
createRecentFilesMenu(); createRecentFilesMenu();
} }

1
limereport/lrreportengine.cpp
View File

@ -252,7 +252,6 @@ void ReportEnginePrivate::clearReport()
m_fileName=""; m_fileName="";
m_scriptEngineContext->clear(); m_scriptEngineContext->clear();
m_reportSettings.setDefaultValues(); m_reportSettings.setDefaultValues();
emit cleared(); emit cleared();
} }

60
limereport/lrsettingdialog.cpp
View File

@ -1,11 +1,12 @@
#include "lrsettingdialog.h" #include "lrsettingdialog.h"
#include "ui_lrsettingdialog.h" #include "ui_lrsettingdialog.h"
#include "lrglobal.h"
#include <QFile> #include <QFile>
namespace LimeReport{ namespace LimeReport{
SettingDialog::SettingDialog(QWidget *parent) : SettingDialog::SettingDialog(QWidget *parent) :
QDialog(parent), QDialog(parent), m_settings(0),
ui(new Ui::SettingDialog) ui(new Ui::SettingDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
@ -13,6 +14,7 @@ SettingDialog::SettingDialog(QWidget *parent) :
if (!theme.exists()){ if (!theme.exists()){
ui->cbbUseDarkTheme->setVisible(false); ui->cbbUseDarkTheme->setVisible(false);
} }
ui->indentSize->setRange(0,10);
} }
SettingDialog::~SettingDialog() SettingDialog::~SettingDialog()
@ -37,6 +39,18 @@ QFont SettingDialog::defaultFont()
return result; return result;
} }
QFont SettingDialog::scriptFont()
{
QFont result = ui->scriptFont->currentFont();
result.setPointSize(ui->scriptFontSize->value());
return result;
}
int SettingDialog::tabIndention()
{
return ui->indentSize->value();
}
bool SettingDialog::userDarkTheme() bool SettingDialog::userDarkTheme()
{ {
return ui->cbbUseDarkTheme->isChecked(); return ui->cbbUseDarkTheme->isChecked();
@ -76,6 +90,17 @@ void SettingDialog::setDefaultFont(const QFont &value)
ui->defaultFontSize->setValue(value.pointSize()); ui->defaultFontSize->setValue(value.pointSize());
} }
void SettingDialog::setScriptFont(const QFont& value)
{
ui->scriptFont->setCurrentFont(value);
ui->scriptFontSize->setValue(value.pointSize());
}
void SettingDialog::setScritpTabIndention(int size)
{
ui->indentSize->setValue(size);
}
void SettingDialog::setUseDarkTheme(bool value) void SettingDialog::setUseDarkTheme(bool value)
{ {
ui->cbbUseDarkTheme->setChecked(value); ui->cbbUseDarkTheme->setChecked(value);
@ -103,4 +128,37 @@ void SettingDialog::setDesignerLanguages(QList<QLocale::Language> languages, QLo
#endif #endif
} }
void SettingDialog::setSettings(QSettings* settings){
m_settings = settings;
if (m_settings){
m_settings->beginGroup("ScriptEditor");
QVariant fontName = m_settings->value("DefaultFontName");
if (fontName.isValid()){
QVariant fontSize = m_settings->value("DefaultFontSize");
ui->scriptFont->setCurrentFont(QFont(fontName.toString(),fontSize.toInt()));
ui->scriptFontSize->setValue(fontSize.toInt());
}
QVariant indentSize = m_settings->value("TabIndention");
if (indentSize.isValid()){
ui->indentSize->setValue(indentSize.toInt());
} else {
ui->indentSize->setValue(LimeReport::Const::DEFAULT_TAB_INDENTION);
}
m_settings->endGroup();
}
}
void SettingDialog::on_bbOkCancel_accepted()
{
if (m_settings){
m_settings->beginGroup("ScriptEditor");
m_settings->setValue("DefaultFontName", ui->scriptFont->currentFont().family());
m_settings->setValue("DefaultFontSize", ui->scriptFontSize->value());
m_settings->setValue("TabIndention", ui->indentSize->value());
m_settings->endGroup();
}
}
} // namespace LimeReport } // namespace LimeReport

10
limereport/lrsettingdialog.h
View File

@ -3,6 +3,7 @@
#include <QDialog> #include <QDialog>
#include <QLocale> #include <QLocale>
#include <QSettings>
namespace LimeReport{ namespace LimeReport{
@ -20,6 +21,8 @@ public:
int verticalGridStep(); int verticalGridStep();
int horizontalGridStep(); int horizontalGridStep();
QFont defaultFont(); QFont defaultFont();
QFont scriptFont();
int tabIndention();
bool userDarkTheme(); bool userDarkTheme();
bool suppressAbsentFieldsAndVarsWarnings(); bool suppressAbsentFieldsAndVarsWarnings();
QLocale::Language designerLanguage(); QLocale::Language designerLanguage();
@ -27,12 +30,19 @@ public:
void setHorizontalGridStep(int value); void setHorizontalGridStep(int value);
void setVerticalGridStep(int value); void setVerticalGridStep(int value);
void setDefaultFont(const QFont& value); void setDefaultFont(const QFont& value);
void setScriptFont(const QFont& value);
void setScritpTabIndention(int size);
void setUseDarkTheme(bool value); void setUseDarkTheme(bool value);
void setDesignerLanguages(QList<QLocale::Language> languages, QLocale::Language currentLanguage); void setDesignerLanguages(QList<QLocale::Language> languages, QLocale::Language currentLanguage);
void setSettings(QSettings* settings);
private slots:
void on_bbOkCancel_accepted();
private: private:
Ui::SettingDialog *ui; Ui::SettingDialog *ui;
QList<QLocale::Language> m_aviableLanguages; QList<QLocale::Language> m_aviableLanguages;
QLocale::Language m_currentLanguage; QLocale::Language m_currentLanguage;
QSettings* m_settings;
}; };
} // namespace LimeReport } // namespace LimeReport

380
limereport/lrsettingdialog.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>397</width> <width>419</width>
<height>345</height> <height>362</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -19,164 +19,260 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Designer setting</string> <string>Designer setting</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item> <item>
<widget class="QGroupBox" name="groupBox_3"> <widget class="QToolBox" name="toolBox">
<property name="title"> <property name="currentIndex">
<string>Designer Setting</string> <number>0</number>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <widget class="QWidget" name="page">
<item> <property name="geometry">
<layout class="QHBoxLayout" name="horizontalLayout"> <rect>
<item> <x>0</x>
<widget class="QLabel" name="label_3"> <y>0</y>
<property name="text"> <width>401</width>
<string>Default font</string> <height>218</height>
</property> </rect>
</widget> </property>
</item> <attribute name="label">
<item> <string>Designer settings</string>
<widget class="QFontComboBox" name="defaultFont"/> </attribute>
</item> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QSpinBox" name="defaultFontSize"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Grid</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item> <item>
<layout class="QFormLayout" name="formLayout"> <widget class="QLabel" name="label_6">
<item row="0" column="0"> <property name="text">
<widget class="QLabel" name="label"> <string>Default font</string>
<property name="text"> </property>
<string>Vertical grid step</string> </widget>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QSpinBox" name="verticalGridStep">
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Horizontal grid step</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="horizontalGridStep">
<property name="value">
<number>10</number>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_3"> <widget class="QFontComboBox" name="defaultFont"/>
</item>
<item>
<widget class="QSpinBox" name="defaultFontSize">
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>73</width> <width>40</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</widget> </item>
</item> <item>
<item> <widget class="QGroupBox" name="groupBox">
<layout class="QHBoxLayout" name="hlLanguage"> <property name="title">
<item> <string>Grid</string>
<widget class="QLabel" name="lblLanguage"> </property>
<property name="text"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<string>Language</string> <item>
</property> <layout class="QFormLayout" name="formLayout_2">
</widget> <item row="0" column="0">
</item> <widget class="QLabel" name="label_4">
<item> <property name="text">
<widget class="QComboBox" name="designerLanguage"> <string>Vertical grid step</string>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> </widget>
<horstretch>0</horstretch> </item>
<verstretch>0</verstretch> <item row="0" column="1">
</sizepolicy> <widget class="QSpinBox" name="verticalGridStep">
</property> <property name="value">
</widget> <number>10</number>
</item> </property>
</layout> </widget>
</item> </item>
<item> <item row="1" column="0">
<widget class="QCheckBox" name="cbbUseDarkTheme"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>Use dark theme</string> <string>Horizontal grid step</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="1" column="1">
<widget class="QSpinBox" name="horizontalGridStep">
<property name="value">
<number>10</number>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>73</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="hlLanguage_2">
<item>
<widget class="QLabel" name="lblLanguage">
<property name="text">
<string>Language</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="designerLanguage">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QCheckBox" name="cbbUseDarkTheme">
<property name="text">
<string>Use dark theme</string>
</property>
</widget>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_3">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>401</width>
<height>218</height>
</rect>
</property>
<attribute name="label">
<string>Script editor settings</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Font</string>
</property>
</widget>
</item>
<item>
<widget class="QFontComboBox" name="scriptFont"/>
</item>
<item>
<widget class="QSpinBox" name="scriptFontSize">
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Indent size</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="indentSize"/>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>123</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="page_2">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>401</width>
<height>218</height>
</rect>
</property>
<attribute name="label">
<string>Report settings</string>
</attribute>
<widget class="QCheckBox" name="cbSuppressWarnings">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>280</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Suppress absent fields and variables warning</string>
</property>
</widget>
</widget>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Report Setting</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QCheckBox" name="cbSuppressWarnings">
<property name="text">
<string>Suppress absent fields and variables warning</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>4</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>

1
limereport/objectinspector/propertyItems/lrcontentpropitem.cpp
View File

@ -26,7 +26,6 @@ void ContentEditor::editButtonClicked()
dialog->setLayout(new QVBoxLayout()); dialog->setLayout(new QVBoxLayout());
dialog->layout()->setContentsMargins(1,1,1,1); dialog->layout()->setContentsMargins(1,1,1,1);
dialog->setAttribute(Qt::WA_DeleteOnClose); dialog->setAttribute(Qt::WA_DeleteOnClose);
//dialog->setGeometry(QStyle::alignedRect(Qt::LeftToRight, Qt::AlignCenter, dialog->size(), QApplication::desktop()->availableGeometry()));
dialog->setWindowTitle(propertyName()); dialog->setWindowTitle(propertyName());
QWidget* editor = dynamic_cast<BaseDesignIntf*>(m_object)->defaultEditor(); QWidget* editor = dynamic_cast<BaseDesignIntf*>(m_object)->defaultEditor();
dialog->layout()->addWidget(editor); dialog->layout()->addWidget(editor);

101
limereport/scripteditor/lrscripteditor.cpp
View File

@ -14,12 +14,13 @@ namespace LimeReport{
ScriptEditor::ScriptEditor(QWidget *parent) : ScriptEditor::ScriptEditor(QWidget *parent) :
QWidget(parent), QWidget(parent),
ui(new Ui::ScriptEditor), m_reportEngine(0), m_page(0) ui(new Ui::ScriptEditor), m_reportEngine(0), m_page(0), m_tabIndention(4)
{ {
ui->setupUi(this); ui->setupUi(this);
setFocusProxy(ui->textEdit); setFocusProxy(ui->textEdit);
m_completer = new ReportStructureCompleater(this); m_completer = new ReportStructureCompleater(this);
ui->textEdit->setCompleter(m_completer); ui->textEdit->setCompleter(m_completer);
ui->textEdit->setTabStopWidth(ui->textEdit->fontMetrics().width("0")*m_tabIndention);
connect(ui->splitter, SIGNAL(splitterMoved(int,int)), this, SIGNAL(splitterMoved(int,int))); connect(ui->splitter, SIGNAL(splitterMoved(int,int)), this, SIGNAL(splitterMoved(int,int)));
} }
@ -79,58 +80,16 @@ void ScriptEditor::setPageBand(BandDesignIntf* band)
} }
} }
void ScriptEditor::setTabIndention(int charCount)
{
if (m_tabIndention != charCount){
ui->textEdit->setTabStopWidth(ui->textEdit->fontMetrics().width("W")*charCount);
m_tabIndention = charCount;
}
}
void ScriptEditor::initCompleter() void ScriptEditor::initCompleter()
{ {
// QStringList dataWords;
// DataSourceManager* dm = 0;
// if (m_reportEngine)
// dm = m_reportEngine->dataManager();
// if (m_page)
// dm = m_page->datasourceManager();
//#ifdef USE_QJSENGINE
// ScriptEngineManager& se = LimeReport::ScriptEngineManager::instance();
// QJSValue globalObject = se.scriptEngine()->globalObject();
// QJSValueIterator it(globalObject);
// while (it.hasNext()){
// it.next();
// if (it.value().isCallable() ){
// dataWords << it.name();
// }
// }
//#endif
// foreach(const QString &dsName,dm->dataSourceNames()){
// dataWords << dsName;
// foreach(const QString &field, dm->fieldNames(dsName)){
// dataWords<<dsName+"."+field;
// }
// }
// foreach (QString varName, dm->variableNames()) {
// dataWords << varName.remove("#");
// }
// if (m_reportEngine){
// for ( int i = 0; i < m_reportEngine->pageCount(); ++i){
// PageDesignIntf* page = m_reportEngine->pageAt(i);
// dataWords << page->pageItem()->objectName();
// QMetaObject const * mo = page->pageItem()->metaObject();
// for(int i = mo->methodOffset(); i < mo->methodCount(); ++i)
// {
// if (mo->method(i).methodType() == QMetaMethod::Signal) {
// dataWords << page->pageItem()->objectName() +"."+QString::fromLatin1(mo->method(i).name());
// }
// }
// dataWords << page->pageItem()->objectName()+".beforeRender";
// dataWords << page->pageItem()->objectName()+".afterRender";
// foreach (BaseDesignIntf* item, page->pageItem()->childBaseItems()){
// addItemToCompleater(page->pageItem()->objectName(), item, dataWords);
// }
// }
// }
// dataWords.sort();
if (m_reportEngine) if (m_reportEngine)
m_completer->updateCompleaterModel(m_reportEngine); m_completer->updateCompleaterModel(m_reportEngine);
else else
@ -167,26 +126,26 @@ QString ScriptEditor::toPlainText()
return ui->textEdit->toPlainText(); return ui->textEdit->toPlainText();
} }
void ScriptEditor::addItemToCompleater(const QString& pageName, BaseDesignIntf* item, QStringList& dataWords) //void ScriptEditor::addItemToCompleater(const QString& pageName, BaseDesignIntf* item, QStringList& dataWords)
{ //{
BandDesignIntf* band = dynamic_cast<BandDesignIntf*>(item); // BandDesignIntf* band = dynamic_cast<BandDesignIntf*>(item);
if (band){ // if (band){
dataWords << band->objectName(); // dataWords << band->objectName();
dataWords << pageName+"_"+band->objectName(); // dataWords << pageName+"_"+band->objectName();
dataWords << pageName+"_"+band->objectName()+".beforeRender"; // dataWords << pageName+"_"+band->objectName()+".beforeRender";
dataWords << pageName+"_"+item->objectName()+".afterData"; // dataWords << pageName+"_"+item->objectName()+".afterData";
dataWords << pageName+"_"+band->objectName()+".afterRender"; // dataWords << pageName+"_"+band->objectName()+".afterRender";
foreach (BaseDesignIntf* child, band->childBaseItems()){ // foreach (BaseDesignIntf* child, band->childBaseItems()){
addItemToCompleater(pageName, child, dataWords); // addItemToCompleater(pageName, child, dataWords);
} // }
} else { // } else {
dataWords << item->objectName(); // dataWords << item->objectName();
dataWords << pageName+"_"+item->objectName(); // dataWords << pageName+"_"+item->objectName();
dataWords << pageName+"_"+item->objectName()+".beforeRender"; // dataWords << pageName+"_"+item->objectName()+".beforeRender";
dataWords << pageName+"_"+item->objectName()+".afterData"; // dataWords << pageName+"_"+item->objectName()+".afterData";
dataWords << pageName+"_"+item->objectName()+".afterRender"; // dataWords << pageName+"_"+item->objectName()+".afterRender";
} // }
} //}
void ScriptEditor::on_twData_doubleClicked(const QModelIndex &index) void ScriptEditor::on_twData_doubleClicked(const QModelIndex &index)
{ {

6
limereport/scripteditor/lrscripteditor.h
View File

@ -52,6 +52,7 @@ public:
void setReportEngine(LimeReport::ReportEnginePrivateInterface* reportEngine); void setReportEngine(LimeReport::ReportEnginePrivateInterface* reportEngine);
void setReportPage(PageDesignIntf* page); void setReportPage(PageDesignIntf* page);
void setPageBand(BandDesignIntf* band); void setPageBand(BandDesignIntf* band);
void setTabIndention(int charCount);
void initCompleter(); void initCompleter();
QByteArray saveState(); QByteArray saveState();
void restoreState(QByteArray state); void restoreState(QByteArray state);
@ -68,13 +69,14 @@ private slots:
void on_twData_doubleClicked(const QModelIndex &index); void on_twData_doubleClicked(const QModelIndex &index);
void on_twScriptEngine_doubleClicked(const QModelIndex &index); void on_twScriptEngine_doubleClicked(const QModelIndex &index);
void slotOnCurrentChanged(const QModelIndex& to, const QModelIndex&); void slotOnCurrentChanged(const QModelIndex& to, const QModelIndex&);
private: //private:
void addItemToCompleater(const QString& pageName, BaseDesignIntf* item, QStringList& dataWords); // void addItemToCompleater(const QString& pageName, BaseDesignIntf* item, QStringList& dataWords);
private: private:
Ui::ScriptEditor *ui; Ui::ScriptEditor *ui;
ReportEnginePrivateInterface* m_reportEngine; ReportEnginePrivateInterface* m_reportEngine;
PageDesignIntf* m_page; PageDesignIntf* m_page;
ReportStructureCompleater* m_completer; ReportStructureCompleater* m_completer;
int m_tabIndention;
}; };
} // namespace LimeReport } // namespace LimeReport