forked from bartvdbraak/blender
*Started to add theme editing in Preferences. Isn't visible in the UI yet.
*Moved some preferences around *Changed the file browser '..' icon (Thanks Elubie!)
This commit is contained in:
parent
03d13ac9e8
commit
39d62a12d9
@ -83,38 +83,30 @@ class USERPREF_PT_interface(bpy.types.Panel):
|
|||||||
sub1.itemR(view, "zoom_to_mouse")
|
sub1.itemR(view, "zoom_to_mouse")
|
||||||
sub1.itemR(view, "rotate_around_selection")
|
sub1.itemR(view, "rotate_around_selection")
|
||||||
sub1.itemS()
|
sub1.itemS()
|
||||||
sub1.itemL(text="Zoom Style:")
|
|
||||||
sub1.row().itemR(view, "viewport_zoom_style", expand=True)
|
|
||||||
sub1.itemL(text="Orbit Style:")
|
sub1.itemR(view, "auto_perspective")
|
||||||
sub1.row().itemR(view, "view_rotation", expand=True)
|
|
||||||
sub1.itemR(view, "perspective_orthographic_switch")
|
|
||||||
sub1.itemR(view, "smooth_view")
|
sub1.itemR(view, "smooth_view")
|
||||||
sub1.itemR(view, "rotation_angle")
|
sub1.itemR(view, "rotation_angle")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
col = split.column()
|
col = split.column()
|
||||||
sub = col.split(percentage=0.85)
|
sub = col.split(percentage=0.85)
|
||||||
|
|
||||||
sub1 = sub.column()
|
sub1 = sub.column()
|
||||||
sub1.itemL(text="Menus:")
|
|
||||||
sub1.itemR(view, "open_mouse_over")
|
|
||||||
sub1.itemL(text="Menu Open Delay:")
|
|
||||||
sub1.itemR(view, "open_toplevel_delay", text="Top Level")
|
|
||||||
sub1.itemR(view, "open_sublevel_delay", text="Sub Level")
|
|
||||||
|
|
||||||
sub1.itemS()
|
|
||||||
sub1.itemS()
|
|
||||||
sub1.itemS()
|
|
||||||
|
|
||||||
sub1.itemL(text="Toolbox:")
|
|
||||||
sub1.itemR(view, "use_column_layout")
|
|
||||||
sub1.itemL(text="Open Toolbox Delay:")
|
|
||||||
sub1.itemR(view, "open_left_mouse_delay", text="Hold LMB")
|
|
||||||
sub1.itemR(view, "open_right_mouse_delay", text="Hold RMB")
|
|
||||||
|
|
||||||
col = split.column()
|
|
||||||
sub = col.split(percentage=0.85)
|
|
||||||
|
|
||||||
sub1 = sub.column()
|
#Toolbox doesn't exist yet
|
||||||
|
# sub1.itemL(text="Toolbox:")
|
||||||
|
# sub1.itemR(view, "use_column_layout")
|
||||||
|
# sub1.itemL(text="Open Toolbox Delay:")
|
||||||
|
# sub1.itemR(view, "open_left_mouse_delay", text="Hold LMB")
|
||||||
|
# sub1.itemR(view, "open_right_mouse_delay", text="Hold RMB")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#manipulator
|
#manipulator
|
||||||
sub1.itemR(view, "use_manipulator")
|
sub1.itemR(view, "use_manipulator")
|
||||||
sub2 = sub1.column()
|
sub2 = sub1.column()
|
||||||
@ -122,6 +114,16 @@ class USERPREF_PT_interface(bpy.types.Panel):
|
|||||||
sub2.itemR(view, "manipulator_size", text="Size")
|
sub2.itemR(view, "manipulator_size", text="Size")
|
||||||
sub2.itemR(view, "manipulator_handle_size", text="Handle Size")
|
sub2.itemR(view, "manipulator_handle_size", text="Handle Size")
|
||||||
sub2.itemR(view, "manipulator_hotspot", text="Hotspot")
|
sub2.itemR(view, "manipulator_hotspot", text="Hotspot")
|
||||||
|
|
||||||
|
sub1.itemS()
|
||||||
|
sub1.itemS()
|
||||||
|
sub1.itemS()
|
||||||
|
|
||||||
|
sub1.itemL(text="Menus:")
|
||||||
|
sub1.itemR(view, "open_mouse_over")
|
||||||
|
sub1.itemL(text="Menu Open Delay:")
|
||||||
|
sub1.itemR(view, "open_toplevel_delay", text="Top Level")
|
||||||
|
sub1.itemR(view, "open_sublevel_delay", text="Sub Level")
|
||||||
|
|
||||||
class USERPREF_PT_edit(bpy.types.Panel):
|
class USERPREF_PT_edit(bpy.types.Panel):
|
||||||
__space_type__ = 'USER_PREFERENCES'
|
__space_type__ = 'USER_PREFERENCES'
|
||||||
@ -137,7 +139,6 @@ class USERPREF_PT_edit(bpy.types.Panel):
|
|||||||
|
|
||||||
userpref = context.user_preferences
|
userpref = context.user_preferences
|
||||||
edit = userpref.edit
|
edit = userpref.edit
|
||||||
view = userpref.view
|
|
||||||
|
|
||||||
split = layout.split()
|
split = layout.split()
|
||||||
|
|
||||||
@ -157,8 +158,13 @@ class USERPREF_PT_edit(bpy.types.Panel):
|
|||||||
sub1.itemS()
|
sub1.itemS()
|
||||||
sub1.itemS()
|
sub1.itemS()
|
||||||
sub1.itemS()
|
sub1.itemS()
|
||||||
sub1.itemL(text="Transform:")
|
|
||||||
sub1.itemR(edit, "drag_immediately")
|
sub1.itemL(text="Undo:")
|
||||||
|
sub1.itemR(edit, "global_undo")
|
||||||
|
sub1.itemR(edit, "undo_steps", text="Steps")
|
||||||
|
sub1.itemR(edit, "undo_memory_limit", text="Memory Limit")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
col = split.column()
|
col = split.column()
|
||||||
sub = col.split(percentage=0.85)
|
sub = col.split(percentage=0.85)
|
||||||
@ -199,10 +205,8 @@ class USERPREF_PT_edit(bpy.types.Panel):
|
|||||||
sub1.itemS()
|
sub1.itemS()
|
||||||
sub1.itemS()
|
sub1.itemS()
|
||||||
|
|
||||||
sub1.itemL(text="Undo:")
|
sub1.itemL(text="Transform:")
|
||||||
sub1.itemR(edit, "global_undo")
|
sub1.itemR(edit, "drag_immediately")
|
||||||
sub1.itemR(edit, "undo_steps", text="Steps")
|
|
||||||
sub1.itemR(edit, "undo_memory_limit", text="Memory Limit")
|
|
||||||
|
|
||||||
sub1.itemS()
|
sub1.itemS()
|
||||||
sub1.itemS()
|
sub1.itemS()
|
||||||
@ -399,7 +403,7 @@ class USERPREF_PT_input(bpy.types.Panel):
|
|||||||
wm = context.manager
|
wm = context.manager
|
||||||
#input = userpref.input
|
#input = userpref.input
|
||||||
input = userpref
|
input = userpref
|
||||||
view = userpref.view
|
inputs = userpref.inputs
|
||||||
|
|
||||||
split = layout.split(percentage=0.25)
|
split = layout.split(percentage=0.25)
|
||||||
|
|
||||||
@ -416,15 +420,26 @@ class USERPREF_PT_input(bpy.types.Panel):
|
|||||||
sub = col.column()
|
sub = col.column()
|
||||||
sub.itemL(text="Mouse:")
|
sub.itemL(text="Mouse:")
|
||||||
sub1 = sub.column()
|
sub1 = sub.column()
|
||||||
sub1.enabled = (view.select_mouse == 'RIGHT')
|
sub1.enabled = (inputs.select_mouse == 'RIGHT')
|
||||||
sub1.itemR(view, "emulate_3_button_mouse")
|
sub1.itemR(inputs, "emulate_3_button_mouse")
|
||||||
sub.itemR(view, "continuous_mouse")
|
sub.itemR(inputs, "continuous_mouse")
|
||||||
|
|
||||||
sub.itemL(text="Select With:")
|
sub.itemL(text="Select With:")
|
||||||
sub.row().itemR(view, "select_mouse", expand=True)
|
sub.row().itemR(inputs, "select_mouse", expand=True)
|
||||||
#sub.itemL(text="Middle Mouse:")
|
sub.itemL(text="Middle Mouse:")
|
||||||
#sub.row().itemR(view, "middle_mouse", expand=True)
|
sub.row().itemR(inputs, "middle_mouse", expand=True)
|
||||||
#sub.itemR(view, "use_middle_mouse_paste")
|
|
||||||
|
sub.itemS()
|
||||||
|
sub.itemS()
|
||||||
|
sub.itemS()
|
||||||
|
|
||||||
|
sub.itemL(text="Orbit Style:")
|
||||||
|
sub.row().itemR(inputs, "view_rotation", expand=True)
|
||||||
|
|
||||||
|
sub.itemL(text="Zoom Style:")
|
||||||
|
sub.row().itemR(inputs, "viewport_zoom_style", expand=True)
|
||||||
|
|
||||||
|
#sub.itemR(inputs, "use_middle_mouse_paste")
|
||||||
|
|
||||||
#col.itemS()
|
#col.itemS()
|
||||||
|
|
||||||
@ -437,8 +452,8 @@ class USERPREF_PT_input(bpy.types.Panel):
|
|||||||
|
|
||||||
sub = col.column()
|
sub = col.column()
|
||||||
sub.itemL(text="NDOF Device:")
|
sub.itemL(text="NDOF Device:")
|
||||||
sub.itemR(view, "ndof_pan_speed", text="Pan Speed")
|
sub.itemR(inputs, "ndof_pan_speed", text="Pan Speed")
|
||||||
sub.itemR(view, "ndof_rotate_speed", text="Orbit Speed")
|
sub.itemR(inputs, "ndof_rotate_speed", text="Orbit Speed")
|
||||||
|
|
||||||
row.itemS()
|
row.itemS()
|
||||||
|
|
||||||
|
@ -290,8 +290,12 @@ static float shorten_string(char* string, float w, int flag)
|
|||||||
|
|
||||||
static int get_file_icon(struct direntry *file)
|
static int get_file_icon(struct direntry *file)
|
||||||
{
|
{
|
||||||
if (file->type & S_IFDIR)
|
if (file->type & S_IFDIR) {
|
||||||
|
if ( strcmp(file->relname, "..") == 0) {
|
||||||
|
return ICON_FILE_PARENT;
|
||||||
|
}
|
||||||
return ICON_FILE_FOLDER;
|
return ICON_FILE_FOLDER;
|
||||||
|
}
|
||||||
else if (file->flags & BLENDERFILE)
|
else if (file->flags & BLENDERFILE)
|
||||||
return ICON_FILE_BLEND;
|
return ICON_FILE_BLEND;
|
||||||
else if (file->flags & IMAGEFILE)
|
else if (file->flags & IMAGEFILE)
|
||||||
|
@ -266,6 +266,8 @@ typedef struct bTheme {
|
|||||||
ThemeWireColor tarm[20];
|
ThemeWireColor tarm[20];
|
||||||
/*ThemeWireColor tobj[20];*/
|
/*ThemeWireColor tobj[20];*/
|
||||||
|
|
||||||
|
int active_theme_group, pad;
|
||||||
|
|
||||||
} bTheme;
|
} bTheme;
|
||||||
|
|
||||||
typedef struct SolidLight {
|
typedef struct SolidLight {
|
||||||
|
@ -116,6 +116,11 @@ static PointerRNA rna_UserDef_edit_get(PointerRNA *ptr)
|
|||||||
return rna_pointer_inherit_refine(ptr, &RNA_UserPreferencesEdit, ptr->data);
|
return rna_pointer_inherit_refine(ptr, &RNA_UserPreferencesEdit, ptr->data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static PointerRNA rna_UserDef_input_get(PointerRNA *ptr)
|
||||||
|
{
|
||||||
|
return rna_pointer_inherit_refine(ptr, &RNA_UserPreferencesInput, ptr->data);
|
||||||
|
}
|
||||||
|
|
||||||
static PointerRNA rna_UserDef_filepaths_get(PointerRNA *ptr)
|
static PointerRNA rna_UserDef_filepaths_get(PointerRNA *ptr)
|
||||||
{
|
{
|
||||||
return rna_pointer_inherit_refine(ptr, &RNA_UserPreferencesFilePaths, ptr->data);
|
return rna_pointer_inherit_refine(ptr, &RNA_UserPreferencesFilePaths, ptr->data);
|
||||||
@ -1414,6 +1419,14 @@ static void rna_def_userdef_themes(BlenderRNA *brna)
|
|||||||
{
|
{
|
||||||
StructRNA *srna;
|
StructRNA *srna;
|
||||||
PropertyRNA *prop;
|
PropertyRNA *prop;
|
||||||
|
|
||||||
|
static EnumPropertyItem active_theme_group[] = {
|
||||||
|
{0, "USER_INTERFACE", 0, "User Interface", ""},
|
||||||
|
{1, "VIEW_3D", 0, "View 3D", ""},
|
||||||
|
{2, "GRAPH_EDITOR", 0, "Graph Editor", ""},
|
||||||
|
{3, "FILE_BROWSER", 0, "File Browser", ""},
|
||||||
|
|
||||||
|
{0, NULL, 0, NULL, NULL}};
|
||||||
|
|
||||||
srna= RNA_def_struct(brna, "Theme", NULL);
|
srna= RNA_def_struct(brna, "Theme", NULL);
|
||||||
RNA_def_struct_sdna(srna, "bTheme");
|
RNA_def_struct_sdna(srna, "bTheme");
|
||||||
@ -1423,6 +1436,11 @@ static void rna_def_userdef_themes(BlenderRNA *brna)
|
|||||||
RNA_def_property_ui_text(prop, "Name", "Name of the theme.");
|
RNA_def_property_ui_text(prop, "Name", "Name of the theme.");
|
||||||
RNA_def_struct_name_property(srna, prop);
|
RNA_def_struct_name_property(srna, prop);
|
||||||
|
|
||||||
|
prop= RNA_def_property(srna, "active_theme_group", PROP_ENUM, PROP_NONE);
|
||||||
|
RNA_def_property_enum_sdna(prop, NULL, "active_theme_group");
|
||||||
|
RNA_def_property_enum_items(prop, active_theme_group);
|
||||||
|
RNA_def_property_ui_text(prop, "Theme Group", "");
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "user_interface", PROP_POINTER, PROP_NONE);
|
prop= RNA_def_property(srna, "user_interface", PROP_POINTER, PROP_NONE);
|
||||||
RNA_def_property_flag(prop, PROP_NEVER_NULL);
|
RNA_def_property_flag(prop, PROP_NEVER_NULL);
|
||||||
RNA_def_property_pointer_sdna(prop, NULL, "tui");
|
RNA_def_property_pointer_sdna(prop, NULL, "tui");
|
||||||
@ -1585,35 +1603,13 @@ static void rna_def_userdef_view(BlenderRNA *brna)
|
|||||||
{
|
{
|
||||||
PropertyRNA *prop;
|
PropertyRNA *prop;
|
||||||
StructRNA *srna;
|
StructRNA *srna;
|
||||||
|
|
||||||
static EnumPropertyItem view_zoom_styles[] = {
|
|
||||||
{USER_ZOOM_CONT, "CONTINUE", 0, "Continue", "Old style zoom, continues while moving mouse up or down."},
|
|
||||||
{USER_ZOOM_DOLLY, "DOLLY", 0, "Dolly", "Zooms in and out based on vertical mouse movement."},
|
|
||||||
{USER_ZOOM_SCALE, "SCALE", 0, "Scale", "Zooms in and out like scaling the view, mouse movements relative to center."},
|
|
||||||
{0, NULL, 0, NULL, NULL}};
|
|
||||||
|
|
||||||
static EnumPropertyItem select_mouse_items[] = {
|
|
||||||
{USER_LMOUSESELECT, "LEFT", 0, "Left", "Use left Mouse Button for selection."},
|
|
||||||
{0, "RIGHT", 0, "Right", "Use Right Mouse Button for selection."},
|
|
||||||
{0, NULL, 0, NULL, NULL}};
|
|
||||||
|
|
||||||
static EnumPropertyItem middle_mouse_mouse_items[] = {
|
|
||||||
{0, "PAN", 0, "Pan", "Use the middle mouse button for panning the viewport."},
|
|
||||||
{USER_VIEWMOVE, "ROTATE", 0, "Rotate", "Use the middle mouse button for rotation the viewport."},
|
|
||||||
{0, NULL, 0, NULL, NULL}};
|
|
||||||
|
|
||||||
static EnumPropertyItem view_rotation_items[] = {
|
|
||||||
{0, "TURNTABLE", 0, "Turntable", "Use turntable style rotation in the viewport."},
|
|
||||||
{USER_TRACKBALL, "TRACKBALL", 0, "Trackball", "Use trackball style rotation in the viewport."},
|
|
||||||
{0, NULL, 0, NULL, NULL}};
|
|
||||||
|
|
||||||
|
|
||||||
srna= RNA_def_struct(brna, "UserPreferencesView", NULL);
|
srna= RNA_def_struct(brna, "UserPreferencesView", NULL);
|
||||||
RNA_def_struct_sdna(srna, "UserDef");
|
RNA_def_struct_sdna(srna, "UserDef");
|
||||||
RNA_def_struct_nested(brna, srna, "UserPreferences");
|
RNA_def_struct_nested(brna, srna, "UserPreferences");
|
||||||
RNA_def_struct_ui_text(srna, "View & Controls", "Preferences related to viewing data");
|
RNA_def_struct_ui_text(srna, "View & Controls", "Preferences related to viewing data");
|
||||||
|
|
||||||
/* View and Controls */
|
/* View */
|
||||||
|
|
||||||
/* display */
|
/* display */
|
||||||
prop= RNA_def_property(srna, "tooltips", PROP_BOOLEAN, PROP_NONE);
|
prop= RNA_def_property(srna, "tooltips", PROP_BOOLEAN, PROP_NONE);
|
||||||
@ -1683,10 +1679,6 @@ static void rna_def_userdef_view(BlenderRNA *brna)
|
|||||||
RNA_def_property_boolean_negative_sdna(prop, NULL, "uiflag", USER_MENUFIXEDORDER);
|
RNA_def_property_boolean_negative_sdna(prop, NULL, "uiflag", USER_MENUFIXEDORDER);
|
||||||
RNA_def_property_ui_text(prop, "Contents Follow Opening Direction", "Otherwise menus, etc will always be top to bottom, left to right, no matter opening direction.");
|
RNA_def_property_ui_text(prop, "Contents Follow Opening Direction", "Otherwise menus, etc will always be top to bottom, left to right, no matter opening direction.");
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "continuous_mouse", PROP_BOOLEAN, PROP_NONE);
|
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_CONTINUOUS_MOUSE);
|
|
||||||
RNA_def_property_ui_text(prop, "Continuous Grab", "Experimental option to allow moving the mouse outside the view");
|
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "global_pivot", PROP_BOOLEAN, PROP_NONE);
|
prop= RNA_def_property(srna, "global_pivot", PROP_BOOLEAN, PROP_NONE);
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_LOCKAROUND);
|
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_LOCKAROUND);
|
||||||
RNA_def_property_ui_text(prop, "Global Pivot", "Lock the same rotation/scaling pivot in all 3D Views.");
|
RNA_def_property_ui_text(prop, "Global Pivot", "Lock the same rotation/scaling pivot in all 3D Views.");
|
||||||
@ -1696,24 +1688,16 @@ static void rna_def_userdef_view(BlenderRNA *brna)
|
|||||||
RNA_def_property_ui_text(prop, "Auto Depth", "Use the depth under the mouse to improve view pan/rotate/zoom functionality.");
|
RNA_def_property_ui_text(prop, "Auto Depth", "Use the depth under the mouse to improve view pan/rotate/zoom functionality.");
|
||||||
|
|
||||||
/* view zoom */
|
/* view zoom */
|
||||||
prop= RNA_def_property(srna, "viewport_zoom_style", PROP_ENUM, PROP_NONE);
|
|
||||||
RNA_def_property_enum_sdna(prop, NULL, "viewzoom");
|
|
||||||
RNA_def_property_enum_items(prop, view_zoom_styles);
|
|
||||||
RNA_def_property_ui_text(prop, "Viewport Zoom Style", "Which style to use for viewport scaling.");
|
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "zoom_to_mouse", PROP_BOOLEAN, PROP_NONE);
|
prop= RNA_def_property(srna, "zoom_to_mouse", PROP_BOOLEAN, PROP_NONE);
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_ZOOM_TO_MOUSEPOS);
|
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_ZOOM_TO_MOUSEPOS);
|
||||||
RNA_def_property_ui_text(prop, "Zoom To Mouse Position", "Zoom in towards the mouse pointer's position in the 3D view, rather than the 2D window center.");
|
RNA_def_property_ui_text(prop, "Zoom To Mouse Position", "Zoom in towards the mouse pointer's position in the 3D view, rather than the 2D window center.");
|
||||||
|
|
||||||
/* view rotation */
|
/* view rotation */
|
||||||
prop= RNA_def_property(srna, "view_rotation", PROP_ENUM, PROP_NONE);
|
|
||||||
RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
|
prop= RNA_def_property(srna, "auto_perspective", PROP_BOOLEAN, PROP_NONE);
|
||||||
RNA_def_property_enum_items(prop, view_rotation_items);
|
|
||||||
RNA_def_property_ui_text(prop, "View Rotation", "Rotation style in the viewport.");
|
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "perspective_orthographic_switch", PROP_BOOLEAN, PROP_NONE);
|
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_AUTOPERSP);
|
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_AUTOPERSP);
|
||||||
RNA_def_property_ui_text(prop, "Perspective/Orthographic Switch", "Automatically switch between orthographic and perspective when changing from top/front/side views.");
|
RNA_def_property_ui_text(prop, "Auto Perspective", "Automatically switch between orthographic and perspective when changing from top/front/side views.");
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "rotate_around_selection", PROP_BOOLEAN, PROP_NONE);
|
prop= RNA_def_property(srna, "rotate_around_selection", PROP_BOOLEAN, PROP_NONE);
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_ORBIT_SELECTION);
|
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_ORBIT_SELECTION);
|
||||||
@ -1721,15 +1705,9 @@ static void rna_def_userdef_view(BlenderRNA *brna)
|
|||||||
|
|
||||||
/* select with */
|
/* select with */
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "select_mouse", PROP_ENUM, PROP_NONE);
|
|
||||||
RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
|
|
||||||
RNA_def_property_enum_items(prop, select_mouse_items);
|
|
||||||
RNA_def_property_ui_text(prop, "Select Mouse", "The mouse button used for selection.");
|
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "emulate_3_button_mouse", PROP_BOOLEAN, PROP_NONE);
|
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_TWOBUTTONMOUSE);
|
|
||||||
RNA_def_property_boolean_funcs(prop, NULL, "rna_userdef_emulate_set");
|
|
||||||
RNA_def_property_ui_text(prop, "Emulate 3 Button Mouse", "Emulates Middle Mouse with Alt+LeftMouse (doesnt work with Left Mouse Select option.)");
|
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "use_middle_mouse_paste", PROP_BOOLEAN, PROP_NONE);
|
prop= RNA_def_property(srna, "use_middle_mouse_paste", PROP_BOOLEAN, PROP_NONE);
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_MMB_PASTE);
|
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_MMB_PASTE);
|
||||||
@ -1754,10 +1732,7 @@ static void rna_def_userdef_view(BlenderRNA *brna)
|
|||||||
|
|
||||||
/* middle mouse button */
|
/* middle mouse button */
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "middle_mouse", PROP_ENUM, PROP_NONE);
|
|
||||||
RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
|
|
||||||
RNA_def_property_enum_items(prop, middle_mouse_mouse_items);
|
|
||||||
RNA_def_property_ui_text(prop, "Middle Mouse", "Use the middle mouse button to pan or zoom the view.");
|
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "wheel_invert_zoom", PROP_BOOLEAN, PROP_NONE);
|
prop= RNA_def_property(srna, "wheel_invert_zoom", PROP_BOOLEAN, PROP_NONE);
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_WHEELZOOMDIR);
|
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_WHEELZOOMDIR);
|
||||||
@ -1807,15 +1782,7 @@ static void rna_def_userdef_view(BlenderRNA *brna)
|
|||||||
RNA_def_property_ui_text(prop, "Object Center Size", "Diameter in Pixels for Object/Lamp center display.");
|
RNA_def_property_ui_text(prop, "Object Center Size", "Diameter in Pixels for Object/Lamp center display.");
|
||||||
RNA_def_property_update(prop, 0, "rna_userdef_update");
|
RNA_def_property_update(prop, 0, "rna_userdef_update");
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "ndof_pan_speed", PROP_INT, PROP_NONE);
|
|
||||||
RNA_def_property_int_sdna(prop, NULL, "ndof_pan");
|
|
||||||
RNA_def_property_range(prop, 0, 200);
|
|
||||||
RNA_def_property_ui_text(prop, "NDof Pan Speed", "The overall panning speed of an NDOF device, as percent of standard.");
|
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "ndof_rotate_speed", PROP_INT, PROP_NONE);
|
|
||||||
RNA_def_property_int_sdna(prop, NULL, "ndof_rotate");
|
|
||||||
RNA_def_property_range(prop, 0, 200);
|
|
||||||
RNA_def_property_ui_text(prop, "NDof Rotation Speed", "The overall rotation speed of an NDOF device, as percent of standard.");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void rna_def_userdef_edit(BlenderRNA *brna)
|
static void rna_def_userdef_edit(BlenderRNA *brna)
|
||||||
@ -2276,6 +2243,77 @@ static void rna_def_userdef_system(BlenderRNA *brna)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void rna_def_userdef_input(BlenderRNA *brna)
|
||||||
|
{
|
||||||
|
PropertyRNA *prop;
|
||||||
|
StructRNA *srna;
|
||||||
|
|
||||||
|
srna= RNA_def_struct(brna, "UserPreferencesInput", NULL);
|
||||||
|
RNA_def_struct_sdna(srna, "UserDef");
|
||||||
|
RNA_def_struct_nested(brna, srna, "UserPreferences");
|
||||||
|
RNA_def_struct_ui_text(srna, "Input", "Settings for input devices.");
|
||||||
|
|
||||||
|
static EnumPropertyItem select_mouse_items[] = {
|
||||||
|
{USER_LMOUSESELECT, "LEFT", 0, "Left", "Use left Mouse Button for selection."},
|
||||||
|
{0, "RIGHT", 0, "Right", "Use Right Mouse Button for selection."},
|
||||||
|
{0, NULL, 0, NULL, NULL}};
|
||||||
|
|
||||||
|
static EnumPropertyItem view_rotation_items[] = {
|
||||||
|
{0, "TURNTABLE", 0, "Turntable", "Use turntable style rotation in the viewport."},
|
||||||
|
{USER_TRACKBALL, "TRACKBALL", 0, "Trackball", "Use trackball style rotation in the viewport."},
|
||||||
|
{0, NULL, 0, NULL, NULL}};
|
||||||
|
|
||||||
|
static EnumPropertyItem middle_mouse_mouse_items[] = {
|
||||||
|
{0, "PAN", 0, "Pan", "Use the middle mouse button for panning the viewport."},
|
||||||
|
{USER_VIEWMOVE, "ROTATE", 0, "Rotate", "Use the middle mouse button for rotation the viewport."},
|
||||||
|
{0, NULL, 0, NULL, NULL}};
|
||||||
|
|
||||||
|
static EnumPropertyItem view_zoom_styles[] = {
|
||||||
|
{USER_ZOOM_CONT, "CONTINUE", 0, "Continue", "Old style zoom, continues while moving mouse up or down."},
|
||||||
|
{USER_ZOOM_DOLLY, "DOLLY", 0, "Dolly", "Zooms in and out based on vertical mouse movement."},
|
||||||
|
{USER_ZOOM_SCALE, "SCALE", 0, "Scale", "Zooms in and out like scaling the view, mouse movements relative to center."},
|
||||||
|
{0, NULL, 0, NULL, NULL}};
|
||||||
|
|
||||||
|
prop= RNA_def_property(srna, "middle_mouse", PROP_ENUM, PROP_NONE);
|
||||||
|
RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
|
||||||
|
RNA_def_property_enum_items(prop, middle_mouse_mouse_items);
|
||||||
|
RNA_def_property_ui_text(prop, "Middle Mouse", "Use the middle mouse button to pan or zoom the view.");
|
||||||
|
|
||||||
|
prop= RNA_def_property(srna, "select_mouse", PROP_ENUM, PROP_NONE);
|
||||||
|
RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
|
||||||
|
RNA_def_property_enum_items(prop, select_mouse_items);
|
||||||
|
RNA_def_property_ui_text(prop, "Select Mouse", "The mouse button used for selection.");
|
||||||
|
|
||||||
|
prop= RNA_def_property(srna, "viewport_zoom_style", PROP_ENUM, PROP_NONE);
|
||||||
|
RNA_def_property_enum_sdna(prop, NULL, "viewzoom");
|
||||||
|
RNA_def_property_enum_items(prop, view_zoom_styles);
|
||||||
|
RNA_def_property_ui_text(prop, "Viewport Zoom Style", "Which style to use for viewport scaling.");
|
||||||
|
|
||||||
|
prop= RNA_def_property(srna, "view_rotation", PROP_ENUM, PROP_NONE);
|
||||||
|
RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
|
||||||
|
RNA_def_property_enum_items(prop, view_rotation_items);
|
||||||
|
RNA_def_property_ui_text(prop, "View Rotation", "Rotation style in the viewport.");
|
||||||
|
|
||||||
|
prop= RNA_def_property(srna, "continuous_mouse", PROP_BOOLEAN, PROP_NONE);
|
||||||
|
RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_CONTINUOUS_MOUSE);
|
||||||
|
RNA_def_property_ui_text(prop, "Continuous Grab", "Experimental option to allow moving the mouse outside the view");
|
||||||
|
|
||||||
|
prop= RNA_def_property(srna, "ndof_pan_speed", PROP_INT, PROP_NONE);
|
||||||
|
RNA_def_property_int_sdna(prop, NULL, "ndof_pan");
|
||||||
|
RNA_def_property_range(prop, 0, 200);
|
||||||
|
RNA_def_property_ui_text(prop, "NDof Pan Speed", "The overall panning speed of an NDOF device, as percent of standard.");
|
||||||
|
|
||||||
|
prop= RNA_def_property(srna, "ndof_rotate_speed", PROP_INT, PROP_NONE);
|
||||||
|
RNA_def_property_int_sdna(prop, NULL, "ndof_rotate");
|
||||||
|
RNA_def_property_range(prop, 0, 200);
|
||||||
|
RNA_def_property_ui_text(prop, "NDof Rotation Speed", "The overall rotation speed of an NDOF device, as percent of standard.");
|
||||||
|
|
||||||
|
prop= RNA_def_property(srna, "emulate_3_button_mouse", PROP_BOOLEAN, PROP_NONE);
|
||||||
|
RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_TWOBUTTONMOUSE);
|
||||||
|
RNA_def_property_boolean_funcs(prop, NULL, "rna_userdef_emulate_set");
|
||||||
|
RNA_def_property_ui_text(prop, "Emulate 3 Button Mouse", "Emulates Middle Mouse with Alt+LeftMouse (doesnt work with Left Mouse Select option.)");
|
||||||
|
}
|
||||||
|
|
||||||
static void rna_def_userdef_filepaths(BlenderRNA *brna)
|
static void rna_def_userdef_filepaths(BlenderRNA *brna)
|
||||||
{
|
{
|
||||||
PropertyRNA *prop;
|
PropertyRNA *prop;
|
||||||
@ -2375,7 +2413,7 @@ void RNA_def_userdef(BlenderRNA *brna)
|
|||||||
{USER_SECTION_INTERFACE, "INTERFACE", 0, "Interface", ""},
|
{USER_SECTION_INTERFACE, "INTERFACE", 0, "Interface", ""},
|
||||||
{USER_SECTION_EDIT, "EDITING", 0, "Editing", ""},
|
{USER_SECTION_EDIT, "EDITING", 0, "Editing", ""},
|
||||||
{USER_SECTION_INPUT, "INPUT", 0, "Input", ""},
|
{USER_SECTION_INPUT, "INPUT", 0, "Input", ""},
|
||||||
// {USER_SECTION_THEME, "THEMES", 0, "Themes", ""}, // Leave this out until we figure out a way to manage themes in the prefs.
|
// {USER_SECTION_THEME, "THEMES", 0, "Themes", ""}, Doesn't work yet
|
||||||
{USER_SECTION_FILE, "FILES", 0, "File", ""},
|
{USER_SECTION_FILE, "FILES", 0, "File", ""},
|
||||||
{USER_SECTION_SYSTEM, "SYSTEM", 0, "System", ""},
|
{USER_SECTION_SYSTEM, "SYSTEM", 0, "System", ""},
|
||||||
{0, NULL, 0, NULL, NULL}};
|
{0, NULL, 0, NULL, NULL}};
|
||||||
@ -2416,6 +2454,12 @@ void RNA_def_userdef(BlenderRNA *brna)
|
|||||||
RNA_def_property_pointer_funcs(prop, "rna_UserDef_edit_get", NULL, NULL);
|
RNA_def_property_pointer_funcs(prop, "rna_UserDef_edit_get", NULL, NULL);
|
||||||
RNA_def_property_ui_text(prop, "Edit Methods", "Settings for interacting with Blender data.");
|
RNA_def_property_ui_text(prop, "Edit Methods", "Settings for interacting with Blender data.");
|
||||||
|
|
||||||
|
prop= RNA_def_property(srna, "inputs", PROP_POINTER, PROP_NONE);
|
||||||
|
RNA_def_property_flag(prop, PROP_NEVER_NULL);
|
||||||
|
RNA_def_property_struct_type(prop, "UserPreferencesInput");
|
||||||
|
RNA_def_property_pointer_funcs(prop, "rna_UserDef_input_get", NULL, NULL);
|
||||||
|
RNA_def_property_ui_text(prop, "Inputs", "Settings for input devices.");
|
||||||
|
|
||||||
prop= RNA_def_property(srna, "filepaths", PROP_POINTER, PROP_NONE);
|
prop= RNA_def_property(srna, "filepaths", PROP_POINTER, PROP_NONE);
|
||||||
RNA_def_property_flag(prop, PROP_NEVER_NULL);
|
RNA_def_property_flag(prop, PROP_NEVER_NULL);
|
||||||
RNA_def_property_struct_type(prop, "UserPreferencesFilePaths");
|
RNA_def_property_struct_type(prop, "UserPreferencesFilePaths");
|
||||||
@ -2430,6 +2474,7 @@ void RNA_def_userdef(BlenderRNA *brna)
|
|||||||
|
|
||||||
rna_def_userdef_view(brna);
|
rna_def_userdef_view(brna);
|
||||||
rna_def_userdef_edit(brna);
|
rna_def_userdef_edit(brna);
|
||||||
|
rna_def_userdef_input(brna);
|
||||||
rna_def_userdef_filepaths(brna);
|
rna_def_userdef_filepaths(brna);
|
||||||
rna_def_userdef_system(brna);
|
rna_def_userdef_system(brna);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user