Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Ind.ie Projects
Heartbeat Cocoa
Commits
74fe32f3
Unverified
Commit
74fe32f3
authored
Aug 24, 2015
by
Aral Balkan
Browse files
Removed the ‘Private Message’ subtitle from the conversations master view. Closes
#173
.
parent
766d443e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Heartbeat/Base.lproj/Main.storyboard
View file @
74fe32f3
...
...
@@ -1132,7 +1132,7 @@
</subviews>
<nil
key=
"backgroundColor"
/>
</clipView>
<scroller
key=
"horizontalScroller"
hidden=
"YES"
verticalHuggingPriority=
"750"
horizontal=
"YES"
id=
"b4B-VU-vU0"
>
<scroller
key=
"horizontalScroller"
verticalHuggingPriority=
"750"
horizontal=
"YES"
id=
"b4B-VU-vU0"
>
<rect
key=
"frame"
x=
"1"
y=
"119"
width=
"223"
height=
"15"
/>
<autoresizingMask
key=
"autoresizingMask"
/>
</scroller>
...
...
Heartbeat/ConversationCellView.swift
View file @
74fe32f3
...
...
@@ -15,7 +15,6 @@ class ConversationCellView: NSView
{
@IBOutlet
weak
var
conversationImage
:
NSImageView
!
@IBOutlet
weak
var
conversationName
:
NSTextField
!
@IBOutlet
weak
var
conversationDescription
:
NSTextField
!
override
init
(
frame
frameRect
:
NSRect
)
{
...
...
Heartbeat/ConversationCellView.xib
View file @
74fe32f3
...
...
@@ -16,24 +16,15 @@
<imageCell
key=
"cell"
refusesFirstResponder=
"YES"
alignment=
"left"
imageScaling=
"proportionallyDown"
image=
"friend-placeholder"
id=
"C5g-RB-t2Z"
/>
</imageView>
<textField
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"750"
fixedFrame=
"YES"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"8n3-fh-BXx"
userLabel=
"Conversation name"
>
<rect
key=
"frame"
x=
"59"
y=
"2
9
"
width=
"299"
height=
"17"
/>
<rect
key=
"frame"
x=
"59"
y=
"2
0
"
width=
"299"
height=
"17"
/>
<textFieldCell
key=
"cell"
scrollable=
"YES"
lineBreakMode=
"clipping"
sendsActionOnEndEditing=
"YES"
title=
"Conversation name"
id=
"wnF-ce-vTD"
>
<font
key=
"font"
metaFont=
"system"
/>
<color
key=
"textColor"
name=
"labelColor"
catalog=
"System"
colorSpace=
"catalog"
/>
<color
key=
"backgroundColor"
name=
"controlColor"
catalog=
"System"
colorSpace=
"catalog"
/>
</textFieldCell>
</textField>
<textField
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"750"
fixedFrame=
"YES"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Ty6-fV-FH9"
userLabel=
"Conversation description"
>
<rect
key=
"frame"
x=
"59"
y=
"11"
width=
"299"
height=
"17"
/>
<textFieldCell
key=
"cell"
scrollable=
"YES"
lineBreakMode=
"clipping"
sendsActionOnEndEditing=
"YES"
title=
"Conversation description"
id=
"GHG-cr-PZp"
>
<font
key=
"font"
metaFont=
"smallSystem"
/>
<color
key=
"textColor"
name=
"scrollBarColor"
catalog=
"System"
colorSpace=
"catalog"
/>
<color
key=
"backgroundColor"
name=
"controlColor"
catalog=
"System"
colorSpace=
"catalog"
/>
</textFieldCell>
</textField>
</subviews>
<connections>
<outlet
property=
"conversationDescription"
destination=
"Ty6-fV-FH9"
id=
"dGj-EQ-CL8"
/>
<outlet
property=
"conversationImage"
destination=
"WuB-MT-aL4"
id=
"dr3-rJ-lUS"
/>
<outlet
property=
"conversationName"
destination=
"8n3-fh-BXx"
id=
"93b-z4-kCu"
/>
</connections>
...
...
Heartbeat/SidebarViewController.swift
View file @
74fe32f3
...
...
@@ -209,7 +209,6 @@ extension SidebarViewController:NSTableViewDataSource, NSTableViewDelegate
let
timeline
:
Timeline
=
(
data
!
)[
row
]
cell
.
conversationName
.
stringValue
=
timeline
.
title
cell
.
conversationDescription
.
stringValue
=
"Private conversation"
// Get the photo
let
photoPath
=
NSHomeDirectory
()
.
stringByAppendingPathComponent
(
"Pulse/Sync/3. All your friends/from/
\(
timeline
.
participants
!
[
0
]
)
/about/me.jpg"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment