Renamed HB Portable to HB Express

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@35 b64f7644-9d1e-0410-96f1-a4d463321fa5

8 files changed, 68 insertions, 44 deletions

diff --git a/macosx/English.lproj/Portable.nib/classes.nib b/macosx/English.lproj/Express.nib/classes.nib
index c9525762f..28084023a 100644
--- a/macosx/English.lproj/Portable.nib/classes.nib
+++ b/macosx/English.lproj/Express.nib/classes.nib
@@ -27,6 +27,34 @@
             }; 
             SUPERCLASS = NSObject; 
         }, 
+        {
+            ACTIONS = {
+                convertGo = id; 
+                openBrowse = id; 
+                openGo = id; 
+                openMatrixChanged = id; 
+                openShow = id; 
+            }; 
+            CLASS = ExpressController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                fConvertFolderPopUp = NSPopUpButton; 
+                fConvertIndicator = NSProgressIndicator; 
+                fConvertTableView = NSTableView; 
+                fConvertView = NSView; 
+                fEmptyView = NSView; 
+                fOpenBrowseButton = NSButton; 
+                fOpenFolderField = NSTextField; 
+                fOpenGoButton = NSButton; 
+                fOpenIndicator = NSProgressIndicator; 
+                fOpenMatrix = NSMatrix; 
+                fOpenPopUp = NSPopUpButton; 
+                fOpenProgressField = NSTextField; 
+                fOpenView = NSView; 
+                fWindow = NSWindow; 
+            }; 
+            SUPERCLASS = NSObject; 
+        }, 
         {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
         {
             ACTIONS = {
diff --git a/macosx/English.lproj/Portable.nib/info.nib b/macosx/English.lproj/Express.nib/info.nib
index ff2bd783c..6dbd31c86 100644
--- a/macosx/English.lproj/Portable.nib/info.nib
+++ b/macosx/English.lproj/Express.nib/info.nib
@@ -9,7 +9,7 @@
 		<key>248</key>
 		<string>483 424 408 321 0 0 1440 878 </string>
 		<key>259</key>
-		<string>484 331 408 508 0 0 1440 878 </string>
+		<string>417 300 408 508 0 0 1280 832 </string>
 		<key>29</key>
 		<string>33 298 338 44 0 0 1280 832 </string>
 		<key>303</key>
@@ -17,11 +17,7 @@
 	</dict>
 	<key>IBFramework Version</key>
 	<string>443.0</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>259</integer>
-	</array>
 	<key>IBSystem Version</key>
-	<string>8F1111g</string>
+	<string>8H14</string>
 </dict>
 </plist>
diff --git a/macosx/English.lproj/Express.nib/keyedobjects.nib b/macosx/English.lproj/Express.nib/keyedobjects.nib
new file mode 100644
index 000000000..0e4089422
--- /dev/null
+++ b/macosx/English.lproj/Express.nib/keyedobjects.nib
diff --git a/macosx/English.lproj/Portable.nib/keyedobjects.nib b/macosx/English.lproj/Portable.nib/keyedobjects.nib
deleted file mode 100644
index cdb138437..000000000
--- a/macosx/English.lproj/Portable.nib/keyedobjects.nib
+++ /dev/null
diff --git a/macosx/Portable.plist b/macosx/Express.plist
index bb5a8597f..7dbd1012e 100644
--- a/macosx/Portable.plist
+++ b/macosx/Express.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.m0k.handbrake.portable</string>
+	<string>org.m0k.handbrake.express</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
@@ -17,7 +17,7 @@
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<key>NSMainNibFile</key>
-	<string>Portable</string>
+	<string>Express</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 </dict>
diff --git a/macosx/PortableController.h b/macosx/ExpressController.h
index 6ebcfa8b6..040728745 100644
--- a/macosx/PortableController.h
+++ b/macosx/ExpressController.h
@@ -1,9 +1,9 @@
-/* PortableController */
+/* ExpressController */
 
 #import <Cocoa/Cocoa.h>
 #import "hb.h"
 
-@interface PortableController : NSObject
+@interface ExpressController : NSObject
 
 {
     hb_handle_t                  * fHandle;
diff --git a/macosx/PortableController.m b/macosx/ExpressController.m
index a807753a9..6a56072bc 100644
--- a/macosx/PortableController.m
+++ b/macosx/ExpressController.m
@@ -1,6 +1,6 @@
-#import "PortableController.h"
+#import "ExpressController.h"
 
-@interface PortableController (Private)
+@interface ExpressController (Private)
 
 - (void) openBrowseDidEnd: (NSOpenPanel *) sheet returnCode: (int)
     returnCode contextInfo: (void *) contextInfo;
@@ -12,7 +12,7 @@
 
 @end
 
-@implementation PortableController
+@implementation ExpressController
 
 /***********************************************************************
  * Application delegate methods
@@ -213,7 +213,7 @@
  * Private methods
  **********************************************************************/
 
-@implementation PortableController (Private)
+@implementation ExpressController (Private)
 
 - (void) openBrowseDidEnd: (NSOpenPanel *) sheet returnCode: (int)
     returnCode contextInfo: (void *) contextInfo
diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 240f92229..d62cb1f21 100644
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -9,8 +9,8 @@
 /* Begin PBXBuildFile section */
 		4D1EA2EA0993B09A00FDC1A2 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; };
 		4D1EA2F60993B0CA00FDC1A2 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-		4D1EA3010993B13700FDC1A2 /* Portable.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4D1EA3000993B13700FDC1A2 /* Portable.nib */; };
-		4D1EA31C0993B24700FDC1A2 /* PortableController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1EA31B0993B24700FDC1A2 /* PortableController.m */; };
+		4D1EA3010993B13700FDC1A2 /* Express.nib in Resources */ = {isa = PBXBuildFile; fileRef = 4D1EA3000993B13700FDC1A2 /* Express.nib */; };
+		4D1EA31C0993B24700FDC1A2 /* ExpressController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D1EA31B0993B24700FDC1A2 /* ExpressController.m */; };
 		4D3ECC2709A4917000B2E45F /* WhiteBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D3ECC2609A4917000B2E45F /* WhiteBox.m */; };
 		4DD93F8F082036E8008E1322 /* Controller.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DF3C8CB052889CD00A80101 /* Controller.h */; };
 		4DD93F90082036E8008E1322 /* PictureGLView.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D85758F052B78E300C39CA9 /* PictureGLView.h */; };
