*** empty log message ***

diff --git a/src/LogWindow/LogWindow.pro b/src/LogWindow/LogWindow.pro
index 40ec097b8e37b98f057a9523cea5bff73fc1d187..9365764c7b00ab31eafad5f403cbe86ad50baa5b 100644 (file)
--- a/src/LogWindow/LogWindow.pro
+++ b/src/LogWindow/LogWindow.pro
@@ -1,11 +1,12 @@
 TEMPLATE = lib
-DESTDIR = ../../lib
+
+DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
-OBJECTS_DIR = ../../obj/$$TARGET
+OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 INCLUDEPATH = ../../include
 win32:LIBS += ../../lib/suit.lib ../../lib/qtx.lib
-unix:LIBS += -L../../lib -lSUIT -lQtx
+unix:LIBS += -L../../$(CONFIG_ID)/lib -lSUIT -lQtx
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared

diff --git a/src/PyConsole/PyConsole.pro b/src/PyConsole/PyConsole.pro
index d5b0cda934eae368102952e674016c31f8ab2f33..527d9b8c7121adc68ad808ef94468f3cedbd1358 100644 (file)
--- a/src/PyConsole/PyConsole.pro
+++ b/src/PyConsole/PyConsole.pro
@@ -1,10 +1,11 @@
 TEMPLATE = lib
-DESTDIR = ../../lib
+
+DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
-OBJECTS_DIR = ../../obj/$$TARGET
+OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 INCLUDEPATH += ../../include $$(PYTHONINC)
-unix:LIBS  += -L../../lib -L$$(PYTHONLIB) -lpython2.3 -lSUIT -lPyInterp
+unix:LIBS  += -L../../$(CONFIG_ID)/lib -L$$(PYTHONLIB) -lpython2.3 -lSUIT -lPyInterp
 win32:LIBS += /LIBPATH:$$(PYTHONLIB) ../../lib/pyinterp.lib ../../lib/suit.lib
 
 CONFIG -= debug release debug_and_release

diff --git a/src/PyInterp/PyInterp.pro b/src/PyInterp/PyInterp.pro
index 95781fccd70fbda753245a58c1d3030bea46f743..50bb6a9f359fd8b7375c8d5c2e9f2538b5411c1d 100644 (file)
--- a/src/PyInterp/PyInterp.pro
+++ b/src/PyInterp/PyInterp.pro
@@ -1,7 +1,8 @@
 TEMPLATE = lib
-DESTDIR = ../../lib
+
+DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
-OBJECTS_DIR = ../../obj/$$TARGET
+OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 INCLUDEPATH += ../../include $$(PYTHONINC)
 unix:LIBS  += -L$$(PYTHONLIB) -lpython2.3

diff --git a/src/Qtx/Qtx.pro b/src/Qtx/Qtx.pro
index b174dfd5b7d8f026fc31bce57852b7e762bc9407..2d1eaeee6def78046834d908f63d6ef28a0ff91a 100644 (file)
--- a/src/Qtx/Qtx.pro
+++ b/src/Qtx/Qtx.pro
@@ -1,7 +1,8 @@
 TEMPLATE = lib
-DESTDIR = ../../lib
+
+DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
-OBJECTS_DIR = ../../obj/$$TARGET
+OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 QT += xml
 CONFIG -= debug release debug_and_release

diff --git a/src/Qtx/QtxPreferenceMgr.cxx b/src/Qtx/QtxPreferenceMgr.cxx
index ee43976945d6234466dde159f000f56164a9ab50..1b12db5e66a2a00f5f1a437fb1d4e88b33e1c2cb 100644 (file)
--- a/src/Qtx/QtxPreferenceMgr.cxx
+++ b/src/Qtx/QtxPreferenceMgr.cxx
@@ -130,7 +130,8 @@ void QtxPreferenceItem::Updater::customEvent( QEvent* /*e*/ )
   \param parent parent preference item
 */
 QtxPreferenceItem::QtxPreferenceItem( QtxPreferenceItem* parent )
-: myParent( 0 )
+: myParent( 0 ),
+myEval( true )
 {
   myId = generateId();
 
@@ -425,6 +426,16 @@ void QtxPreferenceItem::setOption( const QString& name, const QVariant& val )
     sendItemChanges();
 }
 
+bool QtxPreferenceItem::isEvaluateValues() const
+{
+  return myEval;
+}
+
+void QtxPreferenceItem::setEvaluateValues( const bool on )
+{
+  myEval = on;
+}
+
 /*!
   \fn void QtxPreferenceItem::store();
   \brief Save preference item (for example, to the resource file).
@@ -588,8 +599,11 @@ bool QtxPreferenceItem::getBoolean( const bool val ) const
 */
 QString QtxPreferenceItem::getString( const QString& val ) const
 {
+  QString res = val;
   QtxResourceMgr* resMgr = resourceMgr();
-  return resMgr ? resMgr->stringValue( mySection, myParameter, val ) : val;
+  if ( resMgr )
+    resMgr->value( mySection, myParameter, res, isEvaluateValues() );
+  return res;
 }
 
 /*!
@@ -748,9 +762,12 @@ void QtxPreferenceItem::triggerUpdate()
   \return property value or null QVariant if option is not set
   \sa setOptionValue()
 */
