From 416ffc83973b2567949de0c32efb62cf9a47e79e Mon Sep 17 00:00:00 2001
From: Nikolay Pultsin <geometer@fbreader.org>
Date: Fri, 11 Apr 2008 00:17:10 +0000
Subject: [PATCH] text selection feature is delayed

git-svn-id: https://only.mawhrin.net/repos/FBReaderJ/trunk@810 6a642e6f-84f6-412e-ac94-c4a38d5a04b0
---
 TODO                                                | 8 ++++----
 TODO.OptionsDialog                                  | 3 ---
 src/org/fbreader/optionsDialog/KeyBindingsPage.java | 6 +++---
 src/org/fbreader/optionsDialog/OptionsDialog.java   | 6 +++---
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/TODO b/TODO
index b9f2b959f..ae40016df 100644
--- a/TODO
+++ b/TODO
@@ -5,7 +5,7 @@
 
 ZLTextView:
 DONE	пометки (для найденных строк и т.п.)
-2	выделение текста мышкой
+DELAYED	выделение текста мышкой
 2	прокрутка текста мышкой
 	переход по ссылкам
 DONE		внутренним
@@ -133,9 +133,9 @@ DONE	ActionCode.SHOW_BOOK_INFO
 1	ActionCode.OPEN_PREVIOUS_BOOK
 1	ActionCode.GOTO_NEXT_TOC_SECTION
 1	ActionCode.GOTO_PREVIOUS_TOC_SECTION
-2	ActionCode.COPY_SELECTED_TEXT_TO_CLIPBOARD
-2	ActionCode.OPEN_SELECTED_TEXT_IN_DICTIONARY
-2	ActionCode.CLEAR_SELECTION
+DELAYED	ActionCode.COPY_SELECTED_TEXT_TO_CLIPBOARD
+DELAYED	ActionCode.OPEN_SELECTED_TEXT_IN_DICTIONARY
+DELAYED	ActionCode.CLEAR_SELECTION
 
 другое:
 DONE	поиск
diff --git a/TODO.OptionsDialog b/TODO.OptionsDialog
index 5d551602b..14ac391ad 100644
--- a/TODO.OptionsDialog
+++ b/TODO.OptionsDialog
@@ -27,9 +27,6 @@
 -					<node name="percentToScroll" value="Сколько процентов сдвигать"/>
 -					<node name="fingerOnly" value="Только при нажатии пальцем"/>
 -				</node>
-				<node name="Selection" value="Пометка">
-					<node name="enableSelection" value="Разрешить помечать текст"/>
-				</node>
 -				<node name="Format" value="Форматирование">
 -					<node name="optionsFor" value="Настройки для"/>
 -					<node name="lineSpacing" value="Интервал">
diff --git a/src/org/fbreader/optionsDialog/KeyBindingsPage.java b/src/org/fbreader/optionsDialog/KeyBindingsPage.java
index 65249ed09..42087e9b0 100644
--- a/src/org/fbreader/optionsDialog/KeyBindingsPage.java
+++ b/src/org/fbreader/optionsDialog/KeyBindingsPage.java
@@ -103,9 +103,9 @@ public class KeyBindingsPage {
 			addAction(ActionCode.REDO);
 
 			// selection
-			addAction(ActionCode.COPY_SELECTED_TEXT_TO_CLIPBOARD);
-			addAction(ActionCode.OPEN_SELECTED_TEXT_IN_DICTIONARY);
-			addAction(ActionCode.CLEAR_SELECTION);
+			//addAction(ActionCode.COPY_SELECTED_TEXT_TO_CLIPBOARD);
+			//addAction(ActionCode.OPEN_SELECTED_TEXT_IN_DICTIONARY);
+			//addAction(ActionCode.CLEAR_SELECTION);
 
 			// search
 			addAction(ActionCode.SEARCH);
diff --git a/src/org/fbreader/optionsDialog/OptionsDialog.java b/src/org/fbreader/optionsDialog/OptionsDialog.java
index 80f808718..a51830622 100644
--- a/src/org/fbreader/optionsDialog/OptionsDialog.java
+++ b/src/org/fbreader/optionsDialog/OptionsDialog.java
@@ -42,8 +42,8 @@ public class OptionsDialog {
 
 		new ScrollingOptionsPage(myDialog.createTab("Scrolling"), fbreader);
 				
-		ZLDialogContent selectionTab = myDialog.createTab("Selection");
-		selectionTab.addOption("enableSelection", FBView.selectionOption());
+		//ZLDialogContent selectionTab = myDialog.createTab("Selection");
+		//selectionTab.addOption("enableSelection", FBView.selectionOption());
 		
 		ZLDialogContent marginTab = myDialog.createTab("Margins");
 		marginTab.addOptions(
@@ -70,7 +70,7 @@ public class OptionsDialog {
 		ZLColorOptionBuilder builder = new ZLColorOptionBuilder();
 		final String BACKGROUND = resource.getResource("background").getValue();
 		builder.addOption(BACKGROUND, baseStyle.BackgroundColorOption);
-		builder.addOption(resource.getResource("selectionBackground").getValue(), baseStyle.SelectionBackgroundColorOption);
+		//builder.addOption(resource.getResource("selectionBackground").getValue(), baseStyle.SelectionBackgroundColorOption);
 		builder.addOption(resource.getResource("text").getValue(), baseStyle.RegularTextColorOption);
 		builder.addOption(resource.getResource("internalLink").getValue(), baseStyle.InternalHyperlinkTextColorOption);
 		builder.addOption(resource.getResource("externalLink").getValue(), baseStyle.ExternalHyperlinkTextColorOption);