Use connection status for menu

diff --git a/res/menu/main.xml b/res/menu/main.xml
index aaf037f78314d93706e7f0f60ded9512b4e652d2..b3ed52df2a26daf1782b09a0030ebdcdcf433fb2 100644 (file)
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -4,6 +4,6 @@
                android:title="Connect" />
        <item android:id="@+id/disconnect"
                android:title="Disconnect" />
-       <item android:id="@+id/help"
-               android:title="Help" />
+       <item android:id="@+id/exit"
+               android:title="Exit" />
 </menu>

diff --git a/src/org/pileus/spades/Main.java b/src/org/pileus/spades/Main.java
index 29bfff9cd624c518b970c5934ccd8f1fbd700080..cf0baed4caa470a64dfc3be81ad851bc2ee26d6b 100644 (file)
--- a/src/org/pileus/spades/Main.java
+++ b/src/org/pileus/spades/Main.java
@@ -26,6 +26,7 @@ public class Main extends Activity
 
        /* Private data */
        private Task         task;
+       private boolean      ready;
 
        /* Widgets */
        private TabHost      window;
@@ -184,6 +185,14 @@ public class Main extends Activity
                return true;
        }
 
+       @Override
+       public boolean onPrepareOptionsMenu(Menu menu)
+       {
+               menu.findItem(R.id.connect).setVisible(!this.ready);
+               menu.findItem(R.id.disconnect).setVisible(this.ready);
+               return true;
+       }
+
        @Override
        public boolean onOptionsItemSelected(MenuItem item)
        {
@@ -194,8 +203,9 @@ public class Main extends Activity
                        case R.id.disconnect:
                                this.stopService();
                                return true;
-                       case R.id.help:
-                               Os.debug("Main: Help!");
+                       case R.id.exit:
+                               this.stopService();
+                               this.finish();
                                return true;
                        default:
                                return false;
@@ -214,6 +224,12 @@ public class Main extends Activity
                                case Task.MESSAGE:
                                        Main.this.onMessage(msg.obj);
                                        break;
+                               case Task.CONNECT:
+                                       Main.this.ready = true;
+                                       break;
+                               case Task.DISCONNECT:
+                                       Main.this.ready = false;
+                                       break;
                                default:
                                        Os.debug("Main: unknown message - " + msg.what);
                                        break;