[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32422] trunk/blender: [#24226] small inconsistency in user preferences

[Campbell Barton]

Revision: 32422
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32422
Author:   campbellbarton
Date:     2010-10-12 00:05:45 +0200 (Tue, 12 Oct 2010)

Log Message:
-----------
[#24226] small inconsistency in user preferences
also made setting the temp dir more consistent, slash is always added on the end and if the user-pref dir is invalid its not used.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_info.py
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c
    trunk/blender/source/blender/windowmanager/intern/wm_files.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/release/scripts/ui/space_info.py
===================================================================
--- trunk/blender/release/scripts/ui/space_info.py	2010-10-11 21:08:26 UTC (rev 32421)
+++ trunk/blender/release/scripts/ui/space_info.py	2010-10-11 22:05:45 UTC (rev 32422)
@@ -119,7 +119,7 @@
         layout.separator()
 
         layout.operator_context = 'EXEC_AREA'
-        layout.operator("wm.exit_blender", text="Quit", icon='QUIT')
+        layout.operator("wm.quit_blender", text="Quit", icon='QUIT')
 
 
 class INFO_MT_file_import(bpy.types.Menu):

Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2010-10-11 21:08:26 UTC (rev 32421)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2010-10-11 22:05:45 UTC (rev 32422)
@@ -221,8 +221,7 @@
 static void rna_userdef_temp_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
 	extern char btempdir[];
-	UserDef *userdef = (UserDef*)ptr->data;
-	strncpy(btempdir, userdef->tempdir, FILE_MAXDIR+FILE_MAXFILE);
+	BLI_where_is_temp(btempdir, 1);
 }
 
 #else

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-10-11 21:08:26 UTC (rev 32421)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2010-10-11 22:05:45 UTC (rev 32422)
@@ -259,8 +259,7 @@
 	/* set the python auto-execute setting from user prefs */
 	/* disabled by default, unless explicitly enabled in the command line */
 	if ((U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0) G.f |=  G_SCRIPT_AUTOEXEC;
-
-	if(U.tempdir[0]) strncpy(btempdir, U.tempdir, FILE_MAXDIR+FILE_MAXFILE);
+	if(U.tempdir[0]) BLI_where_is_temp(btempdir, 1);
 }
 
 void WM_read_file(bContext *C, char *name, ReportList *reports)

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-10-11 21:08:26 UTC (rev 32421)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-10-11 22:05:45 UTC (rev 32422)
@@ -1998,10 +1998,10 @@
 	return OPERATOR_FINISHED;
 }
 
-static void WM_OT_exit_blender(wmOperatorType *ot)
+static void WM_OT_quit_blender(wmOperatorType *ot)
 {
-	ot->name= "Exit Blender";
-	ot->idname= "WM_OT_exit_blender";
+	ot->name= "Quit Blender";
+	ot->idname= "WM_OT_quit_blender";
 	ot->description= "Quit Blender";
 
 	ot->invoke= WM_operator_confirm;
@@ -3068,7 +3068,7 @@
 	WM_operatortype_append(WM_OT_read_factory_settings);
 	WM_operatortype_append(WM_OT_save_homefile);
 	WM_operatortype_append(WM_OT_window_fullscreen_toggle);
-	WM_operatortype_append(WM_OT_exit_blender);
+	WM_operatortype_append(WM_OT_quit_blender);
 	WM_operatortype_append(WM_OT_open_mainfile);
 	WM_operatortype_append(WM_OT_link_append);
 	WM_operatortype_append(WM_OT_recover_last_session);
@@ -3270,7 +3270,7 @@
 	WM_keymap_add_item(keymap, "WM_OT_open_mainfile", OKEY, KM_PRESS, KM_OSKEY, 0);
 	WM_keymap_add_item(keymap, "WM_OT_save_mainfile", SKEY, KM_PRESS, KM_OSKEY, 0);
 	WM_keymap_add_item(keymap, "WM_OT_save_as_mainfile", SKEY, KM_PRESS, KM_SHIFT|KM_OSKEY, 0);
-	WM_keymap_add_item(keymap, "WM_OT_exit_blender", QKEY, KM_PRESS, KM_OSKEY, 0);
+	WM_keymap_add_item(keymap, "WM_OT_quit_blender", QKEY, KM_PRESS, KM_OSKEY, 0);
 	#endif
 	WM_keymap_add_item(keymap, "WM_OT_read_homefile", NKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "WM_OT_save_homefile", UKEY, KM_PRESS, KM_CTRL, 0); 
@@ -3290,7 +3290,7 @@
 	RNA_boolean_set(kmi->ptr, "copy", 1);
 
 	WM_keymap_verify_item(keymap, "WM_OT_window_fullscreen_toggle", F11KEY, KM_PRESS, KM_ALT, 0);
-	WM_keymap_add_item(keymap, "WM_OT_exit_blender", QKEY, KM_PRESS, KM_CTRL, 0);
+	WM_keymap_add_item(keymap, "WM_OT_quit_blender", QKEY, KM_PRESS, KM_CTRL, 0);
 
 	/* debug/testing */
 	WM_keymap_verify_item(keymap, "WM_OT_redraw_timer", TKEY, KM_PRESS, KM_ALT|KM_CTRL, 0);