[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59069] branches/asset-browser: == asset browser ==

[Andrea Weikert]

Revision: 59069
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59069
Author:   elubie
Date:     2013-08-11 14:30:38 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
== asset browser ==
first step to implement thumbnail view - switching the view type.
TODO: actually show images and fix Drag&Drop

Modified Paths:
--------------
    branches/asset-browser/release/scripts/startup/bl_ui/space_asset.py
    branches/asset-browser/source/blender/editors/listview/listview_draw.c
    branches/asset-browser/source/blender/editors/space_asset/space_asset.c
    branches/asset-browser/source/blender/makesdna/DNA_space_types.h
    branches/asset-browser/source/blender/makesrna/intern/rna_space.c

Modified: branches/asset-browser/release/scripts/startup/bl_ui/space_asset.py
===================================================================
--- branches/asset-browser/release/scripts/startup/bl_ui/space_asset.py	2013-08-11 12:59:51 UTC (rev 59068)
+++ branches/asset-browser/release/scripts/startup/bl_ui/space_asset.py	2013-08-11 14:30:38 UTC (rev 59069)
@@ -33,8 +33,9 @@
 
         row = layout.row(align=True)
         row.template_header()
-
         layout.separator()
+        row.prop(sasset, "display_type", expand=True, text="")
+        layout.separator()
         row = layout.row(align=True)
         row.prop(sasset, "show_scenes", text="")
         row.prop(sasset, "show_groups", text="")

Modified: branches/asset-browser/source/blender/editors/listview/listview_draw.c
===================================================================
--- branches/asset-browser/source/blender/editors/listview/listview_draw.c	2013-08-11 12:59:51 UTC (rev 59068)
+++ branches/asset-browser/source/blender/editors/listview/listview_draw.c	2013-08-11 14:30:38 UTC (rev 59069)
@@ -370,7 +370,7 @@
 			listview_draw_string(sx + 1, tpos, contentlist_entry_get_formatted(cl, i, 0), (float)textwidth, textheight, align);
 		}
 
-		{
+		if (FILE_IMGDISPLAY != layout->display) {
 			sx += textwidth + 12;
 
 			for (col = 1; col < contentlist_num_columns(cl); ++col) {

Modified: branches/asset-browser/source/blender/editors/space_asset/space_asset.c
===================================================================
--- branches/asset-browser/source/blender/editors/space_asset/space_asset.c	2013-08-11 12:59:51 UTC (rev 59068)
+++ branches/asset-browser/source/blender/editors/space_asset/space_asset.c	2013-08-11 14:30:38 UTC (rev 59069)
@@ -287,6 +287,7 @@
 	UI_view2d_region_reinit(v2d, V2D_COMMONVIEW_LIST, ar->winx, ar->winy);
 
 	layout->dirty = 1;
+	layout->display = sasset->display;
 	listview_layout_init(ar);
 
 	/* sets tile/border settings in sfile */
@@ -312,13 +313,16 @@
 	UI_view2d_scrollers_free(scrollers);
 }
 
-static void assetbrowser_main_region_listener(bScreen *UNUSED(sc),ScrArea *UNUSED(sa), ARegion *ar, wmNotifier *wmn)
+static void assetbrowser_main_region_listener(bScreen *UNUSED(sc),ScrArea *sa, ARegion *ar, wmNotifier *wmn)
 {
 	/* context changes */
 	switch (wmn->category) {
-		case NC_LISTVIEW:
-			ED_region_tag_redraw(ar);
-			break;
+		case NC_SPACE:
+			switch (wmn->data) {
+				case ND_SPACE_ASSET:
+					ED_area_tag_redraw(sa);
+					break;
+			}
 		case NC_ASSETCOLLECTION:
 			switch (wmn->data) {
 				case ND_ASSETS_CHANGED:

Modified: branches/asset-browser/source/blender/makesdna/DNA_space_types.h
===================================================================
--- branches/asset-browser/source/blender/makesdna/DNA_space_types.h	2013-08-11 12:59:51 UTC (rev 59068)
+++ branches/asset-browser/source/blender/makesdna/DNA_space_types.h	2013-08-11 14:30:38 UTC (rev 59069)
@@ -1140,6 +1140,8 @@
 	int active_collection;		/* currently selected asset collection */
 	int showflag;
 	int active_asset;
+	short display;
+	short pad1, pad2, pad3;
 } SpaceAsset;
 
 typedef enum eSpaceAsset_ShowFlag {

Modified: branches/asset-browser/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/asset-browser/source/blender/makesrna/intern/rna_space.c	2013-08-11 12:59:51 UTC (rev 59068)
+++ branches/asset-browser/source/blender/makesrna/intern/rna_space.c	2013-08-11 14:30:38 UTC (rev 59069)
@@ -3760,6 +3760,13 @@
 	StructRNA *srna;
 	PropertyRNA *prop;
  
+	static EnumPropertyItem asset_display_items[] = {
+		{FILE_SHORTDISPLAY, "FILE_SHORTDISPLAY", ICON_SHORTDISPLAY, "Short List", "Display files as short list"},
+		{FILE_LONGDISPLAY, "FILE_LONGDISPLAY", ICON_LONGDISPLAY, "Long List", "Display files as a detailed list"},
+		{FILE_IMGDISPLAY, "FILE_IMGDISPLAY", ICON_IMGDISPLAY, "Thumbnails", "Display files as thumbnails"},
+		{0, NULL, 0, NULL, NULL}
+	};
+
 	srna= RNA_def_struct(brna, "SpaceAssetBrowser", "Space");
 	RNA_def_struct_sdna(srna, "SpaceAsset");
 	RNA_def_struct_ui_text(srna, "Asset Browser", "Asset Browser space data");
@@ -3775,6 +3782,13 @@
 	RNA_def_property_clear_flag(prop, PROP_EDITABLE);
 	RNA_def_property_ui_text(prop, "Active Asset", "Selected Asset");
 
+	/* display type */
+	prop = RNA_def_property(srna, "display_type", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "display");
+	RNA_def_property_enum_items(prop, asset_display_items);
+	RNA_def_property_ui_text(prop, "Display Mode", "Display mode for the file list");
+	RNA_def_property_update(prop, NC_SPACE | ND_SPACE_ASSET, NULL);
+
 	/* Showflag for filtering */
 	prop = RNA_def_property(srna, "show_actions", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_ui_text(prop, "Show Actions", "Show actions in asset list");