Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2018-11-25 18:21:35 +0300
committerJulian Eisel <eiseljulian@gmail.com>2018-11-25 19:08:58 +0300
commitb00963afc14978b2de7f2859525bf89612aa4aee (patch)
treef83ec02a96b84019735037528e31e827dcc0dbd6 /source/blender/editors/screen/screen_ops.c
parent3135ed376bba357f3a41f7025db3fb79fd6c0f61 (diff)
UI: Initial User-Preferences redesign
Implements the first changes for T54115: * Rename "User Preferences" window to "Settings" in the UI. We'll likely put workspace settings in there, separate from the global user settings. System settings should become separate from user settings in future to allow settings for specific hardware. * Add sidebar region for navigation (scrolls independently). Addresses space problems, so we can add more categories as needed now. * Increase size of Settings window to compensate new navigation bar. * Group sections into User Preferences and System. Icons for section groups by Andrzej Ambroz. Thanks! * Bumps subversion for file compatibility. Screenshot: https://developer.blender.org/F5715337 I also added categories for future work, but commented them out. We may also want to redesign contents of each section now. Reviewers: brecht, campbellbarton Differential Revision: https://developer.blender.org/D3088 Design Task: https://developer.blender.org/T54115
Diffstat (limited to 'source/blender/editors/screen/screen_ops.c')
-rw-r--r--source/blender/editors/screen/screen_ops.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 6a9f1e13aea..2305ce8f5fe 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -4332,9 +4332,9 @@ static void SCREEN_OT_back_to_previous(struct wmOperatorType *ot)
/** \name Show User Preferences Operator
* \{ */
-static int userpref_show_invoke(bContext *C, wmOperator *op, const wmEvent *event)
+static int settings_show_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
- int sizex = 800 * UI_DPI_FAC;
+ int sizex = (800 + UI_NAVIGATION_REGION_WIDTH) * UI_DPI_FAC;
int sizey = 500 * UI_DPI_FAC;
/* changes context! */
@@ -4348,15 +4348,15 @@ static int userpref_show_invoke(bContext *C, wmOperator *op, const wmEvent *even
}
-static void SCREEN_OT_userpref_show(struct wmOperatorType *ot)
+static void SCREEN_OT_settings_show(struct wmOperatorType *ot)
{
/* identifiers */
- ot->name = "Show User Preferences";
- ot->description = "Show user preferences";
- ot->idname = "SCREEN_OT_userpref_show";
+ ot->name = "Show Blender Settings";
+ ot->description = "Edit user preferences, workspaces and system settings";
+ ot->idname = "SCREEN_OT_settings_show";
/* api callbacks */
- ot->invoke = userpref_show_invoke;
+ ot->invoke = settings_show_invoke;
ot->poll = ED_operator_screenactive;
}
@@ -4814,7 +4814,7 @@ void ED_operatortypes_screen(void)
WM_operatortype_append(SCREEN_OT_back_to_previous);
WM_operatortype_append(SCREEN_OT_spacedata_cleanup);
WM_operatortype_append(SCREEN_OT_screenshot);
- WM_operatortype_append(SCREEN_OT_userpref_show);
+ WM_operatortype_append(SCREEN_OT_settings_show);
WM_operatortype_append(SCREEN_OT_drivers_editor_show);
WM_operatortype_append(SCREEN_OT_region_blend);
WM_operatortype_append(SCREEN_OT_space_context_cycle);