Revision: 26761
http://sourceforge.net/p/bibdesk/svn/26761
Author: hofman
Date: 2021-08-29 13:56:35 +0000 (Sun, 29 Aug 2021)
Log Message:
-----------
Add favicon image, allow url session to use bibdesk: protocol, add favicon to
built-in web pages
Modified Paths:
--------------
trunk/bibdesk/BDSKBibDeskProtocol.m
trunk/bibdesk/BDSKDownloader.m
trunk/bibdesk/BDSKWebView.m
trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj
trunk/bibdesk/en.lproj/WebGroupDownloads.html
trunk/bibdesk/en.lproj/WebGroupStartPage.html
Added Paths:
-----------
trunk/bibdesk/Images/bibdesk.tiff
Modified: trunk/bibdesk/BDSKBibDeskProtocol.m
===================================================================
--- trunk/bibdesk/BDSKBibDeskProtocol.m 2021-08-29 09:28:54 UTC (rev 26760)
+++ trunk/bibdesk/BDSKBibDeskProtocol.m 2021-08-29 13:56:35 UTC (rev 26761)
@@ -53,6 +53,7 @@
#define WEBGROUP_SPECIFIER @"webgroup"
#define DOWNLOADS_SPECIFIER @"downloads"
#define FILEICON_SPECIFIER @"fileicon:"
+#define IMAGE_SPECIFIER @"image:"
#define HELP_SPECIFIER @"help"
NSString *BDSKBibDeskScheme = @"bibdesk";
@@ -104,6 +105,10 @@
NSString *extension = [[resourceSpecifier
substringFromIndex:[FILEICON_SPECIFIER length]]
stringByRemovingPercentEncoding];
NSImage *icon = [[NSWorkspace sharedWorkspace]
iconForFileType:extension];
[self loadData:[icon TIFFRepresentation] MIMEType:@"image/tiff"];
+ } else if ([resourceSpecifier hasCaseInsensitivePrefix:IMAGE_SPECIFIER]) {
+ NSString *name = [[resourceSpecifier
substringFromIndex:[IMAGE_SPECIFIER length]] stringByRemovingPercentEncoding];
+ NSImage *image = [NSImage imageNamed:name];
+ [self loadData:[image TIFFRepresentation] MIMEType:@"image/tiff"];
} else if ([HELP_SPECIFIER isCaseInsensitiveEqual:[[resourceSpecifier
pathComponents] firstObject]]) {
// when there's no "//" the URL we get has percent escapes including
in particular the # character, which would we don't want
NSString *URLString = [NSString stringWithFormat:@"%@://%@",
BDSKBibDeskScheme, [resourceSpecifier stringByRemovingPercentEncoding]];
Modified: trunk/bibdesk/BDSKDownloader.m
===================================================================
--- trunk/bibdesk/BDSKDownloader.m 2021-08-29 09:28:54 UTC (rev 26760)
+++ trunk/bibdesk/BDSKDownloader.m 2021-08-29 13:56:35 UTC (rev 26761)
@@ -39,6 +39,7 @@
#import "BDSKDownloader.h"
#import "BDSKAuthenticationHandler.h"
#import "NSFileManager_BDSKExtensions.h"
+#import "BDSKBibDeskProtocol.h"
@implementation BDSKDownloader
@@ -61,8 +62,10 @@
- (NSURLSession *)session {
if (session == nil) {
+ NSURLSessionConfiguration *sessionConfiguration =
[NSURLSessionConfiguration defaultSessionConfiguration];
+ [sessionConfiguration setProtocolClasses:[[sessionConfiguration
protocolClasses] arrayByAddingObject:[BDSKBibDeskProtocol class]]];
session = [[NSURLSession
- sessionWithConfiguration:[NSURLSessionConfiguration
defaultSessionConfiguration]
+ sessionWithConfiguration:sessionConfiguration
delegate:self
delegateQueue:[NSOperationQueue mainQueue]] retain];
}
Modified: trunk/bibdesk/BDSKWebView.m
===================================================================
--- trunk/bibdesk/BDSKWebView.m 2021-08-29 09:28:54 UTC (rev 26760)
+++ trunk/bibdesk/BDSKWebView.m 2021-08-29 13:56:35 UTC (rev 26761)
@@ -245,7 +245,7 @@
return;
NSData *data = [[download data] retain];
BDSKDESTROY(faviconDownload);
- if (error) {
+ if (error) {NSLog(@"%@", error);
[data release];
return;
}
Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj
===================================================================
--- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2021-08-29 09:28:54 UTC
(rev 26760)
+++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2021-08-29 13:56:35 UTC
(rev 26761)
@@ -548,6 +548,7 @@
CE82B4740D57EECF00A2E8C5 /* BDSKGroup+Scripting.m in Sources */
= {isa = PBXBuildFile; fileRef = CE82B4720D57EECF00A2E8C5 /*
BDSKGroup+Scripting.m */; };
CE82BE8D0D58C12A00A2E8C5 /* BDSKMacroResolver+Scripting.m in
Sources */ = {isa = PBXBuildFile; fileRef = CE82BE8B0D58C12A00A2E8C5 /*
BDSKMacroResolver+Scripting.m */; };
CE83E3A60D294EE300BB7AD8 /* BDSKSortCommand.m in Sources */ =
{isa = PBXBuildFile; fileRef = CE83E3A40D294EE300BB7AD8 /* BDSKSortCommand.m
*/; };
+ CE87E71826DBC8C8002237BF /* bibdesk.tiff in Resources */ = {isa
= PBXBuildFile; fileRef = CE87E70226DBC8C8002237BF /* bibdesk.tiff */; };
CE89618A0CBEB59800EA2D98 /* BDSKToken.m in Sources */ = {isa =
PBXBuildFile; fileRef = CE8961860CBEB59800EA2D98 /* BDSKToken.m */; };
CE89618C0CBEB59800EA2D98 /* BDSKTypeTemplate.m in Sources */ =
{isa = PBXBuildFile; fileRef = CE8961880CBEB59800EA2D98 /* BDSKTypeTemplate.m
*/; };
CE8961BD0CBEB5AC00EA2D98 /* BDSKTemplateDocument.m in Sources
*/ = {isa = PBXBuildFile; fileRef = CE8961BB0CBEB5AC00EA2D98 /*
BDSKTemplateDocument.m */; };
@@ -1653,6 +1654,7 @@
CE8526D8264C861D00C7755B /* de */ = {isa = PBXFileReference;
fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path =
de.lproj/BDSKSearchGroupView.strings; sourceTree = "<group>"; };
CE8526DC264C89C900C7755B /* fr */ = {isa = PBXFileReference;
fileEncoding = 10; lastKnownFileType = text.plist.strings; name = fr; path =
fr.lproj/TextImport.strings; sourceTree = "<group>"; };
CE8526DD264C89CB00C7755B /* de */ = {isa = PBXFileReference;
fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path =
de.lproj/TextImport.strings; sourceTree = "<group>"; };
+ CE87E70226DBC8C8002237BF /* bibdesk.tiff */ = {isa =
PBXFileReference; lastKnownFileType = image.tiff; path = bibdesk.tiff;
sourceTree = "<group>"; };
CE8961850CBEB59800EA2D98 /* BDSKToken.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BDSKToken.h; sourceTree = "<group>"; };
CE8961860CBEB59800EA2D98 /* BDSKToken.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BDSKToken.m; sourceTree = "<group>"; };
CE8961870CBEB59800EA2D98 /* BDSKTypeTemplate.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BDSKTypeTemplate.h; sourceTree = "<group>"; };
@@ -3116,6 +3118,7 @@
children = (
CE023F5C0CC50F86003F52E5 /* Add_Small.tiff */,
F9022DA70758088000C3F701 /*
AutoFilePreferences.tiff */,
+ CE87E70226DBC8C8002237BF /* bibdesk.tiff */,
F9022DA80758088000C3F701 /* bibDocIcon.icns */,
CE038E690F5F00E8001808EA /* Bookmark.tiff */,
F9DE8E55087F81A4006F0427 /* cacheDocIcon.icns
*/,
@@ -4302,6 +4305,7 @@
CE62DE4E0F4B790C00BDF01E /* Preferences.plist
in Resources */,
CEB0C6EC26385D8700B63A29 /*
AutoFileProgress.strings in Resources */,
CE62DE510F4B797B00BDF01E /* ToolbarNext.tiff in
Resources */,
+ CE87E71826DBC8C8002237BF /* bibdesk.tiff in
Resources */,
CEB0C6F826385D8700B63A29 /*
BDSKSaveAccessoryView.strings in Resources */,
CE62DE520F4B797B00BDF01E /*
ToolbarPrevious.tiff in Resources */,
CEDBE0900F4CE06600190AF5 /* ScriptMenu.tiff in
Resources */,
Added: trunk/bibdesk/Images/bibdesk.tiff
===================================================================
(Binary files differ)
Index: trunk/bibdesk/Images/bibdesk.tiff
===================================================================
--- trunk/bibdesk/Images/bibdesk.tiff 2021-08-29 09:28:54 UTC (rev 26760)
+++ trunk/bibdesk/Images/bibdesk.tiff 2021-08-29 13:56:35 UTC (rev 26761)
Property changes on: trunk/bibdesk/Images/bibdesk.tiff
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: trunk/bibdesk/en.lproj/WebGroupDownloads.html
===================================================================
--- trunk/bibdesk/en.lproj/WebGroupDownloads.html 2021-08-29 09:28:54 UTC
(rev 26760)
+++ trunk/bibdesk/en.lproj/WebGroupDownloads.html 2021-08-29 13:56:35 UTC
(rev 26761)
@@ -2,6 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+ <link rel="shortcut icon" href="bibdesk:image:bibdesk" />
<!-- Localize title -->
<title>Downloads</title>
<style type="text/css">
Modified: trunk/bibdesk/en.lproj/WebGroupStartPage.html
===================================================================
--- trunk/bibdesk/en.lproj/WebGroupStartPage.html 2021-08-29 09:28:54 UTC
(rev 26760)
+++ trunk/bibdesk/en.lproj/WebGroupStartPage.html 2021-08-29 13:56:35 UTC
(rev 26761)
@@ -2,6 +2,7 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+ <link rel="shortcut icon" href="bibdesk:image:bibdesk" />
<!-- Localize title -->
<title>BibDesk Web Group</title>
<style type="text/css">
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
