Mercurial > hg > easaier-soundaccess

changeset 60:32b4949086a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix the the first bug color in the layer list
author benoitrigolleau
date Tue, 29 May 2007 08:42:49 +0000
parents 57c85a9d9b4a
children 0387f53242b2
files sv/document/Document.cpp widgets/ItemLayerList.cpp widgets/ItemLayerList.h
diffstat 3 files changed, 23 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/sv/document/Document.cpp	Mon May 28 08:14:40 2007 +0000
+++ b/sv/document/Document.cpp	Tue May 29 08:42:49 2007 +0000
@@ -471,10 +471,10 @@
 	    std::cerr << "(force flag set -- deleting from all views)" << std::endl;
 
 	    for (std::set<View *>::iterator j = m_layerViewMap[layer].begin();
-		 j != m_layerViewMap[layer].end(); ++j) {
-		// don't use removeLayerFromView, as it issues a command
-		layer->setLayerDormant(*j, true);
-		(*j)->removeLayer(layer);
+			 j != m_layerViewMap[layer].end(); ++j) {
+			// don't use removeLayerFromView, as it issues a command
+			layer->setLayerDormant(*j, true);
+			(*j)->removeLayer(layer);
 	    }
 	    
 	    m_layerViewMap.erase(layer);
--- a/widgets/ItemLayerList.cpp	Mon May 28 08:14:40 2007 +0000
+++ b/widgets/ItemLayerList.cpp	Tue May 29 08:42:49 2007 +0000
@@ -46,9 +46,9 @@
 	m_checkBoxShow->setMaximumSize(30,30);
 	//checkBox1->setText("");
 	m_checkBoxShow->setAutoFillBackground(true);
-	//QPalette palette;
-	//palette.setColor(QPalette::Button,QColor ( 100, 60, 20));
-	//checkBox1->setPalette(palette);
+	QPalette palette;
+	palette.setColor(QPalette::Button,palette.color(QPalette::Background));
+	m_checkBoxShow->setPalette(palette);
 
 	m_checkBoxPlay->setMaximumSize(20,30);	
 
@@ -128,8 +128,6 @@
 }
 
 void ItemLayerList::updateCheckboxs(){
-
-
 	Layer *layer = dynamic_cast<Layer *>(m_container);
 	if (layer) {
 		m_checkBoxShow->setEnabled(true);
@@ -139,10 +137,15 @@
 			this, SLOT(updateCheckboxs()));
 		connect(layer, SIGNAL(modelReplaced()),
 			this, SLOT(updateCheckboxs()));
+		
+		disconnect(layer, SIGNAL(layerParametersChanged()),
+			this,SLOT(updateColor()));
+		connect(layer, SIGNAL(layerParametersChanged()),
+			this,SLOT(updateColor()));
+
 	}else{
 		m_checkBoxShow->setEnabled(false);
 	}
-
 	PlayParameters *params = m_container->getPlayParameters();
 
 	if(params){
@@ -154,13 +157,20 @@
 	}else{
 		m_checkBoxPlay->setEnabled(false);
 	}
-
-
 }
 
+void ItemLayerList::updateColor(){
+	Layer *layer = dynamic_cast<Layer *>(m_container);
+	if (layer) {
+		QPalette palette;
+		palette.setColor(QPalette::Button,QColor ( 100, 60, 20));
+		m_checkBoxShow->setPalette(palette);
+	}
+}
 
 
 
 
 
 
+
--- a/widgets/ItemLayerList.h	Mon May 28 08:14:40 2007 +0000
+++ b/widgets/ItemLayerList.h	Tue May 29 08:42:49 2007 +0000
@@ -50,6 +50,7 @@
 	void openPropertyBox();
 	void showLayer(bool value);
 	void updateCheckboxs();
+	void updateColor();
 
 };