Commit: 059f44fe67165dd01e78758d260001045553078a - Moxkiriya7 (git)

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

Commit MetaInfo

• Revision: 059f44fe67165dd01e78758d260001045553078a (tree)
• Time: 2018-10-10 23:10:12
• Author: Harold_Andoh <andolloyd@gmai...>
• Commiter: Harold_Andoh

Log Message

[Moxkiriya7]

• _party.configファイルがない場合、無反応になるバグを修正
  
• 画面の配色を修正
  

Change Summary

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

Incremental Difference

--- a/src/com/wiki/standalone/moxkiriya/Main.java
+++ b/src/com/wiki/standalone/moxkiriya/Main.java
@@ -60,30 +60,32 @@ public class Main extends Application {
 			WikiMainWindow.CloseType closeType = WikiMainWindow.CloseType.EXIT;
 
 			do {
+				String AppRoot  = null;
+				String wikiroot = null;
 				String selectedParty = loadSelectedParty();
 
 				if(selectedParty != null) {
-					String  AppRoot  = settingManager_.get(SettingManager.SETINGKEY_MOXKIRIYAROOT);
-					String  wikiroot = settingManager_.get(SettingManager.SETTINGSKEY_WIKIROOT);
-		
-					if( (AppRoot == null)
-					 || (wikiroot == null)) {
-						/*
-						 * selectPartyを未設定の場合
-						 */
-						Stage stage  = new Stage(StageStyle.UNDECORATED);
-						stage.initOwner(primaryStage);
-						showConfigSettingsDialog(stage, selectedParty);
-					}
-	
+					AppRoot  = settingManager_.get(SettingManager.SETINGKEY_MOXKIRIYAROOT);
+					wikiroot = settingManager_.get(SettingManager.SETTINGSKEY_WIKIROOT);					
+				}
+				
+				if( (AppRoot == null)
+				 || (wikiroot == null)) {
 					/*
-					 * Show a wiki main window.
+					 * selectPartyを未設定の場合
 					 */
-					closeType = showWikiMainWindow();
-					
-					if(closeType == WikiMainWindow.CloseType.RESTART) {
-						wikiMainWindow_.closeSession();
-					}
+					Stage stage  = new Stage(StageStyle.UNDECORATED);
+					stage.initOwner(primaryStage);
+					showConfigSettingsDialog(stage, selectedParty);
+				}
+
+				/*
+				 * Show a wiki main window.
+				 */
+				closeType = showWikiMainWindow();
+				
+				if(closeType == WikiMainWindow.CloseType.RESTART) {
+					wikiMainWindow_.closeSession();
 				}
 			} while(closeType != WikiMainWindow.CloseType.EXIT);
 		} catch(Exception e) {

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
@@ -70,7 +70,7 @@
             <URL value="@application.css" />
           </stylesheets>
         </AnchorPane>
-        <Hyperlink id="hyperlinkMain" fx:id="webViewHyperlinkMain" alignment="CENTER" onMouseClicked="#onMouseClickedWebViewHyperlinkMain" prefHeight="30.0" prefWidth="100.0" style="" styleClass="webViewMainHyperlink" text="%key.Hyperlink.Main" textAlignment="CENTER" textOverrun="ELLIPSIS" AnchorPane.leftAnchor="180.0" AnchorPane.topAnchor="55.0">
+        <Hyperlink id="hyperlinkMain" fx:id="webViewHyperlinkMain" alignment="CENTER" onMouseClicked="#onMouseClickedWebViewHyperlinkMain" prefHeight="30.0" prefWidth="100.0" style="" text="%key.Hyperlink.Main" textAlignment="CENTER" textOverrun="ELLIPSIS" AnchorPane.leftAnchor="180.0" AnchorPane.topAnchor="55.0">
           <stylesheets>
             <URL value="@application.css" />
           </stylesheets>
@@ -98,9 +98,9 @@
             <URL value="@application.css" />
           </stylesheets>
         </AnchorPane>
-        <AnchorPane id="webViewHistoryAnchorPane" fx:id="webViewAnchorPaneHistory" prefHeight="528.0" prefWidth="843.0" style="" styleClass="webViewHistoryAnchorPane" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="180.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="80.0">
+        <AnchorPane id="webViewHistoryAnchorPane" fx:id="webViewAnchorPaneHistory" prefHeight="528.0" prefWidth="843.0" style="" styleClass="webViewMainAnchorPane" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="180.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="85.0">
           <children>
-            <AnchorPane fx:id="webViewHistoryBreadcrumbs" prefHeight="40.0" prefWidth="200.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+            <AnchorPane fx:id="webViewHistoryBreadcrumbs" prefHeight="35.0" prefWidth="200.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="5.0">
               <children>
                 <FlowPane fx:id="webViewHistoryBreadcrumbsPane" prefHeight="40.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                   <padding>
@@ -136,11 +136,16 @@
             <URL value="@application.css" />
           </stylesheets>
         </AnchorPane>
-        <Hyperlink fx:id="webViewHyperlinkHistory" alignment="CENTER" maxWidth="-1.0" onMouseClicked="#onMouseClickedWebViewHyperlinkHistory" prefHeight="30.0" prefWidth="100.0" style="" styleClass="webViewHistoryHyperlink" text="%key.Hyperlink.History" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="55.0">
+        <Hyperlink fx:id="webViewHyperlinkHistory" alignment="CENTER" maxWidth="-1.0" onMouseClicked="#onMouseClickedWebViewHyperlinkHistory" prefHeight="30.0" prefWidth="100.0" style="" text="%key.Hyperlink.History" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="55.0">
           <stylesheets>
             <URL value="@application.css" />
           </stylesheets>
         </Hyperlink>
+        <Label prefHeight="29.999900000002526" prefWidth="594.0" styleClass="webViewGapspace" text="" AnchorPane.leftAnchor="280.0" AnchorPane.rightAnchor="100.0" AnchorPane.topAnchor="55.0">
+          <stylesheets>
+            <URL value="@application.css" />
+          </stylesheets>
+        </Label>
       </children>
     </AnchorPane>
     <AnchorPane fx:id="AnchorPaneContentList" maxHeight="-Infinity" maxWidth="-Infinity" prefHeight="535.0" prefWidth="590.0" visible="false" AnchorPane.bottomAnchor="70.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="73.0">

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindowController.java
@@ -262,6 +262,8 @@ public class WikiMainWindowController implements Initializable {
 											wikiEngine_.setPageDataMap(pageData);
 											loadWikiContent();
 
+											webViewHyperlinkMain.setId("webViewMainHyperlinkActive");
+											webViewHyperlinkHistory.setId("webViewMainHyperlinkInactive");
 											webViewAnchorPaneMain.setVisible(true);
 											webViewAnchorPaneHistory.setVisible(false);
 										} catch (Exception e) {
@@ -331,6 +333,8 @@ public class WikiMainWindowController implements Initializable {
 			}
 		});
 		
