bugfix 2663,2571

This commit is contained in:
2008-06-23 05:15:36 +00:00
parent 054e92f600
commit ec91869a8e
4 changed files with 8 additions and 3 deletions
+3 -2
View File
@@ -29,7 +29,7 @@
#define OBJECTLISTVIEWITEM_H #define OBJECTLISTVIEWITEM_H
#include <qtreewidget.h> #include <qtreewidget.h>
#include "FWWindow.h"
#include <string> #include <string>
#include <map> #include <map>
@@ -58,7 +58,7 @@ class ObjectListViewItem : public QTreeWidgetItem {
ID=-1; 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; } int getFWObjectID() {return ID; }
void setFWObject(libfwbuilder::FWObject *obj) { ID=obj->getId(); } void setFWObject(libfwbuilder::FWObject *obj) { ID=obj->getId(); }
@@ -71,6 +71,7 @@ class ObjectListViewItem : public QTreeWidgetItem {
void setProperty(const QString &name,const QString &val) { void setProperty(const QString &name,const QString &val) {
props[name]=val; props[name]=val;
} }
virtual bool operator< ( const QTreeWidgetItem & other ) const;
}; };
#endif #endif
+3
View File
@@ -2477,6 +2477,9 @@ void ObjectManipulator::changeFirstNotSystemLib()
{ {
for (int i = 0 ; i < idxToLibs.size(); i++) 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::STANDARD_LIB_ID)
{ {
if (idxToLibs[i]->getId()!=FWObjectDatabase::DELETED_OBJECTS_ID) if (idxToLibs[i]->getId()!=FWObjectDatabase::DELETED_OBJECTS_ID)
+1 -1
View File
@@ -3249,7 +3249,7 @@ void ProjectPanel::loadSplitters(QString filename)
int w1 = val.section(',',0,0).toInt(); int w1 = val.section(',',0,0).toInt();
int w2 = mdiWindow->width() - w1; int w2 = mdiWindow->width() - w1;
if (w1 == 0 && w2 == 0) if (w1 == 0 )
{ {
w1 = 250; w1 = 250;
w2 = mdiWindow->width() - 250; w2 = mdiWindow->width() - 250;
+1
View File
@@ -238,6 +238,7 @@ SOURCES += ProjectPanel.cpp \
ConfirmDeleteObjectDialog.cpp \ ConfirmDeleteObjectDialog.cpp \
FakeWizard.cpp \ FakeWizard.cpp \
AskLibForCopyDialog.cpp \ AskLibForCopyDialog.cpp \
ObjectListViewItem.cpp \
RuleGroupPanel.cpp RuleGroupPanel.cpp
FORMS = FWBMainWindow_q.ui \ FORMS = FWBMainWindow_q.ui \