Android: new, more-logical menu hierarchy

9 files changed, 200 insertions, 139 deletions

diff --git a/android/res/drawable-ldpi/ic_annotation.png b/android/res/drawable-ldpi/ic_annotation.png
new file mode 100644
index 00000000..1f4e6d48
--- /dev/null
+++ b/android/res/drawable-ldpi/ic_annotation.png
diff --git a/android/res/drawable-ldpi/ic_check.png b/android/res/drawable-ldpi/ic_check.png
new file mode 100644
index 00000000..fb789c8d
--- /dev/null
+++ b/android/res/drawable-ldpi/ic_check.png
diff --git a/android/res/drawable-ldpi/ic_more.png b/android/res/drawable-ldpi/ic_more.png
new file mode 100644
index 00000000..68988a56
--- /dev/null
+++ b/android/res/drawable-ldpi/ic_more.png
diff --git a/android/res/drawable-mdpi/ic_annotation.png b/android/res/drawable-mdpi/ic_annotation.png
new file mode 100644
index 00000000..6f81c4a0
--- /dev/null
+++ b/android/res/drawable-mdpi/ic_annotation.png
diff --git a/android/res/drawable-mdpi/ic_check.png b/android/res/drawable-mdpi/ic_check.png
new file mode 100644
index 00000000..527aaeb9
--- /dev/null
+++ b/android/res/drawable-mdpi/ic_check.png
diff --git a/android/res/drawable-mdpi/ic_more.png b/android/res/drawable-mdpi/ic_more.png
new file mode 100644
index 00000000..2b662ab3
--- /dev/null
+++ b/android/res/drawable-mdpi/ic_more.png
diff --git a/android/res/layout/buttons.xml b/android/res/layout/buttons.xml
index 7dea3bb1..8759d3c7 100644
--- a/android/res/layout/buttons.xml
+++ b/android/res/layout/buttons.xml
@@ -12,7 +12,7 @@
         android:layout_centerHorizontal="true" >
 
         <RelativeLayout
-            android:id="@+id/topBar"
+			android:id="@+id/topBar0Main"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/toolbar" >
@@ -35,55 +35,56 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_toLeftOf="@+id/annotButton"
+                android:layout_toLeftOf="@+id/reflowButton"
                 android:contentDescription="@string/link_control"
                 android:background="@drawable/button"
                 android:src="@drawable/ic_link" />
 
             <ImageButton
-                android:id="@+id/annotButton"
+                android:id="@+id/reflowButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toLeftOf="@+id/outlineButton"
-                android:contentDescription="@string/edit_annotations"
+                android:contentDescription="@string/search_document"
                 android:background="@drawable/button"
-                android:src="@drawable/ic_annot" />
+                android:src="@drawable/ic_reflow" />
 
             <ImageButton
                 android:id="@+id/outlineButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_toLeftOf="@+id/reflowButton"
+                android:layout_toLeftOf="@+id/searchButton"
                 android:contentDescription="@string/search_document"
                 android:background="@drawable/button"
                 android:src="@drawable/ic_list" />
 
             <ImageButton
-                android:id="@+id/reflowButton"
+                android:id="@+id/searchButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_toLeftOf="@+id/searchButton"
+                android:layout_toLeftOf="@+id/moreButton"
                 android:contentDescription="@string/search_document"
                 android:background="@drawable/button"
-                android:src="@drawable/ic_reflow" />
+                android:src="@drawable/ic_magnifying_glass" />
 
             <ImageButton
-                android:id="@+id/searchButton"
+                android:id="@+id/moreButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_alignParentRight="true"
-                android:contentDescription="@string/search_document"
-                android:background="@drawable/button"
-                android:src="@drawable/ic_magnifying_glass" />
+                android:contentDescription="@string/more"
+				android:background="@drawable/button"
+				android:onClick="OnMoreButtonClick"
+                android:src="@drawable/ic_more" />
 
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/topBar2"
+            android:id="@+id/topBar1Search"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/toolbar" >
@@ -134,20 +135,20 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/topBar3"
+            android:id="@+id/topBar2Annot"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/toolbar" >
 
             <ImageButton
-                android:id="@+id/cancelSelectButton"
+                android:id="@+id/cancelAnnotButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_alignParentLeft="true"
                 android:contentDescription="@string/cancel"
                 android:background="@drawable/button"
-                android:onClick="OnCancelSelectButtonClick"
+                android:onClick="OnCancelAnnotButtonClick"
                 android:src="@drawable/ic_cancel" />
 
             <ImageButton
@@ -177,27 +178,27 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_toLeftOf="@+id/copySelectButton"
+                android:layout_toLeftOf="@+id/inkButton"
                 android:contentDescription="@string/strike_out"
                 android:background="@drawable/button"
                 android:onClick="OnStrikeOutButtonClick"
                 android:src="@drawable/ic_strike" />
 
             <ImageButton
-                android:id="@+id/copySelectButton"
+                android:id="@+id/inkButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_alignParentRight="true"
-                android:contentDescription="@string/copy"
+                android:contentDescription="@string/ink"
                 android:background="@drawable/button"
-                android:onClick="OnCopySelectButtonClick"
-                android:src="@drawable/ic_clipboard" />
+                android:onClick="OnInkButtonClick"
+                android:src="@drawable/ic_pen" />
 
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/topBar4"
+            android:id="@+id/topBar3Delete"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/toolbar" >
@@ -227,20 +228,20 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/topBar5"
+            android:id="@+id/topBar4More"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/toolbar" >
 
             <ImageButton
-                android:id="@+id/cancelAnnotButton"
+                android:id="@+id/cancelMoreButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_alignParentLeft="true"
                 android:contentDescription="@string/cancel"
                 android:background="@drawable/button"
-                android:onClick="OnCancelAnnotButtonClick"
+                android:onClick="OnCancelMoreButtonClick"
                 android:src="@drawable/ic_cancel" />
 
             <ImageButton
@@ -248,60 +249,75 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_toLeftOf="@+id/selectButton"
+                android:layout_toLeftOf="@+id/copyTextButton"
                 android:contentDescription="@string/print"
                 android:background="@drawable/button"
                 android:onClick="OnPrintButtonClick"
                 android:src="@drawable/ic_print" />
 
             <ImageButton
-                android:id="@+id/selectButton"
+                android:id="@+id/copyTextButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_toLeftOf="@+id/inkButton"
-                android:contentDescription="@string/select"
+                android:layout_toLeftOf="@+id/editAnnotButton"
+                android:contentDescription="@string/copy_text_to_the_clipboard"
                 android:background="@drawable/button"
-                android:onClick="OnSelectButtonClick"
-                android:src="@drawable/ic_select" />
+                android:onClick="OnCopyTextButtonClick"
+                android:src="@drawable/ic_clipboard" />
 
             <ImageButton
-                android:id="@+id/inkButton"
+                android:id="@+id/editAnnotButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_alignParentRight="true"
-                android:contentDescription="@string/ink"
+                android:contentDescription="@string/edit_annotations"
                 android:background="@drawable/button"
-                android:onClick="OnInkButtonClick"
-                android:src="@drawable/ic_pen" />
+                android:onClick="OnEditAnnotButtonClick"
+                android:src="@drawable/ic_annotation" />
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/topBar6"
+            android:id="@+id/topBar5Accept"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/toolbar" >
 
             <ImageButton
-                android:id="@+id/cancelInkButton"
+                android:id="@+id/cancelAcceptButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_alignParentLeft="true"
                 android:contentDescription="@string/cancel"
                 android:background="@drawable/button"
-                android:onClick="OnCancelInkButtonClick"
+                android:onClick="OnCancelAcceptButtonClick"
                 android:src="@drawable/ic_cancel" />
 
-            <Button
-                android:id="@+id/saveInkButton"
+            <TextView
+                android:id="@+id/annotType"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toRightOf="@+id/cancelAcceptButton"
+                android:layout_toLeftOf="@+id/acceptButton"
+                android:gravity="center"
+                android:singleLine="true"
+                android:textColor="#FFFFFF"
+                android:textStyle="bold"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
+            <ImageButton
+                android:id="@+id/acceptButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_alignParentRight="true"
-                android:onClick="OnSaveInkButtonClick"
-                android:text="@string/save" />
+                android:contentDescription="@string/accept"
+                android:background="@drawable/button"
+                android:onClick="OnAcceptButtonClick"
+                android:src="@drawable/ic_check" />
         </RelativeLayout>
         </ViewAnimator>
 
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 1a6e94a0..d47b868d 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -14,13 +14,13 @@
     <string name="outline_title">Table of Contents</string>
     <string name="enter_password">Enter Password</string>
     <string name="text_not_found">Text not found</string>
-    <string name="searching_">Searching...</string>
+    <string name="searching_">Searching&#8230;</string>
     <string name="link_control">Link highlighting and enabling</string>
-    <string name="no_further_occurences_found">No further occurences found</string>
+    <string name="no_further_occurences_found">No further occurrences found</string>
     <string name="select">Select</string>
     <string name="search">Search</string>
     <string name="copy">Copy</string>
-    <string name="strike_out">Strike out</string>
+    <string name="strike_out">Strike-out</string>
     <string name="delete">Delete</string>
     <string name="highlight">Highlight</string>
     <string name="underline">Underline</string>
@@ -50,4 +50,8 @@
     <string name="okay">Okay</string>
     <string name="choose_value">choose value</string>
     <string name="not_supported">Not supported</string>
+    <string name="copy_text_to_the_clipboard">Copy text to the clipboard</string>
+    <string name="more">More</string>
+    <string name="accept">Accept</string>
+    <string name="copy_text">copy text</string>
 </resources>
diff --git a/android/src/com/artifex/mupdfdemo/MuPDFActivity.java b/android/src/com/artifex/mupdfdemo/MuPDFActivity.java
index 37a00f5e..15b16443 100644
--- a/android/src/com/artifex/mupdfdemo/MuPDFActivity.java
+++ b/android/src/com/artifex/mupdfdemo/MuPDFActivity.java
@@ -42,7 +42,8 @@ class ThreadPerTaskExecutor implements Executor {
 public class MuPDFActivity extends Activity
 {
 	/* The core rendering instance */
-	enum TopBarMode {Main, Search, Text, AnnotSelect, AnnotCreate, InkCreate};
+	enum TopBarMode {Main, Search, Annot, Delete, More, Accept};
+	enum AcceptMode {Highlight, Underline, StrikeOut, Ink, CopyText};
 
 	private final int    OUTLINE_REQUEST=0;
 	private final int    PRINT_REQUEST=1;
@@ -60,10 +61,12 @@ public class MuPDFActivity extends Activity
 	private ImageButton  mSearchButton;
 	private ImageButton  mReflowButton;
 	private ImageButton  mOutlineButton;
+	private TextView     mAnnotTypeText;
 	private ImageButton mAnnotButton;
 	private ViewAnimator mTopBarSwitcher;
 	private ImageButton  mLinkButton;
 	private TopBarMode   mTopBarMode;
+	private AcceptMode   mAcceptMode;
 	private ImageButton  mSearchBack;
 	private ImageButton  mSearchFwd;
 	private EditText     mSearchText;
@@ -382,7 +385,8 @@ public class MuPDFActivity extends Activity
 				if (!mButtonsVisible) {
 					showButtons();
 				} else {
-					hideButtons();
+					if (mTopBarMode == TopBarMode.Main)
+						hideButtons();
 				}
 			}
 
@@ -393,19 +397,26 @@ public class MuPDFActivity extends Activity
 
 			@Override
 			protected void onHit(Hit item) {
-				switch (item) {
-				case Annotation:
-					showButtons();
-					mTopBarMode = TopBarMode.AnnotSelect;
-					mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
-					break;
-				case Widget:
-				case Nothing:
-					if (mTopBarMode == TopBarMode.AnnotSelect) {
-						mTopBarMode = TopBarMode.Main;
+				switch (mTopBarMode) {
+				case Annot:
+					if (item == Hit.Annotation) {
+						showButtons();
+						mTopBarMode = TopBarMode.Delete;
 						mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
 					}
 					break;
+				case Delete:
+					mTopBarMode = TopBarMode.Annot;
+					mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
+				// fall through
+				default:
+					// Not in annotation editing mode, but the pageview will
+					// still select and highlight hit annotations, so
+					// deselect just in case.
+					MuPDFView pageView = (MuPDFView) mDocView.getDisplayedView();
+					if (pageView != null)
+						pageView.deselectAnnotation();
+					break;
 				}
 			}
 		};
@@ -466,7 +477,7 @@ public class MuPDFActivity extends Activity
 		{
 			mAnnotButton.setOnClickListener(new View.OnClickListener() {
 				public void onClick(View v) {
-					mTopBarMode = TopBarMode.AnnotCreate;
+					mTopBarMode = TopBarMode.Annot;
 					mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
 				}
 			});
@@ -822,7 +833,8 @@ public class MuPDFActivity extends Activity
 		mSearchButton = (ImageButton)mButtonsView.findViewById(R.id.searchButton);
 		mReflowButton = (ImageButton)mButtonsView.findViewById(R.id.reflowButton);
 		mOutlineButton = (ImageButton)mButtonsView.findViewById(R.id.outlineButton);
-		mAnnotButton = (ImageButton)mButtonsView.findViewById(R.id.annotButton);
+		mAnnotButton = (ImageButton)mButtonsView.findViewById(R.id.editAnnotButton);
+		mAnnotTypeText = (TextView)mButtonsView.findViewById(R.id.annotType);
 		mTopBarSwitcher = (ViewAnimator)mButtonsView.findViewById(R.id.switcher);
 		mSearchBack = (ImageButton)mButtonsView.findViewById(R.id.searchBack);
 		mSearchFwd = (ImageButton)mButtonsView.findViewById(R.id.searchForward);
@@ -834,131 +846,160 @@ public class MuPDFActivity extends Activity
 		mPageSlider.setVisibility(View.INVISIBLE);
 	}
 
-	public void OnSelectButtonClick(View v) {
-		mDocView.setMode(MuPDFReaderView.Mode.Selecting);
-		mTopBarMode = TopBarMode.Text;
+	public void OnMoreButtonClick(View v) {
+		mTopBarMode = TopBarMode.More;
+		mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
+	}
+
+	public void OnCancelMoreButtonClick(View v) {
+		mTopBarMode = TopBarMode.Main;
+		mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
+	}
+
+	public void OnPrintButtonClick(View v) {
+		printDoc();
+	}
+
+	public void OnCopyTextButtonClick(View v) {
+		mTopBarMode = TopBarMode.Accept;
 		mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
+		mAcceptMode = AcceptMode.CopyText;
+		mDocView.setMode(MuPDFReaderView.Mode.Selecting);
+		mAnnotTypeText.setText(getString(R.string.copy_text));
 		showInfo(getString(R.string.select_text));
 	}
 
-	public void OnCancelSelectButtonClick(View v) {
-		MuPDFView pageView = (MuPDFView) mDocView.getDisplayedView();
-		if (pageView != null)
-			pageView.deselectText();
-		mDocView.setMode(MuPDFReaderView.Mode.Viewing);
-		mTopBarMode = TopBarMode.AnnotCreate;
+	public void OnEditAnnotButtonClick(View v) {
+		mTopBarMode = TopBarMode.Annot;
 		mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
 	}
 
-	public void OnCopySelectButtonClick(View v) {
-		MuPDFView pageView = (MuPDFView) mDocView.getDisplayedView();
-		boolean copied = false;
-		if (pageView != null)
-			copied = pageView.copySelection();
-		mDocView.setMode(MuPDFReaderView.Mode.Viewing);
-		mTopBarMode = TopBarMode.Main;
+	public void OnCancelAnnotButtonClick(View v) {
+		mTopBarMode = TopBarMode.More;
 		mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
-		showInfo(copied?getString(R.string.copied_to_clipboard):getString(R.string.no_text_selected));
 	}
 
 	public void OnHighlightButtonClick(View v) {
-		MuPDFView pageView = (MuPDFView) mDocView.getDisplayedView();
-		boolean success = false;
-		if (pageView != null)
-			success = pageView.markupSelection(Annotation.Type.HIGHLIGHT);
-		mDocView.setMode(MuPDFReaderView.Mode.Viewing);
-		mTopBarMode = TopBarMode.Main;
+		mTopBarMode = TopBarMode.Accept;
 		mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
-		if (!success)
-			showInfo(getString(R.string.no_text_selected));
+		mAcceptMode = AcceptMode.Highlight;
+		mDocView.setMode(MuPDFReaderView.Mode.Selecting);
+		mAnnotTypeText.setText(R.string.highlight);
+		showInfo(getString(R.string.select_text));
 	}
 
 	public void OnUnderlineButtonClick(View v) {
-		MuPDFView pageView = (MuPDFView) mDocView.getDisplayedView();
-		boolean success = false;
-		if (pageView != null)
-			success = pageView.markupSelection(Annotation.Type.UNDERLINE);
-		mDocView.setMode(MuPDFReaderView.Mode.Viewing);
-		mTopBarMode = TopBarMode.Main;
+		mTopBarMode = TopBarMode.Accept;
 		mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
-		if (!success)
-			showInfo(getString(R.string.no_text_selected));
+		mAcceptMode = AcceptMode.Underline;
+		mDocView.setMode(MuPDFReaderView.Mode.Selecting);
+		mAnnotTypeText.setText(R.string.underline);
+		showInfo(getString(R.string.select_text));
 	}
 
 	public void OnStrikeOutButtonClick(View v) {
-		MuPDFView pageView = (MuPDFView) mDocView.getDisplayedView();
-		boolean success = false;
-		if (pageView != null)
-			success = pageView.markupSelection(Annotation.Type.STRIKEOUT);
-		mDocView.setMode(MuPDFReaderView.Mode.Viewing);
-		mTopBarMode = TopBarMode.Main;
+		mTopBarMode = TopBarMode.Accept;
 		mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
-		if (!success)
-			showInfo(getString(R.string.no_text_selected));
-	}
-
-	public void OnCancelSearchButtonClick(View v) {
-		searchModeOff();
+		mAcceptMode = AcceptMode.StrikeOut;
+		mDocView.setMode(MuPDFReaderView.Mode.Selecting);
+		mAnnotTypeText.setText(R.string.strike_out);
+		showInfo(getString(R.string.select_text));
 	}
 
-	public void OnDeleteButtonClick(View v) {
-		View cv = mDocView.getDisplayedView();
-		if (cv != null)
-			((MuPDFView)cv).deleteSelectedAnnotation();
-		mTopBarMode = TopBarMode.Main;
+	public void OnInkButtonClick(View v) {
+		mTopBarMode = TopBarMode.Accept;
 		mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
+		mAcceptMode = AcceptMode.Ink;
+		mDocView.setMode(MuPDFReaderView.Mode.Drawing);
+		mAnnotTypeText.setText(R.string.ink);
+		showInfo(getString(R.string.draw_annotation));
 	}
 
-	public void OnCancelDeleteButtonClick(View v) {
+	public void OnCancelAcceptButtonClick(View v) {
 		MuPDFView pageView = (MuPDFView) mDocView.getDisplayedView();
-		if (pageView != null)
-			pageView.deselectAnnotation();
+		if (pageView != null) {
+			pageView.deselectText();
+			pageView.cancelDraw();
+		}
 		mDocView.setMode(MuPDFReaderView.Mode.Viewing);
-		mTopBarMode = TopBarMode.Main;
+		switch (mAcceptMode) {
+		case CopyText:
+			mTopBarMode = TopBarMode.More;
+			break;
+		default:
+			mTopBarMode = TopBarMode.Annot;
+			break;
+		}
 		mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
 	}
 
-	public void OnCancelAnnotButtonClick(View v) {
+	public void OnAcceptButtonClick(View v) {
 		MuPDFView pageView = (MuPDFView) mDocView.getDisplayedView();
-		if (pageView != null)
-			pageView.deselectText();
-		mDocView.setMode(MuPDFReaderView.Mode.Viewing);
-		mTopBarMode = TopBarMode.Main;
+		boolean success = false;
+		switch (mAcceptMode) {
+		case CopyText:
+			if (pageView != null)
+				success = pageView.copySelection();
+			mTopBarMode = TopBarMode.More;
+			showInfo(success?getString(R.string.copied_to_clipboard):getString(R.string.no_text_selected));
+			break;
+
+		case Highlight:
+			if (pageView != null)
+				success = pageView.markupSelection(Annotation.Type.HIGHLIGHT);
+			mTopBarMode = TopBarMode.Annot;
+			if (!success)
+				showInfo(getString(R.string.no_text_selected));
+			break;
+
+		case Underline:
+			if (pageView != null)
+				success = pageView.markupSelection(Annotation.Type.UNDERLINE);
+			mTopBarMode = TopBarMode.Annot;
+			if (!success)
+				showInfo(getString(R.string.no_text_selected));
+			break;
+
+		case StrikeOut:
+			if (pageView != null)
+				success = pageView.markupSelection(Annotation.Type.STRIKEOUT);
+			mTopBarMode = TopBarMode.Annot;
+			if (!success)
+				showInfo(getString(R.string.no_text_selected));
+			break;
+
+		case Ink:
+			if (pageView != null)
+				success = pageView.saveDraw();
+			mTopBarMode = TopBarMode.Annot;
+			if (!success)
+				showInfo(getString(R.string.nothing_to_save));
+			break;
+		}
 		mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
+		mDocView.setMode(MuPDFReaderView.Mode.Viewing);
 	}
 
-	public void OnInkButtonClick(View v) {
-		mDocView.setMode(MuPDFReaderView.Mode.Drawing);
-		mTopBarMode = TopBarMode.InkCreate;
-		mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
-		showInfo(getString(R.string.draw_annotation));
+	public void OnCancelSearchButtonClick(View v) {
+		searchModeOff();
 	}
 
-	public void OnSaveInkButtonClick(View v) {
+	public void OnDeleteButtonClick(View v) {
 		MuPDFView pageView = (MuPDFView) mDocView.getDisplayedView();
-		boolean success = false;
 		if (pageView != null)
-			success = pageView.saveDraw();
-		mDocView.setMode(MuPDFReaderView.Mode.Viewing);
-		mTopBarMode = TopBarMode.Main;
+			pageView.deleteSelectedAnnotation();
+		mTopBarMode = TopBarMode.Annot;
 		mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
-		if (!success)
-			showInfo(getString(R.string.nothing_to_save));
 	}
 
-	public void OnCancelInkButtonClick(View v) {
+	public void OnCancelDeleteButtonClick(View v) {
 		MuPDFView pageView = (MuPDFView) mDocView.getDisplayedView();
 		if (pageView != null)
-			pageView.cancelDraw();
-		mDocView.setMode(MuPDFReaderView.Mode.Viewing);
-		mTopBarMode = TopBarMode.AnnotCreate;
+			pageView.deselectAnnotation();
+		mTopBarMode = TopBarMode.Annot;
 		mTopBarSwitcher.setDisplayedChild(mTopBarMode.ordinal());
 	}
 
-	public void OnPrintButtonClick(View v) {
-		printDoc();
-	}
-
 	private void showKeyboard() {
 		InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
 		if (imm != null)