Merge branch 'feature-group' into develop

Conflicts:
	build/vc2013/nana.vcxproj
	build/vc2013/nana.vcxproj.filters
This commit is contained in:
Jinhao 2015-07-12 11:31:06 +08:00
commit 17556cae99
6 changed files with 650 additions and 17 deletions

View File

@ -222,6 +222,7 @@
<ClCompile Include="..\..\source\gui\widgets\float_listbox.cpp" />
<ClCompile Include="..\..\source\gui\widgets\form.cpp" />
<ClCompile Include="..\..\source\gui\widgets\frame.cpp" />
<ClCompile Include="..\..\source\gui\widgets\group.cpp" />
<ClCompile Include="..\..\source\gui\widgets\label.cpp" />
<ClCompile Include="..\..\source\gui\widgets\listbox.cpp" />
<ClCompile Include="..\..\source\gui\widgets\menu.cpp" />
@ -257,9 +258,129 @@
<ClCompile Include="..\..\source\unicode_bidi.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\nana\filesystem\filesystem.hpp" />
<ClInclude Include="..\..\include\nana\any.hpp" />
<ClInclude Include="..\..\include\nana\audio\detail\audio_device.hpp" />
<ClInclude Include="..\..\include\nana\audio\detail\audio_stream.hpp" />
<ClInclude Include="..\..\include\nana\audio\detail\buffer_preparation.hpp" />
<ClInclude Include="..\..\include\nana\audio\player.hpp" />
<ClInclude Include="..\..\include\nana\basic_types.hpp" />
<ClInclude Include="..\..\include\nana\charset.hpp" />
<ClInclude Include="..\..\include\nana\concepts.hpp" />
<ClInclude Include="..\..\include\nana\config.hpp" />
<ClInclude Include="..\..\include\nana\datetime.hpp" />
<ClInclude Include="..\..\include\nana\deploy.hpp" />
<ClInclude Include="..\..\include\nana\detail\linux_X11\msg_dispatcher.hpp" />
<ClInclude Include="..\..\include\nana\detail\linux_X11\msg_packet.hpp" />
<ClInclude Include="..\..\include\nana\detail\linux_X11\platform_spec.hpp" />
<ClInclude Include="..\..\include\nana\detail\win32\platform_spec.hpp" />
<ClInclude Include="..\..\include\nana\exceptions.hpp" />
<ClInclude Include="..\..\include\nana\extrlib\png.h" />
<ClInclude Include="..\..\include\nana\extrlib\pngconf.h" />
<ClInclude Include="..\..\include\nana\extrlib\pnglibconf.h" />
<ClInclude Include="..\..\include\nana\extrlib\zlib.h" />
<ClInclude Include="..\..\include\nana\filesystem\filesystem.hpp" />
<ClInclude Include="..\..\include\nana\filesystem\file_iterator.hpp" />
<ClInclude Include="..\..\include\nana\filesystem\fs_utility.hpp" />
<ClInclude Include="..\..\include\nana\fwd.hpp" />
<ClInclude Include="..\..\include\nana\gui.hpp" />
<ClInclude Include="..\..\include\nana\gui\animation.hpp" />
<ClInclude Include="..\..\include\nana\gui\basis.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\basic_window.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\bedrock.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\bedrock_pi_data.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\color_schemes.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\drawer.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\dynamic_drawing_object.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\effects_renderer.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\element_store.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\events_holder.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\events_operation.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\event_code.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\general_events.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\handle_manager.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\inner_fwd.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\inner_fwd_implement.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\internal_scope_guard.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\native_window_interface.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\runtime_manager.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\widget_colors.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\window_layout.hpp" />
<ClInclude Include="..\..\include\nana\gui\detail\window_manager.hpp" />
<ClInclude Include="..\..\include\nana\gui\dragger.hpp" />
<ClInclude Include="..\..\include\nana\gui\drawing.hpp" />
<ClInclude Include="..\..\include\nana\gui\effects.hpp" />
<ClInclude Include="..\..\include\nana\gui\element.hpp" />
<ClInclude Include="..\..\include\nana\gui\filebox.hpp" />
<ClInclude Include="..\..\include\nana\gui\layout_utility.hpp" />
<ClInclude Include="..\..\include\nana\gui\msgbox.hpp" />
<ClInclude Include="..\..\include\nana\gui\notifier.hpp" />
<ClInclude Include="..\..\include\nana\gui\place.hpp" />
<ClInclude Include="..\..\include\nana\gui\programming_interface.hpp" />
<ClInclude Include="..\..\include\nana\gui\screen.hpp" />
<ClInclude Include="..\..\include\nana\gui\state_cursor.hpp" />
<ClInclude Include="..\..\include\nana\gui\timer.hpp" />
<ClInclude Include="..\..\include\nana\gui\tooltip.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\button.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\categorize.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\checkbox.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\combox.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\date_chooser.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\detail\compset.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\detail\tree_cont.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\float_listbox.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\form.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\frame.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\group.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\label.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\listbox.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\menu.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\menubar.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\panel.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\picture.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\progress.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\scroll.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\skeletons\textbase.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\skeletons\textbase_export_interface.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\skeletons\text_editor.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\skeletons\text_editor_scheme.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\skeletons\text_token_stream.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\slider.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\spinbox.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\tabbar.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\textbox.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\toolbar.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\treebox.hpp" />
<ClInclude Include="..\..\include\nana\gui\widgets\widget.hpp" />
<ClInclude Include="..\..\include\nana\gui\wvl.hpp" />
<ClInclude Include="..\..\include\nana\internationalization.hpp" />
<ClInclude Include="..\..\include\nana\key_type.hpp" />
<ClInclude Include="..\..\include\nana\paint\detail\image_bmp.hpp" />
<ClInclude Include="..\..\include\nana\paint\detail\image_ico.hpp" />
<ClInclude Include="..\..\include\nana\paint\detail\image_impl_interface.hpp" />
<ClInclude Include="..\..\include\nana\paint\detail\image_png.hpp" />
<ClInclude Include="..\..\include\nana\paint\detail\image_processor.hpp" />
<ClInclude Include="..\..\include\nana\paint\detail\image_process_provider.hpp" />
<ClInclude Include="..\..\include\nana\paint\detail\native_paint_interface.hpp" />
<ClInclude Include="..\..\include\nana\paint\gadget.hpp" />
<ClInclude Include="..\..\include\nana\paint\graphics.hpp" />
<ClInclude Include="..\..\include\nana\paint\image.hpp" />
<ClInclude Include="..\..\include\nana\paint\image_process_interface.hpp" />
<ClInclude Include="..\..\include\nana\paint\image_process_selector.hpp" />
<ClInclude Include="..\..\include\nana\paint\pixel_buffer.hpp" />
<ClInclude Include="..\..\include\nana\paint\text_renderer.hpp" />
<ClInclude Include="..\..\include\nana\pat\cloneable.hpp" />
<ClInclude Include="..\..\include\nana\std_condition_variable.hpp" />
<ClInclude Include="..\..\include\nana\std_mutex.hpp" />
<ClInclude Include="..\..\include\nana\std_thread.hpp" />
<ClInclude Include="..\..\include\nana\system\dataexch.hpp" />
<ClInclude Include="..\..\include\nana\system\platform.hpp" />
<ClInclude Include="..\..\include\nana\system\shared_wrapper.hpp" />
<ClInclude Include="..\..\include\nana\system\timepiece.hpp" />
<ClInclude Include="..\..\include\nana\threads\pool.hpp" />
<ClInclude Include="..\..\include\nana\traits.hpp" />
<ClInclude Include="..\..\include\nana\unicode_bidi.hpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

