archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

UI: Clarify descriptions in properties popover

Browse Source 
Updates the descriptions and labels for outliner sync in the properties
editor popover to be more clear.

Differential Revision: https://developer.blender.org/D10010
This commit is contained in:
Nathan Craddock
2021-01-05 13:55:32 -07:00
parent c53022768b
commit 23de16414a
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/space_properties.py
View File

@@ -74,7 +74,7 @@ class PROPERTIES_PT_navigation_bar(Panel):
class PROPERTIES_PT_options(Panel): class PROPERTIES_PT_options(Panel):
bl_space_type = 'PROPERTIES' bl_space_type = 'PROPERTIES'
bl_region_type = 'HEADER' bl_region_type = 'HEADER'
bl_label = 'Options' bl_label = 'Show options for the properties editor'
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout

2
source/blender/editors/space_buttons/buttons_context.c
View File

@@ -756,7 +756,7 @@ bool ED_buttons_should_sync_with_outliner(const bContext *C,
ScrArea *active_area = CTX_wm_area(C); ScrArea *active_area = CTX_wm_area(C);
const bool auto_sync = ED_area_has_shared_border(active_area, area) && const bool auto_sync = ED_area_has_shared_border(active_area, area) &&
sbuts->outliner_sync == PROPERTIES_SYNC_AUTO; sbuts->outliner_sync == PROPERTIES_SYNC_AUTO;
return auto_sync || sbuts->outliner_sync == PROPERTIES_SYNC_ON; return auto_sync || sbuts->outliner_sync == PROPERTIES_SYNC_ALWAYS;
} }
void ED_buttons_set_context(const bContext *C, void ED_buttons_set_context(const bContext *C,

4
source/blender/makesdna/DNA_space_types.h
View File

@@ -241,8 +241,8 @@ typedef enum eSpaceButtons_Flag {
/* SpaceProperties.outliner_sync */ /* SpaceProperties.outliner_sync */
typedef enum eSpaceButtons_OutlinerSync { typedef enum eSpaceButtons_OutlinerSync {
PROPERTIES_SYNC_AUTO = 0, PROPERTIES_SYNC_AUTO = 0,
PROPERTIES_SYNC_OFF = 1, PROPERTIES_SYNC_NEVER = 1,
PROPERTIES_SYNC_ON = 2, PROPERTIES_SYNC_ALWAYS = 2,
} eSpaceButtons_OutlinerSync; } eSpaceButtons_OutlinerSync;
/** \} */ /** \} */

18
source/blender/makesrna/intern/rna_space.c
View File

@@ -4805,13 +4805,21 @@ static void rna_def_space_properties(BlenderRNA *brna)
PropertyRNA *prop; PropertyRNA *prop;
static const EnumPropertyItem tab_sync_items[] = { static const EnumPropertyItem tab_sync_items[] = {
{PROPERTIES_SYNC_ON, "ON", 0, "On", "Always sync from outliner editors to this editor"}, {PROPERTIES_SYNC_ALWAYS,
{PROPERTIES_SYNC_OFF, "OFF", 0, "Off", "Never sync from outliner editors to this editor"}, "ALWAYS",
0,
"Always",
"Always change tabs when clicking an icon in an outliner"},
{PROPERTIES_SYNC_NEVER,
"NEVER",
0,
"Never",
"Never change tabs when clicking an icon in an outliner"},
{PROPERTIES_SYNC_AUTO, {PROPERTIES_SYNC_AUTO,
"AUTO", "AUTO",
0, 0,
"Auto", "Auto",
"Sync when this editor shares an edge with an outliner editor"}, "Change tabs only when this editor shares a border the outliner"},
{0, NULL, 0, NULL, NULL}, {0, NULL, 0, NULL, NULL},
}; };
@@ -4870,7 +4878,9 @@ static void rna_def_space_properties(BlenderRNA *brna)
prop = RNA_def_property(srna, "outliner_sync", PROP_ENUM, PROP_NONE); prop = RNA_def_property(srna, "outliner_sync", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "outliner_sync"); RNA_def_property_enum_sdna(prop, NULL, "outliner_sync");
RNA_def_property_enum_items(prop, tab_sync_items); RNA_def_property_enum_items(prop, tab_sync_items);
RNA_def_property_ui_text(prop, "Outliner Sync", "Sync tabs from outliner datablock selection"); RNA_def_property_ui_text(prop,
"Outliner Sync",
"Change to the corresponding tab when outliner data icons are clicked");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_PROPERTIES, NULL); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_PROPERTIES, NULL);
} }