Skip to content

Commit

Permalink
Revert "Localization, Auto Layout, etc."
Browse files Browse the repository at this point in the history
  • Loading branch information
@clobber
clobber committed Dec 22, 2015
1 parent e5d9771 commit 66f362e
Show file tree
Hide file tree
Showing 57 changed files with 2,439 additions and 592 deletions.
42 changes: 39 additions & 3 deletions Interface Graphics/Theme.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,15 @@
<dict>
<key>Color</key>
<string>white</string>
<key>Shadow</key>
<dict>
<key>Blur Radius</key>
<integer>1</integer>
<key>Color</key>
<string>black</string>
<key>Offset</key>
<string>{0,-1}</string>
</dict>
</dict>
<key>Mouse Over, Pressed</key>
<dict>
Expand All @@ -265,7 +274,7 @@
<key>Blur Radius</key>
<integer>5</integer>
<key>Color</key>
<string>white</string>
<string>black</string>
<key>Offset</key>
<string>{0,-1}</string>
</dict>
Expand All @@ -278,6 +287,15 @@
<string>rgba(174,173,173,1.0)</string>
<key>Family</key>
<string>$SYSTEM_FONT_FAMILY</string>
<key>Shadow</key>
<dict>
<key>Blur Radius</key>
<integer>1</integer>
<key>Color</key>
<string>rgba(0,0,0,1.0)</string>
<key>Offset</key>
<string>{0,1}</string>
</dict>
<key>Size</key>
<integer>11</integer>
<key>Traits</key>
Expand Down Expand Up @@ -337,6 +355,15 @@
<string>rgba(174,173,173,1.0)</string>
<key>Family</key>
<string>$SYSTEM_FONT_FAMILY</string>
<key>Shadow</key>
<dict>
<key>Blur Radius</key>
<integer>1</integer>
<key>Color</key>
<string>rgba(0,0,0,1.0)</string>
<key>Offset</key>
<string>{0,1}</string>
</dict>
<key>Size</key>
<integer>14</integer>
<key>Traits</key>
Expand All @@ -350,6 +377,15 @@
<string>rgba(156,156,156,1.0)</string>
<key>Family</key>
<string>$SYSTEM_FONT_FAMILY</string>
<key>Shadow</key>
<dict>
<key>Blur Radius</key>
<integer>1</integer>
<key>Color</key>
<string>rgba(0,0,0,0.4)</string>
<key>Offset</key>
<string>{0,-1}</string>
</dict>
<key>Size</key>
<integer>11</integer>
<key>Weight</key>
Expand Down Expand Up @@ -1410,8 +1446,8 @@
<dict>
<key>Colors</key>
<array>
<string>#5a5a5a00</string>
<string>#5a5a5a</string>
<string>#4a4a4a</string>
<string>#292929</string>
</array>
<key>Locations</key>
<array>
Expand Down
2 changes: 1 addition & 1 deletion OpenEmu/Base.lproj/OEGameScanner.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</buttonCell>
</tableColumn>
<tableColumn identifier="path" width="491" minWidth="100" maxWidth="1100000" id="75">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Name">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Path">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
Expand Down
2 changes: 1 addition & 1 deletion OpenEmu/Base.lproj/OELibraryGamesViewController.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="5EQ-pA-c2w"/>
<menuItem title="Add to Library…" id="1U8-Yu-nH3">
<menuItem title="Add To Library…" id="1U8-Yu-nH3" userLabel="Add To Library…">
<connections>
<action selector="addToLibrary:" target="-1" id="dMl-dD-TKi"/>
</connections>
Expand Down
6 changes: 3 additions & 3 deletions OpenEmu/Base.lproj/OEPrefCoresController.xib
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="23" headerView="52" id="33" customClass="OETableView">
<rect key="frame" x="0.0" y="0.0" width="430" height="437"/>
<rect key="frame" x="0.0" y="0.0" width="424" height="437"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
Expand All @@ -44,7 +44,7 @@
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
</tableColumn>
<tableColumn identifier="systemColumn" editable="NO" width="202" minWidth="202" maxWidth="202" id="50">
<tableColumn identifier="systemColumn" editable="NO" width="196" minWidth="196" maxWidth="196" id="50">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Console">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
Expand Down Expand Up @@ -84,7 +84,7 @@
<autoresizingMask key="autoresizingMask"/>
</scroller>
<tableHeaderView key="headerView" id="52">
<rect key="frame" x="0.0" y="0.0" width="430" height="23"/>
<rect key="frame" x="0.0" y="0.0" width="424" height="23"/>
<autoresizingMask key="autoresizingMask"/>
</tableHeaderView>
</scrollView>
Expand Down
75 changes: 25 additions & 50 deletions OpenEmu/Base.lproj/OEPrefGameplayController.xib
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9060"/>
Expand All @@ -17,15 +17,17 @@
<rect key="frame" x="0.0" y="0.0" width="423" height="254"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="4" customClass="OEHorizontalLine">
<rect key="frame" x="0.0" y="157" width="423" height="2"/>
<customView id="4" customClass="OEHorizontalLine">
<rect key="frame" x="0.0" y="157" width="432" height="2"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
<animations/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="themeKey" value="preferences_line"/>
</userDefinedRuntimeAttributes>
</customView>
<button translatesAutoresizingMaskIntoConstraints="NO" id="5" userLabel="Check Box 1" customClass="OEButton">
<rect key="frame" x="42" y="90" width="215" height="18"/>
<button id="5" userLabel="Check Box" customClass="OEButton">
<rect key="frame" x="42" y="90" width="223" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<animations/>
<buttonCell key="cell" type="check" title="Always launch games fullscreen" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="26" userLabel="Check Box Cell" customClass="OEButtonCell">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
Expand All @@ -38,8 +40,9 @@
<binding destination="28" name="value" keyPath="values.fullScreen" id="32"/>
</connections>
</button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="6" userLabel="Check Box 2" customClass="OEButton">
<rect key="frame" x="42" y="61" width="248" height="18"/>
<button id="6" userLabel="Check Box" customClass="OEButton">
<rect key="frame" x="42" y="61" width="258" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<animations/>
<buttonCell key="cell" type="check" title="Always use popout gameplay window" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="25" userLabel="Check Box Cell" customClass="OEButtonCell">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
Expand All @@ -52,8 +55,9 @@
<binding destination="28" name="value" keyPath="values.forcePopout" id="65"/>
</connections>
</button>
<button translatesAutoresizingMaskIntoConstraints="NO" id="56" userLabel="Check Box 3" customClass="OEButton">
<rect key="frame" x="42" y="32" width="293" height="18"/>
<button id="56" userLabel="Check Box" customClass="OEButton">
<rect key="frame" x="42" y="32" width="305" height="18"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<animations/>
<buttonCell key="cell" type="check" title="Always pause gameplay when in background" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="57" userLabel="Check Box Cell" customClass="OEButtonCell">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
Expand All @@ -66,8 +70,9 @@
<binding destination="28" name="value" keyPath="values.backgroundPause" id="58"/>
</connections>
</button>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="13" customClass="OELabel">
<rect key="frame" x="39" y="124" width="366" height="14"/>
<textField verticalHuggingPriority="750" id="13" customClass="OELabel">
<rect key="frame" x="41" y="124" width="139" height="14"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<animations/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Window Management" id="14" customClass="OELabelCell">
<font key="font" metaFont="smallSystemBold"/>
Expand All @@ -78,8 +83,9 @@
<userDefinedRuntimeAttribute type="string" keyPath="themeKey" value="preferences_headline"/>
</userDefinedRuntimeAttributes>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8" customClass="OELabel">
<rect key="frame" x="39" y="220" width="366" height="14"/>
<textField verticalHuggingPriority="750" id="8" customClass="OELabel">
<rect key="frame" x="41" y="220" width="139" height="14"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<animations/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Display Mode" id="23" customClass="OELabelCell">
<font key="font" metaFont="smallSystemBold"/>
Expand All @@ -90,12 +96,9 @@
<userDefinedRuntimeAttribute type="string" keyPath="themeKey" value="preferences_headline"/>
</userDefinedRuntimeAttributes>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="10" customClass="OELabel">
<rect key="frame" x="39" y="185" width="42" height="17"/>
<constraints>
<constraint firstAttribute="width" relation="lessThanOrEqual" constant="138" id="RzW-xY-L99"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="38" id="e4J-aE-P1L"/>
</constraints>
<textField verticalHuggingPriority="750" id="10" customClass="OELabel">
<rect key="frame" x="41" y="185" width="41" height="17"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<animations/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Filter:" id="21" customClass="OELabelCell">
<font key="font" metaFont="system"/>
Expand All @@ -106,12 +109,9 @@
<userDefinedRuntimeAttribute type="string" keyPath="themeKey" value="preferences_headline"/>
</userDefinedRuntimeAttributes>
</textField>
<popUpButton focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="11" customClass="OEPopUpButton">
<rect key="frame" x="83" y="183" width="217" height="23"/>
<constraints>
<constraint firstAttribute="width" constant="212" id="6jh-MX-q9D"/>
<constraint firstAttribute="height" constant="18" id="cz9-gs-8lo"/>
</constraints>
<popUpButton focusRingType="none" verticalHuggingPriority="750" id="11" customClass="OEPopUpButton">
<rect key="frame" x="84" y="183" width="217" height="26"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<animations/>
<popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" focusRingType="none" imageScaling="proportionallyDown" inset="2" id="16" customClass="OEPopUpButtonCell">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
Expand All @@ -138,31 +138,6 @@
</connections>
</popUpButton>
</subviews>
<constraints>
<constraint firstItem="5" firstAttribute="top" secondItem="13" secondAttribute="bottom" constant="18" id="1Sm-n6-qK3"/>
<constraint firstItem="5" firstAttribute="trailing" relation="lessThanOrEqual" secondItem="3" secondAttribute="trailing" constant="-20" id="4HD-SN-NMY"/>
<constraint firstItem="8" firstAttribute="leading" secondItem="3" secondAttribute="leading" constant="41" id="5UT-Pf-fwo"/>
<constraint firstItem="8" firstAttribute="top" secondItem="3" secondAttribute="top" constant="20" symbolic="YES" id="5t2-Ez-iVb"/>
<constraint firstItem="6" firstAttribute="trailing" relation="lessThanOrEqual" secondItem="3" secondAttribute="trailing" constant="-20" id="7CH-K7-Rt8"/>
<constraint firstItem="13" firstAttribute="leading" secondItem="8" secondAttribute="leading" id="94z-fj-rki"/>
<constraint firstItem="4" firstAttribute="top" secondItem="10" secondAttribute="bottom" constant="26" id="CWF-e5-11D"/>
<constraint firstItem="13" firstAttribute="top" secondItem="4" secondAttribute="bottom" constant="19" id="E14-se-5DT"/>
<constraint firstItem="56" firstAttribute="trailing" relation="lessThanOrEqual" secondItem="3" secondAttribute="trailing" constant="-20" id="GWb-bf-US8"/>
<constraint firstItem="56" firstAttribute="leading" secondItem="6" secondAttribute="leading" id="J4j-df-qzA"/>
<constraint firstItem="4" firstAttribute="trailing" secondItem="3" secondAttribute="trailing" id="L4M-Xb-YZY"/>
<constraint firstItem="6" firstAttribute="top" secondItem="5" secondAttribute="bottom" constant="15" id="N4M-iK-I7Q"/>
<constraint firstItem="10" firstAttribute="leading" secondItem="8" secondAttribute="leading" id="PBs-z6-n4i"/>
<constraint firstItem="11" firstAttribute="leading" secondItem="10" secondAttribute="trailing" constant="6" id="WIH-K9-L8E"/>
<constraint firstItem="5" firstAttribute="leading" secondItem="13" secondAttribute="leading" constant="3" id="YSV-6s-eIC"/>
<constraint firstItem="56" firstAttribute="top" secondItem="6" secondAttribute="bottom" constant="15" id="ash-0e-CGw"/>
<constraint firstItem="11" firstAttribute="bottom" secondItem="4" secondAttribute="top" constant="-27" id="eHO-aw-my1"/>
<constraint firstItem="56" firstAttribute="bottom" secondItem="3" secondAttribute="bottom" constant="-34" id="n4i-QC-gPS"/>
<constraint firstItem="4" firstAttribute="leading" secondItem="3" secondAttribute="leading" id="nbB-nj-haG"/>
<constraint firstItem="8" firstAttribute="trailing" secondItem="3" secondAttribute="trailing" constant="-20" id="oXB-GC-Mza"/>
<constraint firstItem="10" firstAttribute="top" secondItem="8" secondAttribute="bottom" constant="18" id="pnr-Sm-nkC"/>
<constraint firstItem="6" firstAttribute="leading" secondItem="5" secondAttribute="leading" id="vYB-95-LrV"/>
<constraint firstItem="13" firstAttribute="trailing" secondItem="3" secondAttribute="trailing" constant="-20" id="zX4-JN-fUM"/>
</constraints>
<animations/>
</view>
<userDefaultsController id="28" userLabel="Shared User Defaults Controller"/>
Expand Down
Loading

0 comments on commit 66f362e

Please sign in to comment.