View File

@ -58,6 +58,51 @@
<Filter Include="Source Files\nana\threads">
<UniqueIdentifier>{e95b4a72-643f-4416-af95-b0bbaf7f0c57}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\gui">
<UniqueIdentifier>{d421a05b-b868-4c3d-bdac-ff57d09f8d07}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\gui\widgets">
<UniqueIdentifier>{64c22f90-dce2-40dc-be98-edc9fe8951e8}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\gui\detail">
<UniqueIdentifier>{91301ff5-79ac-40cc-a6db-bca2097ea763}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\gui\widgets\detail">
<UniqueIdentifier>{81c62a28-ef5f-43f7-a6ce-e6c186cb411a}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\gui\widgets\skeletons">
<UniqueIdentifier>{4a1db6f0-a4ee-4514-8e89-54ef9d52e3b8}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\detail">
<UniqueIdentifier>{c92e890a-ffd5-4efd-8b37-78ed9bbea1e1}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\detail\win32">
<UniqueIdentifier>{63401f37-26a3-423e-87e6-6840344c3056}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\detail\linux_X11">
<UniqueIdentifier>{61385c08-f06b-4cf3-8e05-9b47d546164b}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\extrlib">
<UniqueIdentifier>{e9eadc97-4a14-4a4e-bb52-52d3a20e2693}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\filesystem">
<UniqueIdentifier>{5667eac1-0887-4936-9502-eac4dd8c1c1d}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\paint">
<UniqueIdentifier>{e6c4a4d9-b4b5-4c56-bb2a-486f3f777ecb}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\paint\detail">
<UniqueIdentifier>{ac132633-f80c-4983-8e47-fa7fc17f666e}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\pat">
<UniqueIdentifier>{ee3e9e63-7221-409e-9659-25864e576e16}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\system">
<UniqueIdentifier>{ef87057b-dff2-40aa-a05e-9dcd0b335c30}</UniqueIdentifier>
</Filter>
<Filter Include="Header Files\threads">
<UniqueIdentifier>{8ea232cf-bd7c-47e3-a694-6a8898b677d7}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\source\audio\detail\audio_device.cpp">
@ -74,6 +119,9 @@
</ClCompile>
<ClCompile Include="..\..\source\detail\win32\platform_spec.cpp">
<Filter>Source Files\nana\detail\win32</Filter>
</ClCompile>
<ClCompile Include="..\..\source\filesystem\filesystem.cpp">
<Filter>Source Files\nana\filesystem</Filter>
</ClCompile>
<ClCompile Include="..\..\source\filesystem\file_iterator.cpp">
<Filter>Source Files\nana\filesystem</Filter>
@ -300,18 +348,375 @@
<ClCompile Include="..\..\source\gui\widgets\spinbox.cpp">
<Filter>Source Files\nana\gui\widgets</Filter>
</ClCompile>
<ClCompile Include="..\..\source\filesystem\filesystem.cpp">
<Filter>Source Files\nana\filesystem</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\source\gui\widgets\group.cpp">
<Filter>Source Files\nana\gui\widgets</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\nana\filesystem\filesystem.hpp">
<ClInclude Include="..\..\include\nana\gui\widgets\button.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\categorize.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\checkbox.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\combox.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\date_chooser.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\float_listbox.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\form.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\frame.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\label.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\listbox.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\menu.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\menubar.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\panel.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\picture.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\progress.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\scroll.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\slider.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\spinbox.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\tabbar.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\textbox.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\toolbar.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\treebox.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\widget.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\basic_window.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\bedrock.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\bedrock_pi_data.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\color_schemes.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\drawer.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\dynamic_drawing_object.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\effects_renderer.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\element_store.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\event_code.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\events_holder.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\events_operation.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\general_events.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\handle_manager.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\inner_fwd.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\inner_fwd_implement.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\internal_scope_guard.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\native_window_interface.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\runtime_manager.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\widget_colors.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\window_layout.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\detail\window_manager.hpp">
<Filter>Header Files\gui\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\animation.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\basis.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\dragger.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\drawing.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\effects.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\element.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\filebox.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\layout_utility.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\msgbox.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\notifier.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\place.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\programming_interface.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\screen.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\state_cursor.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\timer.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\tooltip.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\wvl.hpp">
<Filter>Header Files\gui</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\detail\compset.hpp">
<Filter>Header Files\gui\widgets\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\detail\tree_cont.hpp">
<Filter>Header Files\gui\widgets\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\skeletons\text_editor.hpp">
<Filter>Header Files\gui\widgets\skeletons</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\skeletons\text_editor_scheme.hpp">
<Filter>Header Files\gui\widgets\skeletons</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\skeletons\text_token_stream.hpp">
<Filter>Header Files\gui\widgets\skeletons</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\skeletons\textbase.hpp">
<Filter>Header Files\gui\widgets\skeletons</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\skeletons\textbase_export_interface.hpp">
<Filter>Header Files\gui\widgets\skeletons</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\any.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\nana\filesystem\filesystem.hpp">
<ClInclude Include="..\..\include\nana\basic_types.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\charset.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\concepts.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\config.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\datetime.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\deploy.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\exceptions.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\fwd.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\internationalization.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\key_type.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\std_condition_variable.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\std_mutex.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\std_thread.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\traits.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\unicode_bidi.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\audio\detail\audio_device.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\audio\detail\audio_stream.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\audio\detail\buffer_preparation.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\audio\player.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\detail\linux_X11\msg_dispatcher.hpp">
<Filter>Header Files\detail\linux_X11</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\detail\linux_X11\msg_packet.hpp">
<Filter>Header Files\detail\linux_X11</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\detail\linux_X11\platform_spec.hpp">
<Filter>Header Files\detail\linux_X11</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\detail\win32\platform_spec.hpp">
<Filter>Header Files\detail\win32</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\extrlib\png.h">
<Filter>Header Files\extrlib</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\extrlib\pngconf.h">
<Filter>Header Files\extrlib</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\extrlib\pnglibconf.h">
<Filter>Header Files\extrlib</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\extrlib\zlib.h">
<Filter>Header Files\extrlib</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\filesystem\filesystem.hpp">
<Filter>Header Files\filesystem</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\filesystem\file_iterator.hpp">
<Filter>Header Files\filesystem</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\filesystem\fs_utility.hpp">
<Filter>Header Files\filesystem</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\paint\gadget.hpp">
<Filter>Header Files\paint</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\paint\graphics.hpp">
<Filter>Header Files\paint</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\paint\image.hpp">
<Filter>Header Files\paint</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\paint\image_process_interface.hpp">
<Filter>Header Files\paint</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\paint\image_process_selector.hpp">
<Filter>Header Files\paint</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\paint\pixel_buffer.hpp">
<Filter>Header Files\paint</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\paint\text_renderer.hpp">
<Filter>Header Files\paint</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\paint\detail\image_ico.hpp">
<Filter>Header Files\paint\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\paint\detail\image_impl_interface.hpp">
<Filter>Header Files\paint\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\paint\detail\image_png.hpp">
<Filter>Header Files\paint\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\paint\detail\image_process_provider.hpp">
<Filter>Header Files\paint\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\paint\detail\image_processor.hpp">
<Filter>Header Files\paint\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\paint\detail\native_paint_interface.hpp">
<Filter>Header Files\paint\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\paint\detail\image_bmp.hpp">
<Filter>Header Files\paint\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\pat\cloneable.hpp">
<Filter>Header Files\pat</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\system\dataexch.hpp">
<Filter>Header Files\system</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\system\platform.hpp">
<Filter>Header Files\system</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\system\shared_wrapper.hpp">
<Filter>Header Files\system</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\system\timepiece.hpp">
<Filter>Header Files\system</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\threads\pool.hpp">
<Filter>Header Files\threads</Filter>
</ClInclude>
<ClInclude Include="..\..\include\nana\gui\widgets\group.hpp">
<Filter>Header Files\gui\widgets</Filter>
</ClInclude>
</ItemGroup>
</Project>
</Project>

