Fixed MobileTerminal default color issue.

git-svn-id: http://svn.telesphoreo.org/trunk@461 514c082c-b64e-11dc-b46d-3d985efe055d

2 files changed, 41 insertions, 4 deletions

diff --git a/data/mobileterminal/_metadata/postinst b/data/mobileterminal/_metadata/postinst
index c0b1fb066..93c5556ce 100644
--- a/data/mobileterminal/_metadata/postinst
+++ b/data/mobileterminal/_metadata/postinst
@@ -2,10 +2,7 @@
 shopt -s extglob
 
 if [[ $# -gt 1 && $1 == configure ]]; then
-    ver=${2%%?(u)-*([0-9])}
-    rev=${2##*-}
-
-    if [[ ${ver} -lt 286 || ${ver} -eq 286 && ${rev} -lt 6 ]]; then
+    if [[ $2 == 316s-5 ]]; then
         rm -f ~mobile/Library/Preferences/com.googlecode.mobileterminal.plist
     fi
 fi
diff --git a/data/mobileterminal/build.diff b/data/mobileterminal/build.diff
index 03f60d98a..8dc13df43 100644
--- a/data/mobileterminal/build.diff
+++ b/data/mobileterminal/build.diff
@@ -1,4 +1,5 @@
 Only in mobileterminal-316s+iPhone/Artwork: .svn
+Only in mobileterminal-316s+iPhone: build
 Only in mobileterminal-316s+iPhone: dstools
 diff -ru mobileterminal-316s/Makefile.build mobileterminal-316s+iPhone/Makefile.build
 --- mobileterminal-316s/Makefile.build	2008-08-23 05:14:22.000000000 +0000
@@ -65,10 +66,49 @@ diff -ru mobileterminal-316s/Sources/Misc/Color.h mobileterminal-316s+iPhone/Sou
  
  UIColor *colorWithRGBA(float red, float green, float blue, float alpha);
  
+diff -ru mobileterminal-316s/Sources/Misc/Color.m mobileterminal-316s+iPhone/Sources/Misc/Color.m
+--- mobileterminal-316s/Sources/Misc/Color.m	2008-08-23 04:37:49.000000000 +0000
++++ mobileterminal-316s+iPhone/Sources/Misc/Color.m	2008-08-27 01:32:07.000000000 +0000
+@@ -35,6 +35,7 @@
+ + (NSArray *)arrayWithColor:(UIColor *)color
+ {
+     const CGFloat * rgba = CGColorGetComponents([color CGColor]);
++    NSLog(@"  %f:%f:%f:%f", rgba[0], rgba[1], rgba[2], rgba[3]);
+ 
+     return [NSArray arrayWithObjects:
+            [NSNumber numberWithFloat:rgba[0]],
 Only in mobileterminal-316s+iPhone/Sources/Misc: ColorMap.o
 Only in mobileterminal-316s+iPhone/Sources/Misc: Color.o
 Only in mobileterminal-316s+iPhone/Sources/Misc: Constants.o
 Only in mobileterminal-316s+iPhone/Sources/Misc: Log.o
+diff -ru mobileterminal-316s/Sources/Misc/Settings.m mobileterminal-316s+iPhone/Sources/Misc/Settings.m
+--- mobileterminal-316s/Sources/Misc/Settings.m	2008-08-23 05:14:22.000000000 +0000
++++ mobileterminal-316s+iPhone/Sources/Misc/Settings.m	2008-08-27 01:43:56.000000000 +0000
+@@ -163,17 +163,19 @@
+         NSArray *colorValues;
+ 
+         switch (i) { // bg color
+-            default: colorValues = [NSArray arrayWithColor:[UIColor blackColor]]; break;
++            default: colorValues = [NSArray arrayWithColor:colorWithRGBA(0, 0, 0, 1)]; break;
+             case 1: colorValues = [NSArray arrayWithColor:colorWithRGBA(0, 0.05f, 0, 1)]; break;
+             case 2: colorValues = [NSArray arrayWithColor:colorWithRGBA(0, 0, 0.1f, 1)]; break;
+             case 3: colorValues = [NSArray arrayWithColor:colorWithRGBA(0.1f, 0, 0, 1)]; break;
+         };
+         [ca addObject:colorValues];
+ 
+-        [ca addObject:[NSArray arrayWithColor:[UIColor whiteColor]]]; // fg color
+-        [ca addObject:[NSArray arrayWithColor:[UIColor yellowColor]]]; // bold color
+-        [ca addObject:[NSArray arrayWithColor:[UIColor redColor]]]; // cursor text
+-        [ca addObject:[NSArray arrayWithColor:[UIColor yellowColor]]]; // cursor color
++        UIColor *yellow = colorWithRGBA(1, 1, 0, 1);
++
++        [ca addObject:[NSArray arrayWithColor:colorWithRGBA(1, 1, 1, 1)]]; // fg color
++        [ca addObject:[NSArray arrayWithColor:yellow]]; // bold color
++        [ca addObject:[NSArray arrayWithColor:colorWithRGBA(1, 0, 0, 1)]]; // cursor text
++        [ca addObject:[NSArray arrayWithColor:yellow]]; // cursor color
+ 
+         [tc setObject:ca forKey:@"colors"];
+         [tcs addObject:tc];
 Only in mobileterminal-316s+iPhone/Sources/Misc: Settings.o
 Only in mobileterminal-316s+iPhone/Sources/Misc: .svn
 Only in mobileterminal-316s+iPhone/Sources/Misc: Tools.o