python-LimeReport/LimeReport
0
0
Fork 0
mirror of https://github.com/python-LimeReport/LimeReport.git synced 2025-10-01 11:40:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/Extract_Designer_to_plugin

Browse Source
This commit is contained in:
Arin Alexander
2017-12-11 14:53:41 +03:00
parent a134425640 76edb45543
commit 4c3e96b01e
14 changed files with 3676 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
limereport/items/lrchartitemeditor.cpp
View File

@@ -95,7 +95,7 @@ void ChartItemEditor::init()
ui->tableWidget->setColumnCount(1);
ui->tableWidget->setRowCount(m_charItem->series().count());
ui->tableWidget->horizontalHeader()->setStretchLastSection(true);
ui->tableWidget->setHorizontalHeaderItem(0,new QTableWidgetItem("Series name"));
ui->tableWidget->setHorizontalHeaderItem(0,new QTableWidgetItem(tr("Series name")));
rebuildTable();

2
limereport/items/lrchartitemeditor.ui
View File

@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
<string>Series editor</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>

4
limereport/items/lrsubitemparentpropitem.cpp
View File

@@ -48,8 +48,8 @@ namespace{
LimeReport::ItemLocationPropItem::ItemLocationPropItem(QObject* object, ObjectsList* objects, const QString &name, const QString &displayName, const QVariant &value, ObjectPropItem* parent, bool readonly)
:LimeReport::ObjectPropItem(object, objects, name, displayName, value, parent, readonly){
m_locationMap.insert("Band",LimeReport::ItemDesignIntf::Band);
m_locationMap.insert("Page",LimeReport::ItemDesignIntf::Page);
m_locationMap.insert(tr("Band"),LimeReport::ItemDesignIntf::Band);
m_locationMap.insert(tr("Page"),LimeReport::ItemDesignIntf::Page);
}