[Bf-blender-cvs] [b00963afc14] blender2.8: UI: Initial User-Preferences redesign
Julian Eisel
noreply at git.blender.org
Sun Nov 25 17:10:01 CET 2018
Commit: b00963afc14978b2de7f2859525bf89612aa4aee
Author: Julian Eisel
Date: Sun Nov 25 16:21:35 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBb00963afc14978b2de7f2859525bf89612aa4aee
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
===================================================================
M release/datafiles/userdef/userdef_default_theme.c
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M release/scripts/startup/bl_ui/space_topbar.py
M release/scripts/startup/bl_ui/space_userpref.py
M source/blender/blenkernel/BKE_blender_version.h
M source/blender/blenkernel/BKE_screen.h
M source/blender/blenkernel/intern/screen.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/space_userpref/space_userpref.c
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_window.c
===================================================================
diff --git a/release/datafiles/userdef/userdef_default_theme.c b/release/datafiles/userdef/userdef_default_theme.c
index b7b9c1aa9b8..b804109c743 100644
--- a/release/datafiles/userdef/userdef_default_theme.c
+++ b/release/datafiles/userdef/userdef_default_theme.c
@@ -819,6 +819,7 @@ const bTheme U_theme_default = {
.button_title = RGBA(0xffffffff),
.button_text = RGBA(0xe5e5e5ff),
.button_text_hi = RGBA(0xffffffff),
+ .navigation_bar = RGBA(0x373737ff),
.panelcolors = {
.header = RGBA(0x42424200),
.back = RGBA(0x333333b3),
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 00fd59820e0..182dfd0870b 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -404,7 +404,7 @@ def km_screen(params):
("screen.region_flip", {"type": 'F5', "value": 'PRESS'}, None),
("screen.redo_last", {"type": 'F6', "value": 'PRESS'}, None),
("script.reload", {"type": 'F8', "value": 'PRESS'}, None),
- ("screen.userpref_show", {"type": 'U', "value": 'PRESS', "ctrl": True, "alt": True}, None),
+ ("screen.settings_show", {"type": 'U', "value": 'PRESS', "ctrl": True, "alt": True}, None),
])
if params.apple:
@@ -413,7 +413,7 @@ def km_screen(params):
("ed.undo", {"type": 'Z', "value": 'PRESS', "oskey": True}, None),
("ed.redo", {"type": 'Z', "value": 'PRESS', "shift": True, "oskey": True}, None),
("ed.undo_history", {"type": 'Z', "value": 'PRESS', "alt": True, "oskey": True}, None),
- ("screen.userpref_show", {"type": 'COMMA', "value": 'PRESS', "oskey": True}, None),
+ ("screen.settings_show", {"type": 'COMMA', "value": 'PRESS', "oskey": True}, None),
])
return keymap
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 8b9c47839e9..4fc2b12e950 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -828,7 +828,7 @@ class TOPBAR_MT_edit(Menu):
layout.separator()
- layout.operator("screen.userpref_show", text="User Preferences...", icon='PREFERENCES')
+ layout.operator("screen.settings_show", text="Settings...", icon='PREFERENCES')
class TOPBAR_MT_window(Menu):
@@ -981,7 +981,7 @@ class TOPBAR_MT_window_specials(Menu):
layout.separator()
- layout.operator("screen.userpref_show", text="User Preferences...", icon='PREFERENCES')
+ layout.operator("screen.settings_show", text="Settings...", icon='PREFERENCES')
class TOPBAR_MT_workspace_menu(Menu):
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 954326f8899..22fb5af5c58 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -59,10 +59,10 @@ class USERPREF_HT_header(Header):
layout.operator("wm.save_userpref")
-class USERPREF_PT_tabs(Panel):
+class USERPREF_PT_navigation(Panel):
bl_label = ""
bl_space_type = 'USER_PREFERENCES'
- bl_region_type = 'WINDOW'
+ bl_region_type = 'NAVIGATION_BAR'
bl_options = {'HIDE_HEADER'}
def draw(self, context):
@@ -70,7 +70,11 @@ class USERPREF_PT_tabs(Panel):
userpref = context.user_preferences
- layout.row().prop(userpref, "active_section", expand=True)
+ col = layout.column()
+
+ col.scale_x = 1.3
+ col.scale_y = 1.3
+ col.prop(userpref, "active_section", expand=True)
class USERPREF_PT_interface(Panel):
@@ -331,16 +335,16 @@ class USERPREF_PT_edit(Panel):
col.prop(edit, "use_duplicate_particle", text="Particle")
-class USERPREF_PT_system(Panel):
+class USERPREF_PT_system_general(Panel):
bl_space_type = 'USER_PREFERENCES'
- bl_label = "System"
+ bl_label = "System General"
bl_region_type = 'WINDOW'
bl_options = {'HIDE_HEADER'}
@classmethod
def poll(cls, context):
userpref = context.user_preferences
- return (userpref.active_section == 'SYSTEM')
+ return (userpref.active_section == 'SYSTEM_GENERAL')
def draw(self, context):
import sys
@@ -880,7 +884,7 @@ class USERPREF_PT_file(Panel):
@classmethod
def poll(cls, context):
userpref = context.user_preferences
- return (userpref.active_section == 'FILES')
+ return (userpref.active_section == 'SYSTEM_FILES')
def draw(self, context):
layout = self.layout
@@ -1572,10 +1576,10 @@ class USERPREF_PT_studiolight_specular(Panel, StudioLightPanelMixin):
classes = (
USERPREF_HT_header,
- USERPREF_PT_tabs,
+ USERPREF_PT_navigation,
USERPREF_PT_interface,
USERPREF_PT_edit,
- USERPREF_PT_system,
+ USERPREF_PT_system_general,
USERPREF_MT_interface_theme_presets,
USERPREF_PT_theme,
USERPREF_PT_file,
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 32b9508a679..b34dc55ba44 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -28,7 +28,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 280
-#define BLENDER_SUBVERSION 33
+#define BLENDER_SUBVERSION 34
/* Several breakages with 280, e.g. collections vs layers */
#define BLENDER_MINVERSION 280
#define BLENDER_MINSUBVERSION 0
diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h
index 0d766e83299..75d2ed0d0bc 100644
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@ -319,6 +319,10 @@ void BKE_spacedata_freelist(ListBase *lb);
void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2);
void BKE_spacedata_draw_locks(int set);
+struct ARegion *BKE_spacedata_find_region_type(
+ const struct SpaceLink *slink, const struct ScrArea *sa,
+ int region_type) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
+
void BKE_spacedata_callback_id_remap_set(
void (*func)(struct ScrArea *sa, struct SpaceLink *sl, struct ID *old_id, struct ID *new_id));
void BKE_spacedata_id_unref(struct ScrArea *sa, struct SpaceLink *sl, struct ID *id);
@@ -332,7 +336,7 @@ void BKE_screen_area_free(struct ScrArea *sa);
void BKE_region_callback_free_gizmomap_set(void (*callback)(struct wmGizmoMap *));
void BKE_region_callback_refresh_tag_gizmomap_set(void (*callback)(struct wmGizmoMap *));
-struct ARegion *BKE_area_find_region_type(struct ScrArea *sa, int type);
+struct ARegion *BKE_area_find_region_type(const struct ScrArea *sa, int type);
struct ARegion *BKE_area_find_region_active_win(struct ScrArea *sa);
struct ARegion *BKE_area_find_region_xy(struct ScrArea *sa, const int regiontype, int x, int y);
struct ScrArea *BKE_screen_find_area_from_space(struct bScreen *sc, struct SpaceLink *sl) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1, 2);
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index 0c93281bf84..e23291d42d4 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -309,6 +309,30 @@ void BKE_spacedata_draw_locks(int set)
}
}
+/**
+ * Version of #BKE_area_find_region_type that also works if \a slink is not the active space of \a sa.
+ */
+ARegion *BKE_spacedata_find_region_type(const SpaceLink *slink, const ScrArea *sa, int region_type)
+{
+ const bool is_slink_active = slink == sa->spacedata.first;
+ const ListBase *regionbase = (is_slink_active) ?
+ &sa->regionbase : &slink->regionbase;
+ ARegion *ar = NULL;
+
+ BLI_assert(BLI_findindex(&sa->spacedata, slink) != -1);
+ for (ar = regionbase->first; ar; ar = ar->next) {
+ if (ar->regiontype == region_type) {
+ break;
+ }
+ }
+
+ /* Should really unit test this instead. */
+ BLI_assert(!is_slink_active || ar == BKE_area_find_region_type(sa, region_type));
+
+ return ar;
+}
+
+
static void (*spacedata_id_remap_cb)(struct ScrArea *sa, struct SpaceLink *sl, ID *old_id, ID *new_id) = NULL;
void BKE_spacedata_callback_id_remap_set(void (*func)(ScrArea *sa, SpaceLink *sl, ID *, ID *))
@@ -644,17 +668,21 @@ void BKE_screen_remove_unused_scrverts(bScreen *sc)
/* ***************** Utilities ********************** */
-/* Find a region of the specified type from the given area */
-ARegion *BKE_area_find_region_type(ScrArea *sa, int type)
+/**
+ * Find a region of type \a region_type in the currently active space of \a sa.
+ *
+ * \note This does _not_ work if the region to look up is not in the active
+ * space. Use #BKE_spacedata_find_region_type if that may be the case.
+ */
+ARegion *BKE_area_find_region_type(const ScrArea *sa, int region_type)
{
if (sa) {
- ARegion *ar;
-
- for (ar = sa->regionbase.first; ar; ar = ar->next) {
- if (ar->regiontype == type)
+ for (ARegion *ar = sa->regionbase.first; ar; ar = ar->next) {
+ if (ar->regiontype == region_type)
return ar;
}
}
+
return NULL;
}
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 2cf00bfe2c1..a844a2dc91b 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -2428,6 +2428,29 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
+ if (!MAIN_VERSION_ATLEAST(bmain, 280, 34)) {
+ for (bScreen *screen = bmain->screen.first; screen; screen = screen->id.next) {
+ for (ScrArea *area = screen->areabase.first; area; area = area->next) {
+ for (SpaceLink *slink = area->spacedata.first; slink; slink = slink->next) {
+ if (slink->spacetype == SPACE_USERPREF) {
+ ARegion *navigation_region = BKE_spacedata_find_region_type(slink, area, RGN_TYPE_NAV_BAR);
+
+ if (!navigation_region) {
+ ListBase *regionbase = (slink == area-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list