Skip to content

Commit 59f3413

Browse files
imotheezaazwm
imothee
and
zaazwm
authored
2.0.6 (#28)
* Adds spanish localization * Adds selection for gigabytes and megabytes fixes #27 * Handle locked disks fixes #26 * update zh-hans localizable strings (#29) update zh-han localizable strings * Sets default units, updates build for distribution --------- Co-authored-by: Weimeng Zhu <[email protected]>
1 parent a8973e1 commit 59f3413

File tree

9 files changed

+1205
-49
lines changed

9 files changed

+1205
-49
lines changed

‎TmpDisk.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@
7575
2200825F2765505100A8524B /* TmpDiskUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TmpDiskUITests.swift; sourceTree = "<group>"; };
7676
220082612765505100A8524B /* TmpDiskUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TmpDiskUITestsLaunchTests.swift; sourceTree = "<group>"; };
7777
2200826E2765508C00A8524B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
78+
220E0556299DD3D200F822F6 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Main.strings; sourceTree = "<group>"; };
79+
220E0557299DD3D200F822F6 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Main.strings; sourceTree = "<group>"; };
80+
220E0558299DD3D200F822F6 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
7881
22235EBF27784F8200FBD8AC /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; };
7982
2226C0D7294EAFF80043D2B7 /* IconUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IconUtil.swift; sourceTree = "<group>"; };
8083
2264C5E1276553E600C45CB8 /* StatusBarController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StatusBarController.swift; sourceTree = "<group>"; };
@@ -335,6 +338,7 @@
335338
en,
336339
Base,
337340
"zh-Hans",
341+
es,
338342
);
339343
mainGroup = 220082372765504E00A8524B;
340344
packageReferences = (
@@ -454,6 +458,7 @@
454458
children = (
455459
2200824A2765505100A8524B /* Base */,
456460
229EFA572985FEB9001EADB2 /* zh-Hans */,
461+
220E0556299DD3D200F822F6 /* es */,
457462
);
458463
name = Main.storyboard;
459464
sourceTree = "<group>";
@@ -463,6 +468,7 @@
463468
children = (
464469
2264C5E72765667500C45CB8 /* en */,
465470
2264C5E92765667700C45CB8 /* zh-Hans */,
471+
220E0558299DD3D200F822F6 /* es */,
466472
);
467473
name = Localizable.strings;
468474
sourceTree = "<group>";
@@ -471,6 +477,7 @@
471477
isa = PBXVariantGroup;
472478
children = (
473479
22A69365277004E90040FDEF /* Base */,
480+
220E0557299DD3D200F822F6 /* es */,
474481
);
475482
name = Main.storyboard;
476483
sourceTree = "<group>";
@@ -606,7 +613,7 @@
606613
CODE_SIGN_IDENTITY = "Apple Development";
607614
CODE_SIGN_STYLE = Automatic;
608615
COMBINE_HIDPI_IMAGES = YES;
609-
CURRENT_PROJECT_VERSION = 1009;
616+
CURRENT_PROJECT_VERSION = 1011;
610617
DEAD_CODE_STRIPPING = YES;
611618
DEVELOPMENT_TEAM = AGZ3AP53DM;
612619
ENABLE_HARDENED_RUNTIME = YES;
@@ -621,7 +628,7 @@
621628
"@executable_path/../Frameworks",
622629
);
623630
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
624-
MARKETING_VERSION = 2.0.5;
631+
MARKETING_VERSION = 2.0.6;
625632
PRODUCT_BUNDLE_IDENTIFIER = com.imothee.TmpDisk;
626633
PRODUCT_NAME = "$(TARGET_NAME)";
627634
SKIP_INSTALL = NO;
@@ -639,7 +646,7 @@
639646
CODE_SIGN_IDENTITY = "Apple Development";
640647
CODE_SIGN_STYLE = Automatic;
641648
COMBINE_HIDPI_IMAGES = YES;
642-
CURRENT_PROJECT_VERSION = 1009;
649+
CURRENT_PROJECT_VERSION = 1011;
643650
DEAD_CODE_STRIPPING = YES;
644651
DEVELOPMENT_TEAM = AGZ3AP53DM;
645652
ENABLE_HARDENED_RUNTIME = YES;
@@ -654,7 +661,7 @@
654661
"@executable_path/../Frameworks",
655662
);
656663
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
657-
MARKETING_VERSION = 2.0.5;
664+
MARKETING_VERSION = 2.0.6;
658665
PRODUCT_BUNDLE_IDENTIFIER = com.imothee.TmpDisk;
659666
PRODUCT_NAME = "$(TARGET_NAME)";
660667
SKIP_INSTALL = NO;
@@ -774,7 +781,7 @@
774781
CODE_SIGN_IDENTITY = "Apple Development";
775782
CODE_SIGN_STYLE = Automatic;
776783
COMBINE_HIDPI_IMAGES = YES;
777-
CURRENT_PROJECT_VERSION = 5;
784+
CURRENT_PROJECT_VERSION = 7;
778785
DEAD_CODE_STRIPPING = YES;
779786
DEVELOPMENT_TEAM = AGZ3AP53DM;
780787
ENABLE_HARDENED_RUNTIME = YES;
@@ -789,7 +796,7 @@
789796
"@executable_path/../Frameworks",
790797
);
791798
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
792-
MARKETING_VERSION = 2.0.4;
799+
MARKETING_VERSION = 2.0.6;
793800
PRODUCT_BUNDLE_IDENTIFIER = com.imothee.TmpDiskLauncher;
794801
PRODUCT_NAME = "$(TARGET_NAME)";
795802
SKIP_INSTALL = YES;
@@ -807,7 +814,7 @@
807814
CODE_SIGN_IDENTITY = "Apple Development";
808815
CODE_SIGN_STYLE = Automatic;
809816
COMBINE_HIDPI_IMAGES = YES;
810-
CURRENT_PROJECT_VERSION = 5;
817+
CURRENT_PROJECT_VERSION = 7;
811818
DEAD_CODE_STRIPPING = YES;
812819
DEVELOPMENT_TEAM = AGZ3AP53DM;
813820
ENABLE_HARDENED_RUNTIME = YES;
@@ -822,7 +829,7 @@
822829
"@executable_path/../Frameworks",
823830
);
824831
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
825-
MARKETING_VERSION = 2.0.4;
832+
MARKETING_VERSION = 2.0.6;
826833
PRODUCT_BUNDLE_IDENTIFIER = com.imothee.TmpDiskLauncher;
827834
PRODUCT_NAME = "$(TARGET_NAME)";
828835
SKIP_INSTALL = YES;
@@ -886,8 +893,8 @@
886893
isa = XCRemoteSwiftPackageReference;
887894
repositoryURL = "https://github.com/sparkle-project/Sparkle";
888895
requirement = {
889-
kind = exactVersion;
890-
version = 2.2.0;
896+
kind = upToNextMajorVersion;
897+
minimumVersion = 2.2.0;
891898
};
892899
};
893900
/* End XCRemoteSwiftPackageReference section */