View File

@ -223,6 +223,7 @@
<ClCompile Include="..\..\source\gui\widgets\float_listbox.cpp" />
<ClCompile Include="..\..\source\gui\widgets\form.cpp" />
<ClCompile Include="..\..\source\gui\widgets\frame.cpp" />
<ClCompile Include="..\..\source\gui\widgets\group.cpp" />
<ClCompile Include="..\..\source\gui\widgets\label.cpp" />
<ClCompile Include="..\..\source\gui\widgets\listbox.cpp" />
<ClCompile Include="..\..\source\gui\widgets\menu.cpp" />
@ -257,9 +258,6 @@
<ClCompile Include="..\..\source\traits.cpp" />
<ClCompile Include="..\..\source\unicode_bidi.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\nana\filesystem\filesystem.hpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>

View File

@ -303,10 +303,8 @@
<ClCompile Include="..\..\source\filesystem\filesystem.cpp">
<Filter>Source Files\nana\filesystem</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\nana\filesystem\filesystem.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClCompile Include="..\..\source\gui\widgets\group.cpp">
<Filter>Source Files\nana\gui\widgets</Filter>
</ClCompile>
</ItemGroup>
</Project>

View File

@ -0,0 +1,48 @@
/**
* A group widget implementation
* Nana C++ Library(http://www.nanaro.org)
* Copyright(C) 2015 Jinhao(cnjinhao@hotmail.com)
*
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt)
*
* @file: nana/gui/widgets/group.hpp
*
* @contributors: Stefan Pfeifer (st-321), Jinhao, Ariel Vina-Rodriguez (qPCR4vir)
*
* @brief group is a widget used to visually group and layout other widgets.
*/
#ifndef NANA_GUI_WIDGETS_GROUP_HPP
#define NANA_GUI_WIDGETS_GROUP_HPP
#include <nana/gui/place.hpp>
#include <nana/gui/widgets/button.hpp>
#include <nana/gui/widgets/panel.hpp>
#include <nana/gui/widgets/label.hpp>
#include <nana/gui/drawing.hpp>
namespace nana{
class group
: public panel<true>
{
place plc_outer{*this};
panel<false> content {*this};
label titel/* {*this}*/;
place plc_inner{content};
unsigned int gap;
public:
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 ={} ///<
);
place& plc (){ return plc_inner; }
window inner(){ return content; }
label& lbl (){ return titel; }
};
}//end namespace nana
#endif

