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

currentObject -> object

Browse Source
This commit is contained in:
Arin Alexander 2019-02-14 21:00:33 +03:00
parent deddd22eb4
commit 2bbd963c18
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
limereport/lrreportdesignwindow.cpp
View File

@ -934,7 +934,7 @@ void ReportDesignWindow::slotNewBand(int bandType)
void ReportDesignWindow::slotItemSelected(LimeReport::BaseDesignIntf *item) void ReportDesignWindow::slotItemSelected(LimeReport::BaseDesignIntf *item)
{ {
if (m_objectInspector->currentObject()!=item){ if (m_objectInspector->object()!=item){
m_newSubDetail->setEnabled(false); m_newSubDetail->setEnabled(false);
m_newSubDetailHeader->setEnabled(false); m_newSubDetailHeader->setEnabled(false);
@ -989,7 +989,7 @@ void ReportDesignWindow::slotItemPropertyChanged(const QString &objectName, cons
Q_UNUSED(oldValue) Q_UNUSED(oldValue)
Q_UNUSED(newValue) Q_UNUSED(newValue)
if (m_objectInspector->currentObject()&&(m_objectInspector->currentObject()->objectName()==objectName)){ if (m_objectInspector->object()&&(m_objectInspector->object()->objectName()==objectName)){
m_objectInspector->updateProperty(propertyName); m_objectInspector->updateProperty(propertyName);
} }
} }

2
limereport/lrreportdesignwindow.h
View File

@ -238,8 +238,6 @@ private:
QSignalMapper* m_recentFilesSignalMap; QSignalMapper* m_recentFilesSignalMap;
ObjectInspectorWidget* m_objectInspector; ObjectInspectorWidget* m_objectInspector;
//QObjectPropertyModel* m_propertyModel;
ReportDesignWidget* m_reportDesignWidget; ReportDesignWidget* m_reportDesignWidget;
DataBrowser * m_dataBrowser; DataBrowser * m_dataBrowser;
ScriptBrowser* m_scriptBrowser; ScriptBrowser* m_scriptBrowser;

2
limereport/objectinspector/lrobjectinspectorwidget.cpp
View File

@ -244,7 +244,7 @@ void ObjectInspectorWidget::setSubclassesAsLevel(bool value)
m_propertyModel->setSubclassesAsLevel(value); m_propertyModel->setSubclassesAsLevel(value);
} }
const QObject *ObjectInspectorWidget::currentObject(){ const QObject *ObjectInspectorWidget::object(){
return m_propertyModel->currentObject(); return m_propertyModel->currentObject();
} }

4
limereport/objectinspector/lrobjectinspectorwidget.h
View File

@ -83,8 +83,8 @@ public:
void setValidator(ValidatorIntf *validator); void setValidator(ValidatorIntf *validator);
bool subclassesAsLevel(); bool subclassesAsLevel();
void setSubclassesAsLevel(bool value); void setSubclassesAsLevel(bool value);
void setObject(QObject* object); void setObject(QObject* setObject);
const QObject* currentObject(); const QObject* object();
void setMultiObjects(QList<QObject *>* list); void setMultiObjects(QList<QObject *>* list);
void clearObjectsList(); void clearObjectsList();
void updateProperty(const QString &propertyName); void updateProperty(const QString &propertyName);