[rkward-cvs] SF.net SVN: rkward:[4477] trunk/rkward/rkward/plugin

[tfry at users.sourceforge.net]

Revision: 4477
          http://rkward.svn.sourceforge.net/rkward/?rev=4477&view=rev
Author:   tfry
Date:     2012-12-05 12:01:18 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
Make <copy>-tag work inside optionsets.

Modified Paths:
--------------
    trunk/rkward/rkward/plugin/rkoptionset.cpp
    trunk/rkward/rkward/plugin/rkstandardcomponent.cpp

Modified: trunk/rkward/rkward/plugin/rkoptionset.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkoptionset.cpp	2012-12-04 09:34:14 UTC (rev 4476)
+++ trunk/rkward/rkward/plugin/rkoptionset.cpp	2012-12-05 12:01:18 UTC (rev 4477)
@@ -78,8 +78,8 @@
 	model = 0;
 	display = 0;	// will be created from the builder, on demand -> createDisplay ()
 	contents_container = new RKComponent (this, user_area);
-	RKComponentBuilder *builder = new RKComponentBuilder (contents_container, QDomElement ());
 	QDomElement content_element = xml->getChildElement (element, "content", DL_ERROR);
+	RKComponentBuilder *builder = new RKComponentBuilder (contents_container, content_element);
 	builder->buildElement (content_element, user_area, false);	// NOTE that parent widget != parent component, here, by intention. The point is that the display should not be disabled along with the contents
 	builder->makeConnections ();
 	addChild ("contents", contents_container);

Modified: trunk/rkward/rkward/plugin/rkstandardcomponent.cpp
===================================================================
--- trunk/rkward/rkward/plugin/rkstandardcomponent.cpp	2012-12-04 09:34:14 UTC (rev 4476)
+++ trunk/rkward/rkward/plugin/rkstandardcomponent.cpp	2012-12-05 12:01:18 UTC (rev 4477)
@@ -505,6 +505,9 @@
 	RK_TRACE (PLUGIN);
 	parent = parent_component;
 	doc_elem = document_element;
+	while (!doc_elem.parentNode ().isNull ()) {
+		doc_elem = doc_elem.parentNode ().toElement ();
+	}
 }
 
 RKComponentBuilder::~RKComponentBuilder () {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.