# HG changeset patch
# User benoitrigolleau
# Date 1184083273 0
# Node ID 486e44e12a5d46e6690508d7f85b2d35214065fa
# Parent  c70c6b99d8715db3a65dbd27516280f131ce6efc
this version use only one servlet. Data is provide by stream capacity.

diff -r c70c6b99d871 -r 486e44e12a5d sv/document/Document.cpp
--- a/sv/document/Document.cpp	Tue Jul 10 10:08:42 2007 +0000
+++ b/sv/document/Document.cpp	Tue Jul 10 16:01:13 2007 +0000
@@ -687,12 +687,12 @@
 Document::AddLayerCommand::execute()
 {
     for (int i = 0; i < m_view->getLayerCount(); ++i) {
-	if (m_view->getLayer(i) == m_layer) {
-	    // already there
-	    m_layer->setLayerDormant(m_view, false);
-	    m_added = true;
-	    return;
-	}
+		if (m_view->getLayer(i) == m_layer) {
+		   // already there
+		  m_layer->setLayerDormant(m_view, false);
+		  m_added = true;
+		  return;
+		}
     }
 
     m_view->addLayer(m_layer);
diff -r c70c6b99d871 -r 486e44e12a5d sv/main/EasaierSessionManager.cpp
--- a/sv/main/EasaierSessionManager.cpp	Tue Jul 10 10:08:42 2007 +0000
+++ b/sv/main/EasaierSessionManager.cpp	Tue Jul 10 16:01:13 2007 +0000
@@ -57,10 +57,7 @@
 
 	m_queryModel = new QueryModel();
 	QString filename = "/data/query/queryfield.xml";
-	QString query = "/data/query/queryfield.xml";
-
-	m_httpClient->setHost(m_httpClient->getHost());
-
+	QString query = m_httpClient->getServletName() + "?theme=getFile&fileName=data/query/queryfield.xml";
 	loadFile(query, filename, LoadedFile::QUERY_CONFIG);
 
 	return true;
@@ -78,8 +75,6 @@
 	QString query = m_httpClient->getServletName() + "?theme=infoFile"+params;
 
 	QString filename = "/easaier/servlet/infoFile";
-	
-	m_httpClient->setHost(m_httpClient->getHost(), 9876);
 
 	loadFile(query, filename, LoadedFile::AUDIO_SOURCE_INFO);
 
@@ -98,8 +93,6 @@
 	QString query = m_httpClient->getServletName() + "?theme=infoFile"+params;
 
 	QString filename = "/easaier/servlet/infoFile";
-	
-	m_httpClient->setHost(m_httpClient->getHost(), 9876);
 
 	loadFile(query, filename, LoadedFile::AUDIO_SOURCE_INFO);
 	
@@ -315,12 +308,10 @@
 		{
 			QString uri = m_audioSourceInfoModel->getInfo(modelName);
 			
-			QString query = uri;
+			QString query = m_httpClient->getServletName() + "?theme=getFile&fileName="+uri;
 
 			std::set<QString>::iterator iterModel = m_modelLoaded.find(uri);
 
-			m_httpClient->setHost(m_httpClient->getHost());
-
 			if (iterModel == m_modelLoaded.end())
 			{
 				m_modelLoaded.insert(uri);
@@ -383,9 +374,7 @@
 
 void EasaierSessionManager::importMetadata(const QString& filename, Pane* pane)
 {
-	QString query = filename;
-
-	m_httpClient->setHost(m_httpClient->getHost());
+	QString query = m_httpClient->getServletName() + "?theme=getFile&fileName="+filename;
 
 	loadFile( query, filename, LoadedFile::METADATA);
 
@@ -407,8 +396,6 @@
 	QString query = m_httpClient->getServletName() + "?theme="+themeName+""+params;
 	QString filename = "/easaier/servlet/"+themeName;
 
-	m_httpClient->setHost(m_httpClient->getHost(), 9876);
-
 	QApplication::setOverrideCursor( Qt::WaitCursor );
 	loadFile(query, filename, LoadedFile::QUERY_RESULTS);
 	
diff -r c70c6b99d871 -r 486e44e12a5d widgets/GenericItemList.cpp
--- a/widgets/GenericItemList.cpp	Tue Jul 10 10:08:42 2007 +0000
+++ b/widgets/GenericItemList.cpp	Tue Jul 10 16:01:13 2007 +0000
@@ -82,7 +82,7 @@
 void GenericItemList::dragEnterEvent(QDragEnterEvent *evt)
 {
 	GenericItemList *source = qobject_cast<GenericItemList *>(evt->source());
-	if(source && source!=this){
+	if(source && source!=this && source->parentWidget()==this->parentWidget()){
 		evt->setDropAction(Qt::MoveAction);
 		evt->accept();
 	}
@@ -91,7 +91,7 @@
 void GenericItemList::dragMoveEvent(QDragMoveEvent *evt)
 {
 	GenericItemList *source = qobject_cast<GenericItemList *>(evt->source());
-	if(source && source!=this){
+	if(source && source!=this && source->parentWidget()==this->parentWidget()){
 		evt->setDropAction(Qt::MoveAction);
 		evt->accept();
 	}
@@ -104,7 +104,7 @@
 	//std::cerr << " "<<evt->pos().y;
 
 	GenericItemList *source = qobject_cast<GenericItemList *>(evt->source());
-	if (source && source!=this){
+	if (source && source!=this && source->parentWidget()==this->parentWidget()){
 		std::cerr << "value = "<< source->m_index<<"   "<<m_index <<std::endl;
 		emit itemDropped(source->m_index,m_index);
 		evt->setDropAction(Qt::MoveAction);
diff -r c70c6b99d871 -r 486e44e12a5d widgets/ItemContainer.cpp
--- a/widgets/ItemContainer.cpp	Tue Jul 10 10:08:42 2007 +0000
+++ b/widgets/ItemContainer.cpp	Tue Jul 10 16:01:13 2007 +0000
@@ -36,10 +36,10 @@
 	this->setLayout(mainlayout);
 
 	m_currentItem = -1;
-
 }
 
 void ItemContainer::addItem(GenericItemList *item){
+
 	m_map->insert(m_cpt,item);
 	m_linkedList->prepend(m_cpt);
 	item->setIndex(m_cpt);