no message

This commit is contained in:
David Kocher
2005-06-09 20:48:53 +00:00
parent e323b664f0
commit 2184e6e885
8 changed files with 169 additions and 538 deletions
-1
View File
@@ -25,7 +25,6 @@ Cyberduck[!!-~]FAQ.rtfd/Pasted[!!-~]Graphic[!!-~]8.tiff -text
Cyberduck[!!-~]FAQ.rtfd/Pasted[!!-~]Graphic[!!-~]9.tiff -text
Cyberduck[!!-~]FAQ.rtfd/Pasted[!!-~]Graphic.tiff -text
Cyberduck[!!-~]FAQ.rtfd/cyberduck-application.icns -text
/Cyberduck.scriptTerminology -text svneol=unset#application/octet-stream
Spotlight[!!-~]Importer/English.lproj/InfoPlist.strings svneol=native#unset
Spotlight[!!-~]Importer/English.lproj/schema.strings svneol=native#unset
build/Growl.framework.zip -text
-370
View File
@@ -1,370 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Name</key>
<string>Cyberduck Suite</string>
<key>Description</key>
<string>AppleScript commands and classes specific to Cyberduck</string>
<key>Classes</key>
<dict>
<key>NSApplication</key>
<dict>
<key>Description</key>
<string>Cyberduck's top level scripting object.</string>
<key>Name</key>
<string>application</string>
<key>PluralName</key>
<string>applications</string>
</dict>
<key>ch.cyberduck.ui.cocoa.CDBrowserController</key>
<dict>
<key>Attributes</key>
<dict>
<key>WorkingDirectory</key>
<dict>
<key>Description</key>
<string>The current working folder.</string>
<key>Name</key>
<string>working folder</string>
</dict>
<key>Encoding</key>
<dict>
<key>Description</key>
<string>The character set to decode filenames.</string>
<key>Name</key>
<string>encoding</string>
</dict>
<key>ShowHiddenFiles</key>
<dict>
<key>Description</key>
<string>Show hidden files.</string>
<key>Name</key>
<string>show hidden</string>
</dict>
</dict>
<key>Description</key>
<string>A Browser</string>
<key>Name</key>
<string>browser</string>
<key>PluralName</key>
<string>browsers</string>
</dict>
</dict>
<key>Commands</key>
<dict>
<key>Create</key>
<dict>
<key>Description</key>
<string>Open new browser window.</string>
<key>Name</key>
<string>make new</string>
</dict>
<key>Connect</key>
<dict>
<key>Description</key>
<string>Connect to a specified server.</string>
<key>Name</key>
<string>connect</string>
<key>Arguments</key>
<dict>
<key>Protocol</key>
<dict>
<key>Description</key>
<string>The protocol to use (FTP or SFTP).</string>
<key>Name</key>
<string>with protocol</string>
</dict>
<key>Host</key>
<dict>
<key>Description</key>
<string>The host to connect to.</string>
<key>Name</key>
<string>to</string>
</dict>
<key>Port</key>
<dict>
<key>Description</key>
<string>The port to use when connecting.</string>
<key>Name</key>
<string>with port</string>
</dict>
<key>InitialPath</key>
<dict>
<key>Description</key>
<string>The initial path to change to after connection is made.</string>
<key>Name</key>
<string>with initial folder</string>
</dict>
<key>Password</key>
<dict>
<key>Description</key>
<string>The password to use when connecting.</string>
<key>Name</key>
<string>with password</string>
</dict>
<key>Username</key>
<dict>
<key>Description</key>
<string>The username to use when connecting.</string>
<key>Name</key>
<string>as user</string>
</dict>
</dict>
</dict>
<key>Disconnect</key>
<dict>
<key>Description</key>
<string>Disconnect from server.</string>
<key>Name</key>
<string>disconnect</string>
</dict>
<key>CreateFolder</key>
<dict>
<key>Description</key>
<string>Create a new folder.</string>
<key>Name</key>
<string>create</string>
<key>Arguments</key>
<dict>
<key>Path</key>
<dict>
<key>Description</key>
<string>The folder.</string>
<key>Name</key>
<string>folder</string>
</dict>
</dict>
</dict>
<key>CreateFile</key>
<dict>
<key>Description</key>
<string>Create a new file.</string>
<key>Name</key>
<string>touch</string>
<key>Arguments</key>
<dict>
<key>Path</key>
<dict>
<key>Description</key>
<string>The filename.</string>
<key>Name</key>
<string>file</string>
</dict>
</dict>
</dict>
<key>EditFile</key>
<dict>
<key>Description</key>
<string>Edit file.</string>
<key>Name</key>
<string>edit</string>
<key>Arguments</key>
<dict>
<key>Path</key>
<dict>
<key>Description</key>
<string>The filename.</string>
<key>Name</key>
<string>file</string>
</dict>
</dict>
</dict>
<key>DeleteFile</key>
<dict>
<key>Description</key>
<string>Delete file.</string>
<key>Name</key>
<string>delete</string>
<key>Arguments</key>
<dict>
<key>Path</key>
<dict>
<key>Description</key>
<string>The filename.</string>
<key>Name</key>
<string>file</string>
</dict>
</dict>
</dict>
<key>Refresh</key>
<dict>
<key>Description</key>
<string>Refresh folder listing.</string>
<key>Name</key>
<string>refresh</string>
</dict>
<key>Download</key>
<dict>
<key>Description</key>
<string>Download file.</string>
<key>Name</key>
<string>download</string>
<key>Arguments</key>
<dict>
<key>Path</key>
<dict>
<key>Description</key>
<string>The filename.</string>
<key>Name</key>
<string>file</string>
</dict>
<key>Local</key>
<dict>
<key>Description</key>
<string>The download folder.</string>
<key>Name</key>
<string>to</string>
</dict>
<key>Name</key>
<dict>
<key>Description</key>
<string>The name to save the file as.</string>
<key>Name</key>
<string>as</string>
</dict>
</dict>
</dict>
<key>Upload</key>
<dict>
<key>Description</key>
<string>Upload file.</string>
<key>Name</key>
<string>upload</string>
<key>Arguments</key>
<dict>
<key>Path</key>
<dict>
<key>Description</key>
<string>The filename.</string>
<key>Name</key>
<string>file</string>
</dict>
<key>Remote</key>
<dict>
<key>Description</key>
<string>The upload folder.</string>
<key>Name</key>
<string>to</string>
</dict>
<key>Name</key>
<dict>
<key>Description</key>
<string>The name to save the file as.</string>
<key>Name</key>
<string>as</string>
</dict>
</dict>
</dict>
<key>Exists</key>
<dict>
<key>Description</key>
<string>If the given file exists.</string>
<key>Name</key>
<string>exists</string>
<key>Arguments</key>
<dict>
<key>Path</key>
<dict>
<key>Description</key>
<string>The filename.</string>
<key>Name</key>
<string>file</string>
</dict>
</dict>
</dict>
<key>Sync</key>
<dict>
<key>Description</key>
<string>Sync folder.</string>
<key>Name</key>
<string>sync</string>
<key>Arguments</key>
<dict>
<key>Path</key>
<dict>
<key>Description</key>
<string>The remote folder.</string>
<key>Name</key>
<string>folder</string>
</dict>
<key>Local</key>
<dict>
<key>Description</key>
<string>The local folder.</string>
<key>Name</key>
<string>with local folder</string>
</dict>
</dict>
</dict>
<key>Goto</key>
<dict>
<key>Description</key>
<string>Go to Folder.</string>
<key>Name</key>
<string>change folder</string>
<key>Arguments</key>
<dict>
<key>Path</key>
<dict>
<key>Description</key>
<string>The filename.</string>
<key>Name</key>
<string>to</string>
</dict>
</dict>
</dict>
<key>List</key>
<dict>
<key>Description</key>
<string>List folder content.</string>
<key>Name</key>
<string>browse</string>
<key>Arguments</key>
<dict>
<key>Path</key>
<dict>
<key>Description</key>
<string>The folder.</string>
<key>Name</key>
<string>folder</string>
</dict>
</dict>
</dict>
<key>GetURL</key>
<dict>
<key>Description</key>
<string>Open a URL</string>
<key>Name</key>
<string>open URL</string>
</dict>
<key>OpenURL</key>
<dict>
<key>Description</key>
<string>Open a URL</string>
<key>Name</key>
<string>open URL</string>
</dict>
</dict>
<key>Enumerations</key>
<dict>
<key>Protocols</key>
<dict>
<key>ftp </key>
<dict>
<key>Description</key>
<string>Connect to server using FTP File Transfer</string>
<key>Name</key>
<string>FTP</string>
</dict>
<key>sftp</key>
<dict>
<key>Description</key>
<string>Connect to server using SSH Secure File Transfer</string>
<key>Name</key>
<string>SFTP</string>
</dict>
</dict>
</dict>
</dict>
</plist>
+146 -146
View File
@@ -1,150 +1,150 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE dictionary SYSTEM "file://localhost/System/Library/DTDs/sdef.dtd">
<dictionary>
<suite name="Cyberduck Suite" code="CYCK" description="AppleScript commands and classes specific to Cyberduck">
<enumeration name="Protocols" code="PrCl">
<enumerator name="SFTP" code="sftp" description="Connect to server using SSH Secure File Transfer">
<cocoa name="sftp"/>
</enumerator>
<enumerator name="FTP" code="ftp " description="Connect to server using FTP File Transfer">
<cocoa name="ftp "/>
</enumerator>
<enumerator code="ftps">
<cocoa name="ftps"/>
</enumerator>
</enumeration>
<class name="application" plural="applications" code="capp" inherits="application" description="Cyberduck's top level scripting object.">
<cocoa class="NSApplication"/>
<element type="browser">
<cocoa key="orderedBrowsers"/>
</element>
</class>
<class name="browser" plural="browsers" code="docu" inherits="document" description="A Browser">
<cocoa class="ch.cyberduck.ui.cocoa.CDBrowserController"/>
<property type="text" name="working folder" code="work" access="r" description="The current working folder.">
<cocoa key="WorkingDirectory"/>
</property>
<property type="text" name="encoding" code="enco" description="The character set to decode filenames.">
<cocoa key="Encoding"/>
</property>
<property type="boolean" name="show hidden" code="hidd" description="Show hidden files.">
<cocoa key="ShowHiddenFiles"/>
</property>
</class>
<command name="edit" code="CYCKEdFi" description="Edit file.">
<cocoa name="EditFile"/>
<parameter type="text" name="file" code="PaTh" description="The filename.">
<cocoa key="Path"/>
</parameter>
</command>
<command name="delete" code="coredelo" description="Delete file.">
<cocoa name="DeleteFile"/>
<parameter type="text" name="file" code="PaTh" description="The filename.">
<cocoa key="Path"/>
</parameter>
</command>
<command name="upload" code="CYCKUpAd" description="Upload file.">
<cocoa name="Upload"/>
<parameter type="text" name="as" code="NaMe" optional="yes" description="The name to save the file as.">
<cocoa key="Name"/>
</parameter>
<parameter type="text" name="to" code="ReTe" optional="yes" description="The upload folder.">
<cocoa key="Remote"/>
</parameter>
<parameter type="text" name="file" code="PaTh" description="The filename.">
<cocoa key="Path"/>
</parameter>
</command>
<command name="change folder" code="CYCKGoTo" description="Go to Folder.">
<cocoa name="Goto"/>
<parameter type="text" name="to" code="PaTh" description="The filename.">
<cocoa key="Path"/>
</parameter>
</command>
<command name="browse" code="CYCKDirL" description="List folder content.">
<cocoa name="List"/>
<parameter type="text" name="folder" code="PaTh" description="The folder.">
<cocoa key="Path"/>
</parameter>
<result>
<type type="item" list="yes"/>
</result>
</command>
<command name="disconnect" code="CYCKDiCt" description="Disconnect from server.">
<cocoa name="Disconnect"/>
</command>
<command name="touch" code="CYCKFiLe" description="Create a new file.">
<cocoa name="CreateFile"/>
<parameter type="text" name="file" code="PaTh" description="The filename.">
<cocoa key="Path"/>
</parameter>
</command>
<command name="open URL" code="WWW!OURL" description="Open a URL">
<cocoa name="OpenURL" class="ch.cyberduck.ui.cocoa.CDApplescriptabilityController"/>
</command>
<command name="exists" code="coredoex" description="If the given file exists.">
<cocoa name="Exists"/>
<parameter type="text" name="file" code="PaTh" description="The filename.">
<cocoa key="Path"/>
</parameter>
<result type="boolean"/>
</command>
<command name="refresh" code="CYCKReSh" description="Refresh folder listing.">
<cocoa name="Refresh"/>
</command>
<command name="make new" code="corecrel" description="Open new browser window.">
<cocoa name="Create" class="ch.cyberduck.ui.cocoa.CDApplescriptabilityController"/>
</command>
<command name="open URL" code="GURLGURL" description="Open a URL">
<cocoa name="GetURL" class="ch.cyberduck.ui.cocoa.CDApplescriptabilityController"/>
</command>
<command name="create" code="CYCKFoLd" description="Create a new folder.">
<cocoa name="CreateFolder"/>
<parameter type="text" name="folder" code="PaTh" description="The folder.">
<cocoa key="Path"/>
</parameter>
</command>
<command name="download" code="CYCKDoAd" description="Download file.">
<cocoa name="Download"/>
<parameter type="text" name="as" code="NaMe" optional="yes" description="The name to save the file as.">
<cocoa key="Name"/>
</parameter>
<parameter type="text" name="file" code="PaTh" description="The filename.">
<cocoa key="Path"/>
</parameter>
<parameter type="text" name="to" code="LoAl" optional="yes" description="The download folder.">
<cocoa key="Local"/>
</parameter>
</command>
<command name="sync" code="CYCKSyNc" description="Sync folder.">
<cocoa name="Sync"/>
<parameter type="text" name="folder" code="PaTh" description="The remote folder.">
<cocoa key="Path"/>
</parameter>
<parameter type="text" name="with local folder" code="LoAl" description="The local folder.">
<cocoa key="Local"/>
</parameter>
</command>
<command name="connect" code="CYCKCoCt" description="Connect to a specified server.">
<cocoa name="Connect"/>
<parameter type="text" name="with port" code="PoRt" optional="yes" description="The port to use when connecting.">
<cocoa key="Port"/>
</parameter>
<parameter type="text" name="to" code="HoSt" description="The host to connect to.">
<cocoa key="Host"/>
</parameter>
<parameter type="text" name="with password" code="PaRd" optional="yes" description="The password to use when connecting.">
<cocoa key="Password"/>
</parameter>
<parameter type="text" name="as user" code="UsMe" optional="yes" description="The username to use when connecting.">
<cocoa key="Username"/>
</parameter>
<parameter type="Protocols" name="with protocol" code="PrCl" optional="yes" description="The protocol to use (FTP or SFTP).">
<cocoa key="Protocol"/>
</parameter>
<parameter type="text" name="with initial folder" code="PaTh" optional="yes" description="The initial path to change to after connection is made.">
<cocoa key="InitialPath"/>
</parameter>
</command>
</suite>
<suite name="Cyberduck Suite" code="CYCK" description="AppleScript commands and classes specific to Cyberduck">
<enumeration name="Protocols" code="PrCl">
<enumerator name="SFTP" code="sftp" description="Connect to server using SFTP">
<cocoa name="sftp"/>
</enumerator>
<enumerator name="FTP" code="ftp " description="Connect to server using FTP">
<cocoa name="ftp "/>
</enumerator>
<enumerator name="FTP-TLS" code="ftps" description="Connect to server using FTP-TLS">
<cocoa name="ftps"/>
</enumerator>
</enumeration>
<class name="application" plural="applications" code="capp" inherits="application" description="Cyberduck's top level scripting object.">
<cocoa class="NSApplication"/>
<element type="browser">
<cocoa key="orderedBrowsers"/>
</element>
</class>
<class name="browser" plural="browsers" code="docu" inherits="document" description="A Browser">
<cocoa class="ch.cyberduck.ui.cocoa.CDBrowserController"/>
<property type="text" name="working folder" code="work" access="r" description="The current working folder.">
<cocoa key="WorkingDirectory"/>
</property>
<property type="text" name="encoding" code="enco" description="The character set to decode filenames.">
<cocoa key="Encoding"/>
</property>
<property type="boolean" name="show hidden" code="hidd" description="Show hidden files.">
<cocoa key="ShowHiddenFiles"/>
</property>
</class>
<command name="edit" code="CYCKEdFi" description="Edit file.">
<cocoa name="EditFile"/>
<parameter type="text" name="file" code="PaTh" description="The filename.">
<cocoa key="Path"/>
</parameter>
</command>
<command name="delete" code="coredelo" description="Delete file.">
<cocoa name="DeleteFile"/>
<parameter type="text" name="file" code="PaTh" description="The filename.">
<cocoa key="Path"/>
</parameter>
</command>
<command name="upload" code="CYCKUpAd" description="Upload file.">
<cocoa name="Upload"/>
<parameter type="text" name="as" code="NaMe" optional="yes" description="The name to save the file as.">
<cocoa key="Name"/>
</parameter>
<parameter type="text" name="to" code="ReTe" optional="yes" description="The upload folder.">
<cocoa key="Remote"/>
</parameter>
<parameter type="text" name="file" code="PaTh" description="The filename.">
<cocoa key="Path"/>
</parameter>
</command>
<command name="change folder" code="CYCKGoTo" description="Go to Folder.">
<cocoa name="Goto"/>
<parameter type="text" name="to" code="PaTh" description="The filename.">
<cocoa key="Path"/>
</parameter>
</command>
<command name="browse" code="CYCKDirL" description="List folder content.">
<cocoa name="List"/>
<parameter type="text" name="folder" code="PaTh" description="The folder.">
<cocoa key="Path"/>
</parameter>
<result>
<type type="item" list="yes"/>
</result>
</command>
<command name="disconnect" code="CYCKDiCt" description="Disconnect from server.">
<cocoa name="Disconnect"/>
</command>
<command name="touch" code="CYCKFiLe" description="Create a new file.">
<cocoa name="CreateFile"/>
<parameter type="text" name="file" code="PaTh" description="The filename.">
<cocoa key="Path"/>
</parameter>
</command>
<command name="open URL" code="WWW!OURL" description="Open a URL">
<cocoa name="OpenURL" class="ch.cyberduck.ui.cocoa.CDApplescriptabilityController"/>
</command>
<command name="exists" code="coredoex" description="If the given file exists.">
<cocoa name="Exists"/>
<parameter type="text" name="file" code="PaTh" description="The filename.">
<cocoa key="Path"/>
</parameter>
<result type="boolean"/>
</command>
<command name="refresh" code="CYCKReSh" description="Refresh folder listing.">
<cocoa name="Refresh"/>
</command>
<command name="make new" code="corecrel" description="Open new browser window.">
<cocoa name="Create" class="ch.cyberduck.ui.cocoa.CDApplescriptabilityController"/>
</command>
<command name="open URL" code="GURLGURL" description="Open a URL">
<cocoa name="GetURL" class="ch.cyberduck.ui.cocoa.CDApplescriptabilityController"/>
</command>
<command name="create" code="CYCKFoLd" description="Create a new folder.">
<cocoa name="CreateFolder"/>
<parameter type="text" name="folder" code="PaTh" description="The folder.">
<cocoa key="Path"/>
</parameter>
</command>
<command name="download" code="CYCKDoAd" description="Download file.">
<cocoa name="Download"/>
<parameter type="text" name="as" code="NaMe" optional="yes" description="The name to save the file as.">
<cocoa key="Name"/>
</parameter>
<parameter type="text" name="file" code="PaTh" description="The filename.">
<cocoa key="Path"/>
</parameter>
<parameter type="text" name="to" code="LoAl" optional="yes" description="The download folder.">
<cocoa key="Local"/>
</parameter>
</command>
<command name="sync" code="CYCKSyNc" description="Sync folder.">
<cocoa name="Sync"/>
<parameter type="text" name="folder" code="PaTh" description="The remote folder.">
<cocoa key="Path"/>
</parameter>
<parameter type="text" name="with local folder" code="LoAl" description="The local folder.">
<cocoa key="Local"/>
</parameter>
</command>
<command name="connect" code="CYCKCoCt" description="Connect to a specified server.">
<cocoa name="Connect"/>
<parameter type="text" name="with port" code="PoRt" optional="yes" description="The port to use when connecting.">
<cocoa key="Port"/>
</parameter>
<parameter type="text" name="to" code="HoSt" description="The host to connect to.">
<cocoa key="Host"/>
</parameter>
<parameter type="text" name="with password" code="PaRd" optional="yes" description="The password to use when connecting.">
<cocoa key="Password"/>
</parameter>
<parameter type="text" name="as user" code="UsMe" optional="yes" description="The username to use when connecting.">
<cocoa key="Username"/>
</parameter>
<parameter type="Protocols" name="with protocol" code="PrCl" optional="yes" description="The protocol to use (FTP or SFTP).">
<cocoa key="Protocol"/>
</parameter>
<parameter type="text" name="with initial folder" code="PaTh" optional="yes" description="The initial path to change to after connection is made.">
<cocoa key="InitialPath"/>
</parameter>
</command>
</suite>
</dictionary>
@@ -369,10 +369,10 @@ public class CDMainController extends CDController {
Host host = rendezvous.getService((String)msg.getContent());
if(msg.getTitle().equals(Message.RENDEZVOUS_ADD)) {
Growl.instance().notifyWithImage(NSBundle.localizedString("Bonjour"),
(String)msg.getContent(),
"rendezvous.icns");
(String)msg.getContent(),
"rendezvous.icns");
items.put((String)msg.getContent(),
host);
host);
}
if(msg.getTitle().equals(Message.RENDEZVOUS_REMOVE)) {
items.remove((String)msg.getContent());
@@ -673,6 +673,7 @@ public class CDMainController extends CDController {
public void applicationDidFinishLaunching(NSNotification notification) {
Growl.instance().register();
log.info("Running Java "+System.getProperty("java.version"));
log.info("Available localizations:"+NSBundle.mainBundle().localizations());
if(Preferences.instance().getBoolean("queue.openByDefault")) {
this.showTransferQueueClicked(null);
@@ -60,6 +60,7 @@
-(void) dealloc
{
[super dealloc];
[itemsList release];
[baseWindowName release];
[autosaveName release];
@@ -28,8 +28,8 @@ public class Growl {
static {
try {
NSBundle bundle = NSBundle.mainBundle();
String lib = bundle.resourcePath()+"/Java/"+"libGrowl.jnilib";
log.debug("Locating libGrowl.jnilib at '"+lib+"'");
String lib = bundle.resourcePath()+"/Java/"+"libGrowl.dylib";
log.info("Locating libGrowl.dylib at '"+lib+"'");
System.load(lib);
}
catch(UnsatisfiedLinkError e) {
+14 -14
View File
@@ -111,24 +111,24 @@ JNIEXPORT void JNICALL Java_ch_cyberduck_ui_cocoa_growl_Growl_notifyWithImage(
- (void)notifyGrowl:(NSString *)title withDescription:(NSString *)description withImage:(NSImage *) image
{
[GrowlApplicationBridge notifyWithTitle:title
description:description
notificationName:title
iconData:[image TIFFRepresentation]
priority:0
isSticky:NO
clickContext:nil];
[GrowlApplicationBridge notifyWithTitle:title
description:description
notificationName:title
iconData:[image TIFFRepresentation]
priority:0
isSticky:NO
clickContext:nil];
}
- (void)notifyGrowl:(NSString *)title withDescription:(NSString *)description
{
[GrowlApplicationBridge notifyWithTitle:title
description:description
notificationName:title
iconData:nil
priority:0
isSticky:NO
clickContext:nil];
[GrowlApplicationBridge notifyWithTitle:title
description:description
notificationName:title
iconData:nil
priority:0
isSticky:NO
clickContext:nil];
}
#pragma mark Growl Delegate methods
+2 -2
View File
@@ -76,8 +76,8 @@ public class Editor {
// Ensure native odb library is loaded
try {
NSBundle bundle = NSBundle.mainBundle();
String lib = bundle.resourcePath()+"/Java/"+"libODBEdit.jnilib";
log.debug("Locating libODBEdit.jnilib at '"+lib+"'");
String lib = bundle.resourcePath()+"/Java/"+"libODBEdit.dylib";
log.info("Locating libODBEdit.dylib at '"+lib+"'");
System.load(lib);
}
catch(UnsatisfiedLinkError e) {