WM: hide screen management and ndof operators from seach popup
authorCampbell Barton <ideasman42@gmail.com>
Wed, 26 Feb 2014 02:48:41 +0000 (13:48 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 26 Feb 2014 02:48:41 +0000 (13:48 +1100)
release/scripts/startup/bl_operators/wm.py
source/blender/editors/interface/view2d_ops.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_clip/clip_ops.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_script/script_edit.c

index 5dadf77ce9214e2c036d68c4efaefcad5420c74a..3fdde1a1339ecfa29fb82db5b1be81d56e1bcc20 100644 (file)
@@ -757,6 +757,7 @@ class WM_OT_url_open(Operator):
     "Open a website in the web-browser"
     bl_idname = "wm.url_open"
     bl_label = ""
+    bl_options = {'INTERNAL'}
 
     url = StringProperty(
             name="URL",
@@ -773,6 +774,7 @@ class WM_OT_path_open(Operator):
     "Open a path in a file browser"
     bl_idname = "wm.path_open"
     bl_label = ""
+    bl_options = {'INTERNAL'}
 
     filepath = StringProperty(
             subtype='FILE_PATH',
@@ -2019,6 +2021,7 @@ class WM_OT_addon_expand(Operator):
     "Display more information on this addon"
     bl_idname = "wm.addon_expand"
     bl_label = ""
+    bl_options = {'INTERNAL'}
 
     module = StringProperty(
             name="Module",
index 1f63ad87b372cb2a9d51228155c0e79abdadfe6c..d3236f611462388c2e49f8465c4be4af615b9841 100644 (file)
@@ -1323,6 +1323,7 @@ static void VIEW2D_OT_ndof(wmOperatorType *ot)
 
        /* api callbacks */
        ot->invoke = view2d_ndof_invoke;
+       ot->poll = view2d_poll;
 
        /* flags */
        ot->flag = OPTYPE_LOCK_BYPASS;
index aa5d9ef3bbb5f9018838c74f9b2ce35977e861a6..2cb28ebba90c8f781a88f55f694b1cc751fc1c16 100644 (file)
@@ -776,7 +776,8 @@ static void SCREEN_OT_actionzone(wmOperatorType *ot)
        ot->poll = actionzone_area_poll;
        ot->cancel = actionzone_cancel;
        
-       ot->flag = OPTYPE_BLOCKING;
+       /* flags */
+       ot->flag = OPTYPE_BLOCKING | OPTYPE_INTERNAL;
        
        RNA_def_int(ot->srna, "modifier", 0, 0, 2, "Modifier", "Modifier state", 0, 2);
 }
@@ -1251,7 +1252,8 @@ static void SCREEN_OT_area_move(wmOperatorType *ot)
        ot->modal = area_move_modal;
        ot->poll = ED_operator_screen_mainwinactive; /* when mouse is over area-edge */
        
-       ot->flag = OPTYPE_BLOCKING;
+       /* flags */
+       ot->flag = OPTYPE_BLOCKING | OPTYPE_INTERNAL;
        
        /* rna */
        RNA_def_int(ot->srna, "x", 0, INT_MIN, INT_MAX, "X", "", INT_MIN, INT_MAX);
@@ -1703,7 +1705,9 @@ static void SCREEN_OT_area_split(wmOperatorType *ot)
        ot->cancel = area_split_cancel;
        
        ot->poll = screen_active_editable;
-       ot->flag = OPTYPE_BLOCKING;
+
+       /* flags */
+       ot->flag = OPTYPE_BLOCKING | OPTYPE_INTERNAL;
        
        /* rna */
        RNA_def_enum(ot->srna, "direction", prop_direction_items, 'h', "Direction", "");
@@ -1973,7 +1977,8 @@ static void SCREEN_OT_region_scale(wmOperatorType *ot)
        
        ot->poll = ED_operator_areaactive;
        
-       ot->flag = OPTYPE_BLOCKING;
+       /* flags */
+       ot->flag = OPTYPE_BLOCKING | OPTYPE_INTERNAL;
 }
 
 
@@ -2287,7 +2292,7 @@ static void SCREEN_OT_screen_set(wmOperatorType *ot)
        
        ot->exec = screen_set_exec;
        ot->poll = ED_operator_screenactive;
-       
+
        /* rna */
        RNA_def_int(ot->srna, "delta", 0, INT_MIN, INT_MAX, "Delta", "", INT_MIN, INT_MAX);
 }
@@ -2611,6 +2616,7 @@ static void SCREEN_OT_area_join(wmOperatorType *ot)
        ot->poll = screen_active_editable;
        ot->cancel = area_join_cancel;
        
+       /* flags */
        ot->flag = OPTYPE_BLOCKING | OPTYPE_INTERNAL;
        
        /* rna */
@@ -2673,6 +2679,9 @@ static void SCREEN_OT_area_options(wmOperatorType *ot)
        ot->invoke = screen_area_options_invoke;
        
        ot->poll = ED_operator_screen_mainwinactive;
+
+       /* flags */
+       ot->flag = OPTYPE_INTERNAL;
 }
 
 
@@ -3860,7 +3869,7 @@ static void SCREEN_OT_region_blend(wmOperatorType *ot)
        ot->invoke = region_blend_invoke;
        
        /* flags */
-       ot->flag = 0;
+       ot->flag = OPTYPE_INTERNAL;
        
        /* properties */
 }
index 7ee94fe92fce1c99e0868b96e5d1dad9ae8f5150..7a6c4268aab09ac95e0a3826f3fce489aeb67233 100644 (file)
@@ -1362,6 +1362,7 @@ void CLIP_OT_view_ndof(wmOperatorType *ot)
 
        /* api callbacks */
        ot->invoke = clip_view_ndof_invoke;
+       ot->poll = ED_space_clip_view_clip_poll;
 }
 
 /********************** Prefetch operator *********************/
index de1dfff932e2df229066ad8097b1114a4315dbc2..90e308ecfa2bacebce62f6978fb9396f38794316 100644 (file)
@@ -628,6 +628,7 @@ void IMAGE_OT_view_ndof(wmOperatorType *ot)
        
        /* api callbacks */
        ot->invoke = image_view_ndof_invoke;
+       ot->poll = space_image_main_area_poll;
 
        /* flags */
        ot->flag = OPTYPE_LOCK_BYPASS;
index 5754af2c83c8891fde20a0f66edb46d1f3851d01..9077d0cf8ed4234b30cdfc12c6633a4162e25b4f 100644 (file)
@@ -83,6 +83,8 @@ void SCRIPT_OT_python_file_run(wmOperatorType *ot)
        ot->exec = run_pyfile_exec;
        ot->poll = ED_operator_areaactive;
 
+       ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL;
+
        RNA_def_string_file_path(ot->srna, "filepath", NULL, FILE_MAX, "Path", "");
 }