[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18749] branches/blender2.5/blender/source /blender/editors/space_image: 2.5: Added simple toolbox menu in image window as a test,

[Brecht Van Lommel]

Revision: 18749
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18749
Author:   blendix
Date:     2009-01-30 13:58:00 +0100 (Fri, 30 Jan 2009)

Log Message:
-----------
2.5: Added simple toolbox menu in image window as a test,
can uses same menus as header now since code doesn't depend
on being in the header anymore.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
    branches/blender2.5/blender/source/blender/editors/space_image/image_intern.h
    branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c
    branches/blender2.5/blender/source/blender/editors/space_image/space_image.c

Modified: branches/blender2.5/blender/source/blender/editors/space_image/image_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_image/image_header.c	2009-01-30 12:49:01 UTC (rev 18748)
+++ branches/blender2.5/blender/source/blender/editors/space_image/image_header.c	2009-01-30 12:58:00 UTC (rev 18749)
@@ -1117,3 +1117,38 @@
 	uiDrawBlock(C, block);
 }
 
+/********************** toolbox operator *********************/
+
+static int toolbox_invoke(bContext *C, wmOperator *op, wmEvent *event)
+{
+	SpaceImage *sima= (SpaceImage*)CTX_wm_space_data(C);
+	Object *obedit= CTX_data_edit_object(C);
+	uiMenuItem *head;
+	int show_uvedit;
+
+	show_uvedit= get_space_image_show_uvedit(sima, obedit);
+
+	head= uiPupMenuBegin("Toolbox");
+
+	uiMenuLevel(head, "View", image_viewmenu);
+	if(show_uvedit) uiMenuLevel(head, "Select", image_selectmenu);
+	uiMenuLevel(head, "Image", image_imagemenu);
+	if(show_uvedit) uiMenuLevel(head, "UVs", image_uvsmenu);
+
+	uiPupMenuEnd(C, head);
+
+	return OPERATOR_CANCELLED;
+}
+
+void IMAGE_OT_toolbox(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Toolbox";
+	ot->idname= "IMAGE_OT_toolbox";
+	
+	/* api callbacks */
+	ot->invoke= toolbox_invoke;
+	ot->poll= space_image_main_area_poll;
+}
+
+

Modified: branches/blender2.5/blender/source/blender/editors/space_image/image_intern.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_image/image_intern.h	2009-01-30 12:49:01 UTC (rev 18748)
+++ branches/blender2.5/blender/source/blender/editors/space_image/image_intern.h	2009-01-30 12:58:00 UTC (rev 18749)
@@ -57,10 +57,14 @@
 /* image_header.c */
 void image_header_buttons(const struct bContext *C, struct ARegion *ar);
 
+void IMAGE_OT_toolbox(struct wmOperatorType *ot);
+
 /* image_draw.c */
 void draw_image_main(struct SpaceImage *sima, struct ARegion *ar, struct Scene *scene);
 
 /* image_ops.c */
+int space_image_main_area_poll(struct bContext *C);
+
 void IMAGE_OT_view_all(struct wmOperatorType *ot);
 void IMAGE_OT_view_pan(struct wmOperatorType *ot);
 void IMAGE_OT_view_selected(struct wmOperatorType *ot);

Modified: branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c	2009-01-30 12:49:01 UTC (rev 18748)
+++ branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c	2009-01-30 12:58:00 UTC (rev 18749)
@@ -144,7 +144,7 @@
 	sima_zoom_set(sima, ar, sima->zoom*zoomfac);
 }
 
-static int space_image_main_area_poll(bContext *C)
+int space_image_main_area_poll(bContext *C)
 {
 	SpaceLink *slink= CTX_wm_space_data(C);
 	ARegion *ar= CTX_wm_region(C);

Modified: branches/blender2.5/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_image/space_image.c	2009-01-30 12:49:01 UTC (rev 18748)
+++ branches/blender2.5/blender/source/blender/editors/space_image/space_image.c	2009-01-30 12:58:00 UTC (rev 18749)
@@ -146,6 +146,8 @@
 	WM_operatortype_append(IMAGE_OT_view_zoom_in);
 	WM_operatortype_append(IMAGE_OT_view_zoom_out);
 	WM_operatortype_append(IMAGE_OT_view_zoom_ratio);
+
+	WM_operatortype_append(IMAGE_OT_toolbox);
 }
 
 void image_keymap(struct wmWindowManager *wm)
@@ -169,6 +171,8 @@
 	RNA_float_set(WM_keymap_add_item(keymap, "IMAGE_OT_view_zoom_ratio", PAD2, KM_PRESS, 0, 0)->ptr, "ratio", 0.5f);
 	RNA_float_set(WM_keymap_add_item(keymap, "IMAGE_OT_view_zoom_ratio", PAD4, KM_PRESS, 0, 0)->ptr, "ratio", 0.25f);
 	RNA_float_set(WM_keymap_add_item(keymap, "IMAGE_OT_view_zoom_ratio", PAD8, KM_PRESS, 0, 0)->ptr, "ratio", 0.125f);
+
+	WM_keymap_add_item(keymap, "IMAGE_OT_toolbox", SPACEKEY, KM_PRESS, 0, 0);
 }
 
 static void image_refresh(const bContext *C, ScrArea *sa)