Skip to content

Commit

Permalink
fixed layout for ja
Browse files Browse the repository at this point in the history
  • Loading branch information
zaru committed Apr 11, 2020
1 parent 5be8e00 commit 3c779f2
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 13 deletions.
4 changes: 2 additions & 2 deletions menuffy.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@
576556E52438CB3800B61B4D /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/PreferenceWindow.strings; sourceTree = "<group>"; };
576556E92438CBBC00B61B4D /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
576556EB2438CBC100B61B4D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
577351FF24414D9F00D8EE05 /* ja */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ja; path = ja.lproj/Settings.xib; sourceTree = "<group>"; };
57C577122436CBC40044F5F5 /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
57C577162436CBDF0044F5F5 /* ShortkeyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortkeyViewController.swift; sourceTree = "<group>"; };
57C88848243A02C800D9CE30 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Carthage/Build/Mac/Sparkle.framework; sourceTree = "<group>"; };
57C8884D243A1EF700D9CE30 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Settings.strings; sourceTree = "<group>"; };
57D1EEE22437FB16000E721E /* ShortkeyManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShortkeyManager.swift; sourceTree = "<group>"; };
57D1EEE624380167000E721E /* LoginServiceKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LoginServiceKit.framework; path = Carthage/Build/Mac/LoginServiceKit.framework; sourceTree = "<group>"; };
57D1EEEA243803B9000E721E /* LoginServiceManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginServiceManager.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -340,7 +340,7 @@
isa = PBXVariantGroup;
children = (
576556D82438CA7D00B61B4D /* Base */,
57C8884D243A1EF700D9CE30 /* ja */,
577351FF24414D9F00D8EE05 /* ja */,
);
name = Settings.xib;
sourceTree = "<group>";
Expand Down
8 changes: 4 additions & 4 deletions menuffy/Preference/Tabs/Base.lproj/Settings.xib
Original file line number Diff line number Diff line change
Expand Up @@ -19,22 +19,22 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CZ6-xA-IZZ">
<rect key="frame" x="18" y="46" width="372" height="18"/>
<rect key="frame" x="18" y="52" width="372" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="check" title="Start menuffy when you log in" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="qAh-6z-DQ4">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
<font key="font" metaFont="message"/>
</buttonCell>
<connections>
<action selector="toggleLoginService:" target="-2" id="Taa-dh-6WN"/>
</connections>
</button>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SdG-O4-18o">
<rect key="frame" x="14" y="6" width="152" height="32"/>
<rect key="frame" x="14" y="12" width="152" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="push" title="Check for updates" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="aZV-PL-Lgw">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<font key="font" metaFont="message"/>
</buttonCell>
<connections>
<action selector="checkForUpdates:" target="ye6-Ug-RDz" id="XDl-ZZ-bp2"/>
Expand Down
7 changes: 0 additions & 7 deletions menuffy/Preference/Tabs/ja.lproj/Settings.strings

This file was deleted.

48 changes: 48 additions & 0 deletions menuffy/Preference/Tabs/ja.lproj/Settings.xib
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16096"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="SettingsViewController" customModule="menuffy" customModuleProvider="target">
<connections>
<outlet property="loginServiceButton" destination="CZ6-xA-IZZ" id="s3b-Pe-6mT"/>
<outlet property="view" destination="c22-O7-iKe" id="0tA-T3-uDl"/>
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="c22-O7-iKe">
<rect key="frame" x="0.0" y="0.0" width="400" height="90"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="CZ6-xA-IZZ">
<rect key="frame" x="18" y="51" width="372" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="check" title="ログイン時に menuffy を自動で起動する" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="qAh-6z-DQ4">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="message"/>
</buttonCell>
<connections>
<action selector="toggleLoginService:" target="-2" id="Taa-dh-6WN"/>
</connections>
</button>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SdG-O4-18o">
<rect key="frame" x="14" y="12" width="185" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<buttonCell key="cell" type="push" title="最新バージョンをチェック" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="aZV-PL-Lgw">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="message"/>
</buttonCell>
<connections>
<action selector="checkForUpdates:" target="ye6-Ug-RDz" id="XDl-ZZ-bp2"/>
</connections>
</button>
</subviews>
<point key="canvasLocation" x="137" y="154"/>
</customView>
<customObject id="ye6-Ug-RDz" customClass="SUUpdater"/>
</objects>
</document>

0 comments on commit 3c779f2

Please sign in to comment.