+		webViewHyperlinkMain.setId("webViewMainHyperlinkActive");
+		webViewHyperlinkHistory.setId("webViewMainHyperlinkInactive");
 		webViewAnchorPaneMain.setVisible(true);
 		webViewAnchorPaneHistory.setVisible(false);
 	}
@@ -500,6 +504,8 @@ public class WikiMainWindowController implements Initializable {
 				wikiEngine_.setPageDataMap(map);
 				loadWikiContent();
 
+				webViewHyperlinkMain.setId("webViewMainHyperlinkActive");
+				webViewHyperlinkHistory.setId("webViewMainHyperlinkInactive");
 				webViewAnchorPaneMain.setVisible(true);
 				webViewAnchorPaneHistory.setVisible(false);
 			}
@@ -538,6 +544,9 @@ public class WikiMainWindowController implements Initializable {
 				AnchorPaneEdit.setVisible(false);
 				AnchorPaneContentList.setVisible(false);
 				AnchorPaneWebView.setVisible(true);
+
+				webViewHyperlinkMain.setId("webViewMainHyperlinkActive");
+				webViewHyperlinkHistory.setId("webViewMainHyperlinkInactive");
 				webViewAnchorPaneMain.setVisible(true);
 				webViewAnchorPaneHistory.setVisible(false);
 			}
