Droog71/oolite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More tuning of manifest screen alignment

Browse Source
This commit is contained in:
cim 2015-04-02 11:32:25 +01:00
parent c661082ff3
commit fa4ee4909c
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Resources/Config/descriptions.plist
View File

@ -1443,8 +1443,8 @@
"equipment-@-not-available" = "%@ (N/A)"; // all broken, only one installed
"equipment-plural-some-na" = "[okcount]/[count] [equipmentName]s"; // some broken, multiple installed
"manifest-cargo-quantity" = "[quantity] [units] × [commodityName]";
"manifest-cargo-quantity-extended" = "[quantity] [units] × [commodityName] ([containers] TC)";
"manifest-cargo-quantity" = " [quantity] [units] × [commodityName]";
"manifest-cargo-quantity-extended" = " [quantity] [units] × [commodityName] ([containers] TC)";
// Short and Long Range Chart Overrides
"charts-distance" = "Distance: [distance|precision:1] Light Years";

2
Resources/Config/gui-settings.plist
View File

@ -136,7 +136,7 @@
// "manifest_no_scroll_color" = "darkGrayColor";
/* the tab stops for the manifest (cargo display) */
// "manifest_tabs" = (0,20,256);
// "manifest_tabs" = (0,256);
/* scale of name labels on F6 chart relative to Oolite default size */

6
src/Core/Entities/PlayerEntityContracts.m
View File

@ -1185,8 +1185,7 @@ for (unsigned i=0;i<amount;i++)
OOGUITabSettings tab_stops;
tab_stops[0] = 0;
tab_stops[1] = 20;
tab_stops[2] = 256;
tab_stops[1] = 256;
[gui overrideTabs:tab_stops from:kGuiManifestTabs length:3];
[gui setTabStops:tab_stops];
@ -1202,7 +1201,7 @@ for (unsigned i=0;i<amount;i++)
current = [[self passengerList] count];
max = max_passengers;
NSString *cabinString = OOExpandKey(@"oolite-manifest-cabins", current, max);
NSArray *manifestHeader = [NSArray arrayWithObjects:cargoString,@"",cabinString,nil];
NSArray *manifestHeader = [NSArray arrayWithObjects:cargoString,cabinString,nil];
SET_MANIFEST_ROW( manifestHeader , entryColor, cargoRow - 1);
@ -1211,7 +1210,6 @@ for (unsigned i=0;i<amount;i++)
for (i = 0; i < cargoRowCount; i++)
{
NSMutableArray* row_info = [NSMutableArray arrayWithCapacity:3];
[row_info addObject:@""];
// i is always smaller than manifest_count, no need to test.
[row_info addObject:[cargoManifest objectAtIndex:i]];
if (i + cargoRowCount < manifestCount)