Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Commit

Permalink
[Core,MacOS]Desktop support (#1126)
Browse files Browse the repository at this point in the history 
* [Controls] Improve sample for MacOS control gallery, add a storyboard for the menu

* [Core] Add QuitApp to platform services

* [Core] Add ClickedGestureREcognizer

* [MacOS] Implement ClickGestureRecognizer

* [Core] Add MainMenu

* [MacOS] Implement Main top menu

* [Controls] Add desktop support test page

* [MacOS] Update menu items if they change

* [MacOS] Refactor to make it build for iOS

* [Core] Add Menu attached property to Element

* [MacOS] Implement MacOS context menu

* [Core] Fix type of ADP

* [Core] Add Accelerators to MenuItem

* [ControlGallery] Add example for Accelerator MenuItems

* [Core,iOS] Update ClickedEventArgs to ButtonMask enum  

* [Docs] Update docs

* [Core]Fix build error

* [WP8] Implement QuitApp

* [WP8] Log warning instead of throw

* [Tests]  Add unit tests for menu and menuitem

* [Docs]Update docs

* Update build submodule

* [Core,MacOS,Docs] Use Attached Property for MainMenu

* [Core] Update ButtonsMask, reduce calls to GetValue getting parameter

* [All] Use Accelerator class

* [Core] Add tests for accelerator

* [All] Move QuitApp to QuitApplication

* [Core, Tests] Add more tests for Accelerator

* [Core]Parse win modifier also

* [UnitTests] Fix TestCaseSource

* [MacOS,Core] Fix typo on Modifiers

* [MacOS] Fix typo

* [WinRT] Fix build

* [Docs] Update docs
  • Loading branch information
@rmarinho
rmarinho committed Oct 2, 2017
1 parent 5272dd8 commit 9f24a41
Show file tree
Hide file tree
Showing 46 changed files with 2,175 additions and 26 deletions.
2 changes: 1 addition & 1 deletion Xamarin.Forms.Build
Submodule Xamarin.Forms.Build updated from 1c71b4 to bcad07
2 changes: 2 additions & 0 deletions Xamarin.Forms.ControlGallery.MacOS/Info.plist
View file
Expand Up @@ -33,5 +33,7 @@
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSMainStoryboardFile</key>
<string>Main</string>
</dict>
</plist>
1 change: 0 additions & 1 deletion Xamarin.Forms.ControlGallery.MacOS/Main.cs
View file
Expand Up @@ -7,7 +7,6 @@ static class MainClass
static void Main(string[] args)
{
NSApplication.Init();
NSApplication.SharedApplication.Delegate = new AppDelegate();
NSApplication.Main(args);
}
}
Expand Down
101 changes: 101 additions & 0 deletions Xamarin.Forms.ControlGallery.MacOS/Main.storyboard
View file
@@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="12121"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Application-->
<scene sceneID="JPo-4y-FX3">
<objects>
<application id="hnw-xV-0zn" sceneMemberID="viewController">
<menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
<items>
<menuItem title="Xamarin.Forms.ControlGallery.MacOS" id="1Xt-HY-uBw">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Xamarin.Forms.ControlGallery.MacOS" systemMenu="apple" id="uQy-DD-JDr">
<items>
<menuItem title="About Xamarin.Forms.ControlGallery.MacOS" id="5kV-Vb-QxS">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
<menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
<menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
<menuItem title="Services" id="NMo-om-nkz">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
</menuItem>
<menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
<menuItem title="Hide Xamarin.Forms.ControlGallery.MacOS" keyEquivalent="h" id="Olw-nP-bQN">
<connections>
<action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68"/>
</connections>
</menuItem>
<menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO">
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
<connections>
<action selector="hideOtherApplications:" target="Ady-hI-5gd" id="VT4-aY-XCT"/>
</connections>
</menuItem>
<menuItem title="Show All" id="Kd2-mp-pUS">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="unhideAllApplications:" target="Ady-hI-5gd" id="Dhg-Le-xox"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
<menuItem title="Quit Xamarin.Forms.ControlGallery.MacOS" keyEquivalent="q" id="4sb-4s-VLi">
<connections>
<action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
</connections>
</menuItem>
</items>
</menu>
</menuItem>
</items>
</menu>
<connections>
<outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
</connections>
</application>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate"/>
<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="75" y="0.0"/>
</scene>
<!--Window Controller-->
<scene sceneID="R2V-B0-nI4">
<objects>
<windowController id="B8D-0N-5wS" sceneMemberID="viewController">
<window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
<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="196" y="240" width="480" height="270"/>
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
</window>
<connections>
<segue destination="XfG-lQ-9wD" kind="relationship" relationship="window.shadowedContentViewController" id="cq2-FE-JQM"/>
</connections>
</windowController>
<customObject id="Oky-zY-oP4" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="75" y="250"/>
</scene>
<!--View Controller-->
<scene sceneID="hIz-AP-VOD">
<objects>
<viewController id="XfG-lQ-9wD" customClass="ViewController" sceneMemberID="viewController">
<view key="view" wantsLayer="YES" id="m2S-Jp-Qdl">
<rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
<autoresizingMask key="autoresizingMask"/>
</view>
</viewController>
<customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="75" y="655"/>
</scene>
</scenes>
</document>
7 changes: 5 additions & 2 deletions Xamarin.Forms.ControlGallery.MacOS/Xamarin.Forms.ControlGallery.MacOS.csproj
View file
Expand Up @@ -105,15 +105,15 @@
</ProjectReference>
<ProjectReference Include="..\Xamarin.Forms.Platform.MacOS\Xamarin.Forms.Platform.MacOS.csproj">
<Project>{C0059C45-EA1E-42F3-8A0E-794BB547EC3C}</Project>
<Name>Xamarin.Forms.Platform.macOS</Name>
<Name>Xamarin.Forms.Platform.MacOS</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Forms.Xaml\Xamarin.Forms.Xaml.csproj">
<Project>{9DB2F292-8034-4E06-89AD-98BBDA4306B9}</Project>
<Name>Xamarin.Forms.Xaml</Name>
</ProjectReference>
<ProjectReference Include="..\Xamarin.Forms.Maps.MacOS\Xamarin.Forms.Maps.MacOS.csproj">
<Project>{C3C24A6D-2D0C-4053-9FCC-E54FF9CA1884}</Project>
<Name>Xamarin.Forms.Maps.macOS</Name>
<Name>Xamarin.Forms.Maps.MacOS</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -391,5 +391,8 @@
<Link>Images\Vegetables%402x.jpg</Link>
</BundleResource>
</ItemGroup>
<ItemGroup>
<InterfaceDefinition Include="Main.storyboard" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
</Project>

0 comments on commit 9f24a41

Please sign in to comment.