‎TmpDisk/Base.lproj/Main.storyboard‎

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@
732732
</textFieldCell>
733733
</textField>
734734
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="E2a-a2-Prg">
735-
<rect key="frame" x="195" y="318" width="250" height="21"/>
735+
<rect key="frame" x="195" y="318" width="284" height="21"/>
736736
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
737737
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="You must enter a Disk Name" drawsBackground="YES" id="5ee-ag-nb5">
738738
<font key="font" metaFont="system"/>
@@ -741,7 +741,7 @@
741741
</textFieldCell>
742742
</textField>
743743
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xyN-2s-pFi">
744-
<rect key="frame" x="216" y="289" width="95" height="21"/>
744+
<rect key="frame" x="216" y="289" width="110" height="21"/>
745745
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
746746
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" title="16" placeholderString="0" drawsBackground="YES" id="nYC-7d-c8X">
747747
<font key="font" metaFont="system"/>
@@ -794,7 +794,7 @@
794794
<stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="P5u-9X-RMA">
795795
<rect key="frame" x="192" y="286" width="19" height="28"/>
796796
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
797-
<stepperCell key="cell" continuous="YES" alignment="left" increment="16" minValue="16" maxValue="32000" doubleValue="16" valueWraps="YES" id="Rpa-l3-js0"/>
797+
<stepperCell key="cell" continuous="YES" alignment="left" increment="16" minValue="16" maxValue="128000" doubleValue="16" valueWraps="YES" id="Rpa-l3-js0"/>
798798
<connections>
799799
<action selector="sizeStepped:" target="4AE-e9-iwB" id="qiA-T1-NOt"/>
800800
</connections>
@@ -829,7 +829,7 @@
829829
</textFieldCell>
830830
</textField>
831831
<textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="H7j-O1-ZBb">
832-
<rect key="frame" x="195" y="259" width="250" height="21"/>
832+
<rect key="frame" x="195" y="259" width="284" height="21"/>
833833
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
834834
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" placeholderString="Comma separated folder names" drawsBackground="YES" id="ini-oz-Wpw">
835835
<font key="font" metaFont="system"/>
@@ -838,7 +838,7 @@
838838
</textFieldCell>
839839
</textField>
840840
<popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MSl-ao-5Ke">
841-
<rect key="frame" x="355" y="285" width="94" height="25"/>
841+
<rect key="frame" x="389" y="285" width="94" height="25"/>
842842
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
843843
<popUpButtonCell key="cell" type="push" title="Custom" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="gcJ-GN-9gz" id="rZ6-s2-bcs">
844844
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -857,15 +857,6 @@
857857
<action selector="sizeSelected:" target="4AE-e9-iwB" id="qPb-lU-iJO"/>
858858
</connections>
859859
</popUpButton>
860-
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aqV-UW-cbZ">
861-
<rect key="frame" x="317" y="291" width="24" height="16"/>
862-
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
863-
<textFieldCell key="cell" alignment="left" title="MB" id="hdG-Me-bAt">
864-
<font key="font" usesAppearanceFont="YES"/>
865-
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
866-
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
867-
</textFieldCell>
868-
</textField>
869860
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9uZ-cc-D1t">
870861
<rect key="frame" x="193" y="95" width="118" height="18"/>
871862
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
@@ -918,6 +909,23 @@
918909
<action selector="createTapped:" target="4AE-e9-iwB" id="4T6-VP-krq"/>
919910
</connections>
920911
</button>
912+
<popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="V2p-wL-s18">
913+
<rect key="frame" x="331" y="285" width="57" height="25"/>
914+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
915+
<popUpButtonCell key="cell" type="push" title="MB" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="JxI-0N-oYo" id="ssH-8t-toD">
916+
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
917+
<font key="font" metaFont="menu"/>
918+
<menu key="menu" id="G57-Hf-orQ">
919+
<items>
920+
<menuItem title="MB" state="on" id="JxI-0N-oYo"/>
921+
<menuItem title="GB" id="QDX-KN-Ki5"/>
922+
</items>
923+
</menu>
924+
</popUpButtonCell>
925+
<connections>
926+
<action selector="unitSelected:" target="4AE-e9-iwB" id="KRZ-WI-2q8"/>
927+
</connections>
928+
</popUpButton>
921929
</subviews>
922930
</view>
923931
<connections>
@@ -928,7 +936,7 @@
928936
<outlet property="diskSizeLabel" destination="O1S-ta-weE" id="goH-tF-DiN"/>
929937
<outlet property="diskSizeSelector" destination="MSl-ao-5Ke" id="I5b-Ym-R4q"/>
930938
<outlet property="diskSizeStepper" destination="P5u-9X-RMA" id="HBq-pW-un9"/>
931-
<outlet property="diskSizeSuffixLabel" destination="aqV-UW-cbZ" id="sAX-I9-2Um"/>
939+
<outlet property="diskUnitSelector" destination="V2p-wL-s18" id="NGY-n8-1FI"/>
932940
<outlet property="folders" destination="H7j-O1-ZBb" id="4Rz-tD-q48"/>
933941
<outlet property="hidden" destination="9uZ-cc-D1t" id="pCK-PN-B6b"/>
934942
<outlet property="icon" destination="1T3-Bk-PAe" id="2hJ-Pd-SiY"/>
@@ -1000,11 +1008,11 @@
10001008
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
10011009
<prototypeCellViews>
10021010
<tableCellView id="lFv-aq-hWE">
1003-
<rect key="frame" x="8" y="0.0" width="165" height="24"/>
1011+
<rect key="frame" x="8" y="0.0" width="166" height="24"/>
10041012
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
10051013
<subviews>
10061014
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="l4G-Ut-HMs">
1007-
<rect key="frame" x="0.0" y="4" width="165" height="16"/>
1015+
<rect key="frame" x="0.0" y="4" width="166" height="16"/>
10081016
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
10091017
<textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="Table View Cell" id="XWF-fr-bC7">
10101018
<font key="font" usesAppearanceFont="YES"/>
@@ -1035,11 +1043,11 @@
10351043
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
10361044
<prototypeCellViews>
10371045
<tableCellView id="JML-g3-qvT">
1038-
<rect key="frame" x="190" y="0.0" width="113" height="24"/>
1046+
<rect key="frame" x="190" y="0.0" width="94" height="24"/>
10391047
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
10401048
<subviews>
10411049
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DfW-y0-Gzf">
1042-
<rect key="frame" x="0.0" y="4" width="113" height="16"/>
1050+
<rect key="frame" x="0.0" y="4" width="94" height="16"/>
10431051
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
10441052
<textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="Table View Cell" id="t3z-IH-wJR">
10451053
<font key="font" usesAppearanceFont="YES"/>
@@ -1070,11 +1078,11 @@
10701078
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
10711079
<prototypeCellViews>
10721080
<tableCellView id="m4U-hC-HcX">
1073-
<rect key="frame" x="289" y="0.0" width="188" height="24"/>
1081+
<rect key="frame" x="289" y="0.0" width="168" height="24"/>
10741082
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
10751083
<subviews>
10761084
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5ZJ-fg-CTz">
1077-
<rect key="frame" x="0.0" y="4" width="188" height="16"/>
1085+
<rect key="frame" x="0.0" y="4" width="168" height="16"/>
10781086
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
10791087
<textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="Table View Cell" id="qXn-wF-aJV">
10801088
<font key="font" usesAppearanceFont="YES"/>
@@ -1309,7 +1317,7 @@
13091317
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
13101318
<prototypeCellViews>
13111319
<tableCellView id="2W4-bt-YC3">
1312-
<rect key="frame" x="894" y="0.0" width="79" height="24"/>
1320+
<rect key="frame" x="894" y="0.0" width="80" height="24"/>
13131321
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
13141322
<subviews>
13151323
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NeM-An-jyl">

0 commit comments

Comments
 (0)