Added release and locale folders for OSX release. Updated xcode project to 1.2.12.9

31 files changed, 21 insertions, 14 deletions

diff --git a/.gitignore b/.gitignore
index 3a69feef2..44edc0bbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -147,5 +147,4 @@ gmon.out
 .DS_Store
 Xcode/ManaPlus.xcodeproj/xcuserdata
 Xcode/ManaPlus.xcodeproj/project.xcworkspace/xcuserdata
-Xcode/Release
-Xcode/locale
+Xcode/Release/ManaPlus.dmg
diff --git a/Xcode/ManaPlus.xcodeproj/project.pbxproj b/Xcode/ManaPlus.xcodeproj/project.pbxproj
index 39e2804dd..9e5365bd7 100644
--- a/Xcode/ManaPlus.xcodeproj/project.pbxproj
+++ b/Xcode/ManaPlus.xcodeproj/project.pbxproj
@@ -8,6 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		2B4EBD02166DE12200BDD105 /* locale in Resources */ = {isa = PBXBuildFile; fileRef = 2B4EBD01166DE12200BDD105 /* locale */; };
+		2B8B70CB167EBCB3003A8440 /* popuplist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B8B70C9167EBCB3003A8440 /* popuplist.cpp */; };
+		2B8B70CE167EBE3A003A8440 /* setup_touch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B8B70CC167EBE3A003A8440 /* setup_touch.cpp */; };
 		2BAC2B44166DB4B300874178 /* manaplus.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2BAC2B43166DB4B300874178 /* manaplus.icns */; };
 		2BAC2B4E166DCFB900874178 /* libXdmcp.6.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BAC2B46166DCFB900874178 /* libXdmcp.6.dylib */; };
 		2BAC2B4F166DCFB900874178 /* libXau.6.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BAC2B47166DCFB900874178 /* libXau.6.dylib */; };
@@ -394,8 +396,6 @@
 		2BDF4BE9166D5B690054E77F /* checkbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48EF166D5B680054E77F /* checkbox.cpp */; };
 		2BDF4BEA166D5B690054E77F /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48F0166D5B680054E77F /* container.cpp */; };
 		2BDF4BEB166D5B690054E77F /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48F0166D5B680054E77F /* container.cpp */; };
-		2BDF4BEC166D5B690054E77F /* dropdown.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48F1166D5B680054E77F /* dropdown.cpp */; };
-		2BDF4BED166D5B690054E77F /* dropdown.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48F1166D5B680054E77F /* dropdown.cpp */; };
 		2BDF4BEE166D5B690054E77F /* label.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48F2166D5B680054E77F /* label.cpp */; };
 		2BDF4BEF166D5B690054E77F /* label.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48F2166D5B680054E77F /* label.cpp */; };
 		2BDF4BF0166D5B690054E77F /* listbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48F3166D5B680054E77F /* listbox.cpp */; };
@@ -827,6 +827,10 @@
 
 /* Begin PBXFileReference section */
 		2B4EBD01166DE12200BDD105 /* locale */ = {isa = PBXFileReference; lastKnownFileType = folder; path = locale; sourceTree = SOURCE_ROOT; };
