mirror of
https://github.com/fwbuilder/fwbuilder
synced 2026-03-24 04:07:55 +01:00
bugfix 2663,2571
This commit is contained in:
parent
054e92f600
commit
ec91869a8e
@ -29,7 +29,7 @@
|
||||
#define OBJECTLISTVIEWITEM_H
|
||||
|
||||
#include <qtreewidget.h>
|
||||
|
||||
#include "FWWindow.h"
|
||||
#include <string>
|
||||
#include <map>
|
||||
|
||||
@ -58,7 +58,7 @@ class ObjectListViewItem : public QTreeWidgetItem {
|
||||
ID=-1;
|
||||
}
|
||||
|
||||
libfwbuilder::FWObject *getFWObject() {return mw->db()->getById(ID,true); }
|
||||
libfwbuilder::FWObject *getFWObject() const {return mw->db()->getById(ID,true); }
|
||||
int getFWObjectID() {return ID; }
|
||||
void setFWObject(libfwbuilder::FWObject *obj) { ID=obj->getId(); }
|
||||
|
||||
@ -71,6 +71,7 @@ class ObjectListViewItem : public QTreeWidgetItem {
|
||||
void setProperty(const QString &name,const QString &val) {
|
||||
props[name]=val;
|
||||
}
|
||||
virtual bool operator< ( const QTreeWidgetItem & other ) const;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -2477,6 +2477,9 @@ void ObjectManipulator::changeFirstNotSystemLib()
|
||||
{
|
||||
for (int i = 0 ; i < idxToLibs.size(); i++)
|
||||
{
|
||||
qDebug (QString().setNum(idxToLibs[i]->getId()).toAscii().data());
|
||||
qDebug (QString().setNum(FWObjectDatabase::STANDARD_LIB_ID).toAscii().data());
|
||||
|
||||
if (idxToLibs[i]->getId()!=FWObjectDatabase::STANDARD_LIB_ID)
|
||||
{
|
||||
if (idxToLibs[i]->getId()!=FWObjectDatabase::DELETED_OBJECTS_ID)
|
||||
|
||||
@ -3249,7 +3249,7 @@ void ProjectPanel::loadSplitters(QString filename)
|
||||
|
||||
int w1 = val.section(',',0,0).toInt();
|
||||
int w2 = mdiWindow->width() - w1;
|
||||
if (w1 == 0 && w2 == 0)
|
||||
if (w1 == 0 )
|
||||
{
|
||||
w1 = 250;
|
||||
w2 = mdiWindow->width() - 250;
|
||||
|
||||
@ -238,6 +238,7 @@ SOURCES += ProjectPanel.cpp \
|
||||
ConfirmDeleteObjectDialog.cpp \
|
||||
FakeWizard.cpp \
|
||||
AskLibForCopyDialog.cpp \
|
||||
ObjectListViewItem.cpp \
|
||||
RuleGroupPanel.cpp
|
||||
|
||||
FORMS = FWBMainWindow_q.ui \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user