diff --git a/macosx/AddMagnetWindowController.h b/macosx/AddMagnetWindowController.h index e1d32a61a..1d7cde56b 100644 --- a/macosx/AddMagnetWindowController.h +++ b/macosx/AddMagnetWindowController.h @@ -13,12 +13,12 @@ - (instancetype)initWithTorrent:(Torrent*)torrent destination:(NSString*)path controller:(Controller*)controller; -- (void)setDestination:(id)sender; +- (IBAction)setDestination:(id)sender; -- (void)add:(id)sender; -- (void)cancelAdd:(id)sender; +- (IBAction)add:(id)sender; +- (IBAction)cancelAdd:(id)sender; -- (void)changePriority:(id)sender; +- (IBAction)changePriority:(id)sender; - (void)updateGroupMenu:(NSNotification*)notification; diff --git a/macosx/AddWindowController.h b/macosx/AddWindowController.h index 1d670591d..a8e46eefd 100644 --- a/macosx/AddWindowController.h +++ b/macosx/AddWindowController.h @@ -21,18 +21,18 @@ deleteTorrentCheckEnableInitially:(BOOL)deleteTorrent canToggleDelete:(BOOL)canToggleDelete; -- (void)setDestination:(id)sender; +- (IBAction)setDestination:(id)sender; -- (void)add:(id)sender; -- (void)cancelAdd:(id)sender; +- (IBAction)add:(id)sender; +- (IBAction)cancelAdd:(id)sender; - (IBAction)setFileFilterText:(id)sender; - (IBAction)checkAll:(id)sender; - (IBAction)uncheckAll:(id)sender; -- (void)verifyLocalData:(id)sender; +- (IBAction)verifyLocalData:(id)sender; -- (void)changePriority:(id)sender; +- (IBAction)changePriority:(id)sender; - (void)updateCheckButtons:(NSNotification*)notification; diff --git a/macosx/Base.lproj/AddWindow.xib b/macosx/Base.lproj/AddWindow.xib index ff7ccb09f..416fe6b00 100644 --- a/macosx/Base.lproj/AddWindow.xib +++ b/macosx/Base.lproj/AddWindow.xib @@ -146,6 +146,7 @@ Gw + diff --git a/macosx/Base.lproj/InfoActivityView.xib b/macosx/Base.lproj/InfoActivityView.xib index 218b6ae46..5eb31e56b 100644 --- a/macosx/Base.lproj/InfoActivityView.xib +++ b/macosx/Base.lproj/InfoActivityView.xib @@ -136,6 +136,9 @@ + + + diff --git a/macosx/BlocklistDownloaderViewController.h b/macosx/BlocklistDownloaderViewController.h index 79fa3ec5b..c7dcb67e1 100644 --- a/macosx/BlocklistDownloaderViewController.h +++ b/macosx/BlocklistDownloaderViewController.h @@ -12,7 +12,7 @@ + (void)downloadWithPrefsController:(PrefsController*)prefsController; -- (void)cancelDownload:(id)sender; +- (IBAction)cancelDownload:(id)sender; - (void)setStatusStarting; - (void)setStatusProgressForCurrentSize:(NSUInteger)currentSize expectedSize:(long long)expectedSize; diff --git a/macosx/Controller.h b/macosx/Controller.h index f178f9f25..fc121f496 100644 --- a/macosx/Controller.h +++ b/macosx/Controller.h @@ -33,7 +33,7 @@ typedef NS_ENUM(unsigned int, addType) { // - (void)askOpenConfirmed:(AddWindowController*)addController add:(BOOL)add; - (void)openCreatedFile:(NSNotification*)notification; - (void)openFilesWithDict:(NSDictionary*)dictionary; -- (void)openShowSheet:(id)sender; +- (IBAction)openShowSheet:(id)sender; - (void)openMagnet:(NSString*)address; - (void)askOpenMagnetConfirmed:(AddMagnetWindowController*)addController add:(BOOL)add; @@ -44,62 +44,62 @@ typedef NS_ENUM(unsigned int, addType) { // - (void)duplicateOpenMagnetAlert:(NSString*)address transferName:(NSString*)name; - (void)openURL:(NSString*)urlString; -- (void)openURLShowSheet:(id)sender; +- (IBAction)openURLShowSheet:(id)sender; @property(nonatomic, readonly) tr_session* sessionHandle; -- (void)createFile:(id)sender; +- (IBAction)createFile:(id)sender; -- (void)resumeSelectedTorrents:(id)sender; -- (void)resumeAllTorrents:(id)sender; +- (IBAction)resumeSelectedTorrents:(id)sender; +- (IBAction)resumeAllTorrents:(id)sender; - (void)resumeTorrents:(NSArray*)torrents; -- (void)resumeSelectedTorrentsNoWait:(id)sender; -- (void)resumeWaitingTorrents:(id)sender; +- (IBAction)resumeSelectedTorrentsNoWait:(id)sender; +- (IBAction)resumeWaitingTorrents:(id)sender; - (void)resumeTorrentsNoWait:(NSArray*)torrents; -- (void)stopSelectedTorrents:(id)sender; -- (void)stopAllTorrents:(id)sender; +- (IBAction)stopSelectedTorrents:(id)sender; +- (IBAction)stopAllTorrents:(id)sender; - (void)stopTorrents:(NSArray*)torrents; - (void)removeTorrents:(NSArray*)torrents deleteData:(BOOL)deleteData; - (void)confirmRemoveTorrents:(NSArray*)torrents deleteData:(BOOL)deleteData; -- (void)removeNoDelete:(id)sender; -- (void)removeDeleteData:(id)sender; +- (IBAction)removeNoDelete:(id)sender; +- (IBAction)removeDeleteData:(id)sender; -- (void)clearCompleted:(id)sender; +- (IBAction)clearCompleted:(id)sender; -- (void)moveDataFilesSelected:(id)sender; +- (IBAction)moveDataFilesSelected:(id)sender; - (void)moveDataFiles:(NSArray*)torrents; -- (void)copyTorrentFiles:(id)sender; +- (IBAction)copyTorrentFiles:(id)sender; - (void)copyTorrentFileForTorrents:(NSMutableArray*)torrents; -- (void)copyMagnetLinks:(id)sender; +- (IBAction)copyMagnetLinks:(id)sender; -- (void)revealFile:(id)sender; +- (IBAction)revealFile:(id)sender; - (IBAction)renameSelected:(id)sender; -- (void)announceSelectedTorrents:(id)sender; +- (IBAction)announceSelectedTorrents:(id)sender; -- (void)verifySelectedTorrents:(id)sender; +- (IBAction)verifySelectedTorrents:(id)sender; - (void)verifyTorrents:(NSArray*)torrents; @property(nonatomic, readonly) NSArray* selectedTorrents; @property(nonatomic, readonly) PrefsController* prefsController; -- (void)showPreferenceWindow:(id)sender; +- (IBAction)showPreferenceWindow:(id)sender; -- (void)showAboutWindow:(id)sender; +- (IBAction)showAboutWindow:(id)sender; -- (void)showInfo:(id)sender; +- (IBAction)showInfo:(id)sender; - (void)resetInfo; -- (void)setInfoTab:(id)sender; +- (IBAction)setInfoTab:(id)sender; @property(nonatomic, readonly) MessageWindowController* messageWindowController; -- (void)showMessageWindow:(id)sender; -- (void)showStatsWindow:(id)sender; +- (IBAction)showMessageWindow:(id)sender; +- (IBAction)showStatsWindow:(id)sender; - (void)updateUI; - (void)fullUpdateUI; @@ -122,18 +122,18 @@ typedef NS_ENUM(unsigned int, addType) { // forParent:(id)parent withSortDescriptors:(NSArray*)descriptors beganTableUpdate:(BOOL*)beganTableUpdate; -- (void)setSort:(id)sender; -- (void)setSortByGroup:(id)sender; -- (void)setSortReverse:(id)sender; +- (IBAction)setSort:(id)sender; +- (IBAction)setSortByGroup:(id)sender; +- (IBAction)setSortReverse:(id)sender; -- (void)switchFilter:(id)sender; +- (IBAction)switchFilter:(id)sender; - (IBAction)showGlobalPopover:(id)sender; - (void)setGroup:(id)sender; //used by delegate-generated menu items -- (void)toggleSpeedLimit:(id)sender; -- (void)speedLimitChanged:(id)sender; +- (IBAction)toggleSpeedLimit:(id)sender; +- (IBAction)speedLimitChanged:(id)sender; - (void)altSpeedToggledCallbackIsLimited:(NSDictionary*)dict; - (void)changeAutoImport; @@ -147,12 +147,12 @@ typedef NS_ENUM(unsigned int, addType) { // - (void)torrentTableViewSelectionDidChange:(NSNotification*)notification; -- (void)toggleSmallView:(id)sender; -- (void)togglePiecesBar:(id)sender; -- (void)toggleAvailabilityBar:(id)sender; +- (IBAction)toggleSmallView:(id)sender; +- (IBAction)togglePiecesBar:(id)sender; +- (IBAction)toggleAvailabilityBar:(id)sender; -- (void)toggleStatusBar:(id)sender; -- (void)toggleFilterBar:(id)sender; +- (IBAction)toggleStatusBar:(id)sender; +- (IBAction)toggleFilterBar:(id)sender; - (void)focusFilterField; - (void)allToolbarClicked:(id)sender; @@ -172,14 +172,14 @@ typedef NS_ENUM(unsigned int, addType) { // - (void)updateForExpandCollapse; -- (void)showMainWindow:(id)sender; +- (IBAction)showMainWindow:(id)sender; -- (void)toggleQuickLook:(id)sender; +- (IBAction)toggleQuickLook:(id)sender; -- (void)linkHomepage:(id)sender; -- (void)linkForums:(id)sender; -- (void)linkGitHub:(id)sender; -- (void)linkDonate:(id)sender; +- (IBAction)linkHomepage:(id)sender; +- (IBAction)linkForums:(id)sender; +- (IBAction)linkGitHub:(id)sender; +- (IBAction)linkDonate:(id)sender; - (void)rpcCallback:(tr_rpc_callback_type)type forTorrentStruct:(struct tr_torrent*)torrentStruct; - (void)rpcAddTorrentStruct:(struct tr_torrent*)torrentStruct; diff --git a/macosx/FileOutlineController.h b/macosx/FileOutlineController.h index 047c71ae0..2853a2d2e 100644 --- a/macosx/FileOutlineController.h +++ b/macosx/FileOutlineController.h @@ -21,7 +21,7 @@ - (void)uncheckAll; - (void)setPriority:(id)sender; -- (void)revealFile:(id)sender; +- (IBAction)revealFile:(id)sender; - (void)renameSelected:(id)sender; diff --git a/macosx/FileOutlineController.mm b/macosx/FileOutlineController.mm index e2e0a97a5..011b611f7 100644 --- a/macosx/FileOutlineController.mm +++ b/macosx/FileOutlineController.mm @@ -40,9 +40,6 @@ typedef NS_ENUM(unsigned int, filePriorityMenuTag) { // { self.fFileList = [[NSMutableArray alloc] init]; - self.fOutline.doubleAction = @selector(revealFile:); - self.fOutline.target = self; - //set table header tool tips [self.fOutline tableColumnWithIdentifier:@"Check"].headerToolTip = NSLocalizedString(@"Download", "file table -> header tool tip"); [self.fOutline tableColumnWithIdentifier:@"Priority"].headerToolTip = NSLocalizedString(@"Priority", "file table -> header tool tip"); diff --git a/macosx/FilterBarController.h b/macosx/FilterBarController.h index eadb80460..623aa0b77 100644 --- a/macosx/FilterBarController.h +++ b/macosx/FilterBarController.h @@ -26,11 +26,11 @@ extern const NSInteger kGroupFilterAllTag; - (instancetype)init; -- (void)setFilter:(id)sender; +- (IBAction)setFilter:(id)sender; - (void)switchFilter:(BOOL)right; -- (void)setSearchText:(id)sender; -- (void)setSearchType:(id)sender; -- (void)setGroupFilter:(id)sender; +- (IBAction)setSearchText:(id)sender; +- (IBAction)setSearchType:(id)sender; +- (IBAction)setGroupFilter:(id)sender; - (void)reset:(BOOL)updateUI; - (void)focusSearchField; diff --git a/macosx/InfoActivityViewController.mm b/macosx/InfoActivityViewController.mm index a1521fddc..49b8567f6 100644 --- a/macosx/InfoActivityViewController.mm +++ b/macosx/InfoActivityViewController.mm @@ -153,11 +153,6 @@ static CGFloat const kStackViewVerticalSpacing = 8.0; frame.size.width -= widthIncrease; field.frame = frame; } - - //set the click action of the pieces view -#warning after 2.8 just hook this up in the xib - self.fPiecesView.action = @selector(updatePiecesView:); - self.fPiecesView.target = self; } - (void)dealloc diff --git a/macosx/InfoFileView.xib b/macosx/InfoFileView.xib index b86e210cc..7970823e5 100644 --- a/macosx/InfoFileView.xib +++ b/macosx/InfoFileView.xib @@ -82,6 +82,7 @@ + diff --git a/macosx/InfoGeneralViewController.h b/macosx/InfoGeneralViewController.h index 64915bd76..3fa13c9b1 100644 --- a/macosx/InfoGeneralViewController.h +++ b/macosx/InfoGeneralViewController.h @@ -11,6 +11,6 @@ - (void)setInfoForTorrents:(NSArray*)torrents; - (void)updateInfo; -- (void)revealDataFile:(id)sender; +- (IBAction)revealDataFile:(id)sender; @end diff --git a/macosx/InfoTrackersViewController.h b/macosx/InfoTrackersViewController.h index e17acb1db..3e73619eb 100644 --- a/macosx/InfoTrackersViewController.h +++ b/macosx/InfoTrackersViewController.h @@ -14,6 +14,6 @@ - (void)saveViewSize; - (void)clearView; -- (void)addRemoveTracker:(id)sender; +- (IBAction)addRemoveTracker:(id)sender; @end diff --git a/macosx/InfoWindow.xib b/macosx/InfoWindow.xib index edab54a9d..54b0054f6 100644 --- a/macosx/InfoWindow.xib +++ b/macosx/InfoWindow.xib @@ -75,6 +75,9 @@ + + + diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h index 8826d3bb2..f8463ec24 100644 --- a/macosx/InfoWindowController.h +++ b/macosx/InfoWindowController.h @@ -15,7 +15,7 @@ - (void)updateInfoStats; - (void)updateOptions; -- (void)setTab:(id)sender; +- (IBAction)setTab:(id)sender; - (void)setNextTab; - (void)setPreviousTab; diff --git a/macosx/InfoWindowController.mm b/macosx/InfoWindowController.mm index f43c60677..f0884594d 100644 --- a/macosx/InfoWindowController.mm +++ b/macosx/InfoWindowController.mm @@ -153,9 +153,6 @@ typedef NS_ENUM(unsigned int, tabTag) { tag = TAB_GENERAL_TAG; } - self.fTabs.target = self; - self.fTabs.action = @selector(setTab:); - self.fTabs.selectedSegment = tag; [self setTab:nil]; diff --git a/macosx/MessageWindowController.h b/macosx/MessageWindowController.h index 3afe2ef63..793199e8d 100644 --- a/macosx/MessageWindowController.h +++ b/macosx/MessageWindowController.h @@ -8,10 +8,10 @@ - (void)updateLog:(NSTimer*)timer; -- (void)changeLevel:(id)sender; -- (void)changeFilter:(id)sender; -- (void)clearLog:(id)sender; +- (IBAction)changeLevel:(id)sender; +- (IBAction)changeFilter:(id)sender; +- (IBAction)clearLog:(id)sender; -- (void)writeToFile:(id)sender; +- (IBAction)writeToFile:(id)sender; @end diff --git a/macosx/StatsWindowController.h b/macosx/StatsWindowController.h index a987b749a..971d8577e 100644 --- a/macosx/StatsWindowController.h +++ b/macosx/StatsWindowController.h @@ -10,6 +10,6 @@ @property(nonatomic, class, readonly) StatsWindowController* statsWindow; -- (void)resetStats:(id)sender; +- (IBAction)resetStats:(id)sender; @end diff --git a/macosx/TorrentTableView.h b/macosx/TorrentTableView.h index 47245c30a..f18d5d4f3 100644 --- a/macosx/TorrentTableView.h +++ b/macosx/TorrentTableView.h @@ -36,14 +36,14 @@ extern const CGFloat kGroupSeparatorHeight; - (void)displayTorrentActionPopoverForEvent:(NSEvent*)event; -- (void)setQuickLimitMode:(id)sender; +- (IBAction)setQuickLimitMode:(id)sender; - (void)setQuickLimit:(id)sender; -- (void)setGlobalLimit:(id)sender; +- (IBAction)setGlobalLimit:(id)sender; -- (void)setQuickRatioMode:(id)sender; +- (IBAction)setQuickRatioMode:(id)sender; - (void)setQuickRatio:(id)sender; -- (void)setPriority:(id)sender; +- (IBAction)setPriority:(id)sender; - (void)togglePiecesBar; @property(nonatomic, readonly) CGFloat piecesBarPercent; diff --git a/macosx/URLSheetWindowController.h b/macosx/URLSheetWindowController.h index aed06f0a8..026f234c0 100644 --- a/macosx/URLSheetWindowController.h +++ b/macosx/URLSheetWindowController.h @@ -10,7 +10,7 @@ - (instancetype)init; -- (void)openURLEndSheet:(id)sender; -- (void)openURLCancelEndSheet:(id)sender; +- (IBAction)openURLEndSheet:(id)sender; +- (IBAction)openURLCancelEndSheet:(id)sender; @end