+		2B8B70C9167EBCB3003A8440 /* popuplist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = popuplist.cpp; sourceTree = "<group>"; };
+		2B8B70CA167EBCB3003A8440 /* popuplist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = popuplist.h; sourceTree = "<group>"; };
+		2B8B70CC167EBE3A003A8440 /* setup_touch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_touch.cpp; sourceTree = "<group>"; };
+		2B8B70CD167EBE3A003A8440 /* setup_touch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_touch.h; sourceTree = "<group>"; };
 		2BAC2B43166DB4B300874178 /* manaplus.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = manaplus.icns; sourceTree = "<group>"; };
 		2BAC2B46166DCFB900874178 /* libXdmcp.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libXdmcp.6.dylib; path = libs/libXdmcp.6.dylib; sourceTree = "<group>"; };
 		2BAC2B47166DCFB900874178 /* libXau.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libXau.6.dylib; path = libs/libXau.6.dylib; sourceTree = "<group>"; };
@@ -1992,6 +1996,8 @@
 		2BDF4798166D5B680054E77F /* gui */ = {
 			isa = PBXGroup;
 			children = (
+				2B8B70CC167EBE3A003A8440 /* setup_touch.cpp */,
+				2B8B70CD167EBE3A003A8440 /* setup_touch.h */,
 				2BDF4799166D5B680054E77F /* beingpopup.cpp */,
 				2BDF479A166D5B680054E77F /* beingpopup.h */,
 				2BDF479B166D5B680054E77F /* botcheckerwindow.cpp */,
@@ -2148,6 +2154,8 @@
 		2BDF4828166D5B680054E77F /* widgets */ = {
 			isa = PBXGroup;
 			children = (
+				2B8B70C9167EBCB3003A8440 /* popuplist.cpp */,
+				2B8B70CA167EBCB3003A8440 /* popuplist.h */,
 				2BDF4829166D5B680054E77F /* avatarlistbox.cpp */,
 				2BDF482A166D5B680054E77F /* avatarlistbox.h */,
 				2BDF482B166D5B680054E77F /* battletab.cpp */,
@@ -3068,7 +3076,6 @@
 				2BDF4BE6166D5B690054E77F /* button.cpp in Sources */,
 				2BDF4BE8166D5B690054E77F /* checkbox.cpp in Sources */,
 				2BDF4BEA166D5B690054E77F /* container.cpp in Sources */,
-				2BDF4BEC166D5B690054E77F /* dropdown.cpp in Sources */,
 				2BDF4BEE166D5B690054E77F /* label.cpp in Sources */,
 				2BDF4BF0166D5B690054E77F /* listbox.cpp in Sources */,
 				2BDF4BF2166D5B690054E77F /* radiobutton.cpp in Sources */,
@@ -3241,6 +3248,8 @@
 				2BDF4D44166D5B690054E77F /* translationmanager.cpp in Sources */,
 				2BDF4D46166D5B690054E77F /* xml.cpp in Sources */,
 				2BDF4D48166D5B690054E77F /* vector.cpp in Sources */,
+				2B8B70CB167EBCB3003A8440 /* popuplist.cpp in Sources */,
+				2B8B70CE167EBE3A003A8440 /* setup_touch.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3432,7 +3441,6 @@
 				2BDF4BE7166D5B690054E77F /* button.cpp in Sources */,
 				2BDF4BE9166D5B690054E77F /* checkbox.cpp in Sources */,
 				2BDF4BEB166D5B690054E77F /* container.cpp in Sources */,
-				2BDF4BED166D5B690054E77F /* dropdown.cpp in Sources */,
 				2BDF4BEF166D5B690054E77F /* label.cpp in Sources */,
 				2BDF4BF1166D5B690054E77F /* listbox.cpp in Sources */,
 				2BDF4BF3166D5B690054E77F /* radiobutton.cpp in Sources */,
@@ -3677,9 +3685,9 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx10.7;
+				SDKROOT = macosx;
 			};
 			name = Debug;
 		};
@@ -3700,8 +3708,8 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.8;
-				SDKROOT = macosx10.7;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				SDKROOT = macosx;
 			};
 			name = Release;
 		};
@@ -3732,7 +3740,7 @@
 					/opt/local/lib,
 					"\"$(SRCROOT)/libs\"",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DUSE_INTERNALGUICHAN",
@@ -3773,7 +3781,7 @@
 					/opt/local/lib,
 					"\"$(SRCROOT)/libs\"",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DUSE_INTERNALGUICHAN",
