minor things
authorkoda
Mon, 15 Nov 2010 04:30:11 +0100 (2010-11-15)
changeset 4341 46b8791e577f
parent 4339 58d4733c9cad
child 4343 19cbea33e4d2
child 4344 23ab3bdbf218
minor things
project_files/HedgewarsMobile/Classes/CommodityFunctions.m
project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m
project_files/HedgewarsMobile/Classes/SupportViewController.m
project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj
project_files/HedgewarsMobile/Resources/Icons/Default.png
project_files/HedgewarsMobile/Resources/Icons/irc.png
tools/CMakeLists.txt
--- a/project_files/HedgewarsMobile/Classes/CommodityFunctions.m	Sun Nov 14 23:28:45 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/CommodityFunctions.m	Mon Nov 15 04:30:11 2010 +0100
@@ -33,7 +33,7 @@
         return (interfaceOrientation == UIInterfaceOrientationLandscapeRight) ||
                (interfaceOrientation == UIInterfaceOrientationLandscapeLeft);
     else
-        return (interfaceOrientation == UIInterfaceOrientationLandscapeRight);
+        return (interfaceOrientation == UIInterfaceOrientationLandscapeLeft);
 }
 
 NSInteger inline randomPort () {
--- a/project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m	Sun Nov 14 23:28:45 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/GeneralSettingsViewController.m	Mon Nov 15 04:30:11 2010 +0100
@@ -156,7 +156,7 @@
                 editableCell.minimumCharacters = 0;
                 editableCell.delegate = self;
                 editableCell.textField.font = [UIFont systemFontOfSize:[UIFont systemFontSize]];
-                editableCell.textField.textColor = [UIColor lightGrayColor];
+                editableCell.textField.textColor = [UIColor blackColor];
             }
             
             if (row == 0) {
--- a/project_files/HedgewarsMobile/Classes/SupportViewController.m	Sun Nov 14 23:28:45 2010 +0100
+++ b/project_files/HedgewarsMobile/Classes/SupportViewController.m	Mon Nov 15 04:30:11 2010 +0100
@@ -39,6 +39,7 @@
                       NSLocalizedString(@"Join us on Facebook",@""),
                       NSLocalizedString(@"Follow on Twitter",@""),
                       NSLocalizedString(@"Visit website",@""),
+                      NSLocalizedString(@"Chat with us in IRC",@""),
                       nil];
     self.waysToSupport = array;
     [array release];
@@ -87,6 +88,9 @@
             case 2:
                 imgString = @"Icon-Small.png";
                 break;
+            case 3:
+                imgString = @"irc.png";
+                break;
             default:
                 DLog(@"No way");
                 break;
@@ -117,6 +121,9 @@
             case 2:
                 urlString = @"http://www.hedgewars.org";
                 break;
+            case 3:
+                urlString = @"http://webchat.freenode.net/?channels=hedgewars";
+                break;
             default:
                 DLog(@"No way");
                 break;
--- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj	Sun Nov 14 23:28:45 2010 +0100
+++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj	Mon Nov 15 04:30:11 2010 +0100
@@ -153,6 +153,7 @@
 		61B3D71C11EA6F2700EC7420 /* uKeys.pas in Sources */ = {isa = PBXBuildFile; fileRef = 617987FE114AA34C00BA94A9 /* uKeys.pas */; };
 		61C079E411F35A300072BF46 /* EditableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61C079E311F35A300072BF46 /* EditableCellView.m */; };
 		61D205A1127CDD1100ABD83E /* ObjcExports.m in Sources */ = {isa = PBXBuildFile; fileRef = 61D205A0127CDD1100ABD83E /* ObjcExports.m */; };
+		61D3D2A51290E03A003CE7C3 /* irc.png in Resources */ = {isa = PBXBuildFile; fileRef = 61D3D2A41290E03A003CE7C3 /* irc.png */; };
 		61DE8F221257EB1100B80214 /* AmmoMenuViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 61DE8F211257EB1100B80214 /* AmmoMenuViewController.m */; };
 		61DF0EDC1284DF2300F3F10B /* HelpPageLobbyViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61DF0EDB1284DF2300F3F10B /* HelpPageLobbyViewController-iPhone.xib */; };
 		61DF0F211284F72A00F3F10B /* HelpPageInGameViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 61DF0F201284F72A00F3F10B /* HelpPageInGameViewController-iPhone.xib */; };
@@ -901,6 +902,7 @@
 		61C079E311F35A300072BF46 /* EditableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditableCellView.m; sourceTree = "<group>"; };
 		61D2059F127CDD1100ABD83E /* ObjcExports.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjcExports.h; path = Classes/ObjcExports.h; sourceTree = "<group>"; };
 		61D205A0127CDD1100ABD83E /* ObjcExports.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ObjcExports.m; path = Classes/ObjcExports.m; sourceTree = "<group>"; };
+		61D3D2A41290E03A003CE7C3 /* irc.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = irc.png; path = Resources/Icons/irc.png; sourceTree = "<group>"; };
 		61DE8F201257EB1100B80214 /* AmmoMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AmmoMenuViewController.h; sourceTree = "<group>"; };
 		61DE8F211257EB1100B80214 /* AmmoMenuViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AmmoMenuViewController.m; sourceTree = "<group>"; };
 		61DF0EDB1284DF2300F3F10B /* HelpPageLobbyViewController-iPhone.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = "HelpPageLobbyViewController-iPhone.xib"; path = "../Resources/HelpPageLobbyViewController-iPhone.xib"; sourceTree = "<group>"; };
@@ -1384,6 +1386,7 @@
 		61F7A42811E2905C0040BA66 /* Icons */ = {
 			isa = PBXGroup;
 			children = (
+				61D3D2A41290E03A003CE7C3 /* irc.png */,
 				61E2F7421283752C00E12521 /* fb.png */,
 				61E2F7431283752C00E12521 /* tw.png */,
 				6183D83C11E2BCE200A88903 /* Default-ipad-Landscape.png */,
@@ -2157,6 +2160,7 @@
 				61808A4B128C901B005D0E2F /* startButton.png in Resources */,
 				61808A5D128C930A005D0E2F /* backSound.wav in Resources */,
 				61808A6F128C94E1005D0E2F /* backgroundTop.png in Resources */,
+				61D3D2A51290E03A003CE7C3 /* irc.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
Binary file project_files/HedgewarsMobile/Resources/Icons/Default.png has changed
Binary file project_files/HedgewarsMobile/Resources/Icons/irc.png has changed
--- a/tools/CMakeLists.txt	Sun Nov 14 23:28:45 2010 +0100
+++ b/tools/CMakeLists.txt	Mon Nov 15 04:30:11 2010 +0100
@@ -19,8 +19,8 @@
 	find_package(SPARKLE)
 
 	#use the associated tool from the libraries we've selected
-	string(REGEX REPLACE "(.*)/include;-.*" "\\1" qt_base_dir "${QT_INCLUDE_DIR}")
-	find_program(macdeployqt_EXE NAMES macdeployqt macdeployqt-mac PATH ${qt_base_dir})
+	string(REGEX REPLACE "(.*)/include.*" "\\1" qt_base_dir "${QT_INCLUDE_DIR}")
+	find_program(macdeployqt_EXE NAMES macdeployqt macdeployqt-mac PATHS ${qt_base_dir}/bin NO_DEFAULT_PATH)
 
 	if(NOT macdeployqt_EXE)
 		message(FATAL_ERROR "The utility macdeployqt is required to create the bundle!")