1 files changed, 23 insertions, 6 deletions

diff --git a/app/src/main/java/org/connectbot/HelpActivity.java b/app/src/main/java/org/connectbot/HelpActivity.java
index 0abcf17..5fae5ff 100644
--- a/app/src/main/java/org/connectbot/HelpActivity.java
+++ b/app/src/main/java/org/connectbot/HelpActivity.java
@@ -20,14 +20,17 @@ package org.connectbot;
 import java.io.IOException;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.Intent;
 import android.content.res.AssetManager;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.LinearLayout;
+import android.widget.TableRow;
 
 /**
  * @author Kenny Root
@@ -39,6 +42,9 @@ public class HelpActivity extends Activity {
 	public final static String HELPDIR = "help";
 	public final static String SUFFIX = ".html";
 
+	private LayoutInflater inflater = null;
+
+
 	@Override
 	public void onCreate(Bundle icicle) {
 		super.onCreate(icicle);
@@ -74,17 +80,28 @@ public class HelpActivity extends Activity {
 			Log.e(TAG, "couldn't get list of help assets", e);
 		}
 
-		Button button = new Button(this);
-		final String topic = getResources().getString(R.string.terms_and_conditions);
-		button.setText(topic);
+		inflater = LayoutInflater.from(this);
+		Button shortcutsButton = new Button(this);
+		shortcutsButton.setText(getResources().getString(R.string.keyboard_shortcuts));
+		shortcutsButton.setOnClickListener(new OnClickListener() {
+			public void onClick(View v) {
+				final View shortcuts = inflater.inflate(R.layout.dia_keyboard_shortcuts, null, false);
+				new AlertDialog.Builder(HelpActivity.this)
+						.setView(shortcuts)
+						.setTitle(R.string.keyboard_shortcuts)
+						.show();
+			}
+		});
+		content.addView(shortcutsButton);
 
-		button.setOnClickListener(new OnClickListener() {
+		Button eulaButton = new Button(this);
+		eulaButton.setText(getResources().getString(R.string.terms_and_conditions));
+		eulaButton.setOnClickListener(new OnClickListener() {
 			public void onClick(View v) {
 				Intent intent = new Intent(HelpActivity.this, EulaActivity.class);
 				HelpActivity.this.startActivity(intent);
 			}
 		});
-
-		content.addView(button);
+		content.addView(eulaButton);
 	}
 }