Commit: fc46df0a0e65db0e2592d7cf808eb68ed1a4ded7 - Moxkiriya7 (git)

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

Commit MetaInfo

• Revision: fc46df0a0e65db0e2592d7cf808eb68ed1a4ded7 (tree)
• Time: 2018-08-18 17:06:09
• Author: Harold_Andoh <andolloyd@gmai...>
• Commiter: Harold_Andoh

Log Message

[Moxkiriya7]

• ヘルプメニューからAbout Moxkiriya ダイアログを表示する機能を追加
  

Change Summary

• modified: src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
• modified: src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
• add: src/com/wiki/standalone/moxkiriya/dialog/AboutMoxkiriyaDialog.fxml
• add: src/com/wiki/standalone/moxkiriya/dialog/AboutMoxkiriyaDialog.java
• add: src/com/wiki/standalone/moxkiriya/dialog/AboutMoxkiriyaDialogController.java
• modified: src/com/wiki/standalone/moxkiriya/resources/moxkiriya.properties

Incremental Difference

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
@@ -29,7 +29,7 @@
         </Menu>
         <Menu mnemonicParsing="false" text="%key.Menu.Help">
           <items>
-            <MenuItem mnemonicParsing="false" text="%key.MenuItem.VersionInfo" fx:id="menuItemVersionInfo" />
+            <MenuItem mnemonicParsing="false" onAction="#onActionMenuItemAboutMoxkiriya" text="%key.MenuItem.About.Moxkiriya" fx:id="menuItemAboutMoxkiriya" />
           </items>
         </Menu>
       </menus>

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
@@ -26,8 +26,10 @@ import org.w3c.dom.events.EventListener;
 import org.w3c.dom.events.EventTarget;
 import org.w3c.dom.events.MouseEvent;
 
+import com.wiki.standalone.moxkiriya.dialog.AboutMoxkiriyaDialog;
 import com.wiki.standalone.moxkiriya.dialog.AddCategoryDialog;
 import com.wiki.standalone.moxkiriya.dialog.AlertDialog;
+import com.wiki.standalone.moxkiriya.dialog.DialogBase;
 import com.wiki.standalone.moxkiriya.dialog.EditAttachFilesDialog;
 import com.wiki.standalone.moxkiriya.util.DefaultProgramExecutor;
 import com.wiki.standalone.moxkiriya.util.FileIO;
