[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34965] trunk/blender: Another small text space usability: option to show right margin ( aka print marign)

[Sergey Sharybin]

Revision: 34965
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34965
Author:   nazgul
Date:     2011-02-18 13:57:54 +0000 (Fri, 18 Feb 2011)
Log Message:
-----------
Another small text space usability: option to show right margin (aka print marign)

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_text.py
    trunk/blender/source/blender/editors/space_text/space_text.c
    trunk/blender/source/blender/editors/space_text/text_draw.c
    trunk/blender/source/blender/makesdna/DNA_space_types.h
    trunk/blender/source/blender/makesrna/intern/rna_space.c

Modified: trunk/blender/release/scripts/ui/space_text.py
===================================================================
--- trunk/blender/release/scripts/ui/space_text.py	2011-02-18 13:40:13 UTC (rev 34964)
+++ trunk/blender/release/scripts/ui/space_text.py	2011-02-18 13:57:54 UTC (rev 34965)
@@ -95,7 +95,12 @@
         if text:
             flow.prop(text, "use_tabs_as_spaces")
 
+        flow.prop(st, "show_margin")
+        col = flow.column()
+        col.active = st.show_margin
+        col.prop(st, "margin_column")
 
+
 class TEXT_PT_find(bpy.types.Panel):
     bl_space_type = 'TEXT_EDITOR'
     bl_region_type = 'UI'

Modified: trunk/blender/source/blender/editors/space_text/space_text.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/space_text.c	2011-02-18 13:40:13 UTC (rev 34964)
+++ trunk/blender/source/blender/editors/space_text/space_text.c	2011-02-18 13:57:54 UTC (rev 34965)
@@ -71,6 +71,7 @@
 
 	stext->lheight= 12;
 	stext->tabnumber= 4;
+	stext->margin_column= 80;
 	
 	/* header */
 	ar= MEM_callocN(sizeof(ARegion), "header for text");

Modified: trunk/blender/source/blender/editors/space_text/text_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_draw.c	2011-02-18 13:40:13 UTC (rev 34964)
+++ trunk/blender/source/blender/editors/space_text/text_draw.c	2011-02-18 13:57:54 UTC (rev 34965)
@@ -1779,6 +1779,15 @@
 		wrap_skip= 0;
 	}
 	
+	if(st->flags&ST_SHOW_MARGIN) {
+		UI_ThemeColor(TH_HILITE);
+
+		glBegin(GL_LINES);
+		glVertex2i(x+st->cwidth*st->margin_column, 0);
+		glVertex2i(x+st->cwidth*st->margin_column, ar->winy - 2);
+		glEnd();
+	}
+
 	/* draw other stuff */
 	draw_brackets(st, ar);
 	draw_markers(st, ar);

Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h	2011-02-18 13:40:13 UTC (rev 34964)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h	2011-02-18 13:57:54 UTC (rev 34965)
@@ -327,6 +327,9 @@
 	char findstr[256];		/* ST_MAX_FIND_STR */
 	char replacestr[256];	/* ST_MAX_FIND_STR */
 
+	short margin_column; /* column number to show right margin at */
+	char pad[6];
+
 	void *drawcache; /* cache for faster drawing */
 } SpaceText;
 
@@ -817,6 +820,7 @@
 									   // execution (see BPY_main.c)
 #define	ST_FIND_WRAP			0x0020
 #define	ST_FIND_ALL				0x0040
+#define	ST_SHOW_MARGIN			0x0080
 
 
 /* stext->findstr/replacestr */

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c	2011-02-18 13:40:13 UTC (rev 34964)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c	2011-02-18 13:57:54 UTC (rev 34965)
@@ -1698,6 +1698,17 @@
 	RNA_def_property_ui_text(prop, "Font Size", "Font size to use for displaying the text");
 	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL);
 
+	prop= RNA_def_property(srna, "show_margin", PROP_BOOLEAN, PROP_NONE);
+	RNA_def_property_boolean_sdna(prop, NULL, "flags", ST_SHOW_MARGIN);
+	RNA_def_property_ui_text(prop, "Show Margin", "Show right margin");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL);
+
+	prop= RNA_def_property(srna, "margin_column", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "margin_column");
+	RNA_def_property_range(prop, 0, 1024);
+	RNA_def_property_ui_text(prop, "Margin Column", "Column number to show right margin at");
+	RNA_def_property_update(prop, NC_SPACE|ND_SPACE_TEXT, NULL);
+
 	/* functionality options */
 	prop= RNA_def_property(srna, "use_overwrite", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "overwrite", 1);