From: Miltiadis Vasilakis Date: Mon, 19 Mar 2012 10:07:11 +0000 (+0200) Subject: Improve UI. Update version. X-Git-Tag: v0.8.2 X-Git-Url: https://code.grnet.gr/git/pithos-macos/commitdiff_plain/ef8f82dfd77d3859418ebe4e4400fde546e9bbed Improve UI. Update version. --- diff --git a/Icons/01-refresh.png b/Icons/01-refresh.png deleted file mode 100644 index 5881938..0000000 Binary files a/Icons/01-refresh.png and /dev/null differ diff --git a/Icons/145-persondot.png b/Icons/145-persondot.png deleted file mode 100644 index e740405..0000000 Binary files a/Icons/145-persondot.png and /dev/null differ diff --git a/pithos-macos.xcodeproj/project.pbxproj b/pithos-macos.xcodeproj/project.pbxproj index b1bd27c..12d5551 100644 --- a/pithos-macos.xcodeproj/project.pbxproj +++ b/pithos-macos.xcodeproj/project.pbxproj @@ -35,7 +35,6 @@ 610DD36713E6E69D00ED982F /* PithosContainerNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD36613E6E69D00ED982F /* PithosContainerNode.m */; }; 610DD37213E7059900ED982F /* PithosObjectNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD37113E7059900ED982F /* PithosObjectNode.m */; }; 610DD37513E7064F00ED982F /* PithosSubdirNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 610DD37413E7064F00ED982F /* PithosSubdirNode.m */; }; - 610DD46313E950E600ED982F /* 01-refresh.png in Resources */ = {isa = PBXBuildFile; fileRef = 610DD46213E950E600ED982F /* 01-refresh.png */; }; 611405D01428BEC000637170 /* PithosContainerNodeInfoController.m in Sources */ = {isa = PBXBuildFile; fileRef = 611405CE1428BEBE00637170 /* PithosContainerNodeInfoController.m */; }; 611405D11428BEC000637170 /* PithosContainerNodeInfoController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 611405CF1428BEC000637170 /* PithosContainerNodeInfoController.xib */; }; 611FFCAF13EBF0B900E43E18 /* PithosEmptyNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 611FFCAE13EBF0B900E43E18 /* PithosEmptyNode.m */; }; @@ -77,7 +76,6 @@ 61C65ADF1428C578002597C2 /* CountTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 61C65ADE1428C578002597C2 /* CountTransformer.m */; }; 61C65AE31428D41C002597C2 /* PolicyVersioningTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 61C65AE21428D41C002597C2 /* PolicyVersioningTransformer.m */; }; 61C65AE6142918DD002597C2 /* PithosObjectNodeInfoController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61C65AE5142918DD002597C2 /* PithosObjectNodeInfoController.m */; }; - 61E99D9413EC348500E48DA5 /* 145-persondot.png in Resources */ = {isa = PBXBuildFile; fileRef = 61E99D9313EC348500E48DA5 /* 145-persondot.png */; }; 61F040F31448547000A0C788 /* FileMD5Hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 61F040F11448547000A0C788 /* FileMD5Hash.c */; }; 61F04132144DB97200A0C788 /* PithosLocalObjectState.m in Sources */ = {isa = PBXBuildFile; fileRef = 61F040EE144757B500A0C788 /* PithosLocalObjectState.m */; }; 61F04133144DB97600A0C788 /* PithosSyncDaemon.m in Sources */ = {isa = PBXBuildFile; fileRef = 61F040EA144724F500A0C788 /* PithosSyncDaemon.m */; }; @@ -91,7 +89,7 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 610DD2F113E6BB2000ED982F /* pithos-macos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "pithos-macos.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 610DD2F113E6BB2000ED982F /* pithos-macos.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = "pithos-macos.app"; path = "Pithos+.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 610DD2F513E6BB2000ED982F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 610DD2F813E6BB2000ED982F /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; 610DD2F913E6BB2000ED982F /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; @@ -150,7 +148,6 @@ 610DD37113E7059900ED982F /* PithosObjectNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PithosObjectNode.m; sourceTree = ""; }; 610DD37313E7064E00ED982F /* PithosSubdirNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PithosSubdirNode.h; sourceTree = ""; }; 610DD37413E7064F00ED982F /* PithosSubdirNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PithosSubdirNode.m; sourceTree = ""; }; - 610DD46213E950E600ED982F /* 01-refresh.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "01-refresh.png"; sourceTree = ""; }; 611405CD1428BEBD00637170 /* PithosContainerNodeInfoController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PithosContainerNodeInfoController.h; sourceTree = ""; }; 611405CE1428BEBE00637170 /* PithosContainerNodeInfoController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PithosContainerNodeInfoController.m; sourceTree = ""; }; 611405CF1428BEC000637170 /* PithosContainerNodeInfoController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PithosContainerNodeInfoController.xib; sourceTree = ""; }; @@ -225,7 +222,6 @@ 61C65AE21428D41C002597C2 /* PolicyVersioningTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PolicyVersioningTransformer.m; path = "pithos-macos/PolicyVersioningTransformer.m"; sourceTree = ""; }; 61C65AE4142918DC002597C2 /* PithosObjectNodeInfoController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PithosObjectNodeInfoController.h; sourceTree = ""; }; 61C65AE5142918DD002597C2 /* PithosObjectNodeInfoController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PithosObjectNodeInfoController.m; sourceTree = ""; }; - 61E99D9313EC348500E48DA5 /* 145-persondot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "145-persondot.png"; sourceTree = ""; }; 61F040E9144724F500A0C788 /* PithosSyncDaemon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PithosSyncDaemon.h; sourceTree = ""; }; 61F040EA144724F500A0C788 /* PithosSyncDaemon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PithosSyncDaemon.m; sourceTree = ""; }; 61F040ED144757B500A0C788 /* PithosLocalObjectState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PithosLocalObjectState.h; sourceTree = ""; }; @@ -393,8 +389,6 @@ 610DD46113E950E500ED982F /* Icons */ = { isa = PBXGroup; children = ( - 610DD46213E950E600ED982F /* 01-refresh.png */, - 61E99D9313EC348500E48DA5 /* 145-persondot.png */, 617A431014630CD900DAB367 /* pithos-large.png */, 6154BF4A145554D600EE353A /* pithos-logo-small.png */, 617A430B14630A3100DAB367 /* pithos.icns */, @@ -587,9 +581,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 610DD2F013E6BB2000ED982F /* pithos-macos */ = { + 610DD2F013E6BB2000ED982F /* Pithos+ */ = { isa = PBXNativeTarget; - buildConfigurationList = 610DD30F13E6BB2000ED982F /* Build configuration list for PBXNativeTarget "pithos-macos" */; + buildConfigurationList = 610DD30F13E6BB2000ED982F /* Build configuration list for PBXNativeTarget "Pithos+" */; buildPhases = ( 610DD2ED13E6BB2000ED982F /* Sources */, 610DD2EE13E6BB2000ED982F /* Frameworks */, @@ -599,7 +593,7 @@ ); dependencies = ( ); - name = "pithos-macos"; + name = "Pithos+"; productName = "pithos-macos"; productReference = 610DD2F113E6BB2000ED982F /* pithos-macos.app */; productType = "com.apple.product-type.application"; @@ -625,7 +619,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 610DD2F013E6BB2000ED982F /* pithos-macos */, + 610DD2F013E6BB2000ED982F /* Pithos+ */, ); }; /* End PBXProject section */ @@ -639,8 +633,6 @@ 610DD30613E6BB2000ED982F /* Credits.rtf in Resources */, 610DD30C13E6BB2000ED982F /* MainMenu.xib in Resources */, 610DD35013E6C00E00ED982F /* PithosBrowserController.xib in Resources */, - 610DD46313E950E600ED982F /* 01-refresh.png in Resources */, - 61E99D9413EC348500E48DA5 /* 145-persondot.png in Resources */, 6121250913F033F500063041 /* PithosBrowserPreviewController.xib in Resources */, 619B85D613F8077800C9371F /* PithosPreferencesController.xib in Resources */, 616FC0AF13F91BA400140A33 /* PithosObjectNodeInfoController.xib in Resources */, @@ -828,7 +820,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 610DD30F13E6BB2000ED982F /* Build configuration list for PBXNativeTarget "pithos-macos" */ = { + 610DD30F13E6BB2000ED982F /* Build configuration list for PBXNativeTarget "Pithos+" */ = { isa = XCConfigurationList; buildConfigurations = ( 610DD31013E6BB2000ED982F /* Debug */, diff --git a/pithos-macos/PithosBrowserController.m b/pithos-macos/PithosBrowserController.m index 1978210..1e52842 100644 --- a/pithos-macos/PithosBrowserController.m +++ b/pithos-macos/PithosBrowserController.m @@ -2023,6 +2023,8 @@ forDraggedRowsWithIndexes:(NSIndexSet *)rowIndexes inColumn:(NSInteger)column { #pragma mark NSOutlineViewDataSource - (NSInteger)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item { + if (!browserInitialized) + return 0; if (item == nil) return 2; if (item == containersNode) @@ -2033,6 +2035,8 @@ forDraggedRowsWithIndexes:(NSIndexSet *)rowIndexes inColumn:(NSInteger)column { } - (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id)item { + if (!browserInitialized) + return nil; if (item == nil) return (!index ? containersNode : sharedNode); if (item == sharedNode) diff --git a/pithos-macos/PithosBrowserController.xib b/pithos-macos/PithosBrowserController.xib index ec80195..c536e02 100755 --- a/pithos-macos/PithosBrowserController.xib +++ b/pithos-macos/PithosBrowserController.xib @@ -3,12 +3,12 @@ 1070 11D50b - 2177 + 2182 1138.32 568.00 com.apple.InterfaceBuilder.CocoaPlugin - 2177 + 2182 YES @@ -100,7 +100,7 @@ {180, 292} - + YES @@ -203,6 +203,7 @@ 1 1 1 + NO 14 @@ -241,7 +242,7 @@ {180, 292} - + 133648 @@ -373,7 +374,6 @@ {{-1, -1}, {511, 402}} - YES 67239488 @@ -890,7 +890,7 @@ - 193 + 202 diff --git a/pithos-macos/en.lproj/Credits.rtf b/pithos-macos/en.lproj/Credits.rtf index 3961f70..1f4c3b8 100644 --- a/pithos-macos/en.lproj/Credits.rtf +++ b/pithos-macos/en.lproj/Credits.rtf @@ -4,7 +4,7 @@ \paperw11900\paperh16840\vieww9600\viewh8400\viewkind0 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc -\f0\fs22 \cf0 Pithos is a file storage service\ +\f0\fs22 \cf0 Pithos+ is a file storage service\ by GRNET ({\field{\*\fldinst{HYPERLINK "http://www.grnet.gr"}}{\fldrslt http://www.grnet.gr}}).\ \ Learn more at:\ diff --git a/pithos-macos/pithos-macos-Info.plist b/pithos-macos/pithos-macos-Info.plist index ff07751..e51fcad 100644 --- a/pithos-macos/pithos-macos-Info.plist +++ b/pithos-macos/pithos-macos-Info.plist @@ -5,19 +5,19 @@ CFBundleDevelopmentRegion en CFBundleExecutable - ${EXECUTABLE_NAME} + Pithos+ CFBundleIconFile pithos.icns CFBundleIdentifier - gr.grnet.${PRODUCT_NAME:rfc1034identifier} + gr.grnet.pithos-macos CFBundleInfoDictionaryVersion 6.0 CFBundleName - ${PRODUCT_NAME} + Pithos+ CFBundlePackageType APPL CFBundleShortVersionString - 0.8.1 + 0.8.2 CFBundleSignature ???? CFBundleURLTypes @@ -32,7 +32,7 @@ CFBundleVersion - 20120316a + 20120319a LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} LSUIElement