Page MenuHome
Files F4407

userprefs.txt
Public
Actions

userprefs.txt
View Options

Index: source/blender/include/BSE_filesel.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/include/BSE_filesel.h,v
retrieving revision 1.10
diff -u -p -u -r1.10 BSE_filesel.h
--- source/blender/include/BSE_filesel.h 20 Dec 2006 17:57:43 -0000 1.10
+++ source/blender/include/BSE_filesel.h 24 Mar 2007 07:36:59 -0000
@@ -58,6 +58,8 @@ void activate_imageselect(int type, char
void activate_databrowse(struct ID *id, int idcode, int fromcode, int retval, short *menup, void (*func)(unsigned short));
void activate_databrowse_args(struct ID *id, int idcode, int fromcode, short *menup, void (*func)(char *, void *, void *), void *arg1, void *arg2);
+void activate_userpreferences(void);
+
void filesel_prevspace(void);
void free_filesel_spec(char *dir);
void winqreadfilespace(struct ScrArea *sa, void *spacedata, struct BWinEvent *evt);
@@ -65,4 +67,3 @@ void main_to_filelist(struct SpaceFile *
void clever_numbuts_filesel(void);
#endif
-
Index: source/blender/src/filesel.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/filesel.c,v
retrieving revision 1.94
diff -u -p -u -r1.94 filesel.c
--- source/blender/src/filesel.c 20 Mar 2007 15:07:23 -0000 1.94
+++ source/blender/src/filesel.c 24 Mar 2007 07:36:59 -0000
@@ -1496,10 +1496,21 @@ void activate_databrowse_args(struct ID
sfile->ipotype= fromcode;
}
+void activate_userpreferences()
+{
+ if(curarea==0) return;
+ if(curarea->win==0) return;
+
+ newspace(curarea, SPACE_INFO);
+ scrarea_queue_winredraw(curarea);
+}
+
void filesel_prevspace()
{
SpaceFile *sfile= curarea->spacedata.first;
+ if(!sfile) return;
+
/* cleanup */
if(sfile->spacetype==SPACE_FILE) {
if(sfile->pupmenu) {
@@ -2771,4 +2782,3 @@ void clever_numbuts_filesel()
scrarea_queue_winredraw(curarea);
}
}
-
Index: source/blender/src/header_info.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/header_info.c,v
retrieving revision 1.111
diff -u -p -u -r1.111 header_info.c
--- source/blender/src/header_info.c 22 Mar 2007 01:40:28 -0000 1.111
+++ source/blender/src/header_info.c 24 Mar 2007 07:37:00 -0000
@@ -890,6 +890,9 @@ static void do_info_filemenu(void *arg,
error("Can't read data from memory!");
}
break;
+ case 33:
+ activate_userpreferences();
+ break;
case 35: /* compress toggle */
U.flag ^= (USER_FILECOMPRESS);
break;
@@ -979,7 +982,7 @@ static uiBlock *info_filemenu(void *arg_
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Save Default Settings|Ctrl U", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 31, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Load Factory Settings", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 32, "");
-
+ uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "User Preferences", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 33, "");
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
Index: source/blender/src/space.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/space.c,v
retrieving revision 1.460
diff -u -p -u -r1.460 space.c
--- source/blender/src/space.c 22 Mar 2007 20:32:20 -0000 1.460
+++ source/blender/src/space.c 24 Mar 2007 07:37:01 -0000
@@ -3900,7 +3900,10 @@ static void winqreadinfospace(ScrArea *s
}
else do_global_buttons(val);
- break;
+ break;
+ case ESCKEY:
+ filesel_prevspace();
+ break;
}
}
}

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
b3/e5/7491b026f1bec2bd576ee2c79fb0

Event Timeline