@@ -601,6 +610,9 @@ public class WikiMainWindowController implements Initializable {
 			AnchorPaneEdit.setVisible(false);
 			AnchorPaneContentList.setVisible(false);
 			AnchorPaneWebView.setVisible(true);
+
+			webViewHyperlinkMain.setId("webViewMainHyperlinkActive");
+			webViewHyperlinkHistory.setId("webViewMainHyperlinkInactive");
 			webViewAnchorPaneMain.setVisible(true);
 			webViewAnchorPaneHistory.setVisible(false);
 
@@ -628,6 +640,9 @@ public class WikiMainWindowController implements Initializable {
 			AnchorPaneEdit.setVisible(false);
 			AnchorPaneContentList.setVisible(false);
 			AnchorPaneWebView.setVisible(true);
+
+			webViewHyperlinkMain.setId("webViewMainHyperlinkActive");
+			webViewHyperlinkHistory.setId("webViewMainHyperlinkInactive");
 			webViewAnchorPaneMain.setVisible(true);
 			webViewAnchorPaneHistory.setVisible(false);
 
@@ -643,6 +658,9 @@ public class WikiMainWindowController implements Initializable {
 		try {
 			wikiEngine_.refreshSession();
 			loadWikiContent();
+
+			webViewHyperlinkMain.setId("webViewMainHyperlinkActive");
+			webViewHyperlinkHistory.setId("webViewMainHyperlinkInactive");
 			webViewAnchorPaneMain.setVisible(true);
 			webViewAnchorPaneHistory.setVisible(false);
 		} catch (Exception e) {
@@ -655,6 +673,9 @@ public class WikiMainWindowController implements Initializable {
 		try {
 			wikiEngine_.setPageDataMap(WikiEngine.MAINPAGE_TITLE);
 			loadWikiContent();
+
+			webViewHyperlinkMain.setId("webViewMainHyperlinkActive");
+			webViewHyperlinkHistory.setId("webViewMainHyperlinkInactive");
 			webViewAnchorPaneMain.setVisible(true);
 			webViewAnchorPaneHistory.setVisible(false);
 		} catch (Exception e) {
@@ -673,6 +694,8 @@ public class WikiMainWindowController implements Initializable {
 
 	@FXML
 	public void onMouseClickedWebViewHyperlinkMain() {
+		webViewHyperlinkMain.setId("webViewMainHyperlinkActive");
+		webViewHyperlinkHistory.setId("webViewMainHyperlinkInactive");
 		webViewAnchorPaneMain.setVisible(true);
 		webViewAnchorPaneHistory.setVisible(false);
 	}
@@ -702,6 +725,8 @@ public class WikiMainWindowController implements Initializable {
 				}
 			}
 
+			webViewHyperlinkMain.setId("webViewMainHyperlinkInactive");
+			webViewHyperlinkHistory.setId("webViewMainHyperlinkActive");
 			webViewAnchorPaneMain.setVisible(false);
 			webViewAnchorPaneHistory.setVisible(true);
 
@@ -738,6 +763,9 @@ public class WikiMainWindowController implements Initializable {
 			wikiEngine_.clearHistory();
 			wikiEngine_.setPageDataMap(WikiEngine.MAINPAGE_TITLE);
 			loadWikiContent();
+
+			webViewHyperlinkMain.setId("webViewMainHyperlinkActive");
+			webViewHyperlinkHistory.setId("webViewMainHyperlinkInactive");
 			webViewAnchorPaneMain.setVisible(true);
 			webViewAnchorPaneHistory.setVisible(false);
 		} catch (Exception e) {
@@ -806,6 +834,9 @@ public class WikiMainWindowController implements Initializable {
 				 */
 				AnchorPaneWebView.setVisible(true);
 				AnchorPaneEdit.setVisible(false);
+
+				webViewHyperlinkMain.setId("webViewMainHyperlinkActive");
+				webViewHyperlinkHistory.setId("webViewMainHyperlinkInactive");
 				webViewAnchorPaneMain.setVisible(true);
 				webViewAnchorPaneHistory.setVisible(false);
 			}

--- a/src/com/wiki/standalone/moxkiriya/application.css
+++ b/src/com/wiki/standalone/moxkiriya/application.css
@@ -11,19 +11,18 @@
 }
 
 .webViewMainAnchorPane {
-	-fx-border-color:#f5f5f5;
+	-fx-border-color:#c0c0c0;
     -fx-border-style:solid;
-    -fx-border-width:1px;
+    -fx-border-width:0px 1px 1px 1px;
     -fx-background-color: #f5f5f5;
 }
 
-.webViewHistoryAnchorPane {
-	-fx-border-color:#dcdcdc;
+.webViewGapspace {
+	-fx-border-color:#c0c0c0;
     -fx-border-style:solid;
-    -fx-border-width:1px;
-    -fx-background-color: #dcdcdc;
+    -fx-border-width:0px 0px 1px 0px;
+    -fx-background-color: transparent;
 }
-
 .webViewHistoryContentAnchorPane {
 	-fx-border-color:#c0c0c0;
     -fx-border-style:solid;
@@ -36,17 +35,17 @@
 	-fx-alignment:center;
 }
 
-.webViewMainHyperlink {
+#webViewMainHyperlinkActive {
     -fx-background-color: #f5f5f5;
-    -fx-border-color: #f5f5f5;
-    -fx-border-width: 1px;
+    -fx-border-color: #c0c0c0;
+    -fx-border-width:1px 1px 0px 1px;
     -fx-border-style: solid;
 }
 
-.webViewHistoryHyperlink {
-    -fx-background-color: #dcdcdc;
-    -fx-border-color: #dcdcdc;
-    -fx-border-width: 1px;
+#webViewMainHyperlinkInactive {
+    -fx-background-color: #e0e0e0;
+    -fx-border-color: #c0c0c0;
+    -fx-border-width:1px 1px 1px 1px;
     -fx-border-style: solid;
 }