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

made it possible to type in ~ at the start of the filename, ~/Desktop for instance.

Browse Source 
Enabled for win32 and in the image browser.
This commit is contained in:
Campbell Barton
2008-03-02 00:26:13 +00:00
parent 0db0f5734d
commit 2b7e99da69
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/src/editimasel.c
View File

@@ -594,7 +594,21 @@ static void do_imasel_buttons(short event, SpaceImaSel *simasel)
}
}
else if(event== B_FS_DIRNAME) {
/* reuse the butname variable */
/* convienence shortcut '~' -> $HOME
* If the first char is ~ then this is invalid on all OS's so its safe to replace with home */
if ( simasel->dir[0] == '~' ) {
if (simasel->dir[1] == '\0') {
BLI_strncpy(simasel->dir, BLI_gethome(), sizeof(simasel->dir) );
} else {
/* replace ~ with home */
char tmpstr[FILE_MAX];
BLI_join_dirfile(tmpstr, BLI_gethome(), simasel->dir+1);
BLI_strncpy(simasel->dir, tmpstr, sizeof(simasel->dir));
}
}
/* reuse the butname vsariable */
BLI_cleanup_dir(G.sce, simasel->dir);
BLI_make_file_string(G.sce, butname, simasel->dir, "");

17
source/blender/src/filesel.c
View File

@@ -1529,12 +1529,19 @@ static void do_filesel_buttons(short event, SpaceFile *sfile)
else if(event== B_FS_DIRNAME) {
/* reuse the butname variable */
#ifndef WIN32
/* convienence shortcut '~' -> $HOME */
if ( sfile->dir[0] == '~' && sfile->dir[1] == '\0' ) {
BLI_strncpy(sfile->dir, BLI_gethome(), sizeof(sfile->dir) );
/* convienence shortcut '~' -> $HOME
* If the first char is ~ then this is invalid on all OS's so its safe to replace with home */
if ( sfile->dir[0] == '~' ) {
if (sfile->dir[1] == '\0') {
BLI_strncpy(sfile->dir, BLI_gethome(), sizeof(sfile->dir) );
} else {
/* replace ~ with home */
char tmpstr[FILE_MAX];
BLI_join_dirfile(tmpstr, BLI_gethome(), sfile->dir+1);
BLI_strncpy(sfile->dir, tmpstr, sizeof(sfile->dir));
}
}
#endif
BLI_cleanup_dir(G.sce, sfile->dir);
BLI_make_file_string(G.sce, butname, sfile->dir, "");