Commit 5a64cf64 authored by Yavor Doganov's avatar Yavor Doganov

Import Upstream version 0.6

parent aeb82abd
......@@ -2,7 +2,7 @@
Project: FTP
Copyright (C) 2005-2013 Riccardo Mottola
Copyright (C) 2005-2016 Riccardo Mottola
Author: Riccardo Mottola
......@@ -36,44 +36,53 @@
@interface AppController : NSObject
{
IBOutlet NSWindow *mainWin;
IBOutlet NSTableView *localView;
IBOutlet NSTableView *remoteView;
IBOutlet NSPopUpButton *localPath;
IBOutlet NSPopUpButton *remotePath;
IBOutlet NSButton *buttDownload;
IBOutlet NSButton *buttUpload;
IBOutlet NSTextField *infoMessage;
IBOutlet NSTextField *infoSpeed;
IBOutlet NSTextField *infoSize;
IBOutlet NSProgressIndicator *progBar;
IBOutlet NSMenu *mainMenu;
IBOutlet NSWindow *mainWin;
IBOutlet NSTableView *localView;
IBOutlet NSTableView *remoteView;
IBOutlet NSPopUpButton *localPath;
IBOutlet NSPopUpButton *remotePath;
IBOutlet NSButton *buttDownload;
IBOutlet NSButton *buttUpload;
IBOutlet NSTextField *infoMessage;
IBOutlet NSTextField *infoSpeed;
IBOutlet NSTextField *infoSize;
IBOutlet NSProgressIndicator *progBar;
IBOutlet NSWindow *logWin;
IBOutlet NSTextView *logTextField;
IBOutlet NSWindow *logWin;
IBOutlet NSTextView *logTextField;
IBOutlet NSPanel *connectPanel;
IBOutlet NSTextField *connAddress;
IBOutlet NSTextField *connPort;
IBOutlet NSTextField *connUser;
IBOutlet NSTextField *connPass;
IBOutlet NSButton *connAnon;
IBOutlet NSPanel *prefPanel;
IBOutlet NSMatrix *portType;
IBOutlet NSPanel *connectPanel;
IBOutlet NSBox *connServerBox;
IBOutlet NSBox *connAccountBox;
IBOutlet NSTextField *connAddress;
IBOutlet NSTextField *connPort;
IBOutlet NSTextField *connUser;
IBOutlet NSTextField *connPass;
IBOutlet NSButton *connAnon;
IBOutlet NSButton *connCancelButt;
IBOutlet NSButton *connConnectButt;
IBOutlet NSPanel *prefPanel;
IBOutlet NSMatrix *portType;
IBOutlet NSButton *prefCancelButt;
IBOutlet NSButton *prefSaveButt;
NSMutableDictionary *textAttributes;
NSMutableDictionary *textAttributes;
FileTable *localTableData;
FileTable *remoteTableData;
FtpClient *ftp;
LocalClient *local;
@private connectionModes connMode;
@private struct timeval beginTimeVal;
@private unsigned long long transferSize;
@private BOOL threadRunning;
@private NSConnection *doConnection;
FileTable *localTableData;
FileTable *remoteTableData;
FtpClient *ftp;
LocalClient *local;
NSMutableArray *filesInProcess;
@private connectionModes connMode;
@private NSTimeInterval beginTimeVal;
@private unsigned long long transferSize;
@private BOOL threadRunning;
@private NSConnection *doConnection;
}
- (void)applicationDidFinishLaunching:(NSNotification *)aNotif;
......@@ -101,9 +110,9 @@
- (void)setThreadRunningState:(BOOL)flag;
- (void)setTransferBegin:(NSString *)name :(unsigned long long)size;
- (void)setTransferProgress:(NSNumber *)bytesTransferred;
- (void)setTransferEnd:(NSNumber *)bytesTransferred;
- (oneway void)setTransferBegin:(in bycopy NSString *)name :(unsigned long long)size;
- (oneway void)setTransferProgress:(in bycopy NSNumber *)bytesTransferred;
- (oneway void)setTransferEnd:(in bycopy NSNumber *)bytesTransferred;
/** closes the open connections and quits the session with the remote server */
- (IBAction)disconnect:(id)sender;
......@@ -116,7 +125,7 @@
/** Called by the server object to register itself */
- (void)setServer:(id)anObject;
- (void)appendTextToLog:(NSString *)textChunk;
- (oneway void)appendTextToLog:(NSString *)textChunk;
- (IBAction)showConnPanel:(id)sender;
- (IBAction)connectConn:(id)sender;
......@@ -132,8 +141,10 @@
- (void)performRetrieveFile;
- (void)performStoreFile;
- (void)retrieveFiles:(NSArray *)files;
- (void)storeFiles:(NSArray *)files;
- (void)retrieveFiles;
- (oneway void)fileRetrieved:(BOOL)success;
- (void)storeFiles;
- (oneway void)fileStored:(BOOL)success;
@end
......
This diff is collapsed.
2017-27-28 Riccardo Mottola <rm@gnu.org>
* ftpclient.m
Track and NSLog() non-200 port response.
2017-03-02 Riccardo Mottola <rm@gnu.org>
* fileTable.m
Further razionalize parsing of lines without user or link info. Use suffix for dir/file heuristics on links.
2017-03-02 Riccardo Mottola <rm@gnu.org>
* fileTable.m
Razionalize parsing with 8 or 9 elements, improve link handling by extracting link information from the dir block.
2016-11-24 Riccardo Mottola <rm@gnu.org>
* AppController.m
More localize Local and Remote menus.
2016-11-18 Riccardo Mottola <rm@gnu.org>
* AppController.m
More localization work.
2016-09-27 Riccardo Mottola <rm@gnu.org>
* AppController.m
* Resources/GetName.nib
* Resources/MainMenu.nib
Localization work: make nib generic
2016-09-16 Riccardo Mottola <rm@gnu.org>
* localclient.m
use isAbsolutePath!
2016-08-23 Riccardo Mottola <rm@gnu.org>
* fileTable.m
cleanup and simplify housekeeping of the sorted array.
2016-08-23 Riccardo Mottola <rm@gnu.org>
* fileTable.m
Do not keep in the sortedArray just name and index, but really just the sorted object pointers.
2016-08-08 Riccardo Mottola <rm@gnu.org>
* AppController.m
Do not run runloop, no longer needed.
2016-08-06 Riccardo Mottola <rm@gnu.org>
* AppController.h
* AppController.m
* ftpclient.h
* ftpclient.m
make store/retrieve client methods return immediately oneway void and then
use call-back method fileStored/fileRetrieved to complete action
2016-08-02 Riccardo Mottola <rm@gnu.org>
* client.h
* client.m
make also workDirSplit return result bycopy
2016-08-02 Riccardo Mottola <rm@gnu.org>
* fileElement.m
Implement coder methods for bycopy.
2016-08-02 Riccardo Mottola <rm@gnu.org>
* AppController.m
When Retrieving, set file-element path since it can be different than source.
2016-08-02 Riccardo Mottola <rm@gnu.org>
* client.h
* client.m
* ftpclient.m
* localclient.m
Pass directory elements array by copy
2016-08-01 Riccardo Mottola <rm@gnu.org>
* AppController.h
* AppController.m
Pass progress parameters by copy
2016-08-01 Riccardo Mottola <rm@gnu.org>
* AppController.h
* AppController.m
Use NSTimeInterval for speed calculations.
2016-07-08 Riccardo Mottola <rm@gnu.org>
* client.h
* client.m
* ftpclient.m
* localclient.m
* AppController.m
Delete files may fail, handle result.
2016-07-07 Riccardo Mottola <rm@gnu.org>
* AppController.m
Use passive as default.
2016-07-03 Riccardo Mottola <rm@gnu.org>
* AppController.h
* AppController.m
Mark progress methods as oneway.
2016-07-03 Riccardo Mottola <rm@gnu.org>
* ftpclient.m
Open local file in binary mode (needed on Windows)
2016-05-16 Riccardo Mottola <rm@gnu.org>
* ftpclient.m
Open files in binary mode (fixes on Windows), check more carefully for sent bytes.
2015-09-04 Riccardo Mottola <rm@gnu.org>
* ftpclient.m
Fix socktype for NetBSD.
2015-02-11 Riccardo Mottola <rm@gnu.org>
* AppController.m
......
......@@ -9,15 +9,16 @@
/* Begin PBXBuildFile section */
8531288D1767CADA00F56C92 /* GetNameController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8531288B1767CADA00F56C92 /* GetNameController.h */; };
8531288E1767CADB00F56C92 /* GetNameController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8531288C1767CADA00F56C92 /* GetNameController.m */; };
853128941767CC2600F56C92 /* GetName.nib in Resources */ = {isa = PBXBuildFile; fileRef = 853128921767CC2600F56C92 /* GetName.nib */; };
85D3CFE11D99296E00679061 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97319FDCFA39411CA2CEA /* MainMenu.nib */; };
85D3CFEB1D992A2200679061 /* GetName.nib in Resources */ = {isa = PBXBuildFile; fileRef = 853128931767CC2600F56C92 /* GetName.nib */; };
85D3CFEE1D992B2C00679061 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 85D3CFEC1D992B2C00679061 /* Localizable.strings */; };
85D3CFF81D992BB100679061 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165DFE840E0CC02AAC07 /* InfoPlist.strings */; };
85E8F2AD16EFCF6C00E03CA9 /* AppController.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F5F93707FD8CAD01A80101 /* AppController.h */; };
85E8F2AE16EFCF6C00E03CA9 /* ftpclient.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F5F93907FD8CAD01A80101 /* ftpclient.h */; };
85E8F2AF16EFCF6C00E03CA9 /* localclient.h in Headers */ = {isa = PBXBuildFile; fileRef = F56A03FD080AC71101A80101 /* localclient.h */; };
85E8F2B016EFCF6C00E03CA9 /* fileTable.h in Headers */ = {isa = PBXBuildFile; fileRef = F5BE3AF6080C6A3601A80101 /* fileTable.h */; };
85E8F2B116EFCF6C00E03CA9 /* fileElement.h in Headers */ = {isa = PBXBuildFile; fileRef = F5C84D6008142DF201A80101 /* fileElement.h */; };
85E8F2B216EFCF6C00E03CA9 /* client.h in Headers */ = {isa = PBXBuildFile; fileRef = F5EFB6470818FE6E01A80101 /* client.h */; };
85E8F2B416EFCF6C00E03CA9 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
85E8F2B516EFCF6C00E03CA9 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
85E8F2B616EFCF6C00E03CA9 /* arrow_right.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F5C0879F08A0C47B01A8012F /* arrow_right.tiff */; };
85E8F2B716EFCF6C00E03CA9 /* arrow_left.tiff in Resources */ = {isa = PBXBuildFile; fileRef = F5C087A108A0C4AF01A8012F /* arrow_left.tiff */; };
85E8F2B816EFCF6C00E03CA9 /* FTP_icon_osx.icns in Resources */ = {isa = PBXBuildFile; fileRef = 85FC29710DD7B28300A80101 /* FTP_icon_osx.icns */; };
......@@ -34,16 +35,19 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
089C165DFE840E0CC02AAC07 /* InfoPlist.strings */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = InfoPlist.strings; path = Resources/InfoPlist.strings; sourceTree = "<group>"; };
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
29B97319FDCFA39411CA2CEA /* MainMenu.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = MainMenu.nib; path = Resources/MainMenu.nib; sourceTree = "<group>"; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
8531288B1767CADA00F56C92 /* GetNameController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GetNameController.h; sourceTree = "<group>"; };
8531288C1767CADA00F56C92 /* GetNameController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = GetNameController.m; sourceTree = "<group>"; };
853128931767CC2600F56C92 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/GetName.nib; sourceTree = "<group>"; };
853128931767CC2600F56C92 /* GetName.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = GetName.nib; path = Resources/GetName.nib; sourceTree = "<group>"; };
853FB7F814A3F52200DE7B18 /* README */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
85D3CFED1D992B2C00679061 /* English */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.strings; name = English; path = Resources/English.lproj/Localizable.strings; sourceTree = "<group>"; };
85D3CFEF1D992B3A00679061 /* German */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = German; path = Resources/German.lproj/Localizable.strings; sourceTree = "<group>"; };
85D3CFF01D992B4000679061 /* Italian */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Italian; path = Resources/Italian.lproj/Localizable.strings; sourceTree = "<group>"; };
85E8F2C916EFCF6C00E03CA9 /* FTP.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FTP.app; sourceTree = BUILT_PRODUCTS_DIR; };
85E8F32416EFD9D000E03CA9 /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ChangeLog; sourceTree = "<group>"; };
85FC29710DD7B28300A80101 /* FTP_icon_osx.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = FTP_icon_osx.icns; sourceTree = "<group>"; };
......@@ -144,12 +148,13 @@
29B97317FDCFA39411CA2CEA /* Resources */ = {
isa = PBXGroup;
children = (
853128921767CC2600F56C92 /* GetName.nib */,
85D3CFEC1D992B2C00679061 /* Localizable.strings */,
853128931767CC2600F56C92 /* GetName.nib */,
85E8F32416EFD9D000E03CA9 /* ChangeLog */,
853FB7F814A3F52200DE7B18 /* README */,
85FC29710DD7B28300A80101 /* FTP_icon_osx.icns */,
29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
29B97319FDCFA39411CA2CEA /* MainMenu.nib */,
089C165DFE840E0CC02AAC07 /* InfoPlist.strings */,
F5C0879F08A0C47B01A8012F /* arrow_right.tiff */,
F5C087A108A0C4AF01A8012F /* arrow_left.tiff */,
);
......@@ -210,9 +215,18 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 85A6DBE310D43D010048FE0B /* Build configuration list for PBXProject "FTP-T" */;
compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
knownRegions = (
English,
Japanese,
French,
German,
Italian,
);
mainGroup = 29B97314FDCFA39411CA2CEA /* FTP */;
projectDirPath = "";
projectRoot = "";
targets = (
85E8F2AB16EFCF6C00E03CA9 /* FTP */,
);
......@@ -224,14 +238,15 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
85E8F2B416EFCF6C00E03CA9 /* MainMenu.nib in Resources */,
85E8F2B516EFCF6C00E03CA9 /* InfoPlist.strings in Resources */,
85D3CFE11D99296E00679061 /* MainMenu.nib in Resources */,
85D3CFF81D992BB100679061 /* InfoPlist.strings in Resources */,
85E8F2B616EFCF6C00E03CA9 /* arrow_right.tiff in Resources */,
85E8F2B716EFCF6C00E03CA9 /* arrow_left.tiff in Resources */,
85E8F2B816EFCF6C00E03CA9 /* FTP_icon_osx.icns in Resources */,
85E8F2B916EFCF6C00E03CA9 /* README in Resources */,
85E8F32516EFD9D000E03CA9 /* ChangeLog in Resources */,
853128941767CC2600F56C92 /* GetName.nib in Resources */,
85D3CFEB1D992A2200679061 /* GetName.nib in Resources */,
85D3CFEE1D992B2C00679061 /* Localizable.strings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......@@ -256,28 +271,14 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXVariantGroup section */
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
089C165DFE840E0CC02AAC07 /* English */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = {
isa = PBXVariantGroup;
children = (
29B97319FDCFA39411CA2CEA /* English */,
);
name = MainMenu.nib;
sourceTree = "<group>";
};
853128921767CC2600F56C92 /* GetName.nib */ = {
85D3CFEC1D992B2C00679061 /* Localizable.strings */ = {
isa = PBXVariantGroup;
children = (
853128931767CC2600F56C92 /* English */,
85D3CFED1D992B2C00679061 /* English */,
85D3CFEF1D992B3A00679061 /* German */,
85D3CFF01D992B4000679061 /* Italian */,
);
name = GetName.nib;
name = Localizable.strings;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
......
......@@ -27,24 +27,6 @@
refType = 4;
sourceTree = "<group>";
};
089C165CFE840E0CC02AAC07 = {
children = (
089C165DFE840E0CC02AAC07,
);
isa = PBXVariantGroup;
name = InfoPlist.strings;
refType = 4;
sourceTree = "<group>";
};
089C165DFE840E0CC02AAC07 = {
fileEncoding = 10;
isa = PBXFileReference;
lastKnownFileType = text.plist.strings;
name = English;
path = English.lproj/InfoPlist.strings;
refType = 4;
sourceTree = "<group>";
};
//080
//081
//082
......@@ -120,6 +102,13 @@
);
hasScannedForEncodings = 1;
isa = PBXProject;
knownRegions = (
English,
Japanese,
French,
German,
Italian,
);
mainGroup = 29B97314FDCFA39411CA2CEA;
projectDirPath = "";
targets = (
......@@ -161,13 +150,14 @@
};
29B97317FDCFA39411CA2CEA = {
children = (
85848F181DBFE1F70050DC12,
85848F121DBFE1A70050DC12,
85848F131DBFE1A70050DC12,
85848F141DBFE1A70050DC12,
85D69CD717651E24000AC90B,
85FC29710DD7B28300A80101,
29B97318FDCFA39411CA2CEA,
089C165CFE840E0CC02AAC07,
F5C0879F08A0C47B01A8012F,
F5C087A108A0C4AF01A8012F,
85D69C741762961D000AC90B,
);
isa = PBXGroup;
name = Resources;
......@@ -175,24 +165,6 @@
refType = 4;
sourceTree = "<group>";
};
29B97318FDCFA39411CA2CEA = {
children = (
29B97319FDCFA39411CA2CEA,
);
isa = PBXVariantGroup;
name = MainMenu.nib;
path = "";
refType = 4;
sourceTree = "<group>";
};
29B97319FDCFA39411CA2CEA = {
isa = PBXFileReference;
lastKnownFileType = wrapper.nib;
name = English;
path = English.lproj/MainMenu.nib;
refType = 4;
sourceTree = "<group>";
};
29B97323FDCFA39411CA2CEA = {
children = (
1058C7A0FEA54F0111CA2CBB,
......@@ -350,29 +322,18 @@
8576CCEA152E1559008F8C62 = {
buildActionMask = 2147483647;
files = (
8576CCEB152E1559008F8C62,
8576CCEC152E1559008F8C62,
8576CCED152E1559008F8C62,
8576CCEE152E1559008F8C62,
8576CCEF152E1559008F8C62,
85D69C761762961D000AC90B,
85D69CD817651E24000AC90B,
85848F151DBFE1A70050DC12,
85848F161DBFE1A70050DC12,
85848F171DBFE1A70050DC12,
85848F1A1DBFE1F70050DC12,
);
isa = PBXResourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
};
8576CCEB152E1559008F8C62 = {
fileRef = 29B97318FDCFA39411CA2CEA;
isa = PBXBuildFile;
settings = {
};
};
8576CCEC152E1559008F8C62 = {
fileRef = 089C165CFE840E0CC02AAC07;
isa = PBXBuildFile;
settings = {
};
};
8576CCED152E1559008F8C62 = {
fileRef = F5C0879F08A0C47B01A8012F;
isa = PBXBuildFile;
......@@ -479,30 +440,92 @@
refType = 3;
sourceTree = BUILT_PRODUCTS_DIR;
};
85D69C741762961D000AC90B = {
85848F121DBFE1A70050DC12 = {
isa = PBXFileReference;
lastKnownFileType = wrapper.nib;
name = GetName.nib;
path = Resources/GetName.nib;
refType = 4;
sourceTree = "<group>";
};
85848F131DBFE1A70050DC12 = {
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = text.plist.strings;
name = InfoPlist.strings;
path = Resources/InfoPlist.strings;
refType = 4;
sourceTree = "<group>";
};
85848F141DBFE1A70050DC12 = {
isa = PBXFileReference;
lastKnownFileType = wrapper.nib;
name = MainMenu.nib;
path = Resources/MainMenu.nib;
refType = 4;
sourceTree = "<group>";
};
85848F151DBFE1A70050DC12 = {
fileRef = 85848F121DBFE1A70050DC12;
isa = PBXBuildFile;
settings = {
};
};
85848F161DBFE1A70050DC12 = {
fileRef = 85848F131DBFE1A70050DC12;
isa = PBXBuildFile;
settings = {
};
};
85848F171DBFE1A70050DC12 = {
fileRef = 85848F141DBFE1A70050DC12;
isa = PBXBuildFile;
settings = {
};
};
85848F181DBFE1F70050DC12 = {
children = (
85D69C751762961D000AC90B,
85848F191DBFE1F70050DC12,
85848F1B1DBFE2040050DC12,
85848F1C1DBFE20A0050DC12,
);
isa = PBXVariantGroup;
name = GetName.nib;
name = Localizable.strings;
path = "";
refType = 4;
sourceTree = "<group>";
};
85D69C751762961D000AC90B = {
85848F191DBFE1F70050DC12 = {
fileEncoding = 30;
isa = PBXFileReference;
lastKnownFileType = wrapper.nib;
lastKnownFileType = text.plist.strings;
name = English;
path = English.lproj/GetName.nib;
path = Resources/English.lproj/Localizable.strings;
refType = 4;
sourceTree = "<group>";
};
85D69C761762961D000AC90B = {
fileRef = 85D69C741762961D000AC90B;
85848F1A1DBFE1F70050DC12 = {
fileRef = 85848F181DBFE1F70050DC12;
isa = PBXBuildFile;
settings = {
};
};
85848F1B1DBFE2040050DC12 = {
isa = PBXFileReference;
lastKnownFileType = text.plist.strings;
name = German;
path = Resources/German.lproj/Localizable.strings;
refType = 4;
sourceTree = "<group>";
};
85848F1C1DBFE20A0050DC12 = {
isa = PBXFileReference;
lastKnownFileType = text.plist.strings;
name = Italian;
path = Resources/Italian.lproj/Localizable.strings;
refType = 4;
sourceTree = "<group>";
};
85D69C7917629757000AC90B = {
fileEncoding = 30;
isa = PBXFileReference;
......
This diff is collapsed.
......@@ -2,13 +2,14 @@
ApplicationDescription = "FTP client";
ApplicationIcon = "FTP_icon_gs.tif";
ApplicationName = FTP;
ApplicationRelease = "0.5";
ApplicationRelease = "0.6";
Authors = (
"Riccardo Mottola <rm@gnu.org>"
);
Copyright = "Copyright (C) 2005-2015";
CopyrightDescription = "Released under GPL";
FullVersionID = "0.5";
CFBundleIdentifier = "org.gap.FTP";
Copyright = "Copyright (C) 2005-2017";
CopyrightDescription = "Released under GPL v2+";
FullVersionID = "0.6";
NSExecutable = FTP;
NSIcon = "FTP_icon_gs.tif";
NSMainNibFile = "FTP.gorm";
......
......@@ -3,6 +3,15 @@
#
ifeq ($(GNUSTEP_MAKEFILES),)
GNUSTEP_MAKEFILES := $(shell gnustep-config --variable=GNUSTEP_MAKEFILES 2>/dev/null)
ifeq ($(GNUSTEP_MAKEFILES),)
$(warning )
$(warning Unable to obtain GNUSTEP_MAKEFILES setting from gnustep-config!)
$(warning Perhaps gnustep-make is not properly installed,)
$(warning so gnustep-config is not in your PATH.)
$(warning )
$(warning Your PATH is currently $(PATH))
$(warning )
endif
endif
ifeq ($(GNUSTEP_MAKEFILES),)
$(error You need to set GNUSTEP_MAKEFILES before compiling!)
......@@ -13,7 +22,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
#
# Application
#
VERSION = 0.5
VERSION = 0.6
PACKAGE_NAME = FTP
APP_NAME = FTP
FTP_APPLICATION_ICON = FTP_icon_gs.tif
......@@ -25,9 +34,9 @@ FTP_APPLICATION_ICON = FTP_icon_gs.tif
FTP_RESOURCE_FILES = \
Resources/FTP.gorm \
Resources/GetName.gorm \
Resources/FTP_icon_gs.tif \
Resources/arrow_left.tiff \
Resources/arrow_right.tiff \
Resources/FTP_icon_gs.tif
Resources/arrow_right.tiff
#
......@@ -35,24 +44,24 @@ Resources/FTP_icon_gs.tif
#
FTP_HEADER_FILES = \
AppController.h \
GetNameController.h \
ftpclient.h \
localclient.h \
fileTable.h \
client.h \
fileElement.h \
client.h
fileTable.h \
ftpclient.h \
GetNameController.h \
localclient.h
#
# Class files
# Objective-C Class files
#
FTP_OBJC_FILES = \
AppController.m \
GetNameController.m \
ftpclient.m \
localclient.m \
fileTable.m \
client.m \
fileElement.m \
client.m
fileTable.m \
ftpclient.m \
GetNameController.m \
localclient.m
#
# Other sources
......