Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble-iphoneos.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitmodules3
m---------Dependencies/three200
-rwxr-xr-xMumble.xcodeproj/project.pbxproj430
-rw-r--r--README.markdown5
-rwxr-xr-xScripts/FixThree209
-rw-r--r--Source/Classes/MumbleApplicationDelegate.m13
-rw-r--r--Source/Classes/MumbleStyleSheet.h35
-rw-r--r--Source/Classes/MumbleStyleSheet.m46
-rw-r--r--Source/Classes/WelcomeScreenController.h35
-rw-r--r--Source/Classes/WelcomeScreenController.m177
-rw-r--r--Source/Classes/WelcomeScreenPhone.m51
-rw-r--r--Source/Mumble.pch1
12 files changed, 37 insertions, 768 deletions
diff --git a/.gitmodules b/.gitmodules
index f4e3f91..866829e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,3 @@
[submodule "Dependencies/fmdb"]
path = Dependencies/fmdb
url = http://github.com/ccgus/fmdb.git
-[submodule "Dependencies/three20"]
- path = Dependencies/three20
- url = http://github.com/facebook/three20.git
diff --git a/Dependencies/three20 b/Dependencies/three20
deleted file mode 160000
-Subproject 8459aca4642cdc4f1fa9fa1580db0ae9c509d7b
diff --git a/Mumble.xcodeproj/project.pbxproj b/Mumble.xcodeproj/project.pbxproj
index 99bdd39..5f6b8d9 100755
--- a/Mumble.xcodeproj/project.pbxproj
+++ b/Mumble.xcodeproj/project.pbxproj
@@ -32,7 +32,6 @@
280D4B411255463000493267 /* channel@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 280D4B3F1255463000493267 /* channel@2x.png */; };
281D1BA511D66E3C006BE21C /* Identity.m in Sources */ = {isa = PBXBuildFile; fileRef = 281D1BA411D66E3C006BE21C /* Identity.m */; };
281EF08811CD721D001C6B73 /* AdvancedAudioPreferencesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 281EF08711CD721D001C6B73 /* AdvancedAudioPreferencesViewController.m */; };
- 2821B7E1124E8EAD001DF8E4 /* MumbleStyleSheet.m in Sources */ = {isa = PBXBuildFile; fileRef = 2821B7E0124E8EAD001DF8E4 /* MumbleStyleSheet.m */; };
2821B821124E9F4E001DF8E4 /* globe.png in Resources */ = {isa = PBXBuildFile; fileRef = 2821B820124E9F4E001DF8E4 /* globe.png */; };
2821B829124EA09F001DF8E4 /* star.png in Resources */ = {isa = PBXBuildFile; fileRef = 2821B828124EA09F001DF8E4 /* star.png */; };
2821B82F124EA784001DF8E4 /* person.png in Resources */ = {isa = PBXBuildFile; fileRef = 2821B82E124EA784001DF8E4 /* person.png */; };
@@ -140,7 +139,6 @@
28A4CCD3117E064B006EB479 /* LogViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28A4CCD2117E064B006EB479 /* LogViewController.m */; };
28A4CCF5117E1D4D006EB479 /* LogEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = 28A4CCF4117E1D4D006EB479 /* LogEntry.m */; };
28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; };
- 28BC8219124D543B00D0D1F9 /* WelcomeScreenController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28BC8218124D543B00D0D1F9 /* WelcomeScreenController.m */; };
28C6EF0A11BBF38100E426C8 /* CountryServerListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28C6EF0911BBF38100E426C8 /* CountryServerListController.m */; };
28F8B04511D97E0B006EFCBC /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F8B04211D97E0B006EFCBC /* sqlite3.c */; };
28F9174811B946250030D649 /* FMDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = 28F9174211B946250030D649 /* FMDatabase.m */; };
@@ -148,13 +146,6 @@
28F9174B11B946250030D649 /* FMResultSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 28F9174711B946250030D649 /* FMResultSet.m */; };
28FEA682124AA5A000A3F6B5 /* ServerConnectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28FEA681124AA5A000A3F6B5 /* ServerConnectionViewController.m */; };
28FEA6A2124AAA7100A3F6B5 /* ServerConnectionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28FEA6A1124AAA7100A3F6B5 /* ServerConnectionView.xib */; };
- 28FEA7A2124AB7E200A3F6B5 /* libThree20.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FEA758124AB77B00A3F6B5 /* libThree20.a */; };
- 28FEA7A3124AB7E500A3F6B5 /* libThree20UINavigator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FEA792124AB7AA00A3F6B5 /* libThree20UINavigator.a */; };
- 28FEA7A4124AB7E500A3F6B5 /* libThree20UICommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FEA78C124AB7AA00A3F6B5 /* libThree20UICommon.a */; };
- 28FEA7A5124AB7E600A3F6B5 /* libThree20UI.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FEA798124AB7AA00A3F6B5 /* libThree20UI.a */; };
- 28FEA7A6124AB7E700A3F6B5 /* libThree20Style.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FEA786124AB7AA00A3F6B5 /* libThree20Style.a */; };
- 28FEA7A7124AB7E700A3F6B5 /* libThree20Network.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FEA780124AB7AA00A3F6B5 /* libThree20Network.a */; };
- 28FEA7A8124AB7E800A3F6B5 /* libThree20Core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28FEA77A124AB7AA00A3F6B5 /* libThree20Core.a */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -214,153 +205,6 @@
remoteGlobalIDString = 10069FE7010069FE7010069F;
remoteInfo = MumbleKitCombined;
};
- 28FEA757124AB77B00A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA72C124AB77A00A3F6B5 /* Three20.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = BEF31F3A0F352DF5000DE5D2;
- remoteInfo = Three20;
- };
- 28FEA759124AB77B00A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA72C124AB77A00A3F6B5 /* Three20.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = EB9E6C6210B6A8F800DE563C;
- remoteInfo = UnitTests;
- };
- 28FEA779124AB7AA00A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA765124AB7AA00A3F6B5 /* Three20Core.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = BEF31F3A0F352DF5000DE5D2;
- remoteInfo = Three20Core;
- };
- 28FEA77B124AB7AA00A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA765124AB7AA00A3F6B5 /* Three20Core.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = EB9E6C6210B6A8F800DE563C;
- remoteInfo = UnitTests;
- };
- 28FEA77F124AB7AA00A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA768124AB7AA00A3F6B5 /* Three20Network.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = BEF31F3A0F352DF5000DE5D2;
- remoteInfo = Three20Network;
- };
- 28FEA781124AB7AA00A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA768124AB7AA00A3F6B5 /* Three20Network.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = EB9E6C6210B6A8F800DE563C;
- remoteInfo = UnitTests;
- };
- 28FEA785124AB7AA00A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA76B124AB7AA00A3F6B5 /* Three20Style.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = BEF31F3A0F352DF5000DE5D2;
- remoteInfo = Three20Style;
- };
- 28FEA787124AB7AA00A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA76B124AB7AA00A3F6B5 /* Three20Style.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = EB9E6C6210B6A8F800DE563C;
- remoteInfo = UnitTests;
- };
- 28FEA78B124AB7AA00A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA76E124AB7AA00A3F6B5 /* Three20UICommon.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = BEF31F3A0F352DF5000DE5D2;
- remoteInfo = Three20UICommon;
- };
- 28FEA78D124AB7AA00A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA76E124AB7AA00A3F6B5 /* Three20UICommon.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = EB9E6C6210B6A8F800DE563C;
- remoteInfo = UnitTests;
- };
- 28FEA791124AB7AA00A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA771124AB7AA00A3F6B5 /* Three20UINavigator.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = BEF31F3A0F352DF5000DE5D2;
- remoteInfo = Three20UINavigator;
- };
- 28FEA793124AB7AA00A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA771124AB7AA00A3F6B5 /* Three20UINavigator.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = EB9E6C6210B6A8F800DE563C;
- remoteInfo = UnitTests;
- };
- 28FEA797124AB7AA00A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA774124AB7AA00A3F6B5 /* Three20UI.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = BEF31F3A0F352DF5000DE5D2;
- remoteInfo = Three20UI;
- };
- 28FEA799124AB7AA00A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA774124AB7AA00A3F6B5 /* Three20UI.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = EB9E6C6210B6A8F800DE563C;
- remoteInfo = UnitTests;
- };
- 28FEA7BE124AB80000A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA774124AB7AA00A3F6B5 /* Three20UI.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = BEF31F390F352DF5000DE5D2;
- remoteInfo = Three20UI;
- };
- 28FEA7C0124AB80000A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA72C124AB77A00A3F6B5 /* Three20.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = BEF31F390F352DF5000DE5D2;
- remoteInfo = Three20;
- };
- 28FEA7C2124AB80000A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA768124AB7AA00A3F6B5 /* Three20Network.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = BEF31F390F352DF5000DE5D2;
- remoteInfo = Three20Network;
- };
- 28FEA7C4124AB80000A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA76E124AB7AA00A3F6B5 /* Three20UICommon.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = BEF31F390F352DF5000DE5D2;
- remoteInfo = Three20UICommon;
- };
- 28FEA7C6124AB80000A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA771124AB7AA00A3F6B5 /* Three20UINavigator.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = BEF31F390F352DF5000DE5D2;
- remoteInfo = Three20UINavigator;
- };
- 28FEA7C8124AB80000A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA765124AB7AA00A3F6B5 /* Three20Core.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = BEF31F390F352DF5000DE5D2;
- remoteInfo = Three20Core;
- };
- 28FEA7CA124AB80000A3F6B5 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 28FEA76B124AB7AA00A3F6B5 /* Three20Style.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = BEF31F390F352DF5000DE5D2;
- remoteInfo = Three20Style;
- };
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
@@ -392,8 +236,6 @@
281D1BA411D66E3C006BE21C /* Identity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Identity.m; sourceTree = "<group>"; };
281EF08611CD721D001C6B73 /* AdvancedAudioPreferencesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AdvancedAudioPreferencesViewController.h; sourceTree = "<group>"; };
281EF08711CD721D001C6B73 /* AdvancedAudioPreferencesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AdvancedAudioPreferencesViewController.m; sourceTree = "<group>"; };
- 2821B7DF124E8EAD001DF8E4 /* MumbleStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MumbleStyleSheet.h; sourceTree = "<group>"; };
- 2821B7E0124E8EAD001DF8E4 /* MumbleStyleSheet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MumbleStyleSheet.m; sourceTree = "<group>"; };
2821B820124E9F4E001DF8E4 /* globe.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = globe.png; path = Resources/icons/ios/globe.png; sourceTree = "<group>"; };
2821B828124EA09F001DF8E4 /* star.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = star.png; path = Resources/icons/ios/star.png; sourceTree = "<group>"; };
2821B82E124EA784001DF8E4 /* person.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = person.png; path = Resources/icons/ios/person.png; sourceTree = "<group>"; };
@@ -533,8 +375,6 @@
28A4CCF3117E1D4D006EB479 /* LogEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LogEntry.h; sourceTree = "<group>"; };
28A4CCF4117E1D4D006EB479 /* LogEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogEntry.m; sourceTree = "<group>"; };
28AD733E0D9D9553002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainWindow.xib; path = ../MainWindow.xib; sourceTree = "<group>"; };
- 28BC8217124D543B00D0D1F9 /* WelcomeScreenController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WelcomeScreenController.h; sourceTree = "<group>"; };
- 28BC8218124D543B00D0D1F9 /* WelcomeScreenController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WelcomeScreenController.m; sourceTree = "<group>"; };
28C6EF0911BBF38100E426C8 /* CountryServerListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CountryServerListController.m; sourceTree = "<group>"; };
28F8B04211D97E0B006EFCBC /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqlite3.c; path = Dependencies/sqlite/sqlite3.c; sourceTree = "<group>"; };
28F8B04311D97E0B006EFCBC /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = Dependencies/sqlite/sqlite3.h; sourceTree = "<group>"; };
@@ -548,13 +388,6 @@
28FEA680124AA5A000A3F6B5 /* ServerConnectionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServerConnectionViewController.h; sourceTree = "<group>"; };
28FEA681124AA5A000A3F6B5 /* ServerConnectionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ServerConnectionViewController.m; sourceTree = "<group>"; };
28FEA6A1124AAA7100A3F6B5 /* ServerConnectionView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ServerConnectionView.xib; sourceTree = "<group>"; };
- 28FEA72C124AB77A00A3F6B5 /* Three20.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20.xcodeproj; path = Dependencies/three20/src/Three20/Three20.xcodeproj; sourceTree = "<group>"; };
- 28FEA765124AB7AA00A3F6B5 /* Three20Core.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20Core.xcodeproj; path = Dependencies/three20/src/Three20Core/Three20Core.xcodeproj; sourceTree = "<group>"; };
- 28FEA768124AB7AA00A3F6B5 /* Three20Network.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20Network.xcodeproj; path = Dependencies/three20/src/Three20Network/Three20Network.xcodeproj; sourceTree = "<group>"; };
- 28FEA76B124AB7AA00A3F6B5 /* Three20Style.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20Style.xcodeproj; path = Dependencies/three20/src/Three20Style/Three20Style.xcodeproj; sourceTree = "<group>"; };
- 28FEA76E124AB7AA00A3F6B5 /* Three20UICommon.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20UICommon.xcodeproj; path = Dependencies/three20/src/Three20UICommon/Three20UICommon.xcodeproj; sourceTree = "<group>"; };
- 28FEA771124AB7AA00A3F6B5 /* Three20UINavigator.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20UINavigator.xcodeproj; path = Dependencies/three20/src/Three20UINavigator/Three20UINavigator.xcodeproj; sourceTree = "<group>"; };
- 28FEA774124AB7AA00A3F6B5 /* Three20UI.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Three20UI.xcodeproj; path = Dependencies/three20/src/Three20UI/Three20UI.xcodeproj; sourceTree = "<group>"; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Source/main.m; sourceTree = "<group>"; };
32CA4F630368D1EE00C91783 /* Mumble.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Mumble.pch; path = Source/Mumble.pch; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Source/Info.plist; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
@@ -573,13 +406,6 @@
2861C2B2116BE9B7002B8514 /* CFNetwork.framework in Frameworks */,
2861C2B6116BE9BA002B8514 /* Security.framework in Frameworks */,
28763A4511D2AA91009DB8B6 /* QuartzCore.framework in Frameworks */,
- 28FEA7A2124AB7E200A3F6B5 /* libThree20.a in Frameworks */,
- 28FEA7A3124AB7E500A3F6B5 /* libThree20UINavigator.a in Frameworks */,
- 28FEA7A4124AB7E500A3F6B5 /* libThree20UICommon.a in Frameworks */,
- 28FEA7A5124AB7E600A3F6B5 /* libThree20UI.a in Frameworks */,
- 28FEA7A6124AB7E700A3F6B5 /* libThree20Style.a in Frameworks */,
- 28FEA7A7124AB7E700A3F6B5 /* libThree20Network.a in Frameworks */,
- 28FEA7A8124AB7E800A3F6B5 /* libThree20Core.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -638,10 +464,6 @@
2858DBA21233E31B000D6F75 /* VersionChecker.m */,
28FEA680124AA5A000A3F6B5 /* ServerConnectionViewController.h */,
28FEA681124AA5A000A3F6B5 /* ServerConnectionViewController.m */,
- 28BC8217124D543B00D0D1F9 /* WelcomeScreenController.h */,
- 28BC8218124D543B00D0D1F9 /* WelcomeScreenController.m */,
- 2821B7DF124E8EAD001DF8E4 /* MumbleStyleSheet.h */,
- 2821B7E0124E8EAD001DF8E4 /* MumbleStyleSheet.m */,
288B55DE1252903300563A28 /* ServerCertificateTrustViewController.h */,
288B55DF1252903300563A28 /* ServerCertificateTrustViewController.m */,
289CBA16125693040015E58E /* ChannelNavigationViewController.h */,
@@ -736,13 +558,6 @@
children = (
28F8B04011D97E00006EFCBC /* sqlite */,
28F9173911B9460D0030D649 /* fmdb */,
- 28FEA765124AB7AA00A3F6B5 /* Three20Core.xcodeproj */,
- 28FEA768124AB7AA00A3F6B5 /* Three20Network.xcodeproj */,
- 28FEA76B124AB7AA00A3F6B5 /* Three20Style.xcodeproj */,
- 28FEA76E124AB7AA00A3F6B5 /* Three20UICommon.xcodeproj */,
- 28FEA771124AB7AA00A3F6B5 /* Three20UINavigator.xcodeproj */,
- 28FEA774124AB7AA00A3F6B5 /* Three20UI.xcodeproj */,
- 28FEA72C124AB77A00A3F6B5 /* Three20.xcodeproj */,
2861C28E116BE91B002B8514 /* MumbleKit.xcodeproj */,
);
name = Dependencies;
@@ -872,69 +687,6 @@
name = fmdb;
sourceTree = "<group>";
};
- 28FEA72D124AB77A00A3F6B5 /* Products */ = {
- isa = PBXGroup;
- children = (
- 28FEA758124AB77B00A3F6B5 /* libThree20.a */,
- 28FEA75A124AB77B00A3F6B5 /* UnitTests.octest */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- 28FEA766124AB7AA00A3F6B5 /* Products */ = {
- isa = PBXGroup;
- children = (
- 28FEA77A124AB7AA00A3F6B5 /* libThree20Core.a */,
- 28FEA77C124AB7AA00A3F6B5 /* CoreUnitTests.octest */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- 28FEA769124AB7AA00A3F6B5 /* Products */ = {
- isa = PBXGroup;
- children = (
- 28FEA780124AB7AA00A3F6B5 /* libThree20Network.a */,
- 28FEA782124AB7AA00A3F6B5 /* UnitTests.octest */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- 28FEA76C124AB7AA00A3F6B5 /* Products */ = {
- isa = PBXGroup;
- children = (
- 28FEA786124AB7AA00A3F6B5 /* libThree20Style.a */,
- 28FEA788124AB7AA00A3F6B5 /* UnitTests.octest */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- 28FEA76F124AB7AA00A3F6B5 /* Products */ = {
- isa = PBXGroup;
- children = (
- 28FEA78C124AB7AA00A3F6B5 /* libThree20UICommon.a */,
- 28FEA78E124AB7AA00A3F6B5 /* UnitTests.octest */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- 28FEA772124AB7AA00A3F6B5 /* Products */ = {
- isa = PBXGroup;
- children = (
- 28FEA792124AB7AA00A3F6B5 /* libThree20UINavigator.a */,
- 28FEA794124AB7AA00A3F6B5 /* UnitTests.octest */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- 28FEA775124AB7AA00A3F6B5 /* Products */ = {
- isa = PBXGroup;
- children = (
- 28FEA798124AB7AA00A3F6B5 /* libThree20UI.a */,
- 28FEA79A124AB7AA00A3F6B5 /* UnitTests.octest */,
- );
- name = Products;
- sourceTree = "<group>";
- };
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
isa = PBXGroup;
children = (
@@ -1004,13 +756,6 @@
);
dependencies = (
287EAB831245303E00A0159D /* PBXTargetDependency */,
- 28FEA7BF124AB80000A3F6B5 /* PBXTargetDependency */,
- 28FEA7C1124AB80000A3F6B5 /* PBXTargetDependency */,
- 28FEA7C3124AB80000A3F6B5 /* PBXTargetDependency */,
- 28FEA7C5124AB80000A3F6B5 /* PBXTargetDependency */,
- 28FEA7C7124AB80000A3F6B5 /* PBXTargetDependency */,
- 28FEA7C9124AB80000A3F6B5 /* PBXTargetDependency */,
- 28FEA7CB124AB80000A3F6B5 /* PBXTargetDependency */,
);
name = Mumble;
productName = Mumble;
@@ -1039,34 +784,6 @@
ProductGroup = 2861C28F116BE91B002B8514 /* Products */;
ProjectRef = 2861C28E116BE91B002B8514 /* MumbleKit.xcodeproj */;
},
- {
- ProductGroup = 28FEA72D124AB77A00A3F6B5 /* Products */;
- ProjectRef = 28FEA72C124AB77A00A3F6B5 /* Three20.xcodeproj */;
- },
- {
- ProductGroup = 28FEA766124AB7AA00A3F6B5 /* Products */;
- ProjectRef = 28FEA765124AB7AA00A3F6B5 /* Three20Core.xcodeproj */;
- },
- {
- ProductGroup = 28FEA769124AB7AA00A3F6B5 /* Products */;
- ProjectRef = 28FEA768124AB7AA00A3F6B5 /* Three20Network.xcodeproj */;
- },
- {
- ProductGroup = 28FEA76C124AB7AA00A3F6B5 /* Products */;
- ProjectRef = 28FEA76B124AB7AA00A3F6B5 /* Three20Style.xcodeproj */;
- },
- {
- ProductGroup = 28FEA775124AB7AA00A3F6B5 /* Products */;
- ProjectRef = 28FEA774124AB7AA00A3F6B5 /* Three20UI.xcodeproj */;
- },
- {
- ProductGroup = 28FEA76F124AB7AA00A3F6B5 /* Products */;
- ProjectRef = 28FEA76E124AB7AA00A3F6B5 /* Three20UICommon.xcodeproj */;
- },
- {
- ProductGroup = 28FEA772124AB7AA00A3F6B5 /* Products */;
- ProjectRef = 28FEA771124AB7AA00A3F6B5 /* Three20UINavigator.xcodeproj */;
- },
);
projectRoot = "";
targets = (
@@ -1125,104 +842,6 @@
remoteRef = 287EAB701245303200A0159D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
- 28FEA758124AB77B00A3F6B5 /* libThree20.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libThree20.a;
- remoteRef = 28FEA757124AB77B00A3F6B5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 28FEA75A124AB77B00A3F6B5 /* UnitTests.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = UnitTests.octest;
- remoteRef = 28FEA759124AB77B00A3F6B5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 28FEA77A124AB7AA00A3F6B5 /* libThree20Core.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libThree20Core.a;
- remoteRef = 28FEA779124AB7AA00A3F6B5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 28FEA77C124AB7AA00A3F6B5 /* CoreUnitTests.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = CoreUnitTests.octest;
- remoteRef = 28FEA77B124AB7AA00A3F6B5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 28FEA780124AB7AA00A3F6B5 /* libThree20Network.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libThree20Network.a;
- remoteRef = 28FEA77F124AB7AA00A3F6B5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 28FEA782124AB7AA00A3F6B5 /* UnitTests.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = UnitTests.octest;
- remoteRef = 28FEA781124AB7AA00A3F6B5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 28FEA786124AB7AA00A3F6B5 /* libThree20Style.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libThree20Style.a;
- remoteRef = 28FEA785124AB7AA00A3F6B5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 28FEA788124AB7AA00A3F6B5 /* UnitTests.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = UnitTests.octest;
- remoteRef = 28FEA787124AB7AA00A3F6B5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 28FEA78C124AB7AA00A3F6B5 /* libThree20UICommon.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libThree20UICommon.a;
- remoteRef = 28FEA78B124AB7AA00A3F6B5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 28FEA78E124AB7AA00A3F6B5 /* UnitTests.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = UnitTests.octest;
- remoteRef = 28FEA78D124AB7AA00A3F6B5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 28FEA792124AB7AA00A3F6B5 /* libThree20UINavigator.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libThree20UINavigator.a;
- remoteRef = 28FEA791124AB7AA00A3F6B5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 28FEA794124AB7AA00A3F6B5 /* UnitTests.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = UnitTests.octest;
- remoteRef = 28FEA793124AB7AA00A3F6B5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 28FEA798124AB7AA00A3F6B5 /* libThree20UI.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libThree20UI.a;
- remoteRef = 28FEA797124AB7AA00A3F6B5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 28FEA79A124AB7AA00A3F6B5 /* UnitTests.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = UnitTests.octest;
- remoteRef = 28FEA799124AB7AA00A3F6B5 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
@@ -1384,8 +1003,6 @@
28847911124696BA0068364D /* IdentityPickerViewController.m in Sources */,
284BBBA512495C4400366F4C /* MumbleApplication.m in Sources */,
28FEA682124AA5A000A3F6B5 /* ServerConnectionViewController.m in Sources */,
- 28BC8219124D543B00D0D1F9 /* WelcomeScreenController.m in Sources */,
- 2821B7E1124E8EAD001DF8E4 /* MumbleStyleSheet.m in Sources */,
288B55E01252903300563A28 /* ServerCertificateTrustViewController.m in Sources */,
289CBA18125693040015E58E /* ChannelNavigationViewController.m in Sources */,
2838EA0F129316C200035C5D /* CertificatePreferencesViewController.m in Sources */,
@@ -1401,41 +1018,6 @@
name = MumbleKitCombined;
targetProxy = 287EAB821245303E00A0159D /* PBXContainerItemProxy */;
};
- 28FEA7BF124AB80000A3F6B5 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = Three20UI;
- targetProxy = 28FEA7BE124AB80000A3F6B5 /* PBXContainerItemProxy */;
- };
- 28FEA7C1124AB80000A3F6B5 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = Three20;
- targetProxy = 28FEA7C0124AB80000A3F6B5 /* PBXContainerItemProxy */;
- };
- 28FEA7C3124AB80000A3F6B5 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = Three20Network;
- targetProxy = 28FEA7C2124AB80000A3F6B5 /* PBXContainerItemProxy */;
- };
- 28FEA7C5124AB80000A3F6B5 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = Three20UICommon;
- targetProxy = 28FEA7C4124AB80000A3F6B5 /* PBXContainerItemProxy */;
- };
- 28FEA7C7124AB80000A3F6B5 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = Three20UINavigator;
- targetProxy = 28FEA7C6124AB80000A3F6B5 /* PBXContainerItemProxy */;
- };
- 28FEA7C9124AB80000A3F6B5 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = Three20Core;
- targetProxy = 28FEA7C8124AB80000A3F6B5 /* PBXContainerItemProxy */;
- };
- 28FEA7CB124AB80000A3F6B5 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = Three20Style;
- targetProxy = 28FEA7CA124AB80000A3F6B5 /* PBXContainerItemProxy */;
- };
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
@@ -1455,11 +1037,9 @@
"${PROJECT_DIR}/MumbleKit/src/",
"${PROJECT_DIR}/Dependencies/fmdb/src/",
"${PROJECT_DIR}/Dependencies/sqlite/",
- "${PROJECT_DIR}/Dependencies/three20/Build/Products/three20",
);
INFOPLIST_FILE = Source/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
- OTHER_CFLAGS = "-D__IPHONE_OS_VERSION_MIN_REQUIRED=040000";
OTHER_LDFLAGS = (
"-all_load",
"-ObjC",
@@ -1485,11 +1065,9 @@
"${PROJECT_DIR}/MumbleKit/src/",
"${PROJECT_DIR}/Dependencies/fmdb/src/",
"${PROJECT_DIR}/Dependencies/sqlite/",
- "${PROJECT_DIR}/Dependencies/three20/Build/Products/three20",
);
INFOPLIST_FILE = Source/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
- OTHER_CFLAGS = "-D__IPHONE_OS_VERSION_MIN_REQUIRED=040000";
OTHER_LDFLAGS = (
"-all_load",
"-ObjC",
@@ -1505,7 +1083,7 @@
28BC1E7A1227155500C03FCF /* BetaDist */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -1536,11 +1114,9 @@
"${PROJECT_DIR}/MumbleKit/src/",
"${PROJECT_DIR}/Dependencies/fmdb/src/",
"${PROJECT_DIR}/Dependencies/sqlite/",
- "${PROJECT_DIR}/Dependencies/three20/Build/Products/three20",
);
INFOPLIST_FILE = Source/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
- OTHER_CFLAGS = "-D__IPHONE_OS_VERSION_MIN_REQUIRED=040000";
OTHER_LDFLAGS = (
"-all_load",
"-ObjC",
@@ -1558,7 +1134,7 @@
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -1574,7 +1150,7 @@
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
diff --git a/README.markdown b/README.markdown
index dfb23bd..bed1e1b 100644
--- a/README.markdown
+++ b/README.markdown
@@ -21,11 +21,6 @@ required submodules:
$ git submodule init
$ git submodule update
-When they're done checking out, run the FixThree20 script to set
-up Three20 to build for both armv6 and armv7:
-
- $ ./Scripts/FixThree20
-
Then it's time to checkout MumbleKit's dependencies:
$ cd MumbleKit
diff --git a/Scripts/FixThree20 b/Scripts/FixThree20
deleted file mode 100755
index 6017c83..0000000
--- a/Scripts/FixThree20
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-pushd Dependencies/three20
-T20P=src/common/Configurations/Project.xcconfig
-T20L=src/common/Configurations/Library.xcconfig
-git checkout ${T20P} && git checkout ${T20L}
-echo "ARCHS = \$(ARCHS_STANDARD_32_BIT)" >> ${T20P}
-echo "ARCHS = \$(ARCHS_STANDARD_32_BIT)" >> ${T20L}
-popd
diff --git a/Source/Classes/MumbleApplicationDelegate.m b/Source/Classes/MumbleApplicationDelegate.m
index 584b743..7f41cd6 100644
--- a/Source/Classes/MumbleApplicationDelegate.m
+++ b/Source/Classes/MumbleApplicationDelegate.m
@@ -33,11 +33,8 @@
#import "MumbleApplication.h"
#import "WelcomeScreenPhone.h"
#import "WelcomeScreenPad.h"
-#import "WelcomeScreenController.h"
#import "Database.h"
-#import "MumbleStyleSheet.h"
-
#import <MumbleKit/MKAudio.h>
#import <MumbleKit/MKConnectionController.h>
@@ -59,7 +56,6 @@
[self reloadPreferences];
[Database initializeDatabase];
- [TTDefaultStyleSheet setGlobalStyleSheet:[[[MumbleStyleSheet alloc] init] autorelease]];
self.navigationController.toolbarHidden = YES;
[window addSubview:[navigationController view]];
@@ -71,14 +67,6 @@
[imageView setImage:[UIImage imageNamed:@"Splash.png"]];
[window addSubview:imageView];
-#if 1
- self.navigationController.view.autoresizesSubviews = YES;
-
- WelcomeScreenController *welcomeScreen = [[WelcomeScreenController alloc] init];
- [navigationController pushViewController:welcomeScreen animated:NO];
- [welcomeScreen release];
-
-#else
if (idiom == UIUserInterfaceIdiomPad) {
NSLog(@"UIUserInterfaceIdiomPad detected.");
WelcomeScreenPad *welcomeScreen = [[WelcomeScreenPad alloc] initWithNibName:@"WelcomeScreenPad" bundle:nil];
@@ -90,7 +78,6 @@
[navigationController pushViewController:welcomeScreen animated:YES];
[welcomeScreen release];
}
-#endif
[UIView animateWithDuration:0.8f animations:^{
imageView.alpha = 0.0f;
diff --git a/Source/Classes/MumbleStyleSheet.h b/Source/Classes/MumbleStyleSheet.h
deleted file mode 100644
index 2de1109..0000000
--- a/Source/Classes/MumbleStyleSheet.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (C) 2009-2010 Mikkel Krautz <mikkel@krautz.dk>
-
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- - Neither the name of the Mumble Developers nor the names of its
- contributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#import <Three20/Three20.h>
-
-@interface MumbleStyleSheet : TTDefaultStyleSheet
-
-@end
diff --git a/Source/Classes/MumbleStyleSheet.m b/Source/Classes/MumbleStyleSheet.m
deleted file mode 100644
index 6194389..0000000
--- a/Source/Classes/MumbleStyleSheet.m
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright (C) 2009-2010 Mikkel Krautz <mikkel@krautz.dk>
-
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- - Neither the name of the Mumble Developers nor the names of its
- contributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#import "MumbleStyleSheet.h"
-
-@implementation MumbleStyleSheet
-
-- (TTStyle *) launcherButton:(UIControlState)state {
- return [TTPartStyle styleWithName:@"image"
- style:TTSTYLESTATE(launcherButtonImage:, state) next:
- [TTTextStyle styleWithFont:[UIFont boldSystemFontOfSize:11]
- color:[UIColor whiteColor]
- minimumFontSize:11
- shadowColor:[UIColor lightGrayColor]
- shadowOffset:CGSizeMake(-1.5f, 1.5f)
- next:nil]];
-}
-
-@end
diff --git a/Source/Classes/WelcomeScreenController.h b/Source/Classes/WelcomeScreenController.h
deleted file mode 100644
index 529cc99..0000000
--- a/Source/Classes/WelcomeScreenController.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (C) 2009-2010 Mikkel Krautz <mikkel@krautz.dk>
-
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- - Neither the name of the Mumble Developers nor the names of its
- contributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-@interface WelcomeScreenController : UIViewController <TTLauncherViewDelegate> {
- TTLauncherView *_launcherView;
-}
-
-@end
diff --git a/Source/Classes/WelcomeScreenController.m b/Source/Classes/WelcomeScreenController.m
deleted file mode 100644
index 0792667..0000000
--- a/Source/Classes/WelcomeScreenController.m
+++ /dev/null
@@ -1,177 +0,0 @@
-/* Copyright (C) 2009-2010 Mikkel Krautz <mikkel@krautz.dk>
-
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- - Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- - Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- - Neither the name of the Mumble Developers nor the names of its
- contributors may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#import <Three20/Three20.h> // force Xcode to syntax highlight
-#import "WelcomeScreenController.h"
-
-#import "PublicServerListController.h"
-#import "FavouriteServerListController.h"
-#import "LanServerListController.h"
-#import "PreferencesViewController.h"
-#import "ServerRootViewController.h"
-#import "AboutViewController.h"
-
-@implementation WelcomeScreenController
-
-- (void) viewWillAppear:(BOOL)animated {
- self.navigationItem.title = @"Mumble";
-
- TTLauncherItem *item;
- item = [[TTLauncherItem alloc] initWithTitle:@"Public Servers"
- image:@"bundle://globe.png"
- URL:@"mumbleapp://public"];
- [_launcherView addItem:item animated:YES];
-
- item = [[TTLauncherItem alloc] initWithTitle:@"Favourite Servers"
- image:@"bundle://star.png"
- URL:@"mumbleapp://favourite"];
- [_launcherView addItem:item animated:YES];
-
- item = [[TTLauncherItem alloc] initWithTitle:@"LAN Servers"
- image:@"bundle://cloud.png"
- URL:@"mumbleapp://lan"];
- [_launcherView addItem:item animated:YES];
-
- [_launcherView setDelegate:self];
-
- UIBarButtonItem *about = [[UIBarButtonItem alloc] initWithTitle:@"About" style:UIBarButtonItemStyleBordered target:self action:@selector(aboutClicked:)];
- [self.navigationItem setRightBarButtonItem:about];
- [about release];
-
- UIBarButtonItem *prefs = [[UIBarButtonItem alloc] initWithTitle:@"Preferences" style:UIBarButtonItemStyleBordered target:self action:@selector(prefsClicked:)];
- [self.navigationItem setLeftBarButtonItem:prefs];
- [prefs release];
-}
-
-- (void) loadView {
- UIScreen *screen = [UIScreen mainScreen];
- _launcherView = [[TTLauncherView alloc] initWithFrame:[screen applicationFrame]];
- _launcherView.backgroundColor = [UIColor groupTableViewBackgroundColor];
- self.view = _launcherView;
- [_launcherView release];
-}
-
-- (void) viewDidLoad {
- [super viewDidLoad];
- self.view.autoresizesSubviews = YES;
- self.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-}
-
-- (void) viewDidUnload {
- [super viewDidUnload];
-}
-
-#pragma mark -
-#pragma mark TTLauncherView delegate
-
-- (void) launcherView:(TTLauncherView *)launcherView didSelectItem:(TTLauncherItem *)item {
- UIViewController *controller = nil;
- if ([[item URL] isEqualToString:@"mumbleapp://public"]) {
- controller = [[PublicServerListController alloc] init];
- } else if ([[item URL] isEqualToString:@"mumbleapp://favourite"]) {
- controller = [[FavouriteServerListController alloc] init];
- } else if ([[item URL] isEqualToString:@"mumbleapp://lan"]) {
- controller = [[LanServerListController alloc] init];
- }
-
- if (controller) {
- [[self navigationController] pushViewController:controller animated:YES];
- [controller release];
- }
-}
-
-
-- (void) launcherViewDidBeginEditing:(TTLauncherView *)launcher {
- UIBarButtonItem *flexSpace = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil];
- UIBarButtonItem *doneButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(doneEditingClicked:)];
- [self setToolbarItems:[NSArray arrayWithObjects:flexSpace, doneButton, flexSpace, nil]];
- [self.navigationController setToolbarHidden:NO animated:YES];
- [doneButton release];
- [flexSpace release];
-}
-
-- (void) launcherViewDidEndEditing:(TTLauncherView *)launcher {
- [self.navigationController setToolbarHidden:YES animated:YES];
-}
-
-#pragma mark -
-#pragma mark Actions
-
-- (void) aboutClicked:(id)sender {
-#ifdef MUMBLE_BETA_DIST
- NSString *aboutTitle = [NSString stringWithFormat:@"Mumble %@ (%@)",
- [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"],
- [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MumbleGitRevision"]];
-#else
- NSString *aboutTitle = [NSString stringWithFormat:@"Mumble %@",
- [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]];
-#endif
- NSString *aboutMessage = @"Low-latency, high-quality VoIP app";
-
- UIAlertView *aboutView = [[UIAlertView alloc] initWithTitle:aboutTitle message:aboutMessage delegate:self
- cancelButtonTitle:@"OK"
- otherButtonTitles:@"Website", @"Contributors", @"Legal", nil];
- [aboutView show];
- [aboutView release];
-}
-
-- (void) prefsClicked:(id)sender {
- PreferencesViewController *prefs = [[[PreferencesViewController alloc] init] autorelease];
- [self.navigationController pushViewController:prefs animated:YES];
-}
-
-- (void) doneEditingClicked:(id)sender {
- [_launcherView endEditing];
-}
-
-#pragma mark -
-#pragma mark About Dialog
-
-- (void) alertView:(UIAlertView *)alert didDismissWithButtonIndex:(NSInteger)buttonIndex {
- if (buttonIndex == 1) {
- [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"http://www.mumble.info/"]];
- } else if (buttonIndex == 2) {
- AboutViewController *contribView = [[AboutViewController alloc] initWithContent:@"Contributors"];
- UINavigationController *navController = [[UINavigationController alloc] init];
- [navController pushViewController:contribView animated:NO];
- [contribView release];
- [[self navigationController] presentModalViewController:navController animated:YES];
- [navController release];
- } else if (buttonIndex == 3) {
- AboutViewController *legalView = [[AboutViewController alloc] initWithContent:@"Legal"];
- UINavigationController *navController = [[UINavigationController alloc] init];
- [navController pushViewController:legalView animated:NO];
- [legalView release];
- [[self navigationController] presentModalViewController:navController animated:YES];
- [navController release];
- }
-}
-
-@end
diff --git a/Source/Classes/WelcomeScreenPhone.m b/Source/Classes/WelcomeScreenPhone.m
index f2967a4..a31e4bf 100644
--- a/Source/Classes/WelcomeScreenPhone.m
+++ b/Source/Classes/WelcomeScreenPhone.m
@@ -61,11 +61,17 @@
[super viewDidLoad];
}
-- (void) viewDidAppear:(BOOL)animated {
- [super viewDidAppear:animated];
-
+- (void) viewWillAppear:(BOOL)animated {
self.navigationItem.title = @"Mumble";
self.navigationController.toolbarHidden = YES;
+
+ UIBarButtonItem *about = [[UIBarButtonItem alloc] initWithTitle:@"About" style:UIBarButtonItemStyleBordered target:self action:@selector(aboutClicked:)];
+ [self.navigationItem setRightBarButtonItem:about];
+ [about release];
+
+ UIBarButtonItem *prefs = [[UIBarButtonItem alloc] initWithTitle:@"Preferences" style:UIBarButtonItemStyleBordered target:self action:@selector(prefsClicked:)];
+ [self.navigationItem setLeftBarButtonItem:prefs];
+ [prefs release];
}
- (void) didReceiveMemoryWarning {
@@ -140,32 +146,43 @@
}
}
-#pragma mark -
-#pragma mark About Dialog
-
-- (void) presentAboutDialog {
- NSString *aboutTitle = [NSString stringWithFormat:@"Mumble %@", [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]];
+- (void) aboutClicked:(id)sender {
+#ifdef MUMBLE_BETA_DIST
+ NSString *aboutTitle = [NSString stringWithFormat:@"Mumble %@ (%@)",
+ [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"],
+ [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MumbleGitRevision"]];
+#else
+ NSString *aboutTitle = [NSString stringWithFormat:@"Mumble %@",
+ [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]];
+#endif
NSString *aboutMessage = @"Low-latency, high-quality VoIP app";
+
+ UIAlertView *aboutView = [[UIAlertView alloc] initWithTitle:aboutTitle message:aboutMessage delegate:self
+ cancelButtonTitle:@"OK"
+ otherButtonTitles:@"Website", @"Contributors", @"Legal", nil];
+ [aboutView show];
+ [aboutView release];
+}
- _aboutView = [[UIAlertView alloc] initWithTitle:aboutTitle message:aboutMessage delegate:self cancelButtonTitle:@"OK" otherButtonTitles:nil];
- _aboutWebsiteButton = [_aboutView addButtonWithTitle:@"Website"];
- _aboutContribButton = [_aboutView addButtonWithTitle:@"Contributors"];
- _aboutLegalButton = [_aboutView addButtonWithTitle:@"Legal"];
- [_aboutView show];
- [_aboutView release];
+- (void) prefsClicked:(id)sender {
+ PreferencesViewController *prefs = [[[PreferencesViewController alloc] init] autorelease];
+ [self.navigationController pushViewController:prefs animated:YES];
}
+#pragma mark -
+#pragma mark About Dialog
+
- (void) alertView:(UIAlertView *)alert didDismissWithButtonIndex:(NSInteger)buttonIndex {
- if (buttonIndex == _aboutWebsiteButton) {
+ if (buttonIndex == 1) {
[[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"http://www.mumble.info/"]];
- } else if (buttonIndex == _aboutContribButton) {
+ } else if (buttonIndex == 2) {
AboutViewController *contribView = [[AboutViewController alloc] initWithContent:@"Contributors"];
UINavigationController *navController = [[UINavigationController alloc] init];
[navController pushViewController:contribView animated:NO];
[contribView release];
[[self navigationController] presentModalViewController:navController animated:YES];
[navController release];
- } else if (buttonIndex == _aboutLegalButton) {
+ } else if (buttonIndex == 3) {
AboutViewController *legalView = [[AboutViewController alloc] initWithContent:@"Legal"];
UINavigationController *navController = [[UINavigationController alloc] init];
[navController pushViewController:legalView animated:NO];
diff --git a/Source/Mumble.pch b/Source/Mumble.pch
index 7140a68..45feba2 100644
--- a/Source/Mumble.pch
+++ b/Source/Mumble.pch
@@ -42,6 +42,5 @@
# import <Foundation/Foundation.h>
# import <UIKit/UIKit.h>
# import <QuartzCore/QuartzCore.h>
-# import <Three20/Three20.h>
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 10:33:38 +0300