@@ -70,11 +70,11 @@
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
 		4D118405053054CD00C39CA9 /* HandBrake.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HandBrake.icns; sourceTree = "<group>"; };
-		4D1EA2DA0993B01000FDC1A2 /* HandBrake Portable.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HandBrake Portable.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		4D1EA2DC0993B01000FDC1A2 /* Portable.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Portable.plist; sourceTree = "<group>"; };
-		4D1EA3000993B13700FDC1A2 /* Portable.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Portable.nib; path = English.lproj/Portable.nib; sourceTree = "<group>"; };
-		4D1EA31A0993B24700FDC1A2 /* PortableController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PortableController.h; sourceTree = "<group>"; };
-		4D1EA31B0993B24700FDC1A2 /* PortableController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PortableController.m; sourceTree = "<group>"; };
+		4D1EA2DA0993B01000FDC1A2 /* HandBrake Express.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HandBrake Express.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		4D1EA2DC0993B01000FDC1A2 /* Express.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Express.plist; sourceTree = "<group>"; };
+		4D1EA3000993B13700FDC1A2 /* Express.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Express.nib; path = English.lproj/Express.nib; sourceTree = "<group>"; };
+		4D1EA31A0993B24700FDC1A2 /* ExpressController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ExpressController.h; sourceTree = "<group>"; };
+		4D1EA31B0993B24700FDC1A2 /* ExpressController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ExpressController.m; sourceTree = "<group>"; };
 		4D1FD381073D19CE00E46515 /* PictureController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PictureController.h; sourceTree = "<group>"; };
 		4D1FD382073D19CE00E46515 /* PictureController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PictureController.mm; sourceTree = "<group>"; };
 		4D3ECC2509A4917000B2E45F /* WhiteBox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WhiteBox.h; sourceTree = "<group>"; };
@@ -120,8 +120,8 @@
 		080E96DDFE201D6D7F000001 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
-				4D1EA31A0993B24700FDC1A2 /* PortableController.h */,
-				4D1EA31B0993B24700FDC1A2 /* PortableController.m */,
+				4D1EA31A0993B24700FDC1A2 /* ExpressController.h */,
+				4D1EA31B0993B24700FDC1A2 /* ExpressController.m */,
 				4D1FD381073D19CE00E46515 /* PictureController.h */,
 				4D1FD382073D19CE00E46515 /* PictureController.mm */,
 				4DF3C8CB052889CD00A80101 /* Controller.h */,
@@ -163,7 +163,7 @@
 			isa = PBXGroup;
 			children = (
 				4DD93FA6082036E8008E1322 /* HandBrake.app */,
-				4D1EA2DA0993B01000FDC1A2 /* HandBrake Portable.app */,
+				4D1EA2DA0993B01000FDC1A2 /* HandBrake Express.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -177,7 +177,7 @@
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
 				19C28FACFE9D520D11CA2CBB /* Products */,
 				4DE09E62082038A400FB751F /* HandBrake.plist */,
-				4D1EA2DC0993B01000FDC1A2 /* Portable.plist */,
+				4D1EA2DC0993B01000FDC1A2 /* Express.plist */,
 			);
 			name = HandBrake;
 			sourceTree = "<group>";
