Skip to content

Commit

Permalink
Merge pull request #231 from raisingthefloor/master
Browse files Browse the repository at this point in the history 
Morphic for macOS v1.7
  • Loading branch information
@christopher-rtf
christopher-rtf authored Oct 3, 2024
2 parents a5465ca + 6a73f94 commit df345a1
Show file tree
Hide file tree
Showing 28 changed files with 231 additions and 148 deletions.
28 changes: 14 additions & 14 deletions Morphic/Morphic.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1507,7 +1507,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
Expand Down Expand Up @@ -1563,7 +1563,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = macosx;
Expand All @@ -1587,8 +1587,8 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.6;
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.7;
OTHER_SWIFT_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "org.raisingthefloor.Morphic-Debug";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1613,8 +1613,8 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.6;
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.7;
OTHER_SWIFT_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = org.raisingthefloor.Morphic;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1638,8 +1638,8 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.6;
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.7;
OTHER_SWIFT_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "org.raisingthefloor.MorphicConfigurator-Debug";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1663,8 +1663,8 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MARKETING_VERSION = 1.6;
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.7;
OTHER_SWIFT_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = org.raisingthefloor.MorphicConfigurator;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1689,7 +1689,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 12.0;
PRODUCT_BUNDLE_IDENTIFIER = "org.raisingthefloor.MorphicDockApp-Debug";
PRODUCT_NAME = " Morphic ";
SWIFT_VERSION = 5.0;
Expand All @@ -1713,7 +1713,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 12.0;
PRODUCT_BUNDLE_IDENTIFIER = org.raisingthefloor.MorphicDockApp;
PRODUCT_NAME = " Morphic ";
PROVISIONING_PROFILE_SPECIFIER = "Morphic Dock App for macOS";
Expand All @@ -1738,7 +1738,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 12.0;
OTHER_SWIFT_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "org.raisingthefloor.MorphicLauncher-Debug";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1764,7 +1764,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
MACOSX_DEPLOYMENT_TARGET = 12.0;
OTHER_SWIFT_FLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = org.raisingthefloor.MorphicLauncher;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
14 changes: 9 additions & 5 deletions Morphic/Morphic/About Box/AboutBoxWindowController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ class AboutBoxWindowController: NSWindowController, NSWindowDelegate {

@IBOutlet weak var versionTextField: NSTextField!
@IBOutlet weak var buildTextField: NSTextField!


@IBOutlet weak var copyrightTextField: NSTextField!

override var windowNibName: NSNib.Name? {
return NSNib.Name("AboutBoxWindowController")
}
Expand Down Expand Up @@ -59,16 +61,18 @@ class AboutBoxWindowController: NSWindowController, NSWindowDelegate {

// populate the version and build # in our labels
if let shortVersionAsString = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String {
versionTextField.stringValue = "version " + shortVersionAsString
self.versionTextField.stringValue = "version " + shortVersionAsString
} else {
versionTextField.stringValue = "[version is unknown]"
self.versionTextField.stringValue = "[version is unknown]"
}
//
if let buildAsString = Bundle.main.infoDictionary?["CFBundleVersion" as String] {
buildTextField.stringValue = "(build \(buildAsString))"
self.buildTextField.stringValue = "(build \(buildAsString))"
} else {
buildTextField.stringValue = "[build version is unknown]"
self.buildTextField.stringValue = "[build version is unknown]"
}

self.copyrightTextField.stringValue = "Copyright (c) 2020-2024 Raising the Floor - US Inc."
}

func centerOnScreen() {
Expand Down
47 changes: 29 additions & 18 deletions Morphic/Morphic/About Box/Base.lproj/AboutBoxWindowController.xib
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19162" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23094" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19162"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23094"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="AboutBoxWindowController" customModule="Morphic" customModuleProvider="target">
<connections>
<outlet property="buildTextField" destination="onK-5c-5rq" id="tFX-mt-jlh"/>
<outlet property="copyrightTextField" destination="Epn-GG-KhA" id="EcZ-4W-4C2"/>
<outlet property="versionTextField" destination="Mly-xV-m1p" id="zO1-ty-Lng"/>
<outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
</connections>
Expand All @@ -18,63 +19,73 @@
<window title="About Morphic" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" titlebarAppearsTransparent="YES" id="F0z-JX-Cv5">
<windowStyleMask key="styleMask" titled="YES" closable="YES"/>
<rect key="contentRect" x="196" y="240" width="403" height="255"/>
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
<rect key="screenRect" x="0.0" y="0.0" width="1536" height="935"/>
<view key="contentView" id="se5-gp-TjO">
<rect key="frame" x="0.0" y="0.0" width="403" height="255"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Auq-sw-XnR">
<rect key="frame" x="178" y="159" width="48" height="48"/>
<rect key="frame" x="178" y="169" width="48" height="48"/>
<constraints>
<constraint firstAttribute="height" constant="48" id="5DY-1f-4K2"/>
<constraint firstAttribute="width" constant="48" id="UtP-N0-LyG"/>
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="Icon" id="gFD-l3-ahg"/>
</imageView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xiq-0B-kHt">
<rect key="frame" x="137" y="112" width="129" height="16"/>
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xiq-0B-kHt">
<rect key="frame" x="137" y="133" width="129" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Morphic for macOS" id="P3l-Rg-JEz">
<font key="font" metaFont="systemBold"/>
<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" translatesAutoresizingMaskIntoConstraints="NO" id="Mly-xV-m1p">
<rect key="frame" x="177" y="88" width="50" height="16"/>
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mly-xV-m1p">
<rect key="frame" x="177" y="105" width="50" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Version" id="rtb-dd-Jkw">
<font key="font" metaFont="system"/>
<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" translatesAutoresizingMaskIntoConstraints="NO" id="onK-5c-5rq">
<rect key="frame" x="179" y="64" width="45" height="16"/>
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="onK-5c-5rq">
<rect key="frame" x="179" y="81" width="45" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="(Build)" id="dcf-3V-XXl">
<font key="font" metaFont="system"/>
<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" translatesAutoresizingMaskIntoConstraints="NO" id="sdd-Te-nD9" customClass="HyperlinkTextField" customModule="Morphic" customModuleProvider="target">
<rect key="frame" x="170" y="42" width="63" height="14"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Contact Us" id="bKV-Nb-ezu">
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Epn-GG-KhA">
<rect key="frame" x="51" y="53" width="302" height="16"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Copyright 2020-2024 Raising the Floor - US, Inc." id="s1G-ye-seh">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sdd-Te-nD9" customClass="HyperlinkTextField" customModule="Morphic" customModuleProvider="target">
<rect key="frame" x="130" y="27" width="143" height="14"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Learn More about Morphic" id="bKV-Nb-ezu">
<font key="font" metaFont="label" size="11"/>
<color key="textColor" name="linkColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="urlAsString" value="mailto:support@morphic.org"/>
<userDefinedRuntimeAttribute type="string" keyPath="urlAsString" value="https://morphic.org"/>
</userDefinedRuntimeAttributes>
</textField>
</subviews>
<constraints>
<constraint firstItem="Auq-sw-XnR" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" constant="48" id="0B1-Cy-Qnr"/>
<constraint firstItem="xiq-0B-kHt" firstAttribute="top" secondItem="Auq-sw-XnR" secondAttribute="bottom" constant="31" id="2sD-MW-6St"/>
<constraint firstItem="Auq-sw-XnR" firstAttribute="top" secondItem="se5-gp-TjO" secondAttribute="top" constant="38" id="0B1-Cy-Qnr"/>
<constraint firstItem="xiq-0B-kHt" firstAttribute="top" secondItem="Auq-sw-XnR" secondAttribute="bottom" constant="20" id="2sD-MW-6St"/>
<constraint firstItem="onK-5c-5rq" firstAttribute="top" secondItem="Mly-xV-m1p" secondAttribute="bottom" constant="8" id="EP9-qv-Zdi"/>
<constraint firstItem="sdd-Te-nD9" firstAttribute="top" secondItem="onK-5c-5rq" secondAttribute="bottom" constant="8" id="Iu0-44-ae0"/>
<constraint firstItem="Auq-sw-XnR" firstAttribute="centerX" secondItem="se5-gp-TjO" secondAttribute="centerX" id="OxA-Yi-Dig"/>
<constraint firstItem="Mly-xV-m1p" firstAttribute="top" secondItem="xiq-0B-kHt" secondAttribute="bottom" constant="8" id="eON-GN-bJG"/>
<constraint firstItem="sdd-Te-nD9" firstAttribute="top" secondItem="Epn-GG-KhA" secondAttribute="bottom" constant="12" id="Y83-mu-D4k"/>
<constraint firstItem="Mly-xV-m1p" firstAttribute="top" secondItem="xiq-0B-kHt" secondAttribute="bottom" constant="12" id="eON-GN-bJG"/>
<constraint firstItem="sdd-Te-nD9" firstAttribute="centerX" secondItem="se5-gp-TjO" secondAttribute="centerX" id="fDB-ff-UAG"/>
<constraint firstItem="Epn-GG-KhA" firstAttribute="centerX" secondItem="se5-gp-TjO" secondAttribute="centerX" id="mwo-q9-Xhg"/>
<constraint firstItem="Epn-GG-KhA" firstAttribute="top" secondItem="onK-5c-5rq" secondAttribute="bottom" constant="12" id="oVR-Au-9bm"/>
<constraint firstItem="Mly-xV-m1p" firstAttribute="centerX" secondItem="se5-gp-TjO" secondAttribute="centerX" id="pbl-0j-0dg"/>
<constraint firstItem="onK-5c-5rq" firstAttribute="centerX" secondItem="se5-gp-TjO" secondAttribute="centerX" id="qEG-A8-ves"/>
<constraint firstItem="xiq-0B-kHt" firstAttribute="centerX" secondItem="se5-gp-TjO" secondAttribute="centerX" id="qfB-CD-GKg"/>
Expand Down
4 changes: 2 additions & 2 deletions Morphic/Morphic/About Box/en.lproj/AboutBoxWindowController.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
/* Class = "NSTextFieldCell"; title = "Morphic for macOS"; ObjectID = "P3l-Rg-JEz"; */
"P3l-Rg-JEz.title" = "Morphic for macOS";

/* Class = "NSTextFieldCell"; title = "Contact Us"; ObjectID = "bKV-Nb-ezu"; */
"bKV-Nb-ezu.title" = "Contact Us";
/* Class = "NSTextFieldCell"; title = "Learn More about Morphic"; ObjectID = "bKV-Nb-ezu"; */
"bKV-Nb-ezu.title" = "Learn More about Morphic";

/* Class = "NSTextFieldCell"; title = "(Build)"; ObjectID = "dcf-3V-XXl"; */
"dcf-3V-XXl.title" = "(Build)";
Expand Down
4 changes: 2 additions & 2 deletions Morphic/Morphic/About Box/es.lproj/AboutBoxWindowController.strings
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
/* Class = "NSTextFieldCell"; title = "Morphic for macOS"; ObjectID = "P3l-Rg-JEz"; */
"P3l-Rg-JEz.title" = "Morphic para macOS";

/* Class = "NSTextFieldCell"; title = "Contact Us"; ObjectID = "bKV-Nb-ezu"; */
"bKV-Nb-ezu.title" = "Contacto";
/* Class = "NSTextFieldCell"; title = "Learn More about Morphic"; ObjectID = "bKV-Nb-ezu"; */
"bKV-Nb-ezu.title" = "Más información sobre Morphic";

/* Class = "NSTextFieldCell"; title = "(Build)"; ObjectID = "dcf-3V-XXl"; */
"dcf-3V-XXl.title" = "(Compilar)";
Expand Down
Loading

0 comments on commit df345a1

Please sign in to comment.