diff --git a/src/gui/ObjectListViewItem.h b/src/gui/ObjectListViewItem.h index f636953ec..fda345b1a 100644 --- a/src/gui/ObjectListViewItem.h +++ b/src/gui/ObjectListViewItem.h @@ -29,7 +29,7 @@ #define OBJECTLISTVIEWITEM_H #include - +#include "FWWindow.h" #include #include @@ -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 diff --git a/src/gui/ObjectManipulator.cpp b/src/gui/ObjectManipulator.cpp index 176fd5660..5be0695f8 100644 --- a/src/gui/ObjectManipulator.cpp +++ b/src/gui/ObjectManipulator.cpp @@ -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) diff --git a/src/gui/ProjectPanel.cpp b/src/gui/ProjectPanel.cpp index 9c9750477..2c36dc8fe 100644 --- a/src/gui/ProjectPanel.cpp +++ b/src/gui/ProjectPanel.cpp @@ -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; diff --git a/src/gui/gui.pro b/src/gui/gui.pro index f08c59337..6c905b2dd 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -238,6 +238,7 @@ SOURCES += ProjectPanel.cpp \ ConfirmDeleteObjectDialog.cpp \ FakeWizard.cpp \ AskLibForCopyDialog.cpp \ + ObjectListViewItem.cpp \ RuleGroupPanel.cpp FORMS = FWBMainWindow_q.ui \