-QVariant QtxPreferenceItem::optionValue( const QString& /*name*/ ) const
+QVariant QtxPreferenceItem::optionValue( const QString& name ) const
 {
-  return QVariant();
+  QVariant val;
+  if ( name == "eval" || name == "evaluation" || name == "subst" || name == "substitution" )
+    val = isEvaluateValues();
+  return val;
 }
 
 /*!
@@ -763,8 +780,13 @@ QVariant QtxPreferenceItem::optionValue( const QString& /*name*/ ) const
   \param val new property value
   \sa optionValue()
 */
-void QtxPreferenceItem::setOptionValue( const QString& /*name*/, const QVariant& /*val*/ )
+void QtxPreferenceItem::setOptionValue( const QString& name, const QVariant& val )
 {
+  if ( name == "eval" || name == "evaluation" || name == "subst" || name == "substitution" )
+  {
+    if ( val.canConvert( QVariant::Bool ) )
+      setEvaluateValues( val.toBool() );
+  }
 }
 
 /*!

diff --git a/src/Qtx/QtxPreferenceMgr.h b/src/Qtx/QtxPreferenceMgr.h
index 50fc3241667db0ad1bd29bc97a3b302d8330581e..0e193db3414e626c3bfb450d9f8019c312557a3d 100644 (file)
--- a/src/Qtx/QtxPreferenceMgr.h
+++ b/src/Qtx/QtxPreferenceMgr.h
@@ -73,6 +73,9 @@ public:
   QVariant                  option( const QString& ) const;
   void                      setOption( const QString&, const QVariant& );
 
+  bool                      isEvaluateValues() const;
+  void                      setEvaluateValues( const bool );
+
   virtual void              store() = 0;
   virtual void              retrieve() = 0;
 
@@ -125,6 +128,7 @@ private:
   QtxPreferenceItem*        myParent;
   ItemList                  myChildren;
 
+  bool                      myEval;
   QIcon                     myIcon;
   QString                   myTitle;
   QString                   mySection;

diff --git a/src/STD/STD.pro b/src/STD/STD.pro
index 7db9dfa0d8cee665008e81c35df6051da9211f44..ab2ad477680349853fefe8e067d5c5830033e467 100644 (file)
--- a/src/STD/STD.pro
+++ b/src/STD/STD.pro
@@ -1,10 +1,11 @@
 TEMPLATE = lib
-DESTDIR = ../../lib
+
+DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
-OBJECTS_DIR = ../../obj/$$TARGET
+OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 INCLUDEPATH = ../../include
-LIBS += -L../../lib -lSUIT -lQtx
+LIBS += -L../../$(CONFIG_ID)/lib -lSUIT -lQtx
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared

diff --git a/src/SUIT/SUIT.pro b/src/SUIT/SUIT.pro
index 773dd3402b26913eac19160810eb3c05d3f7dd56..7bad1747f2bf13eb76ca2572054715eaeded9e04 100644 (file)
--- a/src/SUIT/SUIT.pro
+++ b/src/SUIT/SUIT.pro
@@ -1,10 +1,11 @@
 TEMPLATE = lib
-DESTDIR = ../../lib
+
+DESTDIR = ../../$(CONFIG_ID)/lib
 MOC_DIR = ../../moc
-OBJECTS_DIR = ../../obj/$$TARGET
+OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 INCLUDEPATH = ../../include
-LIBS += -L../../lib -lQtx
+LIBS += -L../../$(CONFIG_ID)/lib -lQtx
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared

diff --git a/src/SUITApp/SUITApp.pro b/src/SUITApp/SUITApp.pro
index c088c851ca6c08edf34d2ce905aeb61d5827908d..d7040d3a1d19c89af02ac49632332cc0e7224e28 100644 (file)
--- a/src/SUITApp/SUITApp.pro
+++ b/src/SUITApp/SUITApp.pro
@@ -1,10 +1,11 @@
 TEMPLATE = app
-DESTDIR = ../../bin
+
+DESTDIR = ../../$(CONFIG_ID)/bin
 MOC_DIR = ../../moc
-OBJECTS_DIR = ../../obj/$$TARGET
+OBJECTS_DIR = ../../$(CONFIG_ID)/obj/$$TARGET
 
 INCLUDEPATH = ../../include
-LIBS += -L../../lib -lSUIT -lQtx
+LIBS += -L../../$(CONFIG_ID)/lib -lSUIT -lQtx
 
 CONFIG -= debug release debug_and_release
 CONFIG += qt thread debug dll shared