From f0555e856741997114ece9e4fa2b11594a420802 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Tue, 7 Jun 2011 23:21:15 +0000 Subject: [PATCH] #4314 tweak the filter bar item positions and the text filter size --- macosx/FileOutlineView.m | 2 - macosx/FilterBar.xib | 700 +++------------------------------------ 2 files changed, 45 insertions(+), 657 deletions(-) diff --git a/macosx/FileOutlineView.m b/macosx/FileOutlineView.m index c426772fc..b926a39c4 100644 --- a/macosx/FileOutlineView.m +++ b/macosx/FileOutlineView.m @@ -28,8 +28,6 @@ #import "FileOutlineView.h" #import "FilePriorityCell.h" #import "Torrent.h" -#import "NSApplicationAdditions.h" -#import @implementation FileOutlineView diff --git a/macosx/FilterBar.xib b/macosx/FilterBar.xib index 982537f13..323622e8f 100644 --- a/macosx/FilterBar.xib +++ b/macosx/FilterBar.xib @@ -2,17 +2,27 @@ 1060 - 10J567 - 823 + 10J4138 + 1306 1038.35 - 462.00 + 461.00 com.apple.InterfaceBuilder.CocoaPlugin - 823 + 1306 - + YES - + NSCustomObject + NSMenu + NSMenuItem + NSSearchField + NSPopUpButton + NSCustomView + NSSearchFieldCell + NSButtonCell + NSButton + NSPopUpButtonCell + NSBox YES @@ -41,17 +51,19 @@ 257 - {{357, 4}, {95, 15}} + {{357, 2}, {95, 19}} + + YES 343014976 - 268698624 + 268567552 LucidaGrande - 9 - 3614 + 11 + 3100 YES @@ -123,6 +135,8 @@ 268 {{42, 2}, {30, 17}} + + YES 67239488 @@ -147,6 +161,8 @@ 268 {{123, 2}, {89, 17}} + + YES 67239488 @@ -167,6 +183,8 @@ 268 {{213, 2}, {59, 17}} + + YES 67239488 @@ -187,6 +205,8 @@ 268 {{273, 2}, {55, 17}} + + YES 67239488 @@ -205,8 +225,10 @@ 268 - {{34, 5}, {5, 12}} + {{34, 5}, {5, 13}} + + {0, 0} 67239424 @@ -231,8 +253,10 @@ 268 - {{5, 4}, {26, 14}} + {{5, 4}, {26, 15}} + + YES -2076049856 @@ -313,6 +337,8 @@ 268 {{73, 2}, {49, 17}} + + YES 67239488 @@ -331,6 +357,8 @@ {457, 23} + + FilterBarView NSView @@ -834,17 +862,13 @@ YES - - YES - + YES - - YES - + 60 @@ -855,52 +879,6 @@ FilterBarController NSViewController - - YES - - YES - setFilter: - setGroupFilter: - setSearchText: - setSearchType: - - - YES - id - id - id - id - - - - YES - - YES - setFilter: - setGroupFilter: - setSearchText: - setSearchType: - - - YES - - setFilter: - id - - - setGroupFilter: - id - - - setSearchText: - id - - - setSearchType: - id - - - YES @@ -970,7 +948,7 @@ IBProjectSource - macosx/FilterBarController.h + ./Classes/FilterBarController.h @@ -978,7 +956,7 @@ NSView IBProjectSource - macosx/FilterBarView.h + ./Classes/FilterBarView.h @@ -986,594 +964,7 @@ NSButton IBProjectSource - macosx/FilterButton.h - - - - NSApplication - - IBProjectSource - macosx/NSApplicationAdditions.h - - - - NSObject - - IBProjectSource - macosx/UKKQueue/UKFileWatcher.h - - - - NSObject - - IBProjectSource - macosx/UKKQueue/UKKQueue.h - - - - NSObject - - IBProjectSource - macosx/UKKQueue/UKMainThreadProxy.h - - - - - YES - - NSActionCell - NSCell - - IBFrameworkSource - AppKit.framework/Headers/NSActionCell.h - - - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSBox - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSBox.h - - - - NSButton - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSButton.h - - - - NSButtonCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSButtonCell.h - - - - NSCell - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSCell.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSMenuItem - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSMenuItemCell - NSButtonCell - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItemCell.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSObject - - IBFrameworkSource - Growl.framework/Headers/GrowlApplicationBridge.h - - - - NSObject - - IBFrameworkSource - ImageKit.framework/Headers/IKImageBrowserView.h - - - - NSObject - - IBFrameworkSource - ImageKit.framework/Headers/IKSaveOptions.h - - - - NSObject - - IBFrameworkSource - ImageKit.framework/Headers/ImageKitDeprecated.h - - - - NSObject - - IBFrameworkSource - PDFKit.framework/Headers/PDFDocument.h - - - - NSObject - - IBFrameworkSource - PDFKit.framework/Headers/PDFView.h - - - - NSObject - - IBFrameworkSource - QuartzComposer.framework/Headers/QCCompositionParameterView.h - - - - NSObject - - IBFrameworkSource - QuartzComposer.framework/Headers/QCCompositionPickerView.h - - - - NSObject - - IBFrameworkSource - QuartzFilters.framework/Headers/QuartzFilterManager.h - - - - NSObject - - IBFrameworkSource - QuickLookUI.framework/Headers/QLPreviewPanel.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUAppcast.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUUpdater.h - - - - NSPopUpButton - NSButton - - IBFrameworkSource - AppKit.framework/Headers/NSPopUpButton.h - - - - NSPopUpButtonCell - NSMenuItemCell - - IBFrameworkSource - AppKit.framework/Headers/NSPopUpButtonCell.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSSearchField - NSTextField - - IBFrameworkSource - AppKit.framework/Headers/NSSearchField.h - - - - NSSearchFieldCell - NSTextFieldCell - - IBFrameworkSource - AppKit.framework/Headers/NSSearchFieldCell.h - - - - NSTextField - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSTextField.h - - - - NSTextFieldCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSTextFieldCell.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - - NSViewController - NSResponder - - view - NSView - - - view - - view - NSView - - - - IBFrameworkSource - AppKit.framework/Headers/NSViewController.h + ./Classes/FilterButton.h @@ -1589,7 +980,6 @@ YES - ../Transmission.xcodeproj 3 YES