Skip to content

Feature/proper about window #294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
s0ph0s-dog wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature/proper about window #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9313b8a
Ignore xcuserdata folders
s0ph0s-2 Apr 13, 2019
454f6d9
Add proper about window
s0ph0s-2 Apr 13, 2019
9603624
Merge branch 'master' into feature/proper-about-window
s0ph0s-2 May 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ Telegram.xcodeproj/xcuserdata/telegram.xcuserdatad/xcschemes/Telegram.xcscheme
Telegram.xcodeproj/xcuserdata/telegram.xcuserdatad/xcschemes/xcschememanagement.plist
TGUIKit/TGUIKit.xcodeproj/xcuserdata/telegram.xcuserdatad/xcschemes/TGUIKit.xcscheme
TGUIKit/TGUIKit.xcodeproj/xcuserdata/telegram.xcuserdatad/xcschemes/xcschememanagement.plist
xcuserdata
7 changes: 5 additions & 2 deletions Telegram-Mac/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,8 +856,11 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
}

@IBAction func aboutAction(_ sender: Any) {
showModal(with: AboutModalController(), for: window)
window.makeKeyAndOrderFront(sender)
let aboutStoryboard = NSStoryboard.init(name: "TGAboutWindow", bundle: nil)
let aboutWindow = aboutStoryboard.instantiateController(withIdentifier: "TGAboutWindowController") as! NSWindowController
aboutWindow.showWindow(self)
//showModal(with: AboutModalController(), for: window)
//window.makeKeyAndOrderFront(sender)
}
@IBAction func preferencesAction(_ sender: Any) {

Expand Down
35 changes: 35 additions & 0 deletions Telegram-Mac/TGAboutViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
//
// TGAboutViewController.swift
// Telegram
//
// Created by s0ph0s on 2019-04-06.
// Copyright © 2019 Telegram. All rights reserved.
//

import Cocoa

class TGAboutViewController: NSViewController {

@IBOutlet weak var appIconImageView: NSImageView!
@IBOutlet weak var versionLabel: NSTextField!
let versionString = Bundle.main.infoDictionary?["CFBundleShortVersionString"] ?? "1"
let buildString = Bundle.main.infoDictionary?["CFBundleVersion"] ?? "0"
#if STABLE
let releaseChannel = "Stable"
#elseif APP_STORE
let releaseChannel = "Mac App Store"
#else
let releaseChannel = "Beta"
#endif

override func viewDidLoad() {
super.viewDidLoad()

versionLabel.stringValue = "Version \(versionString) (\(buildString))\n\(releaseChannel)"
appIconImageView.image = NSImage(named: "AppIcon")
}

@IBAction func copyButtonClicked(_ sender: Any) {
copyToClipboard("\(versionString) (\(buildString)) \(releaseChannel)")
}
}
100 changes: 100 additions & 0 deletions Telegram-Mac/TGAboutWindow.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Window Controller-->
<scene sceneID="8U8-dt-6ih">
<objects>
<windowController storyboardIdentifier="TGAboutWindowController" showSeguePresentationStyle="single" id="4IT-0F-a13" sceneMemberID="viewController">
<window key="window" title="About Telegram" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" hidesOnDeactivate="YES" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="none" frameAutosaveName="" titleVisibility="hidden" id="aS8-cw-954" customClass="TGAboutWindow" customModule="Telegram" customModuleProvider="target">
<windowStyleMask key="styleMask" titled="YES" closable="YES"/>
<windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="245" y="301" width="328" height="270"/>
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
<value key="minSize" type="size" width="328" height="270"/>
<value key="maxSize" type="size" width="328" height="270"/>
<connections>
<outlet property="delegate" destination="4IT-0F-a13" id="bEo-h0-miV"/>
</connections>
</window>
<connections>
<segue destination="iy1-iR-ByA" kind="relationship" relationship="window.shadowedContentViewController" id="VVL-Rp-1w7"/>
</connections>
</windowController>
<customObject id="Yvc-Cg-iyP" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-142" y="95"/>
</scene>
<!--About View Controller-->
<scene sceneID="5vI-X5-baF">
<objects>
<viewController showSeguePresentationStyle="single" id="iy1-iR-ByA" customClass="TGAboutViewController" customModule="Telegram" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="o0x-fS-ZFt">
<rect key="frame" x="0.0" y="0.0" width="314" height="247"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UNb-tG-O6e">
<rect key="frame" x="123" y="157" width="70" height="70"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="Mif-HA-K2L"/>
</imageView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uoh-fZ-hcn">
<rect key="frame" x="122" y="128" width="72" height="21"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Telegram" id="aqa-g8-PkV">
<font key="font" metaFont="systemBold" size="14"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IPB-WT-oMo">
<rect key="frame" x="28" y="20" width="260" height="28"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" id="oKE-Kn-Sj8">
<font key="font" metaFont="smallSystem"/>
<string key="title">Copyright © 2019 TELEGRAM MESSENGER LLP.
All rights reserved.</string>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="g12-WR-g1L">
<rect key="frame" x="103" y="67" width="109" height="19"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="roundRect" title="Copy to Clipboard" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="jkx-4l-Bvo">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
<connections>
<action selector="copyButtonClicked:" target="iy1-iR-ByA" id="qOf-IX-dv2"/>
</connections>
</button>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7wx-9O-ZxV">
<rect key="frame" x="87" y="94" width="141" height="28"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" id="P7E-x4-hJQ">
<font key="font" metaFont="smallSystem"/>
<string key="title">Version 5.0.1 (123456)
Mac App Store</string>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
</view>
<connections>
<outlet property="appIconImageView" destination="UNb-tG-O6e" id="6f3-nn-6gG"/>
<outlet property="versionLabel" destination="7wx-9O-ZxV" id="Tdz-bV-kc5"/>
</connections>
</viewController>
<customObject id="9H5-yz-bWK" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-142" y="500.5"/>
</scene>
</scenes>
</document>
15 changes: 15 additions & 0 deletions Telegram-Mac/TGAboutWindow.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// TGAboutWindow.swift
// Telegram
//
// Created by s0ph0s on 2019-04-06.
// Copyright © 2019 Telegram. All rights reserved.
//

import Cocoa

class TGAboutWindow: NSWindow {
override func cancelOperation(_ sender: Any?) {
self.orderOut(sender)
}
}