@@ -195,7 +195,7 @@
 			children = (
 				29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
 				4D118405053054CD00C39CA9 /* HandBrake.icns */,
-				4D1EA3000993B13700FDC1A2 /* Portable.nib */,
+				4D1EA3000993B13700FDC1A2 /* Express.nib */,
 				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
 			);
 			name = Resources;
@@ -229,9 +229,9 @@
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
-		4D1EA2D90993B01000FDC1A2 /* HandBrake Portable */ = {
+		4D1EA2D90993B01000FDC1A2 /* HandBrake Express */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "HandBrake Portable" */;
+			buildConfigurationList = 4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "HandBrake Express" */;
 			buildPhases = (
 				4D1EA2D60993B01000FDC1A2 /* Resources */,
 				4D1EA2D70993B01000FDC1A2 /* Sources */,
@@ -244,7 +244,7 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
-				INFOPLIST_FILE = "HandBrake Portable.plist";
+				INFOPLIST_FILE = "HandBrake Express.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
 					"-framework",
@@ -253,15 +253,15 @@
 					AppKit,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = "HandBrake Portable";
+				PRODUCT_NAME = "HandBrake Express";
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = YES;
 			};
 			dependencies = (
 			);
-			name = "HandBrake Portable";
-			productName = "HandBrake Portable";
-			productReference = 4D1EA2DA0993B01000FDC1A2 /* HandBrake Portable.app */;
+			name = "HandBrake Express";
+			productName = "HandBrake Express";
+			productReference = 4D1EA2DA0993B01000FDC1A2 /* HandBrake Express.app */;
 			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
 <plist version=\"1.0\">
@@ -271,7 +271,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.HandBrake Portable</string>
+	<string>com.yourcompany.HandBrake Express</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
@@ -361,7 +361,7 @@
 			projectDirPath = "";
 			targets = (
 				4DD93F8D082036E8008E1322 /* HandBrake */,
-				4D1EA2D90993B01000FDC1A2 /* HandBrake Portable */,
+				4D1EA2D90993B01000FDC1A2 /* HandBrake Express */,
 			);
 		};
 /* End PBXProject section */
@@ -371,7 +371,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				4D1EA3010993B13700FDC1A2 /* Portable.nib in Resources */,
+				4D1EA3010993B13700FDC1A2 /* Express.nib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -394,7 +394,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				4D1EA2EA0993B09A00FDC1A2 /* main.mm in Sources */,
-				4D1EA31C0993B24700FDC1A2 /* PortableController.m in Sources */,
+				4D1EA31C0993B24700FDC1A2 /* ExpressController.m in Sources */,
 				4D3ECC2709A4917000B2E45F /* WhiteBox.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -447,7 +447,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
 				HEADER_SEARCH_PATHS = ../libhb;
-				INFOPLIST_FILE = Portable.plist;
+				INFOPLIST_FILE = Express.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
 					../libhb/libhb.a,
@@ -468,7 +468,7 @@
 					../contrib/lib/libxvidcore.a,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = "HandBrake Portable";
+				PRODUCT_NAME = "HandBrake Express";
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = NO;
 			};
@@ -484,7 +484,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
 				HEADER_SEARCH_PATHS = ../libhb;
-				INFOPLIST_FILE = Portable.plist;
+				INFOPLIST_FILE = Express.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
 					../libhb/libhb.a,
@@ -505,7 +505,7 @@
 					../contrib/lib/libxvidcore.a,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = "HandBrake Portable";
+				PRODUCT_NAME = "HandBrake Express";
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = NO;
 			};
@@ -519,7 +519,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
 				HEADER_SEARCH_PATHS = ../libhb;
-				INFOPLIST_FILE = Portable.plist;
+				INFOPLIST_FILE = Express.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
 				OTHER_LDFLAGS = (
 					../libhb/libhb.a,
@@ -540,7 +540,7 @@
 					../contrib/lib/libxvidcore.a,
 				);
 				PREBINDING = NO;
-				PRODUCT_NAME = "HandBrake Portable";
+				PRODUCT_NAME = "HandBrake Express";
 				WRAPPER_EXTENSION = app;
 				ZERO_LINK = NO;
 			};
@@ -693,7 +693,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "HandBrake Portable" */ = {
+		4D1EA2DD0993B01100FDC1A2 /* Build configuration list for PBXNativeTarget "HandBrake Express" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				4D1EA2DE0993B01100FDC1A2 /* Development */,