View File

@ -0,0 +1,63 @@
/**
* A group widget implementation
* Nana C++ Library(http://www.nanaro.org)
* Copyright(C) 2015 Jinhao(cnjinhao@hotmail.com)
*
* Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at
* http://www.boost.org/LICENSE_1_0.txt)
*
* @file: nana/gui/widgets/group.cpp
*
* @contributors: Stefan Pfeifer (st-321), Jinhao, Ariel Vina-Rodriguez (qPCR4vir)
*
* @brief group is a widget used to visually group and layout other widgets.
*/
#include <nana/gui/widgets/group.hpp>
namespace nana{
group::group( window parent, ///<
string titel_ /*={}*/, ///<
bool format /*=false*/, ///<
unsigned gap /*=2*/, ///<
rectangle r /*={} */ ///<
)
: panel (parent, r),
titel (*this, titel_)
{
titel.format(format);
::nana::size sz = titel.measure(1000);
std::stringstream ft;
ft << "vertical margin=[0," << gap << "," << gap << "," << gap << "]"
<< " <weight=" << sz.height << " <weight=5> <titel weight=" << sz.width+1 << "> >"
<< " <content>";
plc_outer.div(ft.str().c_str());
plc_outer["titel" ] << titel;
plc_outer["content"] << content;
plc_outer.collocate();
color pbg = API::bgcolor( parent);
titel.bgcolor(pbg.blend(colors::black, 0.975) );
color bg=pbg.blend(colors::black, 0.950 );
bgcolor(pbg);
content.bgcolor(bg);
drawing dw(*this);
// This drawing function is owner by the onwer of dw (the outer panel of the group widget), not by dw !!
dw.draw([gap,sz,bg,pbg](paint::graphics& graph)
{
graph.rectangle(true, pbg);
graph.round_rectangle(rectangle( point ( gap-1 , sz.height/2 ),
nana::size (graph.width()-2*(gap-1), graph.height()-sz.height/2-(gap-1))
),
3,3, colors::gray_border, true, bg);
});
}
}//end namespace nana