Skip to content

Commit 3102fa5

Browse files
committed
Make the clipboard use rich text for displaying pasted items
1 parent 7fc1f6a commit 3102fa5

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

QSPasteboardController.m

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,6 @@ - (void)awakeFromNib {
263263
[pasteboardHistoryArray makeObjectsPerformSelector:@selector(loadIcon)];
264264

265265
[[self window] setAutosaveName:@"QSPasteboardHistoryWindow"]; // should use the real methods to do this
266-
NSCell *newCell = nil;
267266

268267
//NSImageCell *imageCell = nil;
269268
[pasteboardHistoryTable setVerticalMotionCanBeginDrag: TRUE];
@@ -280,12 +279,15 @@ - (void)awakeFromNib {
280279

281280
[pasteboardHistoryTable setTarget:self];
282281
[pasteboardHistoryTable setOpaque:YES];
283-
newCell = [[QSObjectCell alloc] init];
284-
[[pasteboardHistoryTable tableColumnWithIdentifier: @"object"] setDataCell:newCell];
282+
QSObjectCell *objectCell = [[QSObjectCell alloc] init];
283+
if ([objectCell respondsToSelector:@selector(showsRichText)]) {
284+
objectCell.showsRichText = YES;
285+
}
286+
[[pasteboardHistoryTable tableColumnWithIdentifier: @"object"] setDataCell:objectCell];
285287

286-
newCell = [[QSPasteboardAccessoryCell alloc] init];
288+
NSCell *numberCell = [[QSPasteboardAccessoryCell alloc] init];
287289

288-
[[pasteboardHistoryTable tableColumnWithIdentifier: @"sequence"] setDataCell:newCell];
290+
[[pasteboardHistoryTable tableColumnWithIdentifier: @"sequence"] setDataCell:numberCell];
289291

290292

291293
if ([pasteboardHistoryArray count]) {

Resources/Pasteboard.xib

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
3131
<subviews>
3232
<button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="95" customClass="QSMenuButton">
33-
<rect key="frame" x="231" y="-1" width="22" height="22.5"/>
33+
<rect key="frame" x="234" y="-1" width="22" height="23"/>
3434
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
35-
<buttonCell key="cell" type="square" title="" bezelStyle="shadowlessSquare" image="gearshape.fill" catalog="system" imagePosition="leading" alignment="center" alternateImage="gearshape" inset="2" id="186">
35+
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="Button-GearMenu" imagePosition="leading" alignment="center" alternateImage="Button-GearMenu" imageScaling="proportionallyDown" inset="2" id="186">
3636
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
3737
<font key="font" metaFont="smallSystem"/>
3838
</buttonCell>
@@ -96,7 +96,7 @@
9696
</connections>
9797
</tableView>
9898
</subviews>
99-
<color key="backgroundColor" red="0.96370959" green="0.95328312999999998" blue="0.86656146999999994" alpha="1" colorSpace="calibratedRGB"/>
99+
<nil key="backgroundColor"/>
100100
</clipView>
101101
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" controlSize="small" horizontal="YES" id="193">
102102
<rect key="frame" x="-100" y="-100" width="232" height="11"/>
@@ -182,7 +182,6 @@
182182
</menu>
183183
</objects>
184184
<resources>
185-
<image name="gearshape" catalog="system" width="16" height="16"/>
186-
<image name="gearshape.fill" catalog="system" width="16" height="16"/>
185+
<image name="Button-GearMenu" width="128" height="128"/>
187186
</resources>
188187
</document>

0 commit comments

Comments
 (0)