# HG changeset patch
# User antonc27
# Date 1446756859 -3600
# Node ID 92b02309515302d953bb64e24d1231f1d60cd1b7
# Parent 72c46b4923c43a225ec4d0c8c7877ccd63711d55
- Update rus localization for 'About' screen
- 'Info' button's color changed to yellow
- Update Qt front-end 'About' with my credits
diff -r 72c46b4923c4 -r 92b023095153 QTfrontend/res/html/about.html
--- a/QTfrontend/res/html/about.html Thu Nov 05 05:33:24 2015 +0100
+++ b/QTfrontend/res/html/about.html Thu Nov 05 21:54:19 2015 +0100
@@ -35,6 +35,7 @@
Keybinds, feedback, maps and hats interfaces: Drew Gottlieb <gottlieb.drew@gmail.com>
Login dialogs, frontend improvements: Ondrej Skopek <skopekondrej@gmail.com>
Icegun weapon: Julia Struchenko <urbertar@gmail.com>
+ iPhone/iPad ports: Anton Malmygin <antonc27@mail.ru>
Art:
diff -r 72c46b4923c4 -r 92b023095153 project_files/HedgewarsMobile/Classes/AboutViewController.m
--- a/project_files/HedgewarsMobile/Classes/AboutViewController.m Thu Nov 05 05:33:24 2015 +0100
+++ b/project_files/HedgewarsMobile/Classes/AboutViewController.m Thu Nov 05 21:54:19 2015 +0100
@@ -27,7 +27,10 @@
return rotationManager(interfaceOrientation);
}
--(void) viewDidLoad {
+-(void) viewDidLoad
+{
+ [super viewDidLoad];
+
[self.tableView setBackgroundColorForAnyTable:[UIColor clearColor]];
self.tableView.allowsSelection = NO;
@@ -48,7 +51,7 @@
[self.view insertSubview:background atIndex:0];
[background release];
- [super viewDidLoad];
+ [self localizeSegmentedControl];
}
-(IBAction) buttonPressed:(id) sender {
@@ -56,6 +59,17 @@
[self.presentingViewController dismissViewControllerAnimated:YES completion:nil];
}
+#pragma mark - Segmented Control
+
+- (void)localizeSegmentedControl
+{
+ for (NSUInteger i = 0; i < self.segmentedControl.numberOfSegments; i++)
+ {
+ NSString *oldTitle = [self.segmentedControl titleForSegmentAtIndex:i];
+ [self.segmentedControl setTitle:NSLocalizedStringFromTable(oldTitle, @"About", nil) forSegmentAtIndex:i];
+ }
+}
+
-(IBAction) segmentedControlChanged:(id) sender {
[[AudioManagerController mainManager] playClickSound];
[self.tableView setContentOffset:CGPointMake(0, 0) animated:NO];
diff -r 72c46b4923c4 -r 92b023095153 project_files/HedgewarsMobile/Classes/MainMenuViewController-iPad.xib
--- a/project_files/HedgewarsMobile/Classes/MainMenuViewController-iPad.xib Thu Nov 05 05:33:24 2015 +0100
+++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController-iPad.xib Thu Nov 05 21:54:19 2015 +0100
@@ -1,446 +1,135 @@
-
-
-
- 1792
- 14E46
- 7706
- 1348.17
- 758.70
-
-
- IBProxyObject
- IBUIButton
- IBUIImageView
- IBUIView
-
-
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
-
-
-
-
-
-
-
-
-
-
- view
-
-
-
- 3
-
-
-
- simpleGameButton
-
-
-
- 95
-
-
-
- missionsButton
-
-
-
- 96
-
-
-
- switchViews:
-
-
- 7
-
- 48
-
-
-
- switchViews:
-
-
- 7
-
- 47
-
-
-
- switchViews:
-
-
- 7
-
- 54
-
-
-
- switchViews:
-
-
- 7
-
- 89
-
-
-
- switchViews:
-
-
- 7
-
- 92
-
-
-
- switchViews:
-
-
- 7
-
- 94
-
-
-
-
-
- 0
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -1
-
-
- File's Owner
-
-
- -2
-
-
-
-
- 39
-
-
- local
-
-
- 45
-
-
-
-
- 52
-
-
-
-
- 37
-
-
-
-
- 88
-
-
-
-
- 90
-
-
-
-
- 91
-
-
-
-
- 93
-
-
-
-
-
-
- MainMenuViewController
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UIResponder
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
-
-
-
-
- 96
-
-
- 0
- IBIPadFramework
- NO
-
- com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3
-
-
- YES
- 3
-
- {1024, 768}
- {263, 244}
- {64, 64}
- {64, 64}
- {540, 300}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 72c46b4923c4 -r 92b023095153 project_files/HedgewarsMobile/Classes/MainMenuViewController-iPhone.xib
--- a/project_files/HedgewarsMobile/Classes/MainMenuViewController-iPhone.xib Thu Nov 05 05:33:24 2015 +0100
+++ b/project_files/HedgewarsMobile/Classes/MainMenuViewController-iPhone.xib Thu Nov 05 21:54:19 2015 +0100
@@ -1,581 +1,137 @@
-
-
-
- 1792
- 14E46
- 7706
- 1348.17
- 758.70
-
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- 7703
-
-
- IBProxyObject
- IBUIButton
- IBUIImageView
- IBUIView
-
-
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
-
-
-
- IBFilesOwner
- IBCocoaTouchFramework
-
-
- IBFirstResponder
- IBCocoaTouchFramework
-
-
-
- 293
-
-
-
- 274
- {480, 320}
-
-
-
-
- 3
- MCAwAA
-
- 2
- NO
- IBCocoaTouchFramework
-
- NSImage
- background.png
-
-
-
-
- 293
- {{105, 20}, {270, 150}}
-
-
-
- NO
- NO
- 4
- NO
- IBCocoaTouchFramework
-
- NSImage
- title.png
-
-
-
-
- 289
- {{376, 14}, {89, 31}}
-
-
-
- NO
- 5
- IBCocoaTouchFramework
- 0
- 0
- 1
-
- 1
- MC4xOTYwNzg0MzE0IDAuMzA5ODAzOTIxNiAwLjUyMTU2ODYyNzUAA
-
-
- 3
- MQA
-
- Missions
-
- 3
- MC41AA
-
-
- Helvetica-Bold
- Helvetica
- 2
- 15
-
-
- Helvetica-Bold
- 15
- 16
-
-
-
-
- 269
- {{190, 200}, {100, 100}}
-
-
-
-
- 1
- MCAwIDAgMAA
-
- NO
- NO
- IBCocoaTouchFramework
- 0
- 0
-
- 1
- MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA
-
-
-
-
- NSImage
- localplayButton.png
-
-
-
-
-
-
- 265
- {{396, 236}, {64, 64}}
-
-
- NO
- NO
- 2
- IBCocoaTouchFramework
- 0
- 0
-
- 1
- MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA
-
-
-
-
- NSImage
- settingsButton.png
-
-
-
-
-
-
- 268
- {{20, 236}, {64, 64}}
-
-
-
- NO
- NO
- 4
- IBCocoaTouchFramework
- 0
- 0
-
- 1
- MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA
-
-
-
-
- NSImage
- savesButton.png
-
-
-
-
-
-
- 292
- {{20, 19}, {18, 19}}
-
-
-
- NO
- 0.5
- 3
- IBCocoaTouchFramework
- 0
- 0
- 3
- YES
-
- 1
- MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA
-
-
-
-
-
-
-
-
- 289
- {{376, 57}, {89, 31}}
-
-
-
- NO
- 6
- IBCocoaTouchFramework
- 0
- 0
- 1
-
-
- Simple
-
-
-
-
-
- {480, 320}
-
-
-
-
- 1
- MCAwIDAAA
- darkTextColor
-
-
- 3
- 3
-
-
- IBUISimulatedFreeformSizeMetricsSentinel
- Freeform
-
- IBCocoaTouchFramework
-
-
-
-
-
-
- view
-
-
-
- 3
-
-
-
- missionsButton
-
-
-
- 54
-
-
-
- simpleGameButton
-
-
-
- 56
-
-
-
- switchViews:
-
-
- 7
-
- 40
-
-
-
- switchViews:
-
-
- 7
-
- 30
-
-
-
- switchViews:
-
-
- 7
-
- 42
-
-
-
- switchViews:
-
-
- 7
-
- 44
-
-
-
- switchViews:
-
-
- 7
-
- 55
-
-
-
- switchViews:
-
-
- 7
-
- 53
-
-
-
-
-
- 0
-
-
-
-
-
- 1
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -1
-
-
- File's Owner
-
-
- -2
-
-
-
-
- 23
-
-
-
-
- 22
-
-
-
-
- 41
-
-
-
-
- 43
-
-
-
-
- 24
-
-
-
-
- 28
-
-
-
-
- 51
-
-
-
-
- 52
-
-
-
-
-
-
- MainMenuViewController
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- UIResponder
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
- {567, 470}
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
-
-
-
-
- 56
-
-
-
-
- MainMenuViewController
- UIViewController
-
- switchViews:
- id
-
-
- switchViews:
-
- switchViews:
- id
-
-
-
- IBProjectSource
- ../Classes/MainMenuViewController.h
-
-
-
- MainMenuViewController
-
- switchViews:
- id
-
-
- switchViews:
-
- switchViews:
- id
-
-
-
- UIButton
- UIButton
-
-
-
- missionsButton
- UIButton
-
-
- simpleGameButton
- UIButton
-
-
-
- IBProjectSource
- ../Classes/MainMenuViewController.m
-
-
-
-
-
- UIButton
- UIControl
-
- IBFrameworkSource
- UIKit.framework/Headers/UIButton.h
-
-
-
- UIControl
- UIView
-
- IBFrameworkSource
- UIKit.framework/Headers/UIControl.h
-
-
-
- UIGestureRecognizer
- NSObject
-
- IBFrameworkSource
- UIKit.framework/Headers/UIGestureRecognizer.h
-
-
-
- UIImageView
- UIView
-
- IBFrameworkSource
- UIKit.framework/Headers/UIImageView.h
-
-
-
- UIResponder
- NSObject
-
- IBFrameworkSource
- UIKit.framework/Headers/UIResponder.h
-
-
-
- UISearchBar
- UIView
-
- IBFrameworkSource
- UIKit.framework/Headers/UISearchBar.h
-
-
-
- UISearchDisplayController
- NSObject
-
- IBFrameworkSource
- UIKit.framework/Headers/UISearchDisplayController.h
-
-
-
- UIView
- UIResponder
-
- IBFrameworkSource
- UIKit.framework/Headers/UIView.h
-
-
-
- UIViewController
- UIResponder
-
- IBFrameworkSource
- UIKit.framework/Headers/UIViewController.h
-
-
-
-
- 0
- IBCocoaTouchFramework
- NO
-
- com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3
-
-
- YES
- 3
-
- {480, 320}
- {100, 100}
- {64, 64}
- {64, 64}
- {270, 150}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 72c46b4923c4 -r 92b023095153 project_files/HedgewarsMobile/Locale/English.lproj/About.strings
Binary file project_files/HedgewarsMobile/Locale/English.lproj/About.strings has changed
diff -r 72c46b4923c4 -r 92b023095153 project_files/HedgewarsMobile/Locale/ru.lproj/About.strings
Binary file project_files/HedgewarsMobile/Locale/ru.lproj/About.strings has changed