diff --git a/Xcode/ManaPlus/ManaPlus-Info.plist b/Xcode/ManaPlus/ManaPlus-Info.plist
index dadf510f2..56ff6c102 100644
--- a/Xcode/ManaPlus/ManaPlus-Info.plist
+++ b/Xcode/ManaPlus/ManaPlus-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.2.12.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Xcode/Release/Applications b/Xcode/Release/Applications
new file mode 100755
index 000000000..e27ea7261
--- /dev/null
+++ b/Xcode/Release/Applications
diff --git a/Xcode/Release/ManaPlus 2.icns b/Xcode/Release/ManaPlus 2.icns
new file mode 100644
index 000000000..db266f359
--- /dev/null
+++ b/Xcode/Release/ManaPlus 2.icns
diff --git a/Xcode/Release/Release.dmgCanvas/Disk Image b/Xcode/Release/Release.dmgCanvas/Disk Image
new file mode 100644
index 000000000..cdf57a9f1
--- /dev/null
+++ b/Xcode/Release/Release.dmgCanvas/Disk Image
diff --git a/Xcode/Release/Release.dmgCanvas/QuickLook/Preview.jpg b/Xcode/Release/Release.dmgCanvas/QuickLook/Preview.jpg
new file mode 100644
index 000000000..a4a979827
--- /dev/null
+++ b/Xcode/Release/Release.dmgCanvas/QuickLook/Preview.jpg
diff --git a/Xcode/Release/login_wallpaper.png b/Xcode/Release/login_wallpaper.png
new file mode 100644
index 000000000..df93609cd
--- /dev/null
+++ b/Xcode/Release/login_wallpaper.png
diff --git a/Xcode/Release/loginwallpaper_800x600.png b/Xcode/Release/loginwallpaper_800x600.png
new file mode 100644
index 000000000..a1fe4f83b
--- /dev/null
+++ b/Xcode/Release/loginwallpaper_800x600.png
diff --git a/Xcode/Release/manaplus.icns b/Xcode/Release/manaplus.icns
new file mode 100644
index 000000000..6556fccb1
--- /dev/null
+++ b/Xcode/Release/manaplus.icns
diff --git a/Xcode/locale/cs/LC_MESSAGES/manaplus.mo b/Xcode/locale/cs/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..22ed5b285
--- /dev/null
+++ b/Xcode/locale/cs/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/da/LC_MESSAGES/manaplus.mo b/Xcode/locale/da/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..424a97b5d
--- /dev/null
+++ b/Xcode/locale/da/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/de/LC_MESSAGES/manaplus.mo b/Xcode/locale/de/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..3d51c6f35
--- /dev/null
+++ b/Xcode/locale/de/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/en_GB/LC_MESSAGES/manaplus.mo b/Xcode/locale/en_GB/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..5f4ef1362
--- /dev/null
+++ b/Xcode/locale/en_GB/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/es/LC_MESSAGES/manaplus.mo b/Xcode/locale/es/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..47a930cf1
--- /dev/null
+++ b/Xcode/locale/es/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/fi/LC_MESSAGES/manaplus.mo b/Xcode/locale/fi/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..3ffb6f32b
--- /dev/null
+++ b/Xcode/locale/fi/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/fr/LC_MESSAGES/manaplus.mo b/Xcode/locale/fr/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..8e301f27d
--- /dev/null
+++ b/Xcode/locale/fr/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/hr/LC_MESSAGES/manaplus.mo b/Xcode/locale/hr/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..384ca030f
--- /dev/null
+++ b/Xcode/locale/hr/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/hu/LC_MESSAGES/manaplus.mo b/Xcode/locale/hu/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..c01430238
--- /dev/null
+++ b/Xcode/locale/hu/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/id/LC_MESSAGES/manaplus.mo b/Xcode/locale/id/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..bb8fa2ecb
--- /dev/null
+++ b/Xcode/locale/id/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/it/LC_MESSAGES/manaplus.mo b/Xcode/locale/it/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..0ebc656de
--- /dev/null
+++ b/Xcode/locale/it/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/ja/LC_MESSAGES/manaplus.mo b/Xcode/locale/ja/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..0df62e4b1
--- /dev/null
+++ b/Xcode/locale/ja/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/nl/LC_MESSAGES/manaplus.mo b/Xcode/locale/nl/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..f3d81b346
--- /dev/null
+++ b/Xcode/locale/nl/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/nl_BE/LC_MESSAGES/manaplus.mo b/Xcode/locale/nl_BE/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..47469cae5
--- /dev/null
+++ b/Xcode/locale/nl_BE/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/pl/LC_MESSAGES/manaplus.mo b/Xcode/locale/pl/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..fac449c25
--- /dev/null
+++ b/Xcode/locale/pl/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/pt/LC_MESSAGES/manaplus.mo b/Xcode/locale/pt/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..13a8c9d5a
--- /dev/null
+++ b/Xcode/locale/pt/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/pt_BR/LC_MESSAGES/manaplus.mo b/Xcode/locale/pt_BR/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..4617acdc2
--- /dev/null
+++ b/Xcode/locale/pt_BR/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/ru/LC_MESSAGES/manaplus.mo b/Xcode/locale/ru/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..9065d73a5
--- /dev/null
+++ b/Xcode/locale/ru/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/sv/LC_MESSAGES/manaplus.mo b/Xcode/locale/sv/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..2a1384d6f
--- /dev/null
+++ b/Xcode/locale/sv/LC_MESSAGES/manaplus.mo
diff --git a/Xcode/locale/zh_CN/LC_MESSAGES/manaplus.mo b/Xcode/locale/zh_CN/LC_MESSAGES/manaplus.mo
new file mode 100644
index 000000000..dcde050fb
--- /dev/null
+++ b/Xcode/locale/zh_CN/LC_MESSAGES/manaplus.mo
diff --git a/src/main.h b/src/main.h
index 886f54f12..e7641235f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -57,7 +57,7 @@
 #endif
 
 #if defined __APPLE__
-#define PACKAGE_OS "Apple"
+#define PACKAGE_OS "Mac OSX"
 #elif defined(__ANDROID__) || defined(ANDROID)
 #define PACKAGE_OS "Android"
 #elif defined __FreeBSD__ || defined __DragonFly__