From ef17483ae7ac52c7e9b5bd62480854a8a6e2685a Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Wed, 23 Dec 2009 17:37:24 +0000
Subject: Set default FG/BG during colors reset

git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@459 df292f66-193f-0410-a5fc-6d59da041ff2
---
 AndroidManifest.xml                    | 2 +-
 src/org/connectbot/ColorsActivity.java | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d4306c3..be2541c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="org.connectbot"
 	android:versionName="1.7-dev"
-	android:versionCode="242">
+	android:versionCode="243">
 
 	<application
 		android:icon="@drawable/icon"
diff --git a/src/org/connectbot/ColorsActivity.java b/src/org/connectbot/ColorsActivity.java
index 37e2c35..3b0fc71 100644
--- a/src/org/connectbot/ColorsActivity.java
+++ b/src/org/connectbot/ColorsActivity.java
@@ -308,6 +308,7 @@ public class ColorsActivity extends Activity implements OnItemClickListener, OnC
 		reset.setIcon(android.R.drawable.ic_menu_revert);
 		reset.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 			public boolean onMenuItemClick(MenuItem arg0) {
+				// Reset each individual color to defaults.
 				for (int i = 0; i < Colors.defaults.length; i++) {
 					if (mColorList.get(i) != Colors.defaults[i]) {
 						hostdb.setGlobalColor(i, Colors.defaults[i]);
@@ -315,6 +316,13 @@ public class ColorsActivity extends Activity implements OnItemClickListener, OnC
 					}
 				}
 				mColorGrid.invalidateViews();
+
+				// Reset the default FG/BG colors as well.
+				mFgSpinner.setSelection(HostDatabase.DEFAULT_FG_COLOR);
+				mBgSpinner.setSelection(HostDatabase.DEFAULT_BG_COLOR);
+				hostdb.setDefaultColorsForScheme(HostDatabase.DEFAULT_COLOR_SCHEME,
+						HostDatabase.DEFAULT_FG_COLOR, HostDatabase.DEFAULT_BG_COLOR);
+
 				return true;
 			}
 		});
-- 
cgit v1.2.3