From c838e5322744a1204b9c429e8a657cd9202415b3 Mon Sep 17 00:00:00 2001
From: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
Date: Wed, 2 Oct 2019 10:36:32 -0400
Subject: [PATCH] UI/UX: keep Jami in toolbar after closing app
Change-Id: Ibaa2d828abe96113b3a2d986c3ec51aedbbb1845
---
src/PreferencesWC.mm | 5 -----
src/RingMainWindow.mm | 2 +-
src/RingWindowController.mm | 4 ----
ui/Base.lproj/RingWindow.xib | 10 +++++-----
4 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/PreferencesWC.mm b/src/PreferencesWC.mm
index 88320d3e..ca6426c0 100644
--- a/src/PreferencesWC.mm
+++ b/src/PreferencesWC.mm
@@ -132,9 +132,4 @@ static auto const kVideoPrefsIdentifer = @"VideoPrefsIdentifer";
return (frame.size.height - contentRect.size.height);
}
-- (BOOL)windowShouldClose:(id)sender {
- [self.window orderOut:self];
- return NO;
-}
-
@end
diff --git a/src/RingMainWindow.mm b/src/RingMainWindow.mm
index 39fe525d..4ad963fe 100644
--- a/src/RingMainWindow.mm
+++ b/src/RingMainWindow.mm
@@ -23,7 +23,7 @@
- (void)close {
[super close];
- [[NSApplication sharedApplication] addWindowsItem:self title:@"Ring" filename:NO];
+ [[NSApplication sharedApplication] addWindowsItem:self title:@"Jami" filename:NO];
}
@end
diff --git a/src/RingWindowController.mm b/src/RingWindowController.mm
index 3693dcc5..bb0ab05a 100644
--- a/src/RingWindowController.mm
+++ b/src/RingWindowController.mm
@@ -596,8 +596,4 @@ typedef NS_ENUM(NSInteger, ViewState) {
[self changeViewTo:SHOW_CONVERSATION_SCREEN];
}
-- (BOOL)windowShouldClose:(id)sender {
- [NSApp hide:nil];
- return NO;
-}
@end
diff --git a/ui/Base.lproj/RingWindow.xib b/ui/Base.lproj/RingWindow.xib
index 7ad4d2dd..54655b97 100644
--- a/ui/Base.lproj/RingWindow.xib
+++ b/ui/Base.lproj/RingWindow.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
<capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@@ -24,12 +24,12 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<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"/>
<windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="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="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
<view key="contentView" autoresizesSubviews="NO" id="se5-gp-TjO">
<rect key="frame" x="0.0" y="0.0" width="1053" height="658"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -773,7 +773,7 @@ Copy and share it with your friends!</string>
<resources>
<image name="NSActionTemplate" width="14" height="14"/>
<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_cancel" width="72" height="72"/>
<image name="ic_person_add" width="48" height="48"/>
--
GitLab