[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33009] trunk/blender: move report/ operator view out of the 'Console' into the 'Info' space (file menu).

Campbell Barton ideasman42 at gmail.com
Thu Nov 11 14:36:57 CET 2010


Revision: 33009
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33009
Author:   campbellbarton
Date:     2010-11-11 14:36:57 +0100 (Thu, 11 Nov 2010)

Log Message:
-----------
move report/operator view out of the 'Console' into the 'Info' space (file menu).

Ton will work on moving the File menu out of the Info space before release.

notes.
- reply Operator isn't working anymore.
- UI for reports is commented out so its not mixed with the file menu.

Modified Paths:
--------------
    trunk/blender/release/scripts/op/console_python.py
    trunk/blender/release/scripts/ui/space_console.py
    trunk/blender/release/scripts/ui/space_info.py
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/editors/include/ED_screen.h
    trunk/blender/source/blender/editors/screen/area.c
    trunk/blender/source/blender/editors/screen/screen_ops.c
    trunk/blender/source/blender/editors/space_console/CMakeLists.txt
    trunk/blender/source/blender/editors/space_console/console_draw.c
    trunk/blender/source/blender/editors/space_console/console_intern.h
    trunk/blender/source/blender/editors/space_console/console_ops.c
    trunk/blender/source/blender/editors/space_console/space_console.c
    trunk/blender/source/blender/editors/space_info/CMakeLists.txt
    trunk/blender/source/blender/editors/space_info/info_intern.h
    trunk/blender/source/blender/editors/space_info/info_ops.c
    trunk/blender/source/blender/editors/space_info/space_info.c
    trunk/blender/source/blender/makesdna/DNA_space_types.h
    trunk/blender/source/blender/makesrna/intern/rna_space.c
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c
    trunk/blender/source/blender/windowmanager/WM_types.h
    trunk/blender/source/blender/windowmanager/intern/wm.c
    trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Added Paths:
-----------
    trunk/blender/source/blender/editors/space_info/info_draw.c
    trunk/blender/source/blender/editors/space_info/info_report.c

Removed Paths:
-------------
    trunk/blender/source/blender/editors/space_console/console_report.c

Modified: trunk/blender/release/scripts/op/console_python.py
===================================================================
--- trunk/blender/release/scripts/op/console_python.py	2010-11-11 11:56:50 UTC (rev 33008)
+++ trunk/blender/release/scripts/op/console_python.py	2010-11-11 13:36:57 UTC (rev 33009)
@@ -110,9 +110,6 @@
     except:
         return {'CANCELLED'}
 
-    if sc.console_type != 'PYTHON':
-        return {'CANCELLED'}
-
     console, stdout, stderr = get_console(hash(context.region))
 
     # redirect output
@@ -200,9 +197,6 @@
     if not console:
         return {'CANCELLED'}
 
-    if sc.console_type != 'PYTHON':
-        return {'CANCELLED'}
-
     # dont allow the stdin to be used, can lock blender.
     # note: unlikely stdin would be used for autocomp. but its possible.
     stdin_backup = sys.stdin

Modified: trunk/blender/release/scripts/ui/space_console.py
===================================================================
--- trunk/blender/release/scripts/ui/space_console.py	2010-11-11 11:56:50 UTC (rev 33008)
+++ trunk/blender/release/scripts/ui/space_console.py	2010-11-11 13:36:57 UTC (rev 33009)
@@ -34,31 +34,12 @@
 
         if context.area.show_menus:
             sub = row.row(align=True)
+            sub.menu("CONSOLE_MT_console")
 
-            if sc.console_type == 'REPORT':
-                sub.menu("CONSOLE_MT_report")
-            else:
-                sub.menu("CONSOLE_MT_console")
+        row = layout.row(align=True)
+        row.operator("console.autocomplete", text="Autocomplete")
 
-        layout.separator()
-        layout.prop(sc, "console_type", expand=True)
 
-        if sc.console_type == 'REPORT':
-            row = layout.row(align=True)
-            row.prop(sc, "show_report_debug", text="Debug")
-            row.prop(sc, "show_report_info", text="Info")
-            row.prop(sc, "show_report_operator", text="Operators")
-            row.prop(sc, "show_report_warning", text="Warnings")
-            row.prop(sc, "show_report_error", text="Errors")
-
-            row = layout.row()
-            row.enabled = sc.show_report_operator
-            row.operator("console.report_replay")
-        else:
-            row = layout.row(align=True)
-            row.operator("console.autocomplete", text="Autocomplete")
-
-
 class CONSOLE_MT_console(bpy.types.Menu):
     bl_label = "Console"
 
@@ -76,18 +57,6 @@
         layout.operator("screen.screen_full_area")
 
 
-class CONSOLE_MT_report(bpy.types.Menu):
-    bl_label = "Report"
-
-    def draw(self, context):
-        layout = self.layout
-        layout.column()
-        layout.operator("console.select_all_toggle")
-        layout.operator("console.select_border")
-        layout.operator("console.report_delete")
-        layout.operator("console.report_copy")
-
-
 class CONSOLE_MT_language(bpy.types.Menu):
     bl_label = "Languages..."
 
@@ -138,10 +107,6 @@
     bl_idname = "console.autocomplete"
     bl_label = "Console Autocomplete"
 
-    @classmethod
-    def poll(cls, context):
-        return context.space_data.console_type != 'REPORT'
-
     def execute(self, context):
         sc = context.space_data
         module = __import__("console_" + sc.language)

Modified: trunk/blender/release/scripts/ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/ui/space_info.py	2010-11-11 11:56:50 UTC (rev 33008)
+++ trunk/blender/release/scripts/ui/space_info.py	2010-11-11 13:36:57 UTC (rev 33009)
@@ -28,6 +28,7 @@
 
         wm = context.window_manager
         window = context.window
+        sinfo = context.space_data
         scene = context.scene
         rd = scene.render
 
@@ -69,6 +70,35 @@
         layout.operator("wm.window_fullscreen_toggle", icon='FULLSCREEN_ENTER', text="")
 
 
+        # XXX: BEFORE RELEASE, MOVE FILE MENU OUT OF INFO!!!
+        """
+        row = layout.row(align=True)
+        row.prop(sinfo, "show_report_debug", text="Debug")
+        row.prop(sinfo, "show_report_info", text="Info")
+        row.prop(sinfo, "show_report_operator", text="Operators")
+        row.prop(sinfo, "show_report_warning", text="Warnings")
+        row.prop(sinfo, "show_report_error", text="Errors")
+
+        row = layout.row()
+        row.enabled = sinfo.show_report_operator
+        row.operator("info.report_replay")
+        
+        row.menu("INFO_MT_report")
+        """
+
+
+class INFO_MT_report(bpy.types.Menu):
+    bl_label = "Report"
+
+    def draw(self, context):
+        layout = self.layout
+        layout.column()
+        layout.operator("console.select_all_toggle")
+        layout.operator("console.select_border")
+        layout.operator("console.report_delete")
+        layout.operator("console.report_copy")
+
+
 class INFO_MT_file(bpy.types.Menu):
     bl_label = "File"
 

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2010-11-11 11:56:50 UTC (rev 33008)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-11-11 13:36:57 UTC (rev 33009)
@@ -11112,6 +11112,35 @@
 		}
 	}
 
+	{
+		bScreen *sc;
+		for (sc= main->screen.first; sc; sc= sc->id.next) {
+			ScrArea *sa;
+			for (sa= sc->areabase.first; sa; sa= sa->next) {
+				SpaceLink *sl;
+				for (sl= sa->spacedata.first; sl; sl= sl->next) {
+					if (sl->spacetype == SPACE_INFO) {
+						SpaceInfo *sinfo= (SpaceInfo *)sl;
+						ARegion *ar;
+
+						sinfo->rpt_mask= INFO_RPT_OP;
+
+						for (ar= sa->regionbase.first; ar; ar= ar->next) {
+							if (ar->regiontype == RGN_TYPE_WINDOW) {
+								ar->v2d.scroll = (V2D_SCROLL_RIGHT);
+								ar->v2d.align = V2D_ALIGN_NO_NEG_X|V2D_ALIGN_NO_NEG_Y; /* align bottom left */
+								ar->v2d.keepofs = V2D_LOCKOFS_X;
+								ar->v2d.keepzoom = (V2D_LOCKZOOM_X|V2D_LOCKZOOM_Y|V2D_LIMITZOOM|V2D_KEEPASPECT);
+								ar->v2d.keeptot= V2D_KEEPTOT_BOUNDS;
+								ar->v2d.minzoom= ar->v2d.maxzoom= 1.0f;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
 	/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */
 

Modified: trunk/blender/source/blender/editors/include/ED_screen.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_screen.h	2010-11-11 11:56:50 UTC (rev 33008)
+++ trunk/blender/source/blender/editors/include/ED_screen.h	2010-11-11 13:36:57 UTC (rev 33009)
@@ -141,7 +141,10 @@
 int		ED_operator_image_active(struct bContext *C);
 int		ED_operator_nla_active(struct bContext *C);
 int		ED_operator_logic_active(struct bContext *C);
+int		ED_operator_info_active(struct bContext *C);
+int		ED_operator_console_active(struct bContext *C);
 
+
 int		ED_operator_object_active(struct bContext *C);
 int		ED_operator_object_active_editable(struct bContext *C);
 int		ED_operator_object_active_editable_mesh(struct bContext *C);

Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c	2010-11-11 11:56:50 UTC (rev 33008)
+++ trunk/blender/source/blender/editors/screen/area.c	2010-11-11 13:36:57 UTC (rev 33009)
@@ -1165,7 +1165,7 @@
 		   
 		   "|%l"
 		   
-		   "|Console %x18"
+		   "|Python Console %x18"
 		   );
 }
 

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2010-11-11 11:56:50 UTC (rev 33008)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2010-11-11 13:36:57 UTC (rev 33009)
@@ -226,6 +226,17 @@
 	return ed_spacetype_test(C, SPACE_LOGIC);
 }
 
+int ED_operator_info_active(bContext *C)
+{
+	return ed_spacetype_test(C, SPACE_INFO);
+}
+
+
+int ED_operator_console_active(bContext *C)
+{
+	return ed_spacetype_test(C, SPACE_CONSOLE);
+}
+
 int ED_operator_object_active(bContext *C)
 {
 	Object *ob = ED_object_active_context(C);

Modified: trunk/blender/source/blender/editors/space_console/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_console/CMakeLists.txt	2010-11-11 11:56:50 UTC (rev 33008)
+++ trunk/blender/source/blender/editors/space_console/CMakeLists.txt	2010-11-11 13:36:57 UTC (rev 33009)
@@ -34,7 +34,6 @@
 SET(SRC
 	console_draw.c
 	console_ops.c
-	console_report.c
 	space_console.c
 )
 

Modified: trunk/blender/source/blender/editors/space_console/console_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_console/console_draw.c	2010-11-11 11:56:50 UTC (rev 33008)
+++ trunk/blender/source/blender/editors/space_console/console_draw.c	2010-11-11 13:36:57 UTC (rev 33009)
@@ -73,39 +73,6 @@
 	}
 }
 
-static void console_report_color(unsigned char *fg, unsigned char *bg, Report *report, int bool)
-{
-	/*
-	if		(type & RPT_ERROR_ALL)		{ fg[0]=220; fg[1]=0; fg[2]=0; }
-	else if	(type & RPT_WARNING_ALL)	{ fg[0]=220; fg[1]=96; fg[2]=96; }
-	else if	(type & RPT_OPERATOR_ALL)	{ fg[0]=96; fg[1]=128; fg[2]=255; }
-	else if	(type & RPT_INFO_ALL)		{ fg[0]=0; fg[1]=170; fg[2]=0; }
-	else if	(type & RPT_DEBUG_ALL)		{ fg[0]=196; fg[1]=196; fg[2]=196; }
-	else								{ fg[0]=196; fg[1]=196; fg[2]=196; }
-	*/
-	if(report->flag & SELECT) {
-		fg[0]=255; fg[1]=255; fg[2]=255;
-		if(bool) {
-			bg[0]=96; bg[1]=128; bg[2]=255;
-		}
-		else {
-			bg[0]=90; bg[1]=122; bg[2]=249;
-		}
-	}
-
-	else {
-		fg[0]=0; fg[1]=0; fg[2]=0;
-
-		if(bool) {
-			bg[0]=120; bg[1]=120; bg[2]=120;
-		}
-		else {
-			bg[0]=114; bg[1]=114; bg[2]=114;
-		}
-
-	}
-}
-
 typedef struct ConsoleDrawContext {
 	int cwidth;
 	int lheight;
@@ -201,131 +168,50 @@
 }
 
 
-
-/* reports! */
-static int report_textview_begin(TextViewContext *tvc)
+static int console_textview_main__internal(struct SpaceConsole *sc, struct ARegion *ar, ReportList *UNUSED(reports), int draw, int mval[2], void **mouse_pick, int *pos_pick)
 {
-	SpaceConsole *sc= (SpaceConsole *)tvc->arg1;
-	ReportList *reports= (ReportList *)tvc->arg2;
-
-	tvc->lheight= sc->lheight;
-	tvc->sel_start= sc->sel_start;
-	tvc->sel_end= sc->sel_end;
+	ConsoleLine cl_dummy= {0};
+	int ret= 0;
 	
-	/* iterator */
-	tvc->iter= reports->list.last;
-	

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list