@@ -83,7 +85,7 @@ public class WikiMainWindowController implements Initializable {
 	@FXML	private MenuItem menuItemNew;
 	@FXML	private MenuItem menuItemExit;
 	@FXML	private MenuItem menuItemDelete;
-	@FXML	private MenuItem menuItemVersionInfo;
+	@FXML	private MenuItem menuItemAboutMoxkiriya;
 
 	/*
 	 * ChoiceView controls.
@@ -274,6 +276,16 @@ public class WikiMainWindowController implements Initializable {
 	}
 	
 	@FXML
+	public void onActionMenuItemAboutMoxkiriya(ActionEvent event) {
+		try {
+			DialogBase dialog = new AboutMoxkiriyaDialog();
+			dialog.showDialog(primaryStage_, resourceBundle_);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	@FXML
 	public void onActionButtonSearch(ActionEvent event) {
 		try {
 			String key = webViewMenuAnchorPaneTextFieldSearchWiki.getText();

--- /dev/null
+++ b/src/com/wiki/standalone/moxkiriya/dialog/AboutMoxkiriyaDialog.fxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.paint.*?>
+<?scenebuilder-preview-i18n-resource ../resources/moxkiriya.properties?>
+
+<AnchorPane id="AnchorPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/2.2" fx:controller="com.wiki.standalone.moxkiriya.dialog.AboutMoxkiriyaDialogController">
+  <children>
+    <Button fx:id="buttonOK" layoutX="250.0" layoutY="358.0" maxHeight="-Infinity" maxWidth="-Infinity" mnemonicParsing="false" onAction="#onActionButtonOK" prefHeight="30.0" prefWidth="100.0" text="%key.Button.OK" />
+    <Label prefHeight="30.0" prefWidth="480.0" text="%key.About.Moxkiriya" AnchorPane.leftAnchor="50.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="30.0" />
+    <Label prefHeight="30.0" prefWidth="500.0" text="%key.About.Moxkiriya.Copyright" AnchorPane.leftAnchor="80.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="55.0" />
+    <Label prefHeight="30.0" prefWidth="500.0" text="%key.About.Moxkiriya.License" AnchorPane.leftAnchor="80.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="80.0" />
+    <Label maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="30.0" prefWidth="480.0" text="%key.About.Moxkiriya.Other.info" AnchorPane.leftAnchor="50.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="230.0" />
+    <Label maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="30.0" prefWidth="500.0" text="%key.About.Moxkiriya.Powered.Apache.Lucene" AnchorPane.leftAnchor="80.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="255.0" />
+    <Label prefHeight="30.0" prefWidth="500.0" text="%key.About.Moxkiriya.System.requirement" AnchorPane.leftAnchor="50.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="130.0" />
+    <Label prefHeight="30.0" prefWidth="500.0" text="%key.About.Moxkiriya.System.requirement.Java" AnchorPane.leftAnchor="80.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="155.0" />
+  </children>
+</AnchorPane>

--- /dev/null
+++ b/src/com/wiki/standalone/moxkiriya/dialog/AboutMoxkiriyaDialog.java
@@ -0,0 +1,27 @@
+/**
+ * Moxkiriya standalone Wiki.
+ * About Moxkiriya Dialog.
+ * 
+ * @author Ryuhei Terada
+ * See the '<a href="{@docRoot}/copyright.html">Copyright</a>'
+ */
+package com.wiki.standalone.moxkiriya.dialog;
+
+/**
+ * About Moxkiriyaダイアログを表示する。
+ */
+public class AboutMoxkiriyaDialog extends DialogBase {
+
+	@Override
+	protected String getFXML() {
+		return "AboutMoxkiriyaDialog.fxml";
+	}
+
+	@Override
+	protected DialogController getController() throws Exception {
+		AboutMoxkiriyaDialogController controller = loader_.getController();
+		
+		return controller;
+	}
+
+}

--- /dev/null
+++ b/src/com/wiki/standalone/moxkiriya/dialog/AboutMoxkiriyaDialogController.java
@@ -0,0 +1,25 @@
+/**
+ * Moxkiriya standalone Wiki.
+ * About Moxkiriya Dialog Controller.
+ * 
+ * @author Ryuhei Terada
+ * See the '<a href="{@docRoot}/copyright.html">Copyright</a>'
+ */
+package com.wiki.standalone.moxkiriya.dialog;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.control.Button;
+
+/**
+ * About Moxkiriyaダイアログのコントローラ。
+ */
+public class AboutMoxkiriyaDialogController extends DialogControllerBase {
+	@FXML private Button buttonOK;
+
+	@FXML
+	void onActionButtonOK(ActionEvent event) {
+		((Node)event.getSource()).getScene().getWindow().hide();
+	}	
+}

--- a/src/com/wiki/standalone/moxkiriya/resources/moxkiriya.properties
+++ b/src/com/wiki/standalone/moxkiriya/resources/moxkiriya.properties
@@ -21,7 +21,7 @@ key.Menu.Help: Help
 key.MenuItem.New: New
 key.MenuItem.Exit: Exit
 key.MenuItem.Delete: Delete
-key.MenuItem.VersionInfo: Version Info.
+key.MenuItem.About.Moxkiriya: About Moxkiriya.
 
 key.TextField.Search_Wiki: Search Wiki
 key.Hyperlink.Reading: Reading
@@ -61,3 +61,12 @@ key.AddCategoryDialg.Button.Cancel:Cancel
 key.search.result.PageTitle: Search results
 key.search.result.SearchKey: Search key:
 key.search.result.message.nopage: There was no pages that hit the search.
+
+key.About.Moxkiriya: About Moxkiriya.
+key.About.Moxkiriya.Copyright: Copyright 2018 Ryuhei Terada All rights reserved.
+key.About.Moxkiriya.License: This software is licensed by GPL version 3.0.
+key.About.Moxkiriya.System.requirement: System requirement.
+key.About.Moxkiriya.System.requirement.Java: Java version 1.7.0 or later.
+key.About.Moxkiriya.Other.info: Other infomation.
+key.About.Moxkiriya.Powered.Apache.Lucene: This software uses Apache Lucene that licensed by Apache license version 2.0.
+