提交: 7d68da5a4b424a88189469bb9f3dccb0f126e5de - Moxkiriya7 (git)

Moxkiriyaプロジェクト事前開発用の作業部屋

Commit MetaInfo

• 修訂: 7d68da5a4b424a88189469bb9f3dccb0f126e5de (tree)
• 時間: 2018-10-20 10:25:20
• 作者: Harold_Andoh <andolloyd@gmai...>
• Commiter: Harold_Andoh

Log Message

[Moxkiriya7]

• WebViewのコンテキストメニューを無効に修正
  
• Search
  WikiテキストフィールドでEnterキー押下で全文検索を実行するように修正
  

Change Summary

• modified: src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
• modified: src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java

差異

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
@@ -64,7 +64,7 @@
                 <Font size="20.0" fx:id="x2" />
               </font>
             </Button>
-            <TextField id="TextFieldSearchWiki" fx:id="webViewMenuAnchorPaneTextFieldSearchWiki" maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="35.0" prefWidth="256.0" promptText="%key.TextField.Search_Wiki" AnchorPane.rightAnchor="85.0" AnchorPane.topAnchor="2.0" />
+            <TextField id="TextFieldSearchWiki" fx:id="webViewMenuAnchorPaneTextFieldSearchWiki" maxHeight="-Infinity" maxWidth="-Infinity" onKeyPressed="#onKeyPressedTextFieldSearchWiki" prefHeight="35.0" prefWidth="256.0" promptText="%key.TextField.Search_Wiki" AnchorPane.rightAnchor="85.0" AnchorPane.topAnchor="2.0" />
             <Button id="ButtonSearch" fx:id="webViewMenuAnchorPaneButtonSearch" maxHeight="-Infinity" maxWidth="-Infinity" mnemonicParsing="false" onAction="#onActionButtonSearch" prefHeight="35.0" prefWidth="80.0" text="%key.Button.Search" AnchorPane.rightAnchor="2.0" AnchorPane.topAnchor="2.0" />
           </children>
           <padding>

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
@@ -60,6 +60,8 @@ import javafx.scene.control.TextField;
 import javafx.scene.control.cell.CheckBoxTableCell;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.image.ImageView;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.FlowPane;
 import javafx.scene.web.WebEngine;
@@ -214,7 +216,9 @@ public class WikiMainWindowController implements Initializable {
 	@Override
 	public void initialize(URL url, ResourceBundle resourceBundle) {
 		resourceBundle_ = resourceBundle;
+
 		setLinkClickListner(webView.getEngine());
+		webView.setContextMenuEnabled(false);
 
 		previewWindow_  = new WikiPreviewWindow(stage_, resourceBundle_);
 		previewWindow_.setMainWindowController(this);
@@ -513,23 +517,22 @@ public class WikiMainWindowController implements Initializable {
 	}
 
 	@FXML
-	public void onActionButtonSearch(ActionEvent event) {
+	public void onKeyPressedTextFieldSearchWiki(KeyEvent event) {
 		try {
-			String key = webViewMenuAnchorPaneTextFieldSearchWiki.getText();
-			
-			if(key.isEmpty() != true) {				
-				HashMap<String, PageData> map = wikiEngine_.queryPageFullTextSearch(key);
-
-				wikiEngine_.setPageDataMap(map);
-				loadWikiContent();
-
-				webViewHyperlinkMain.setId("webViewMainHyperlinkActive");
-				webViewHyperlinkHistory.setId("webViewMainHyperlinkInactive");
-				webViewAnchorPaneMain.setVisible(true);
-				webViewAnchorPaneHistory.setVisible(false);
+			if(event.getCode().equals(KeyCode.ENTER) == true) {
+				doSearchWiki();
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
+		}			
+	}
+
+	@FXML
+	public void onActionButtonSearch(ActionEvent event) {
+		try {
+			doSearchWiki();
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
 	}
 
@@ -990,6 +993,7 @@ public class WikiMainWindowController implements Initializable {
 			e.printStackTrace();
 		}		
 	}
+	
 	/**
 	 * Latest contents getter.
 	 * @return PageData
@@ -1040,7 +1044,7 @@ public class WikiMainWindowController implements Initializable {
 			e.printStackTrace();
 		}
 	}
-	
+
 	/**
 	 * ページ内の指定セクションリンクへジャンプする。
 	 * @param target
@@ -1069,6 +1073,26 @@ public class WikiMainWindowController implements Initializable {
 	public ImageView getImageViewLoading() {
 		return ImageViewLoading;
 	}
+
+	/**
+	 * Execute search wiki.
+	 * @throws Exception
+	 */
+	private void doSearchWiki() throws Exception {
+		String key = webViewMenuAnchorPaneTextFieldSearchWiki.getText();
+		
+		if(key.isEmpty() != true) {				
+			HashMap<String, PageData> map = wikiEngine_.queryPageFullTextSearch(key);
+
+			wikiEngine_.setPageDataMap(map);
+			loadWikiContent();
+
+			webViewHyperlinkMain.setId("webViewMainHyperlinkActive");
+			webViewHyperlinkHistory.setId("webViewMainHyperlinkInactive");
+			webViewAnchorPaneMain.setVisible(true);
+			webViewAnchorPaneHistory.setVisible(false);
+		}
+	}
 	
 	/**
 	 * 選択中または現在表示中のコンテンツのディレクトリを取得する。