summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-08-15 23:45:06 -0700
committerMinh Nguyễn <mxn@1ec5.org>2016-08-17 23:17:40 -0700
commit9fe22bc0cd9cb7bdab74df4e2f275fc27a421530 (patch)
treead653f4ff20a9ff51e52f4066a54c8d5a0958a91 /platform
parent7b1f9011dbcf0fb7b005ceebc5b91a4f292a1796 (diff)
downloadqtlocation-mapboxgl-9fe22bc0cd9cb7bdab74df4e2f275fc27a421530.tar.gz
[macos] Moved runtime styling demo to Debug menu
Fixes #6022.
Diffstat (limited to 'platform')
-rw-r--r--platform/macos/app/Base.lproj/MainMenu.xib11
-rw-r--r--platform/macos/app/Base.lproj/MapDocument.xib14
-rw-r--r--platform/macos/app/MapDocument.m4
3 files changed, 15 insertions, 14 deletions
diff --git a/platform/macos/app/Base.lproj/MainMenu.xib b/platform/macos/app/Base.lproj/MainMenu.xib
index 4d81289314..fae2a7db7d 100644
--- a/platform/macos/app/Base.lproj/MainMenu.xib
+++ b/platform/macos/app/Base.lproj/MainMenu.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G26a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11191" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11191"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -520,6 +520,13 @@ CA
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="wQq-Mx-QY0"/>
+ <menuItem title="Manipulate Style" id="Zli-T5-cTQ">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="manipulateStyle:" target="-1" id="9Np-3n-FXK"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="vMh-WE-Frt"/>
<menuItem title="Start World Tour" id="VFo-Jh-2sw">
<modifierMask key="keyEquivalentModifierMask" option="YES"/>
<connections>
diff --git a/platform/macos/app/Base.lproj/MapDocument.xib b/platform/macos/app/Base.lproj/MapDocument.xib
index 5b2b75be9c..2fb02f9c47 100644
--- a/platform/macos/app/Base.lproj/MapDocument.xib
+++ b/platform/macos/app/Base.lproj/MapDocument.xib
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="16A254g" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11191" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11191"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="MapDocument">
@@ -17,7 +17,7 @@
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" fullSizeContentView="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="388" y="211" width="512" height="480"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1058"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1280" height="777"/>
<view key="contentView" id="TuG-C5-zLS">
<rect key="frame" x="0.0" y="0.0" width="512" height="480"/>
<autoresizingMask key="autoresizingMask"/>
@@ -129,12 +129,6 @@
<action selector="selectFeatures:" target="-1" id="ikt-CZ-yZT"/>
</connections>
</menuItem>
- <menuItem title="Manipulate Style" id="qZJ-mM-bLj">
- <modifierMask key="keyEquivalentModifierMask"/>
- <connections>
- <action selector="runtimeStyling:" target="-1" id="gN9-lw-fG8"/>
- </connections>
- </menuItem>
</items>
<connections>
<outlet property="delegate" destination="-2" id="oHe-ZP-lyc"/>
diff --git a/platform/macos/app/MapDocument.m b/platform/macos/app/MapDocument.m
index 65b2032f5c..9e65539990 100644
--- a/platform/macos/app/MapDocument.m
+++ b/platform/macos/app/MapDocument.m
@@ -484,7 +484,7 @@ NS_ARRAY_OF(id <MGLAnnotation>) *MBXFlattenedShapes(NS_ARRAY_OF(id <MGLAnnotatio
}
}
-- (IBAction)runtimeStyling:(id)sender {
+- (IBAction)manipulateStyle:(id)sender {
MGLFillStyleLayer *fillStyleLayer = (MGLFillStyleLayer *)[self.mapView.style layerWithIdentifier:@"water"];
MGLStyleAttributeFunction *colorFunction = [[MGLStyleAttributeFunction alloc] init];
@@ -600,7 +600,7 @@ NS_ARRAY_OF(id <MGLAnnotation>) *MBXFlattenedShapes(NS_ARRAY_OF(id <MGLAnnotatio
if (menuItem.action == @selector(reload:)) {
return YES;
}
- if (menuItem.action == @selector(runtimeStyling:)) {
+ if (menuItem.action == @selector(manipulateStyle:)) {
return YES;
}
if (menuItem.action == @selector(dropPin:)) {