Changeset 25555

Timestamp:

11/09/2008 12:50:54 PM (2 months ago)

Author:

zacw

Message:

Patch from tarragon to hide the "stop" button on a successful transfer, and replace it with a "resend" button on an outgoing unsuccessful transfer. Fixes #9446. Thanks!

Files:

• trunk/Adium.xcodeproj/project.pbxproj (modified) (11 diffs)
• trunk/Resources/FTProgressResendPressed_Selected.tif (added)
• trunk/Resources/FTProgressResendPressed.tif (added)
• trunk/Resources/FTProgressResendRollover_Selected.tif (added)
• trunk/Resources/FTProgressResendRollover.tif (added)
• trunk/Resources/FTProgressResend_Selected.tif (added)
• trunk/Resources/FTProgressResend.tif (added)
• trunk/Source/ESFileTransferProgressRow.m (modified) (3 diffs)
• trunk/Source/ESFileTransferProgressView.h (modified) (2 diffs)
• trunk/Source/ESFileTransferProgressView.m (modified) (3 diffs)

trunk/Adium.xcodeproj/project.pbxproj

@@ -4 +4 @@
-        classes = {
-        };
-5
+4
-        objects = {
-
@@ -93 +93 @@
-                1172FBD80CDAA8D400B8E233 /* libmeanwhile.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC80CDAA8D400B8E233 /* libmeanwhile.framework */; };
-                1172FBD90CDAA8D400B8E233 /* libpurple.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1172FBC90CDAA8D400B8E233 /* libpurple.framework */; };
+                117866DE0EC759B9003E9B97 /* FTProgressResend_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866D80EC759B9003E9B97 /* FTProgressResend_Selected.tif */; };
+                117866DF0EC759B9003E9B97 /* FTProgressResend.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866D90EC759B9003E9B97 /* FTProgressResend.tif */; };
+                117866E00EC759B9003E9B97 /* FTProgressResendPressed_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DA0EC759B9003E9B97 /* FTProgressResendPressed_Selected.tif */; };
+                117866E10EC759B9003E9B97 /* FTProgressResendPressed.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DB0EC759B9003E9B97 /* FTProgressResendPressed.tif */; };
+                117866E20EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DC0EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif */; };
+                117866E30EC759B9003E9B97 /* FTProgressResendRollover.tif in Resources */ = {isa = PBXBuildFile; fileRef = 117866DD0EC759B9003E9B97 /* FTProgressResendRollover.tif */; };
-                117D6DC00BC5F0C40080D02B /* notify.png in Resources */ = {isa = PBXBuildFile; fileRef = 117D6DBF0BC5F0C40080D02B /* notify.png */; };
-                11AA1EFA0BCAE9C3003DDA66 /* Quartz.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11AA1EF90BCAE9C3003DDA66 /* Quartz.framework */; };
@@ -1883 +1889 @@
-                1172FBC80CDAA8D400B8E233 /* libmeanwhile.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libmeanwhile.framework; path = Frameworks/libmeanwhile.framework; sourceTree = "<group>"; };
-                1172FBC90CDAA8D400B8E233 /* libpurple.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = libpurple.framework; path = Frameworks/libpurple.framework; sourceTree = "<group>"; };
+                117866D80EC759B9003E9B97 /* FTProgressResend_Selected.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressResend_Selected.tif; path = Resources/FTProgressResend_Selected.tif; sourceTree = "<group>"; };
+                117866D90EC759B9003E9B97 /* FTProgressResend.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressResend.tif; path = Resources/FTProgressResend.tif; sourceTree = "<group>"; };
+                117866DA0EC759B9003E9B97 /* FTProgressResendPressed_Selected.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressResendPressed_Selected.tif; path = Resources/FTProgressResendPressed_Selected.tif; sourceTree = "<group>"; };
+                117866DB0EC759B9003E9B97 /* FTProgressResendPressed.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressResendPressed.tif; path = Resources/FTProgressResendPressed.tif; sourceTree = "<group>"; };
+                117866DC0EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressResendRollover_Selected.tif; path = Resources/FTProgressResendRollover_Selected.tif; sourceTree = "<group>"; };
+                117866DD0EC759B9003E9B97 /* FTProgressResendRollover.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = FTProgressResendRollover.tif; path = Resources/FTProgressResendRollover.tif; sourceTree = "<group>"; };
-                117D6DBF0BC5F0C40080D02B /* notify.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = notify.png; path = Resources/notify.png; sourceTree = SOURCE_ROOT; };
-                11AA1EF90BCAE9C3003DDA66 /* Quartz.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Quartz.framework; path = /System/Library/Frameworks/Quartz.framework; sourceTree = "<absolute>"; };
@@ -5442 +5454 @@
-                                34D2E8670758BB0B0054C56D /* ESFileTransferPreferences.h */,
-                                34D2E8680758BB0B0054C56D /* ESFileTransferPreferences.m */,
+                                117866D80EC759B9003E9B97 /* FTProgressResend_Selected.tif */,
+                                117866D90EC759B9003E9B97 /* FTProgressResend.tif */,
+                                117866DA0EC759B9003E9B97 /* FTProgressResendPressed_Selected.tif */,
+                                117866DB0EC759B9003E9B97 /* FTProgressResendPressed.tif */,
+                                117866DC0EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif */,
+                                117866DD0EC759B9003E9B97 /* FTProgressResendRollover.tif */,
-                                34D8324807CBD53A006466F2 /* FTProgressRevealRollover.tif */,
-                                34D8324907CBD53A006466F2 /* FTProgressRevealRollover_Selected.tif */,
@@ -8575 +8593 @@
-                        };
-                        buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
-1
+0
-                        hasScannedForEncodings = 1;
-                        knownRegions = (
@@ -9136 +9154 @@
-                                34A1AEEE0DFD4C4A00AC78CF /* AIAdvancedInspectorPane.nib in Resources */,
-                                317D83680E89F40500298BDB /* bookmark_chat.png in Resources */,
+                                117866DE0EC759B9003E9B97 /* FTProgressResend_Selected.tif in Resources */,
+                                117866DF0EC759B9003E9B97 /* FTProgressResend.tif in Resources */,
+                                117866E00EC759B9003E9B97 /* FTProgressResendPressed_Selected.tif in Resources */,
+                                117866E10EC759B9003E9B97 /* FTProgressResendPressed.tif in Resources */,
+                                117866E20EC759B9003E9B97 /* FTProgressResendRollover_Selected.tif in Resources */,
+                                117866E30EC759B9003E9B97 /* FTProgressResendRollover.tif in Resources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
@@ -12521 +12545 @@
-                                PREBINDING = NO;
-                                PRECOMP_DESTINATION_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/PrefixHeaders";
-macosx10.5
+"$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"
-                                STRIP_INSTALLED_PRODUCT = NO;
-                                VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64";
@@ -12531 +12555 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-
+
+
-                                COPY_PHASE_STRIP = YES;
-                                DEBUG_INFORMATION_FORMAT = dwarf;
@@ -12559 +12584 @@
-                                PREBINDING = NO;
-                                PRECOMP_DESTINATION_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/PrefixHeaders";
-macosx10.5
+"$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"
-                                VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64";
-                                WARNING_CFLAGS = "-Wall";
@@ -12568 +12593 @@
-                        isa = XCBuildConfiguration;
-                        buildSettings = {
-
+
+
-                                COPY_PHASE_STRIP = NO;
-                                DEBUG_INFORMATION_FORMAT = dwarf;
@@ -12599 +12625 @@
-                                PREBINDING = NO;
-                                PRECOMP_DESTINATION_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/PrefixHeaders";
-macosx10.5
+"$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk"
-                                STRIP_INSTALLED_PRODUCT = NO;
-                                VALID_ARCHS = "i386 ppc ppc64 ppc7400 ppc970 x86_64";

trunk/Source/ESFileTransferProgressRow.m

@@ -150 +150 @@
-        [self gotUpdateForFileTransfer:inFileTransfer];
-        
-        [view setAllowsCancel:![inFileTransfer isStopped]];
-        [owner progressRowDidChangeStatus:self];
-        
@@ -200 +199 @@
-                case Complete_FileTransfer:
-                        [view setProgressVisible:NO];
+            [view setButtonStopResumeVisible:NO];
-                        transferSpeedStatus = AILocalizedString(@"Complete",nil);
-                        break;
-                case Cancelled_Local_FileTransfer:
+                    [view setProgressVisible:NO];
+                        if (type == Outgoing_FileTransfer) {
+                    [view setButtonStopResumeIsResend:YES];
+                        } else {
+                                //can't resend what wasn't ours
+                                [view setButtonStopResumeVisible:NO];
+                        }
+                        transferSpeedStatus = AILocalizedString(@"Stopped",nil);
+                        break;
-                case Cancelled_Remote_FileTransfer:
-                        [view setProgressVisible:NO];
+                        [view setButtonStopResumeVisible:NO];
-                        transferSpeedStatus = AILocalizedString(@"Stopped",nil);
-                        break;
-                case Failed_FileTransfer:
-                        [view setProgressVisible:NO];
+                        [view setButtonStopResumeIsResend:YES];
-                        transferSpeedStatus = AILocalizedString(@"Failed",nil);
-                        break;
@@ -345 +356 @@
-- (IBAction)stopResumeAction:(id)sender
-{
-
-
+
+
+
+
+
+
+
+
-- (IBAction)revealAction:(id)sender
-{

trunk/Source/ESFileTransferProgressView.h

@@ -34 +34 @@
-        IBOutlet AIRolloverButton               *button_stopResume;
-        BOOL                                                    buttonStopResumeIsHovered;
+    BOOL                            buttonStopResumeIsResend;
-
-        IBOutlet AIRolloverButton               *button_reveal;
@@ -71 +72 @@
-- (void)setProgressVisible:(BOOL)flag;
-
+- (void)setButtonStopResumeVisible:(BOOL)flag;
+- (void)setButtonStopResumeIsResend:(BOOL)flag;
+- (BOOL)buttonStopResumeIsResend;
+
-- (void)setTransferBytesStatus:(NSString *)inTransferBytesStatus
-                           remainingStatus:(NSString *)inTransferRemainingStatus

trunk/Source/ESFileTransferProgressView.m

@@ -50 +50 @@
-
-        buttonStopResumeIsHovered = NO;
+    buttonStopResumeIsResend = NO;
-        buttonRevealIsHovered = NO;
-}
@@ -156 +157 @@
-                [[self window] display];
-        }
+}
+
+- (void)setButtonStopResumeVisible:(BOOL)flag
+{
+    [button_stopResume setHidden:!flag];
+}
+
+- (void)setButtonStopResumeIsResend:(BOOL)flag
+{
+    buttonStopResumeIsResend = flag;
+    [self updateButtonStopResume];
+}
+
+- (BOOL)buttonStopResumeIsResend
+{
+    return buttonStopResumeIsResend;
-}
-
@@ -306 +323 @@
-- (void)updateButtonStopResume
-{
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-}