Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-macos
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-client-macos
Commits
c838e532
Commit
c838e532
authored
5 years ago
by
Kateryna Kostiuk
Browse files
Options
Downloads
Patches
Plain Diff
UI/UX: keep Jami in toolbar after closing app
Change-Id: Ibaa2d828abe96113b3a2d986c3ec51aedbbb1845
parent
3f1e511e
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/PreferencesWC.mm
+0
-5
0 additions, 5 deletions
src/PreferencesWC.mm
src/RingMainWindow.mm
+1
-1
1 addition, 1 deletion
src/RingMainWindow.mm
src/RingWindowController.mm
+0
-4
0 additions, 4 deletions
src/RingWindowController.mm
ui/Base.lproj/RingWindow.xib
+5
-5
5 additions, 5 deletions
ui/Base.lproj/RingWindow.xib
with
6 additions
and
15 deletions
src/PreferencesWC.mm
+
0
−
5
View file @
c838e532
...
@@ -132,9 +132,4 @@ static auto const kVideoPrefsIdentifer = @"VideoPrefsIdentifer";
...
@@ -132,9 +132,4 @@ static auto const kVideoPrefsIdentifer = @"VideoPrefsIdentifer";
return
(
frame
.
size
.
height
-
contentRect
.
size
.
height
);
return
(
frame
.
size
.
height
-
contentRect
.
size
.
height
);
}
}
-
(
BOOL
)
windowShouldClose
:(
id
)
sender
{
[
self
.
window
orderOut
:
self
];
return
NO
;
}
@end
@end
This diff is collapsed.
Click to expand it.
src/RingMainWindow.mm
+
1
−
1
View file @
c838e532
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
-
(
void
)
close
{
-
(
void
)
close
{
[
super
close
];
[
super
close
];
[[
NSApplication
sharedApplication
]
addWindowsItem
:
self
title
:
@"
Ring
"
filename
:
NO
];
[[
NSApplication
sharedApplication
]
addWindowsItem
:
self
title
:
@"
Jami
"
filename
:
NO
];
}
}
@end
@end
This diff is collapsed.
Click to expand it.
src/RingWindowController.mm
+
0
−
4
View file @
c838e532
...
@@ -596,8 +596,4 @@ typedef NS_ENUM(NSInteger, ViewState) {
...
@@ -596,8 +596,4 @@ typedef NS_ENUM(NSInteger, ViewState) {
[
self
changeViewTo
:
SHOW_CONVERSATION_SCREEN
];
[
self
changeViewTo
:
SHOW_CONVERSATION_SCREEN
];
}
}
-
(
BOOL
)
windowShouldClose
:(
id
)
sender
{
[
NSApp
hide
:
nil
];
return
NO
;
}
@end
@end
This diff is collapsed.
Click to expand it.
ui/Base.lproj/RingWindow.xib
+
5
−
5
View file @
c838e532
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<document
type=
"com.apple.InterfaceBuilder3.Cocoa.XIB"
version=
"3.0"
toolsVersion=
"144
6
0.
31
"
targetRuntime=
"MacOSX.Cocoa"
propertyAccessControl=
"none"
useAutolayout=
"YES"
customObjectInstantitationMethod=
"direct"
>
<document
type=
"com.apple.InterfaceBuilder3.Cocoa.XIB"
version=
"3.0"
toolsVersion=
"144
9
0.
70
"
targetRuntime=
"MacOSX.Cocoa"
propertyAccessControl=
"none"
useAutolayout=
"YES"
customObjectInstantitationMethod=
"direct"
>
<dependencies>
<dependencies>
<plugIn
identifier=
"com.apple.InterfaceBuilder.CocoaPlugin"
version=
"144
6
0.
31
"
/>
<plugIn
identifier=
"com.apple.InterfaceBuilder.CocoaPlugin"
version=
"144
9
0.
70
"
/>
<capability
name=
"System colors introduced in macOS 10.14"
minToolsVersion=
"10.0"
/>
<capability
name=
"System colors introduced in macOS 10.14"
minToolsVersion=
"10.0"
/>
<capability
name=
"documents saved in the Xcode 8 format"
minToolsVersion=
"8.0"
/>
<capability
name=
"documents saved in the Xcode 8 format"
minToolsVersion=
"8.0"
/>
</dependencies>
</dependencies>
...
@@ -24,12 +24,12 @@
...
@@ -24,12 +24,12 @@
</customObject>
</customObject>
<customObject
id=
"-1"
userLabel=
"First Responder"
customClass=
"FirstResponder"
/>
<customObject
id=
"-1"
userLabel=
"First Responder"
customClass=
"FirstResponder"
/>
<customObject
id=
"-3"
userLabel=
"Application"
customClass=
"NSObject"
/>
<customObject
id=
"-3"
userLabel=
"Application"
customClass=
"NSObject"
/>
<window
title=
"
Ring
"
autorecalculatesKeyViewLoop=
"NO"
releasedWhenClosed=
"NO"
animationBehavior=
"default"
titlebarAppearsTransparent=
"YES"
id=
"F0z-JX-Cv5"
customClass=
"RingMainWindow"
>
<window
title=
"
Jami
"
autorecalculatesKeyViewLoop=
"NO"
releasedWhenClosed=
"NO"
animationBehavior=
"default"
titlebarAppearsTransparent=
"YES"
id=
"F0z-JX-Cv5"
customClass=
"RingMainWindow"
>
<windowStyleMask
key=
"styleMask"
titled=
"YES"
closable=
"YES"
miniaturizable=
"YES"
resizable=
"YES"
fullSizeContentView=
"YES"
/>
<windowStyleMask
key=
"styleMask"
titled=
"YES"
closable=
"YES"
miniaturizable=
"YES"
resizable=
"YES"
fullSizeContentView=
"YES"
/>
<windowCollectionBehavior
key=
"collectionBehavior"
fullScreenPrimary=
"YES"
/>
<windowCollectionBehavior
key=
"collectionBehavior"
fullScreenPrimary=
"YES"
/>
<windowPositionMask
key=
"initialPositionMask"
leftStrut=
"YES"
rightStrut=
"YES"
topStrut=
"YES"
bottomStrut=
"YES"
/>
<windowPositionMask
key=
"initialPositionMask"
leftStrut=
"YES"
rightStrut=
"YES"
topStrut=
"YES"
bottomStrut=
"YES"
/>
<rect
key=
"contentRect"
x=
"196"
y=
"240"
width=
"1053"
height=
"658"
/>
<rect
key=
"contentRect"
x=
"196"
y=
"240"
width=
"1053"
height=
"658"
/>
<rect
key=
"screenRect"
x=
"0.0"
y=
"0.0"
width=
"1
44
0"
height=
"
87
7"
/>
<rect
key=
"screenRect"
x=
"0.0"
y=
"0.0"
width=
"1
68
0"
height=
"
102
7"
/>
<view
key=
"contentView"
autoresizesSubviews=
"NO"
id=
"se5-gp-TjO"
>
<view
key=
"contentView"
autoresizesSubviews=
"NO"
id=
"se5-gp-TjO"
>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"1053"
height=
"658"
/>
<rect
key=
"frame"
x=
"0.0"
y=
"0.0"
width=
"1053"
height=
"658"
/>
<autoresizingMask
key=
"autoresizingMask"
widthSizable=
"YES"
heightSizable=
"YES"
/>
<autoresizingMask
key=
"autoresizingMask"
widthSizable=
"YES"
heightSizable=
"YES"
/>
...
@@ -773,7 +773,7 @@ Copy and share it with your friends!</string>
...
@@ -773,7 +773,7 @@ Copy and share it with your friends!</string>
<resources>
<resources>
<image
name=
"NSActionTemplate"
width=
"14"
height=
"14"
/>
<image
name=
"NSActionTemplate"
width=
"14"
height=
"14"
/>
<image
name=
"NSShareTemplate"
width=
"11"
height=
"16"
/>
<image
name=
"NSShareTemplate"
width=
"11"
height=
"16"
/>
<image
name=
"NSUser"
width=
"
128
"
height=
"
128
"
/>
<image
name=
"NSUser"
width=
"
32
"
height=
"
32
"
/>
<image
name=
"ic_action_block"
width=
"72"
height=
"72"
/>
<image
name=
"ic_action_block"
width=
"72"
height=
"72"
/>
<image
name=
"ic_action_cancel"
width=
"72"
height=
"72"
/>
<image
name=
"ic_action_cancel"
width=
"72"
height=
"72"
/>
<image
name=
"ic_person_add"
width=
"48"
height=
"48"
/>
<image
name=
"ic_person_add"
width=
"48"
height=
"48"
/>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment