Revision: 27491
http://sourceforge.net/p/bibdesk/svn/27491
Author: hofman
Date: 2022-05-27 22:49:15 +0000 (Fri, 27 May 2022)
Log Message:
-----------
reset downloads folder pref when choosing default folder
Modified Paths:
--------------
trunk/bibdesk/Base.lproj/BibPref_Defaults.xib
trunk/bibdesk/BibPref_Defaults.m
Modified: trunk/bibdesk/Base.lproj/BibPref_Defaults.xib
===================================================================
--- trunk/bibdesk/Base.lproj/BibPref_Defaults.xib 2022-05-27 22:18:07 UTC
(rev 27490)
+++ trunk/bibdesk/Base.lproj/BibPref_Defaults.xib 2022-05-27 22:49:15 UTC
(rev 27491)
@@ -360,7 +360,7 @@
<tableColumnResizingMask
key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView id="VFR-1v-zAf"
customClass="BDSKControlTableCellView">
- <rect key="frame" x="307.5"
y="1" width="65" height="14"/>
+ <rect key="frame" x="308"
y="1" width="65" height="14"/>
<autoresizingMask
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button
verticalHuggingPriority="750" horizontalCompressionResistancePriority="250"
translatesAutoresizingMaskIntoConstraints="NO" id="ZUV-ng-GFc">
Modified: trunk/bibdesk/BibPref_Defaults.m
===================================================================
--- trunk/bibdesk/BibPref_Defaults.m 2022-05-27 22:18:07 UTC (rev 27490)
+++ trunk/bibdesk/BibPref_Defaults.m 2022-05-27 22:49:15 UTC (rev 27491)
@@ -678,18 +678,21 @@
[sender selectItemAtIndex:0];
NSString *downloadsFolder = [[[NSUserDefaults standardUserDefaults]
stringForKey:BDSKDownloadsDirectoryKey] stringByExpandingTildeInPath];
+ NSString *defaultDownloadsFolder = [[[NSFileManager defaultManager]
downloadFolderURL] path];
if (downloadsFolder == nil)
- downloadsFolder = [[[NSFileManager defaultManager]
downloadFolderURL] path];
- NSURL *downloadsFolderURL = [NSURL fileURLWithPath:downloadsFolder
isDirectory:YES];
+ downloadsFolder = defaultDownloadsFolder;
NSOpenPanel *openPanel = [NSOpenPanel openPanel];
[openPanel setCanChooseDirectories:YES];
[openPanel setCanChooseFiles:NO];
[openPanel setPrompt:NSLocalizedString(@"Select", @"Button title")];
- [openPanel setDirectoryURL:downloadsFolderURL];
+ [openPanel setDirectoryURL:[NSURL fileURLWithPath:downloadsFolder
isDirectory:YES]];
[openPanel beginSheetModalForWindow:[[self view] window]
completionHandler:^(NSInteger result){
if (result == NSFileHandlingPanelOKButton) {
- [[NSUserDefaults standardUserDefaults]
setObject:[[[openPanel URL] path] stringByAbbreviatingWithTildeInPath]
forKey:BDSKDownloadsDirectoryKey];
+ if([[[openPanel URL] path]
isEqualToString:defaultDownloadsFolder])
+ [[NSUserDefaults standardUserDefaults]
removeObjectForKey:BDSKDownloadsDirectoryKey];
+ else
+ [[NSUserDefaults standardUserDefaults]
setObject:[[[openPanel URL] path] stringByAbbreviatingWithTildeInPath]
forKey:BDSKDownloadsDirectoryKey];
[self updateDownloadsFolderPopUp];
}
}];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
