Skip to content
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

Jump to bottom

Bugfix/restore missing menus #296

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

Bugfix/restore missing menus #296

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe323f1
Restore missing menu items
s0ph0s-2 Apr 14, 2019
a55b9e6
Use proper classes for translation
s0ph0s-2 Apr 14, 2019
4c8e3aa
Merge branch 'master' into bugfix/restore-missing-menus
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
84 changes: 50 additions & 34 deletions Telegram-Mac/Base.lproj/MainMenu.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?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>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -15,75 +15,66 @@
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Telegram" customModuleProvider="target">
<connections>
<outlet property="aboutAction" destination="5kV-Vb-QxS" id="Jbc-RA-ysB"/>
<outlet property="checkForUpdates" destination="xey-M7-XVy" id="7ii-1E-tIe"/>
<outlet property="preferences" destination="BOF-NM-1cW" id="iiN-GN-soF"/>
<outlet property="showQuickSwitcher" destination="sZh-ct-GQS" id="loY-ub-t4u"/>
<outlet property="window" destination="QvC-M9-y7g" id="gIp-Ho-8D9"/>
</connections>
</customObject>
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
<menu title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
<items>
<menuItem title="TelegramMac" identifier="1Xt-HY-uBw" id="1Xt-HY-uBw" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<menuItem title="Telegram" identifier="1Xt-HY-uBw" id="cn5-jO-DSb">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="TelegramMac" systemMenu="apple" identifier="uQy-DD-JDr" id="uQy-DD-JDr" customClass="MMMenu" customModule="Telegram" customModuleProvider="target">
<menu key="submenu" title="Telegram" id="RQr-l4-pSp" customClass="MMMenu" customModule="Telegram" customModuleProvider="target">
<items>
<menuItem title="About Telegram" identifier="5kV-Vb-QxS" id="5kV-Vb-QxS" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<menuItem title="About Telegram" identifier="5kV-Vb-QxS" id="Lda-Xv-z5I" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="aboutAction:" target="Voe-Tx-rLC" id="O7X-lz-vtu"/>
<action selector="aboutAction:" target="Voe-Tx-rLC" id="aoe-4r-h63"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="sE9-sf-sdU"/>
<menuItem title="Preferences…" keyEquivalent="," identifier="BOF-NM-1cW" id="BOF-NM-1cW" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<connections>
<action selector="preferencesAction:" target="Voe-Tx-rLC" id="7BZ-fj-knq"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
<menuItem title="Check for Updates" tag="1000" identifier="1000" id="xey-M7-XVy" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<menuItem title="Check for Updates…" tag="1000" identifier="1000" id="xey-M7-XVy" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="checkForUpdates:" target="Voe-Tx-rLC" id="Ang-sr-P90"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
<menuItem title="Quick Switcher" keyEquivalent="k" identifier="sZh-ct-GQS" id="sZh-ct-GQS" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<menuItem isSeparatorItem="YES" id="LTF-r1-w7x"/>
<menuItem title="Preferences…" keyEquivalent="," identifier="BOF-NM-1cW" id="Wbo-Mf-iFJ" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<connections>
<action selector="showQuickSwitcher:" target="Voe-Tx-rLC" id="OFA-D5-XK6"/>
<action selector="preferencesAction:" target="Voe-Tx-rLC" id="iq2-3Q-meR"/>
</connections>
</menuItem>
<menuItem title="Hide" keyEquivalent="w" identifier="Olw-nP-bQN" id="Olw-nP-bQN" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<connections>
<action selector="closeWindow:" target="Voe-Tx-rLC" id="IKs-t5-kxH"/>
</connections>
<menuItem isSeparatorItem="YES" id="j1h-py-oFA"/>
<menuItem title="Services" id="YcR-bu-ROC" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Services" systemMenu="services" id="FXE-a1-KOc" customClass="MMMenu" customModule="Telegram" customModuleProvider="target"/>
</menuItem>
<menuItem title="Hide Telegram" keyEquivalent="h" identifier="Cag-YX-WT6" id="Cag-YX-WT6" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<menuItem isSeparatorItem="YES" id="VOU-1z-IFc"/>
<menuItem title="Hide Telegram" keyEquivalent="h" identifier="Cag-YX-WT6" id="flI-Q3-zUb" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<connections>
<action selector="hide:" target="-1" id="KWr-rt-JTa"/>
<action selector="hide:" target="-1" id="bsw-TW-aCA"/>
</connections>
</menuItem>
<menuItem title="Hide Others" keyEquivalent="h" identifier="Vdr-fp-XzO" id="Vdr-fp-XzO" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<menuItem title="Hide Others" keyEquivalent="h" identifier="Vdr-fp-XzO" id="ZlT-gw-1JV" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
<connections>
<action selector="hideOtherApplications:" target="-1" id="VT4-aY-XCT"/>
<action selector="hideOtherApplications:" target="-1" id="Uey-Th-RWl"/>
</connections>
</menuItem>
<menuItem title="Show All" identifier="Kd2-mp-pUS" id="Kd2-mp-pUS" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<menuItem title="Show All" identifier="Kd2-mp-pUS" id="Z2Z-qd-QK7" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="unhideAllApplications:" target="-1" id="Dhg-Le-xox"/>
<action selector="unhideAllApplications:" target="-1" id="y8L-1F-Noh"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
<menuItem title="Quit Telegram" keyEquivalent="q" identifier="4sb-4s-VLi" id="4sb-4s-VLi" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<menuItem isSeparatorItem="YES" id="ZFK-kl-x8Q"/>
<menuItem title="Quit Telegram" keyEquivalent="q" identifier="4sb-4s-VLi" id="sMV-hR-zoM" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<connections>
<action selector="terminate:" target="-1" id="Te7-pn-YzF"/>
<action selector="terminate:" target="-1" id="Tbw-oV-xTV"/>
</connections>
</menuItem>
</items>
<accessibility identifier="uQy-DD-JDr"/>
</menu>
</menuItem>
<menuItem title="Edit" identifier="5QF-Oa-p0T" id="5QF-Oa-p0T" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
Expand Down Expand Up @@ -248,6 +239,18 @@
</items>
</menu>
</menuItem>
<menuItem title="Chats" id="6au-7c-WPr">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Chats" id="S6B-4K-RTG" customClass="MMMenu" customModule="Telegram" customModuleProvider="target">
<items>
<menuItem title="Quick Switcher" keyEquivalent="k" identifier="sZh-ct-GQS" id="sZh-ct-GQS" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<connections>
<action selector="showQuickSwitcher:" target="Voe-Tx-rLC" id="OFA-D5-XK6"/>
</connections>
</menuItem>
</items>
</menu>
</menuItem>
<menuItem title="View" identifier="H8h-7b-M4v" id="H8h-7b-M4v" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="View" identifier="HyV-fh-RgO" id="HyV-fh-RgO" customClass="MMMenu" customModule="Telegram" customModuleProvider="target">
Expand All @@ -265,6 +268,11 @@
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Window" systemMenu="window" identifier="Td7-aD-5lo" id="Td7-aD-5lo" customClass="MMMenu" customModule="Telegram" customModuleProvider="target">
<items>
<menuItem title="Close" keyEquivalent="w" identifier="Olw-nP-bQN" id="Olw-nP-bQN" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<connections>
<action selector="closeWindow:" target="Voe-Tx-rLC" id="IKs-t5-kxH"/>
</connections>
</menuItem>
<menuItem title="Minimize" keyEquivalent="m" identifier="OY7-WF-poV" id="OY7-WF-poV" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target">
<connections>
<action selector="performMiniaturize:" target="-1" id="VwT-WD-YPe"/>
Expand Down Expand Up @@ -292,13 +300,21 @@
</items>
</menu>
</menuItem>
<menuItem title="Help" id="GKO-ZQ-bd4">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Help" id="yJE-Jt-t2F" customClass="MMMenu" customModule="Telegram" customModuleProvider="target">
<items>
<menuItem title="Telegram Help" keyEquivalent="?" id="tTg-ww-GN5" customClass="MMMenuItem" customModule="Telegram" customModuleProvider="target"/>
</items>
</menu>
</menuItem>
</items>
</menu>
<window title="Telegram" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" tabbingMode="disallowed" id="QvC-M9-y7g" customClass="Window" customModule="TGUIKit">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="335" y="390" width="480" height="360"/>
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
<view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
<rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
<autoresizingMask key="autoresizingMask"/>
Expand Down