Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							d96efd11a6 
							
						 
					 
					
						
						
							
							Merge branch 'besh81-develop' into develop  
						
						
						
						
					 
					
						2019-05-10 04:33:42 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							44cbb18a50 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/besh81/nana  into besh81-develop  
						
						
						
						
					 
					
						2019-05-10 04:33:25 +08:00 
						 
				 
			
				
					
						
							
							
								besh81 
							
						 
					 
					
						
						
						
						
							
						
						
							67f5d1743f 
							
						 
					 
					
						
						
							
							toolbar: show text inside the button  
						
						... 
						
						
						
						Added function/method both to toolbar and item_proxy:
void textout(size_type index, bool show); ///< Show/Hide the text inside the button
Before: button without image weren't display
Now: button without image is display as empty square. In case the textout is on the text is show 
						
						
					 
					
						2019-05-09 09:44:37 +02:00 
						 
				 
			
				
					
						
							
							
								besh81 
							
						 
					 
					
						
						
						
						
							
						
						
							5422c43002 
							
						 
					 
					
						
						
							
							toolbar : added toggle button  
						
						... 
						
						
						
						Following functions/methods have been add both to toolbar and item_proxy:
bool istoggle() const; ///< Returns true if the tool style is toggle.
				bool toggle() const; ///< Gets the tool toggle state (only if tool style is toggle).
				item_proxy& toggle(bool toggle_state); ///< Sets the tool toggle state (only if tool style is toggle).
				std::string toggle_group() const;	///< Returns the toggle group associated with the tool (only if tool style is toggle).
				item_proxy& toggle_group(const ::std::string& group);	///< Adds the tool to a toggle group (only if tool style is toggle). 
						
						
					 
					
						2019-05-08 18:11:21 +02:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							5c19c9a9c3 
							
						 
					 
					
						
						
							
							Merge branch 'ErrorFlynn-hotfix-1.7' into hotfix-1.7.1  
						
						
						
						
					 
					
						2019-05-07 00:29:47 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							dfc3cf0cbd 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.7' of  https://github.com/ErrorFlynn/nana  into ErrorFlynn-hotfix-1.7  
						
						
						
						
					 
					
						2019-05-07 00:29:04 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							3d89eb2ea1 
							
						 
					 
					
						
						
							
							Merge branch 'qPCR4vir-test_error' into develop  
						
						
						
						
					 
					
						2019-05-07 00:25:46 +08:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							9e60ae87ba 
							
						 
					 
					
						
						
							
							better text error  
						
						
						
						
					 
					
						2019-05-05 23:47:44 +02:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							4d42409a54 
							
						 
					 
					
						
						
							
							cover more place methods with place:error  
						
						
						
						
					 
					
						2019-05-05 23:05:25 +02:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							ca96a9d3ca 
							
						 
					 
					
						
						
							
							Fix merge  
						
						... 
						
						
						
						# Conflicts:
#	include/nana/gui/widgets/treebox.hpp
#	source/gui/place.cpp 
						
						
					 
					
						2019-05-05 22:15:41 +02:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							d6088e5d7d 
							
						 
					 
					
						
						
							
							nana dev point to nana-demo cmake-dev. No Boost, print CMAKE_CXX_FLAGS_RELEASE.  
						
						
						
						
					 
					
						2019-05-05 21:53:05 +02:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							20c40a091a 
							
						 
					 
					
						
						
							
							fix warning about order of initialization  
						
						
						
						
					 
					
						2019-05-05 21:46:20 +02:00 
						 
				 
			
				
					
						
							
							
								ErrorFlynn 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4e3641ed88 
							
						 
					 
					
						
						
							
							fix for issue  #428  
						
						
						
						
					 
					
						2019-05-05 11:13:08 -04:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							74b486e267 
							
						 
					 
					
						
						
							
							first "working" version of place::error - compiles and run when Ok  
						
						... 
						
						
						
						tested with some errors as espected 
						
						
					 
					
						2019-05-05 11:20:09 +02:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							003ffee01a 
							
						 
					 
					
						
						
							
							implement error  
						
						
						
						
					 
					
						2019-05-05 11:20:09 +02:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							45bb9f4318 
							
						 
					 
					
						
						
							
							\todo introduce a place::implement::field_gather::error ??  
						
						
						
						
					 
					
						2019-05-05 11:20:09 +02:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							5b1d0b4606 
							
						 
					 
					
						
						
							
							tokenizer errors  
						
						
						
						
					 
					
						2019-05-05 11:20:09 +02:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							1d2e489c7f 
							
						 
					 
					
						
						
							
							full error msg at one place  
						
						
						
						
					 
					
						2019-05-05 11:20:09 +02:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							7830f430c0 
							
						 
					 
					
						
						
							
							tokenizer::error  
						
						
						
						
					 
					
						2019-05-05 11:20:09 +02:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							064d59de13 
							
						 
					 
					
						
						
							
							rename to valid_field_name  
						
						
						
						
					 
					
						2019-05-05 11:20:09 +02:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							6b3c02b558 
							
						 
					 
					
						
						
							
							introduce place::error and badname  
						
						
						
						
					 
					
						2019-05-05 11:20:09 +02:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							77dd467f73 
							
						 
					 
					
						
						
							
							Add field name to place error  
						
						
						
						
					 
					
						2019-05-05 11:20:02 +02:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							d18a4e9506 
							
						 
					 
					
						
						
							
							LanguageStandard -> stdcpplatest  
						
						
						
						
					 
					
						2019-05-05 11:18:02 +02:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							ce3dd2e9a1 
							
						 
					 
					
						
						
							
							scheme code format  
						
						
						
						
					 
					
						2019-05-05 11:17:20 +02:00 
						 
				 
			
				
					
						
							
							
								qPCR4vir 
							
						 
					 
					
						
						
						
						
							
						
						
							662a9b6b80 
							
						 
					 
					
						
						
							
							FIX big executables in release mode: from 103 MB to 3 MB  
						
						
						
						
					 
					
						2019-05-05 11:14:16 +02:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							36556b44f5 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.7.1' into develop  
						
						
						
						
					 
					
						2019-04-28 05:00:20 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							ec38e666a1 
							
						 
					 
					
						
						
							
							fix bug that grayscale png is mistakely processed  
						
						
						
						
					 
					
						2019-04-24 01:18:27 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							ffa170b5f5 
							
						 
					 
					
						
						
							
							Merge branch 'develop'  
						
						
						
						
					 
					
						2019-04-22 05:58:06 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							b9ab3f8a4f 
							
						 
					 
					
						
						
							
							remove deprecated code  
						
						
						
						
					 
					
						2019-04-22 05:51:56 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							4df1689b46 
							
						 
					 
					
						
						
							
							Merge branch 'develop'  
						
						
						
						
					 
					
						2019-04-22 05:06:30 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							a08e274088 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.7' into develop  
						
						
						
						
					 
					
						2019-04-22 01:08:49 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							ac9cb8e589 
							
						 
					 
					
						
						
							
							add a member type item_interface to float_listbox::item_renderer  
						
						
						
						
					 
					
						2019-04-22 01:07:15 +08:00 
						 
				 
			
				
					
						
							
							
								ErrorFlynn 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e36a3270e9 
							
						 
					 
					
						
						
							
							bug: second parameter of category_icon() is rvalue reference  
						
						
						
						
					 
					
						2019-04-18 17:13:19 -04:00 
						 
				 
			
				
					
						
							
							
								ErrorFlynn 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c5b38f3643 
							
						 
					 
					
						
						
							
							bug: second parameter of category_icon() is rvalue reference  
						
						
						
						
					 
					
						2019-04-18 17:12:31 -04:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							5320ead6bd 
							
						 
					 
					
						
						
							
							add treebox.horvered method  
						
						
						
						
					 
					
						2019-04-19 04:40:49 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							8b2dc1eddd 
							
						 
					 
					
						
						
							
							fix missing fs.weakly_canonical for c++11/14  
						
						
						
						
					 
					
						2019-04-19 04:38:30 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							9e91bd0160 
							
						 
					 
					
						
						
							
							recover the behavior of treebox path which starts with separater( #422 )  
						
						
						
						
					 
					
						2019-04-19 02:07:47 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							9ec8ab4e9d 
							
						 
					 
					
						
						
							
							add contributor information  
						
						
						
						
					 
					
						2019-04-17 05:36:19 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							5f7fa53f88 
							
						 
					 
					
						
						
							
							Merge branch 'ErrorFlynn-hotfix-1.7' into hotfix-1.7  
						
						
						
						
					 
					
						2019-04-16 23:50:24 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							6c62b1e819 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.7' of  https://github.com/ErrorFlynn/nana  into ErrorFlynn-hotfix-1.7  
						
						
						
						
					 
					
						2019-04-16 23:48:53 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							ebb1cf79fb 
							
						 
					 
					
						
						
							
							Merge branch 'beru-develop' into develop  
						
						
						
						
					 
					
						2019-04-16 23:40:12 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							f274ff4c4c 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of  https://github.com/beru/nana  into beru-develop  
						
						
						
						
					 
					
						2019-04-16 23:39:40 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							fd120c6425 
							
						 
					 
					
						
						
							
							Merge branch 'hotfix-1.7' into develop  
						
						
						
						
					 
					
						2019-04-16 04:01:44 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							5335bb841f 
							
						 
					 
					
						
						
							
							add on_clicked and on_checked for radio_group  
						
						
						
						
					 
					
						2019-04-16 03:59:51 +08:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							f697f4c338 
							
						 
					 
					
						
						
							
							uses std::chrono  
						
						
						
						
					 
					
						2019-04-16 03:54:16 +08:00 
						 
				 
			
				
					
						
							
							
								ErrorFlynn 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b7ddcd7d3a 
							
						 
					 
					
						
						
							
							fix for issue  #420  
						
						
						
						
					 
					
						2019-04-15 13:00:04 -04:00 
						 
				 
			
				
					
						
							
							
								ErrorFlynn 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1468d1836c 
							
						 
					 
					
						
						
							
							Merge pull request  #4  from cnjinhao/hotfix-1.7  
						
						... 
						
						
						
						Hotfix 1.7 
						
						
					 
					
						2019-04-15 12:52:33 -04:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							7de40cdc69 
							
						 
					 
					
						
						
							
							Merge branch 'rbrugo-develop' into develop  
						
						
						
						
					 
					
						2019-04-15 00:21:01 +08:00 
						 
				 
			
				
					
						
							
							
								beru 
							
						 
					 
					
						
						
						
						
							
						
						
							a596c7f64e 
							
						 
					 
					
						
						
							
							fix typos  
						
						
						
						
					 
					
						2019-04-14 14:49:01 +09:00 
						 
				 
			
				
					
						
							
							
								Jinhao 
							
						 
					 
					
						
						
						
						
							
						
						
							cff318d182 
							
						 
					 
					
						
						
							
							enhance the performance of nana  
						
						
						
						
					 
					
						2019-04-13 00:03:40 +08:00