diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-07-14 03:51:21 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-07-14 03:51:21 +0400 |
commit | 3580d6229a2c2ee5815ff76665d4bb014eacfb99 (patch) | |
tree | 24a38ec45f417458760875c20d10914e4aa5c973 /release | |
parent | 03e638d1285b2a26902230772ae9261406fd6658 (diff) |
- text3d was missing menu items for toggling bold/underline/italic/smallcaps.
- made smallcaps use a temp flag so caps can still have the smallcaps flag.
- utility function for getting the char from a font. find_vfont_char(), was inline in ~5 places.
- removed CU_STYLE mix of flags only used in one place, not needed. removed 'style' from rna too.
- fix for some warnings.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/modules/rna_info.py | 2 | ||||
-rw-r--r-- | release/scripts/op/presets.py | 4 | ||||
-rw-r--r-- | release/scripts/ui/properties_data_curve.py | 10 | ||||
-rw-r--r-- | release/scripts/ui/space_view3d.py | 7 |
4 files changed, 17 insertions, 6 deletions
diff --git a/release/scripts/modules/rna_info.py b/release/scripts/modules/rna_info.py index 9c2a2688949..3fd70fedd8c 100644 --- a/release/scripts/modules/rna_info.py +++ b/release/scripts/modules/rna_info.py @@ -631,6 +631,8 @@ if __name__ == "__main__": props = [(prop.identifier, prop) for prop in v.properties] for prop_id, prop in sorted(props): + if prop.type == 'boolean': + continue data += "%s.%s -> %s: %s%s %s\n" % (struct_id_str, prop.identifier, prop.identifier, prop.type, ", (read-only)" if prop.is_readonly else "", prop.description) if bpy.app.background: diff --git a/release/scripts/op/presets.py b/release/scripts/op/presets.py index 9552a5e6785..f80c5e69ddd 100644 --- a/release/scripts/op/presets.py +++ b/release/scripts/op/presets.py @@ -27,8 +27,8 @@ class AddPresetBase(bpy.types.Operator): subclasses must define - preset_values - preset_subdir ''' - bl_idname = "script.add_preset_base" - bl_label = "Add a Python Preset" + # bl_idname = "script.preset_base_add" + # bl_label = "Add a Python Preset" name = bpy.props.StringProperty(name="Name", description="Name of the preset, used to make the path name", maxlen=64, default="") diff --git a/release/scripts/ui/properties_data_curve.py b/release/scripts/ui/properties_data_curve.py index 8c02754ecac..fd836f5e5d4 100644 --- a/release/scripts/ui/properties_data_curve.py +++ b/release/scripts/ui/properties_data_curve.py @@ -313,8 +313,6 @@ class DATA_PT_font(DataButtonsPanel): colsub.label(text="Underline:") colsub.prop(text, "ul_position", text="Position") colsub.prop(text, "ul_height", text="Thickness") - col.label(text="") - col.prop(text, "small_caps_scale", text="Small Caps") if wide_ui: col = split.column() @@ -322,9 +320,13 @@ class DATA_PT_font(DataButtonsPanel): col.prop(char, "bold") col.prop(char, "italic") col.prop(char, "underline") + + split = layout.split() + col = split.column() + col.prop(text, "small_caps_scale", text="Small Caps") + + col = split.column() col.prop(char, "use_small_caps") -# col.prop(char, "style") -# col.prop(char, "wrap") class DATA_PT_paragraph(DataButtonsPanel): diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index 6860739bd03..bab3695a0b6 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -1707,6 +1707,13 @@ class VIEW3D_MT_edit_text(bpy.types.Menu): layout.menu("VIEW3D_MT_edit_text_chars") + layout.separator() + + layout.operator("font.style_toggle", text="Toggle Bold").style = 'BOLD' + layout.operator("font.style_toggle", text="Toggle Italic").style = 'ITALIC' + layout.operator("font.style_toggle", text="Toggle Underline").style = 'UNDERLINE' + layout.operator("font.style_toggle", text="Toggle Small Caps").style = 'SMALL_CAPS' + class VIEW3D_MT_edit_text_chars(bpy.types.Menu): bl_label = "Special Characters" |