[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46201] trunk/blender: Clip editor: cleanup of View menu - do not show operators which doesn' t make sense in dopesheet/curve view
Sergey Sharybin
sergey.vfx at gmail.com
Wed May 2 19:33:48 CEST 2012
Revision: 46201
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46201
Author: nazgul
Date: 2012-05-02 17:33:48 +0000 (Wed, 02 May 2012)
Log Message:
-----------
Clip editor: cleanup of View menu - do not show operators which doesn't make sense in dopesheet/curve view
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/space_clip.py
trunk/blender/source/blender/editors/include/ED_clip.h
trunk/blender/source/blender/editors/space_clip/clip_editor.c
trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c
trunk/blender/source/blender/editors/space_clip/clip_ops.c
Modified: trunk/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_clip.py 2012-05-02 17:03:46 UTC (rev 46200)
+++ trunk/blender/release/scripts/startup/bl_ui/space_clip.py 2012-05-02 17:33:48 UTC (rev 46201)
@@ -776,28 +776,29 @@
layout = self.layout
sc = context.space_data
- layout.prop(sc, "show_seconds")
- layout.separator()
+ if sc.view == 'CLIP':
+ layout.operator("clip.properties", icon='MENU_PANEL')
+ layout.operator("clip.tools", icon='MENU_PANEL')
+ layout.separator()
- layout.operator("clip.properties", icon='MENU_PANEL')
- layout.operator("clip.tools", icon='MENU_PANEL')
- layout.separator()
+ layout.operator("clip.view_selected")
+ layout.operator("clip.view_all")
- layout.operator("clip.view_selected")
- layout.operator("clip.view_all")
+ layout.separator()
+ layout.operator("clip.view_zoom_in")
+ layout.operator("clip.view_zoom_out")
- layout.separator()
- layout.operator("clip.view_zoom_in")
- layout.operator("clip.view_zoom_out")
+ layout.separator()
- layout.separator()
+ ratios = ((1, 8), (1, 4), (1, 2), (1, 1), (2, 1), (4, 1), (8, 1))
- ratios = ((1, 8), (1, 4), (1, 2), (1, 1), (2, 1), (4, 1), (8, 1))
+ for a, b in ratios:
+ text = "Zoom %d:%d" % (a, b)
+ layout.operator("clip.view_zoom_ratio", text=text).ratio = a / b
+ else:
+ layout.prop(sc, "show_seconds")
+ layout.separator()
- for a, b in ratios:
- text = "Zoom %d:%d" % (a, b)
- layout.operator("clip.view_zoom_ratio", text=text).ratio = a / b
-
layout.separator()
layout.operator("screen.area_dupli")
layout.operator("screen.screen_full_area")
Modified: trunk/blender/source/blender/editors/include/ED_clip.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_clip.h 2012-05-02 17:03:46 UTC (rev 46200)
+++ trunk/blender/source/blender/editors/include/ED_clip.h 2012-05-02 17:33:48 UTC (rev 46201)
@@ -42,6 +42,9 @@
/* clip_editor.c */
int ED_space_clip_poll(struct bContext *C);
+
+int ED_space_clip_view_clip_poll(struct bContext *C);
+
int ED_space_clip_tracking_poll(struct bContext *C);
int ED_space_clip_tracking_size_poll(struct bContext *C);
int ED_space_clip_tracking_frame_poll(struct bContext *C);
Modified: trunk/blender/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_editor.c 2012-05-02 17:03:46 UTC (rev 46200)
+++ trunk/blender/source/blender/editors/space_clip/clip_editor.c 2012-05-02 17:33:48 UTC (rev 46201)
@@ -73,6 +73,17 @@
return FALSE;
}
+int ED_space_clip_view_clip_poll(bContext *C)
+{
+ SpaceClip *sc = CTX_wm_space_clip(C);
+
+ if (sc && sc->clip) {
+ return sc->view == SC_VIEW_CLIP;
+ }
+
+ return FALSE;
+}
+
int ED_space_clip_tracking_poll(bContext *C)
{
SpaceClip *sc= CTX_wm_space_clip(C);
Modified: trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c 2012-05-02 17:03:46 UTC (rev 46200)
+++ trunk/blender/source/blender/editors/space_clip/clip_graph_ops.c 2012-05-02 17:33:48 UTC (rev 46201)
@@ -66,11 +66,7 @@
if (ED_space_clip_tracking_poll(C)) {
SpaceClip *sc = CTX_wm_space_clip(C);
- if (sc->view == SC_VIEW_GRAPH) {
- ARegion *ar = CTX_wm_region(C);
-
- return ar->regiontype == RGN_TYPE_PREVIEW;
- }
+ return sc->view == SC_VIEW_GRAPH;
}
return FALSE;
Modified: trunk/blender/source/blender/editors/space_clip/clip_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_ops.c 2012-05-02 17:03:46 UTC (rev 46200)
+++ trunk/blender/source/blender/editors/space_clip/clip_ops.c 2012-05-02 17:33:48 UTC (rev 46201)
@@ -408,7 +408,7 @@
ot->invoke = view_pan_invoke;
ot->modal = view_pan_modal;
ot->cancel = view_pan_cancel;
- ot->poll = ED_space_clip_poll;
+ ot->poll = ED_space_clip_view_clip_poll;
/* flags */
ot->flag = OPTYPE_BLOCKING;
@@ -534,7 +534,7 @@
ot->invoke = view_zoom_invoke;
ot->modal = view_zoom_modal;
ot->cancel = view_zoom_cancel;
- ot->poll = ED_space_clip_poll;
+ ot->poll = ED_space_clip_view_clip_poll;
/* flags */
ot->flag = OPTYPE_BLOCKING|OPTYPE_GRAB_POINTER;
@@ -580,7 +580,7 @@
/* api callbacks */
ot->exec = view_zoom_in_exec;
ot->invoke = view_zoom_in_invoke;
- ot->poll = ED_space_clip_poll;
+ ot->poll = ED_space_clip_view_clip_poll;
/* properties */
RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, "Location", "Cursor location in screen coordinates", -10.0f, 10.0f);
@@ -620,7 +620,7 @@
/* api callbacks */
ot->exec = view_zoom_out_exec;
ot->invoke = view_zoom_out_invoke;
- ot->poll = ED_space_clip_poll;
+ ot->poll = ED_space_clip_view_clip_poll;
/* properties */
RNA_def_float_vector(ot->srna, "location", 2, NULL, -FLT_MAX, FLT_MAX, "Location", "Cursor location in normalised (0.0-1.0) coordinates", -10.0f, 10.0f);
@@ -652,7 +652,7 @@
/* api callbacks */
ot->exec = view_zoom_ratio_exec;
- ot->poll = ED_space_clip_poll;
+ ot->poll = ED_space_clip_view_clip_poll;
/* properties */
RNA_def_float(ot->srna, "ratio", 0.0f, 0.0f, FLT_MAX,
@@ -719,7 +719,7 @@
/* api callbacks */
ot->exec = view_all_exec;
- ot->poll = ED_space_clip_poll;
+ ot->poll = ED_space_clip_view_clip_poll;
/* properties */
RNA_def_boolean(ot->srna, "fit_view", 0, "Fit View", "Fit frame to the viewport");
@@ -749,7 +749,7 @@
/* api callbacks */
ot->exec = view_selected_exec;
- ot->poll = ED_space_clip_poll;
+ ot->poll = ED_space_clip_view_clip_poll;
}
/********************** change frame operator *********************/
More information about the Bf-blender-cvs
mailing list