Merge branch 'qPCRvir-develop' into develop

include/nana/gui/widgets/group.hpp

@@ -34,6 +34,17 @@ namespace nana{
 		/// The construction that creates the widget
 		group(window parent, const rectangle& = {}, bool visible = true);
 
+		///  The construction that creates the widget and set the titel or caption
+
+		group(window    parent,          ///< 
+			  string    titel_ /*= { STR("") }*/,     ///< 
+			  bool      format = false,  ///< Use a formated label?
+			  unsigned  gap = 2,         ///< betwen the content  and the external limit
+			  rectangle r = {} ,          ///<
+			  bool visible = true
+		     );
+
+
 		/// The destruction
 		~group();
 
@@ -60,6 +71,7 @@ namespace nana{
 		void _m_complete_creation() override;
 		::nana::string _m_caption() const override;
 		void _m_caption(::nana::string&&) override;
+		void init();
 	private:
 		std::unique_ptr<implement> impl_;
     };

include/nana/gui/widgets/progress.hpp

@@ -31,7 +31,7 @@ namespace nana
 				void unknown(bool);
 				bool unknown() const;
 				bool stop(bool s = true);
-				bool stoped() const;
+				bool stopped() const;
 			private:
 				void attached(widget_reference, graph_reference)	override;
 				void refresh(graph_reference)	override;
@@ -71,7 +71,7 @@ namespace nana
 		void unknown(bool);
 		bool unknown() const;
 		bool stop(bool s=true);  ///< request stop or cancel and return previus stop status
-		bool stoped() const;  
+		bool stopped() const;  
 	};
 }//end namespace nana
 #endif

source/gui/widgets/group.cpp

@@ -31,8 +31,17 @@ namespace nana{
 		void create(window pnl)
 		{
 			caption.create(pnl);
+			caption.caption(STR(""));
 			place_content.bind(pnl);
 		}
+
+		implement() = default;
+		implement(window grp_panel, string titel, bool format, unsigned gap=2)
+			: caption (grp_panel, std::move(titel), format),
+			  place_content{grp_panel},
+			  gap{gap}
+		{
+		}
 	};
 
 	group::group()
@@ -46,6 +55,20 @@ namespace nana{
 		create(parent, r, vsb);
 	}
 
+	group::group(	window    parent,              ///<
+					string    titel_   /*={}*/,     ///<
+					bool      format /*=false*/,  ///<
+					unsigned  gap /*=2*/,         ///<
+					rectangle r /*={} */,          ///<
+		            bool      vsb /*= true */        ///<
+					)
+		: panel(parent, r, vsb),
+		  impl_(new implement(*this, std::move(titel_), vsb))
+	{
+		impl_->caption.format(format);
+		init();
+	}
+
 
 	group::~group()
 	{
@@ -91,12 +114,8 @@ namespace nana{
 		impl_->place_content[field] << wdg->handle();
 	}
 
-	void group::_m_complete_creation()
+	void group::init()
 	{
-		panel::_m_complete_creation();
-
-		impl_->create(handle());
-
 		this->div(nullptr);
 
 		auto & outter = impl_->place_content;
@@ -108,7 +127,7 @@ namespace nana{
 		impl_->caption.bgcolor(pbg.blend(colors::black, 0.975));
 		color bg = pbg.blend(colors::black, 0.950);
 
-		bgcolor(pbg);
+		bgcolor(bg);
 
 		drawing dw(*this);
 
@@ -127,6 +146,16 @@ namespace nana{
 		});
 	}
 
+	void group::_m_complete_creation()
+	{
+		panel::_m_complete_creation();
+
+		impl_->create(handle());
+
+
+		init();
+	}
+
 	::nana::string group::_m_caption() const
 	{
 		return impl_->caption.caption();

source/gui/widgets/progress.cpp

@@ -89,7 +89,7 @@ namespace nana
 			{
 				return unknown_;
 			}
-			bool trigger::stoped() const
+			bool trigger::stopped() const
 			{
 				return stop_;
 			}
@@ -210,9 +210,9 @@ namespace nana
 		{
 			return get_drawer_trigger().stop(s);
 		}
-		bool progress::stoped() const
+		bool progress::stopped() const
 		{
-			return get_drawer_trigger().stoped();
+			return get_drawer_trigger().stopped();
 		}
 	//end class progress
 }//end namespace nana