adium 5205:f8d107e49e5a: Fixed "Retina assets are not scaled cor...
commits at adium.im
commits at adium.im
Mon Oct 29 08:28:51 UTC 2012
details: http://hg.adium.im/adium/rev/f8d107e49e5a
revision: 5205:f8d107e49e5a
branch: adium-1.6
author: Adrian Godoroja <robotive at icloud.com>
date: Sun Oct 28 20:54:10 2012 +0100
Fixed "Retina assets are not scaled correctly in context menus", for service icons at least. - Fixes #16143.
Subject: adium 5206:2c300136974f: Fixed "Transcript Viewer Search bar gets cut off". - Fixes #16053.
details: http://hg.adium.im/adium/rev/2c300136974f
revision: 5206:2c300136974f
branch: adium-1.6
author: Adrian Godoroja <robotive at icloud.com>
date: Sun Oct 28 22:26:31 2012 +0100
Fixed "Transcript Viewer Search bar gets cut off". - Fixes #16053.
Subject: adium 5207:e2d2bf0db1f6: Fixed service icons in log viewer not scaling properly on retina displays.
details: http://hg.adium.im/adium/rev/e2d2bf0db1f6
revision: 5207:e2d2bf0db1f6
branch: adium-1.6
author: Adrian Godoroja <robotive at icloud.com>
date: Sun Oct 28 22:49:32 2012 +0100
Fixed service icons in log viewer not scaling properly on retina displays.
diffs (544 lines):
diff -r 92c9c36c10a3 -r e2d2bf0db1f6 Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.m
--- a/Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.m Sat Oct 27 18:08:05 2012 -0700
+++ b/Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.m Sun Oct 28 22:49:32 2012 +0100
@@ -160,7 +160,7 @@
//menuUserIconForObject
secondaryIcon = [AIUserIcons menuUserIconForObject:listObject];
} else {
- secondaryIcon = [AIServiceIcons serviceIconForObject:listObject type:AIServiceIconSmall direction:AIIconNormal];
+ secondaryIcon = [[AIServiceIcons serviceIconForObject:listObject type:AIServiceIconSmall direction:AIIconNormal] imageByScalingForMenuItem];
}
secondarySize = [secondaryIcon size];
diff -r 92c9c36c10a3 -r e2d2bf0db1f6 Frameworks/Adium Framework/Source/AIAccountMenu.m
--- a/Frameworks/Adium Framework/Source/AIAccountMenu.m Sat Oct 27 18:08:05 2012 -0700
+++ b/Frameworks/Adium Framework/Source/AIAccountMenu.m Sun Oct 28 22:49:32 2012 +0100
@@ -21,6 +21,7 @@
#import <AIUtilities/AIMenuAdditions.h>
#import <AIUtilities/AIAttributedStringAdditions.h>
#import <AIUtilities/AIImageAdditions.h>
+#import <AIUtilities/AIImageDrawingAdditions.h>
#import <AIUtilities/AIParagraphStyleAdditions.h>
#import <Adium/AIAccount.h>
#import <Adium/AIService.h>
@@ -349,16 +350,13 @@
//Add an SSL icon if the account is encrypted.
if ([account encrypted]) {
- NSBundle *securityInterfaceFramework = [NSBundle bundleWithIdentifier:@"com.apple.securityinterface"];
- if (!securityInterfaceFramework) securityInterfaceFramework = [NSBundle bundleWithPath:@"/System/Library/Frameworks/SecurityInterface.framework"];
+ NSImage *SSLIcon = [[NSImage imageForSSL] copy];
+ NSTextAttachment *textAttachment = [[NSTextAttachment alloc] init];
+ NSMutableAttributedString *title = nil;
- NSString *path = [securityInterfaceFramework pathForImageResource:@"CertSmallStd"];
- NSFileWrapper *fileWrapper = nil;
- NSTextAttachment *textAttachment = nil;
- NSMutableAttributedString *title = nil;
-
- fileWrapper = [[NSFileWrapper alloc] initWithPath:path];
- textAttachment = [[NSTextAttachment alloc] initWithFileWrapper:fileWrapper];
+ [SSLIcon imageByScalingForMenuItem];
+ [textAttachment setAttachmentCell:[[[NSTextAttachmentCell alloc] initImageCell:SSLIcon] autorelease]];
+ [SSLIcon release];
title = [plainTitle mutableCopy];
@@ -376,7 +374,6 @@
[title release];
[textAttachment release];
- [fileWrapper release];
} else {
[menuItem setAttributedTitle:plainTitle];
}
diff -r 92c9c36c10a3 -r e2d2bf0db1f6 Resources/LogViewer.xib
--- a/Resources/LogViewer.xib Sat Oct 27 18:08:05 2012 -0700
+++ b/Resources/LogViewer.xib Sun Oct 28 22:49:32 2012 +0100
@@ -2,13 +2,13 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">12A269</string>
- <string key="IBDocument.InterfaceBuilderVersion">2549</string>
- <string key="IBDocument.AppKitVersion">1187</string>
- <string key="IBDocument.HIToolboxVersion">624.00</string>
+ <string key="IBDocument.SystemVersion">12C60</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2843</string>
+ <string key="IBDocument.AppKitVersion">1187.34</string>
+ <string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="NS.object.0">2549</string>
+ <string key="NS.object.0">2843</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSBox</string>
@@ -88,7 +88,7 @@
<string key="NSFrameSize">{177, 535}</string>
<reference key="NSSuperview" ref="981661881"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="268459162"/>
+ <reference key="NSNextKeyView" ref="55917509"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -220,7 +220,7 @@
<string key="NSFrame">{{0, -1}, {177, 535}}</string>
<reference key="NSSuperview" ref="28735003"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="981661881"/>
+ <reference key="NSNextKeyView" ref="268459162"/>
<int key="NSsFlags">133648</int>
<reference key="NSVScroller" ref="666117040"/>
<reference key="NSHScroller" ref="268459162"/>
@@ -263,7 +263,7 @@
<string key="NSFrameSize">{595, 126}</string>
<reference key="NSSuperview" ref="452103105"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="529274724"/>
+ <reference key="NSNextKeyView" ref="608471247"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -273,10 +273,10 @@
<string key="NSFrameSize">{595, 17}</string>
<reference key="NSSuperview" ref="529274724"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="426295635"/>
+ <reference key="NSNextKeyView" ref="452103105"/>
<reference key="NSTableView" ref="294998714"/>
</object>
- <object class="_NSCornerView" key="NSCornerView" id="426295635">
+ <object class="_NSCornerView" key="NSCornerView">
<nil key="NSNextResponder"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{523, 0}, {16, 17}}</string>
@@ -462,7 +462,7 @@
<string key="NSFrameSize">{595, 143}</string>
<reference key="NSSuperview" ref="834810345"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="452103105"/>
+ <reference key="NSNextKeyView" ref="529274724"/>
<int key="NSsFlags">133680</int>
<reference key="NSVScroller" ref="611885226"/>
<reference key="NSHScroller" ref="608471247"/>
@@ -510,7 +510,7 @@
<int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Box</string>
- <object class="NSFont" key="NSSupport">
+ <object class="NSFont" key="NSSupport" id="1018010627">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
@@ -631,7 +631,7 @@
<string key="NSFrameSize">{595, 357}</string>
<reference key="NSSuperview" ref="358384816"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="607861257"/>
+ <reference key="NSNextKeyView" ref="194644508"/>
<object class="NSTextContainer" key="NSTextContainer" id="79517778">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -751,7 +751,7 @@
<string key="NSFrameSize">{595, 357}</string>
<reference key="NSSuperview" ref="196815603"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="358384816"/>
+ <reference key="NSNextKeyView" ref="607861257"/>
<int key="NSsFlags">133136</int>
<reference key="NSVScroller" ref="194644508"/>
<reference key="NSHScroller" ref="607861257"/>
@@ -1158,74 +1158,64 @@
<int key="NSWindowCollectionBehavior">128</int>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
- <object class="NSCustomView" id="263556283">
+ <object class="NSSearchField" id="360077433">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="NSSearchField" id="360077433">
- <reference key="NSNextResponder" ref="263556283"/>
- <int key="NSvFlags">256</int>
- <string key="NSFrameSize">{228, 22}</string>
- <reference key="NSSuperview" ref="263556283"/>
- <reference key="NSWindow"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSSearchFieldCell" key="NSCell" id="692075214">
- <int key="NSCellFlags">342884416</int>
- <int key="NSCellFlags2">1024</int>
- <string key="NSContents"/>
- <reference key="NSSupport" ref="297420841"/>
- <string key="NSPlaceholderString">Search Logs</string>
- <reference key="NSControlView" ref="360077433"/>
- <bool key="NSDrawsBackground">YES</bool>
- <int key="NSTextBezelStyle">1</int>
- <reference key="NSBackgroundColor" ref="766900425"/>
- <reference key="NSTextColor" ref="735596086"/>
- <object class="NSButtonCell" key="NSSearchButtonCell">
- <int key="NSCellFlags">0</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">search</string>
- <reference key="NSControlView" ref="360077433"/>
- <string key="NSAction">_searchFieldSearch:</string>
- <reference key="NSTarget" ref="692075214"/>
- <int key="NSButtonFlags">138690560</int>
- <int key="NSButtonFlags2">0</int>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- </object>
- <object class="NSButtonCell" key="NSCancelButtonCell">
- <int key="NSCellFlags">0</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">clear</string>
- <array class="NSMutableArray" key="NSAccessibilityOverriddenAttributes">
- <dictionary class="NSMutableDictionary">
- <string key="AXDescription">cancel</string>
- <integer value="1" key="NSAccessibilityEncodedAttributesValueType"/>
- </dictionary>
- </array>
- <string key="NSAction">_searchFieldCancel:</string>
- <reference key="NSTarget" ref="692075214"/>
- <int key="NSButtonFlags">138428416</int>
- <int key="NSButtonFlags2">0</int>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- </object>
- <int key="NSMaximumRecents">255</int>
- </object>
- <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
- </object>
- </array>
- <string key="NSFrameSize">{228, 22}</string>
+ <string key="NSFrameSize">{227, 22}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
- <string key="NSClassName">NSView</string>
- <string key="NSExtension">NSResponder</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSSearchFieldCell" key="NSCell" id="692075214">
+ <int key="NSCellFlags">342884416</int>
+ <int key="NSCellFlags2">1024</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="1018010627"/>
+ <string key="NSPlaceholderString">Search Logs</string>
+ <reference key="NSControlView" ref="360077433"/>
+ <int key="NSTextBezelStyle">1</int>
+ <reference key="NSBackgroundColor" ref="766900425"/>
+ <reference key="NSTextColor" ref="735596086"/>
+ <object class="NSButtonCell" key="NSSearchButtonCell">
+ <int key="NSCellFlags">0</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">search</string>
+ <reference key="NSControlView" ref="360077433"/>
+ <string key="NSAction">_searchFieldSearch:</string>
+ <reference key="NSTarget" ref="692075214"/>
+ <int key="NSButtonFlags">138690560</int>
+ <int key="NSButtonFlags2">0</int>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ <object class="NSButtonCell" key="NSCancelButtonCell">
+ <int key="NSCellFlags">0</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">clear</string>
+ <array class="NSMutableArray" key="NSAccessibilityOverriddenAttributes">
+ <dictionary class="NSMutableDictionary">
+ <string key="AXDescription">cancel</string>
+ <integer value="1" key="NSAccessibilityEncodedAttributesValueType"/>
+ </dictionary>
+ </array>
+ <string key="NSAction">_searchFieldCancel:</string>
+ <reference key="NSTarget" ref="692075214"/>
+ <int key="NSButtonFlags">138428416</int>
+ <int key="NSButtonFlags2">0</int>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">400</int>
+ <int key="NSPeriodicInterval">75</int>
+ </object>
+ <int key="NSMaximumRecents">255</int>
+ </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSCustomView" id="496523070">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{320, 24}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<object class="NSMutableString" key="NSClassName">
<characters key="NS.bytes">NSView</characters>
</object>
@@ -1236,22 +1226,6 @@
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">searchField_logs</string>
- <reference key="source" ref="938320995"/>
- <reference key="destination" ref="360077433"/>
- </object>
- <int key="connectionID">122</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
- <string key="label">updateSearch:</string>
- <reference key="source" ref="938320995"/>
- <reference key="destination" ref="360077433"/>
- </object>
- <int key="connectionID">123</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">window</string>
<reference key="source" ref="938320995"/>
<reference key="destination" ref="946713354"/>
@@ -1260,14 +1234,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">view_SearchField</string>
- <reference key="source" ref="938320995"/>
- <reference key="destination" ref="263556283"/>
- </object>
- <int key="connectionID">202</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">view_DatePicker</string>
<reference key="source" ref="938320995"/>
<reference key="destination" ref="496523070"/>
@@ -1396,6 +1362,22 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
+ <string key="label">searchField_logs</string>
+ <reference key="source" ref="938320995"/>
+ <reference key="destination" ref="360077433"/>
+ </object>
+ <int key="connectionID">122</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">updateSearch:</string>
+ <reference key="source" ref="938320995"/>
+ <reference key="destination" ref="360077433"/>
+ </object>
+ <int key="connectionID">123</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="946713354"/>
<reference key="destination" ref="938320995"/>
@@ -1492,34 +1474,12 @@
<reference key="parent" ref="946713354"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">120</int>
- <reference key="object" ref="263556283"/>
- <array class="NSMutableArray" key="children">
- <reference ref="360077433"/>
- </array>
- <reference key="parent" ref="0"/>
- <string key="objectName">SearchToolbar</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">121</int>
- <reference key="object" ref="360077433"/>
- <array class="NSMutableArray" key="children">
- <reference ref="692075214"/>
- </array>
- <reference key="parent" ref="263556283"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">225</int>
<reference key="object" ref="496523070"/>
<reference key="parent" ref="0"/>
<string key="objectName">DateToolbar</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">363</int>
- <reference key="object" ref="692075214"/>
- <reference key="parent" ref="360077433"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">-3</int>
<reference key="object" ref="799555517"/>
<reference key="parent" ref="0"/>
@@ -1804,13 +1764,25 @@
<reference key="object" ref="24578004"/>
<reference key="parent" ref="52515128"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">121</int>
+ <reference key="object" ref="360077433"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="692075214"/>
+ </array>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">363</int>
+ <reference key="object" ref="692075214"/>
+ <reference key="parent" ref="360077433"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="120.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="121.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="225.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1928,11 +1900,17 @@
<string key="className">AILogViewerWindowController</string>
<string key="superclassName">AIWindowController</string>
<dictionary class="NSMutableDictionary" key="actions">
+ <string key="selectDate:">id</string>
<string key="selectDateType:">id</string>
<string key="selectNextPreviousOccurrence:">id</string>
+ <string key="toggleTimestampFiltering:">id</string>
<string key="updateSearch:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBActionInfo" key="selectDate:">
+ <string key="name">selectDate:</string>
+ <string key="candidateClassName">id</string>
+ </object>
<object class="IBActionInfo" key="selectDateType:">
<string key="name">selectDateType:</string>
<string key="candidateClassName">id</string>
@@ -1941,6 +1919,10 @@
<string key="name">selectNextPreviousOccurrence:</string>
<string key="candidateClassName">id</string>
</object>
+ <object class="IBActionInfo" key="toggleTimestampFiltering:">
+ <string key="name">toggleTimestampFiltering:</string>
+ <string key="candidateClassName">id</string>
+ </object>
<object class="IBActionInfo" key="updateSearch:">
<string key="name">updateSearch:</string>
<string key="candidateClassName">id</string>
@@ -1962,7 +1944,6 @@
<string key="textView_content">NSTextView</string>
<string key="view_DatePicker">NSView</string>
<string key="view_FindNavigator">AIGradientView</string>
- <string key="view_SearchField">NSView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="datePicker">
@@ -2025,10 +2006,6 @@
<string key="name">view_FindNavigator</string>
<string key="candidateClassName">AIGradientView</string>
</object>
- <object class="IBToOneOutletInfo" key="view_SearchField">
- <string key="name">view_SearchField</string>
- <string key="candidateClassName">NSView</string>
- </object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
diff -r 92c9c36c10a3 -r e2d2bf0db1f6 Source/AILogViewerWindowController.h
--- a/Source/AILogViewerWindowController.h Sat Oct 27 18:08:05 2012 -0700
+++ b/Source/AILogViewerWindowController.h Sun Oct 28 22:49:32 2012 +0100
@@ -48,8 +48,6 @@
IBOutlet NSTableView *tableView_results;
IBOutlet NSTextView *textView_content;
- IBOutlet NSView *view_SearchField;
-
IBOutlet NSView *view_DatePicker;
IBOutlet NSPopUpButton *popUp_dateFilter;
diff -r 92c9c36c10a3 -r e2d2bf0db1f6 Source/AILogViewerWindowController.m
--- a/Source/AILogViewerWindowController.m Sat Oct 27 18:08:05 2012 -0700
+++ b/Source/AILogViewerWindowController.m Sun Oct 28 22:49:32 2012 +0100
@@ -44,6 +44,7 @@
#import <AIUtilities/AIDateFormatterAdditions.h>
#import <AIUtilities/AIFileManagerAdditions.h>
#import <AIUtilities/AIImageAdditions.h>
+#import <AIUtilities/AIImageDrawingAdditions.h>
#import <AIUtilities/AIOutlineViewAdditions.h>
#import <AIUtilities/AIStringAdditions.h>
#import <AIUtilities/AITableViewAdditions.h>
@@ -1908,9 +1909,9 @@
NSImage *image;
serviceClass = [theLog serviceClass];
- image = [AIServiceIcons serviceIconForService:[adium.accountController firstServiceWithServiceID:serviceClass]
+ image = [[AIServiceIcons serviceIconForService:[adium.accountController firstServiceWithServiceID:serviceClass]
type:AIServiceIconSmall
- direction:AIIconNormal];
+ direction:AIIconNormal] imageByScalingForMenuItem];
value = (image ? image : blankImage);
}
}
@@ -2130,15 +2131,15 @@
} else if ([item isKindOfClass:[AIListContact class]]) {
NSImage *image = [AIUserIcons listUserIconForContact:(AIListContact *)item
size:NSMakeSize(16,16)];
- if (!image) image = [AIServiceIcons serviceIconForObject:(AIListContact *)item
+ if (!image) image = [[AIServiceIcons serviceIconForObject:(AIListContact *)item
type:AIServiceIconSmall
- direction:AIIconFlipped];
+ direction:AIIconFlipped] imageByScalingForMenuItem];
[cell setImage:image];
} else if ([item isKindOfClass:[AILogToGroup class]]) {
- [cell setImage:[AIServiceIcons serviceIconForService:[adium.accountController firstServiceWithServiceID:[(AILogToGroup *)item serviceClass]]
+ [cell setImage:[[AIServiceIcons serviceIconForService:[adium.accountController firstServiceWithServiceID:[(AILogToGroup *)item serviceClass]]
type:AIServiceIconSmall
- direction:AIIconNormal]];
+ direction:AIIconFlipped] imageByScalingForMenuItem]];
} else if ([item isKindOfClass:[allContactsIdentifier class]]) {
if ([[outlineView arrayOfSelectedItems] containsObjectIdenticalTo:item] &&
@@ -2324,14 +2325,14 @@
toolTip:AILocalizedString(@"Search or filter logs",nil)
target:self
settingSelector:@selector(setView:)
- itemContent:view_SearchField
+ itemContent:searchField_logs
action:@selector(updateSearch:)
menu:nil];
if ([toolbarItem respondsToSelector:@selector(setVisibilityPriority:)]) {
[toolbarItem setVisibilityPriority:(NSToolbarItemVisibilityPriorityHigh + 1)];
}
- [toolbarItem setMinSize:NSMakeSize(130, NSHeight([view_SearchField frame]))];
- [toolbarItem setMaxSize:NSMakeSize(230, NSHeight([view_SearchField frame]))];
+ [toolbarItem setMinSize:NSMakeSize(130, NSHeight([searchField_logs frame]))];
+ [toolbarItem setMaxSize:NSMakeSize(230, NSHeight([searchField_logs frame]))];
[toolbarItems setObject:toolbarItem forKey:[toolbarItem itemIdentifier]];
toolbarItem = [AIToolbarUtilities toolbarItemWithIdentifier:DATE_ITEM_IDENTIFIER
diff -r 92c9c36c10a3 -r e2d2bf0db1f6 Source/AIServiceMenu.m
--- a/Source/AIServiceMenu.m Sat Oct 27 18:08:05 2012 -0700
+++ b/Source/AIServiceMenu.m Sun Oct 28 22:49:32 2012 +0100
@@ -19,6 +19,7 @@
#import <Adium/AIService.h>
#import <Adium/AIServiceIcons.h>
#import <AIUtilities/AIMenuAdditions.h>
+#import <AIUtilities/AIImageDrawingAdditions.h>
/*!
* @class AIServiceMenu
@@ -92,9 +93,9 @@
action:@selector(selectServiceType:)
keyEquivalent:@""];
[menuItem setRepresentedObject:service];
- [menuItem setImage:[AIServiceIcons serviceIconForService:service
+ [menuItem setImage:[[AIServiceIcons serviceIconForService:service
type:AIServiceIconSmall
- direction:AIIconNormal]];
+ direction:AIIconNormal] imageByScalingForMenuItem]];
[menuItemArray addObject:menuItem];
[menuItem release];
}
More information about the commits
mailing list