OSDN -- Desarrollar y descargar software de código abierto
Translation Status of Español translation status for es
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

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


Commit MetaInfo

Revisióncb1cb3d669cb3b200586327e8b1a4db0849ec680 (tree)
Tiempo2018-10-10 07:24:43
AutorHarold_Andoh <andolloyd@gmai...>
CommiterHarold_Andoh

Log Message

[Moxkiriya7]

  • 画面の配色を修正

Cambiar Resumen

Diferencia incremental

--- a/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
+++ b/src/com/wiki/standalone/moxkiriya/WikiMainWindow.fxml
@@ -70,17 +70,12 @@
7070 <URL value="@application.css" />
7171 </stylesheets>
7272 </AnchorPane>
73- <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="51.0">
73+ <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">
7474 <stylesheets>
7575 <URL value="@application.css" />
7676 </stylesheets>
7777 </Hyperlink>
78- <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="51.0">
79- <stylesheets>
80- <URL value="@application.css" />
81- </stylesheets>
82- </Hyperlink>
83- <AnchorPane id="webViewMainAnchorPane" fx:id="webViewAnchorPaneMain" prefHeight="453.0" prefWidth="792.0" style="" styleClass="webViewMainAnchorPane" visible="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="180.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="80.0">
78+ <AnchorPane id="webViewMainAnchorPane" fx:id="webViewAnchorPaneMain" prefHeight="453.0" prefWidth="792.0" style="" styleClass="webViewMainAnchorPane" visible="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="180.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="85.0">
8479 <children>
8580 <HBox alignment="CENTER" prefHeight="200.0" prefWidth="200.0" style="" visible="true" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="5.0" AnchorPane.rightAnchor="5.0" AnchorPane.topAnchor="5.0">
8681 <children>
@@ -141,6 +136,11 @@
141136 <URL value="@application.css" />
142137 </stylesheets>
143138 </AnchorPane>
139+ <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">
140+ <stylesheets>
141+ <URL value="@application.css" />
142+ </stylesheets>
143+ </Hyperlink>
144144 </children>
145145 </AnchorPane>
146146 <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,8 +262,6 @@ public class WikiMainWindowController implements Initializable {
262262 wikiEngine_.setPageDataMap(pageData);
263263 loadWikiContent();
264264
265- webViewHyperlinkMain.setId("webViewHyperlinkActive");
266- webViewHyperlinkHistory.setId("webViewHyperlinkInactive");
267265 webViewAnchorPaneMain.setVisible(true);
268266 webViewAnchorPaneHistory.setVisible(false);
269267 } catch (Exception e) {
@@ -333,10 +331,6 @@ public class WikiMainWindowController implements Initializable {
333331 }
334332 });
335333
336-
337- webViewHyperlinkMain.setId("webViewHyperlinkActive");
338- webViewHyperlinkHistory.setId("webViewHyperlinkInactive");
339-
340334 webViewAnchorPaneMain.setVisible(true);
341335 webViewAnchorPaneHistory.setVisible(false);
342336 }
@@ -506,8 +500,6 @@ public class WikiMainWindowController implements Initializable {
506500 wikiEngine_.setPageDataMap(map);
507501 loadWikiContent();
508502
509- webViewHyperlinkMain.setId("webViewHyperlinkActive");
510- webViewHyperlinkHistory.setId("webViewHyperlinkInactive");
511503 webViewAnchorPaneMain.setVisible(true);
512504 webViewAnchorPaneHistory.setVisible(false);
513505 }
@@ -546,8 +538,6 @@ public class WikiMainWindowController implements Initializable {
546538 AnchorPaneEdit.setVisible(false);
547539 AnchorPaneContentList.setVisible(false);
548540 AnchorPaneWebView.setVisible(true);
549- webViewHyperlinkMain.setId("webViewHyperlinkActive");
550- webViewHyperlinkHistory.setId("webViewHyperlinkInactive");
551541 webViewAnchorPaneMain.setVisible(true);
552542 webViewAnchorPaneHistory.setVisible(false);
553543 }
@@ -611,8 +601,6 @@ public class WikiMainWindowController implements Initializable {
611601 AnchorPaneEdit.setVisible(false);
612602 AnchorPaneContentList.setVisible(false);
613603 AnchorPaneWebView.setVisible(true);
614- webViewHyperlinkMain.setId("webViewHyperlinkActive");
615- webViewHyperlinkHistory.setId("webViewHyperlinkInactive");
616604 webViewAnchorPaneMain.setVisible(true);
617605 webViewAnchorPaneHistory.setVisible(false);
618606
@@ -640,8 +628,6 @@ public class WikiMainWindowController implements Initializable {
640628 AnchorPaneEdit.setVisible(false);
641629 AnchorPaneContentList.setVisible(false);
642630 AnchorPaneWebView.setVisible(true);
643- webViewHyperlinkMain.setId("webViewHyperlinkActive");
644- webViewHyperlinkHistory.setId("webViewHyperlinkInactive");
645631 webViewAnchorPaneMain.setVisible(true);
646632 webViewAnchorPaneHistory.setVisible(false);
647633
@@ -657,8 +643,6 @@ public class WikiMainWindowController implements Initializable {
657643 try {
658644 wikiEngine_.refreshSession();
659645 loadWikiContent();
660- webViewHyperlinkMain.setId("webViewHyperlinkActive");
661- webViewHyperlinkHistory.setId("webViewHyperlinkInactive");
662646 webViewAnchorPaneMain.setVisible(true);
663647 webViewAnchorPaneHistory.setVisible(false);
664648 } catch (Exception e) {
@@ -671,8 +655,6 @@ public class WikiMainWindowController implements Initializable {
671655 try {
672656 wikiEngine_.setPageDataMap(WikiEngine.MAINPAGE_TITLE);
673657 loadWikiContent();
674- webViewHyperlinkMain.setId("webViewHyperlinkActive");
675- webViewHyperlinkHistory.setId("webViewHyperlinkInactive");
676658 webViewAnchorPaneMain.setVisible(true);
677659 webViewAnchorPaneHistory.setVisible(false);
678660 } catch (Exception e) {
@@ -691,9 +673,6 @@ public class WikiMainWindowController implements Initializable {
691673
692674 @FXML
693675 public void onMouseClickedWebViewHyperlinkMain() {
694- webViewHyperlinkMain.setId("webViewHyperlinkActive");
695- webViewHyperlinkHistory.setId("webViewHyperlinkInactive");
696-
697676 webViewAnchorPaneMain.setVisible(true);
698677 webViewAnchorPaneHistory.setVisible(false);
699678 }
@@ -709,8 +688,6 @@ public class WikiMainWindowController implements Initializable {
709688 ObservableList<VersionHistoryListItem> list = webViewHistoryListView.getItems();
710689
711690 list.clear();
712- webViewHyperlinkMain.setId("webViewHyperlinkInactive");
713- webViewHyperlinkHistory.setId("webViewHyperlinkActive");
714691
715692 VersionIterator versionIter = wikiEngine_.getVersionHistory();
716693 versionIter.skip(1);
@@ -761,8 +738,6 @@ public class WikiMainWindowController implements Initializable {
761738 wikiEngine_.clearHistory();
762739 wikiEngine_.setPageDataMap(WikiEngine.MAINPAGE_TITLE);
763740 loadWikiContent();
764- webViewHyperlinkMain.setId("webViewHyperlinkActive");
765- webViewHyperlinkHistory.setId("webViewHyperlinkInactive");
766741 webViewAnchorPaneMain.setVisible(true);
767742 webViewAnchorPaneHistory.setVisible(false);
768743 } catch (Exception e) {
@@ -831,8 +806,6 @@ public class WikiMainWindowController implements Initializable {
831806 */
832807 AnchorPaneWebView.setVisible(true);
833808 AnchorPaneEdit.setVisible(false);
834- webViewHyperlinkMain.setId("webViewHyperlinkActive");
835- webViewHyperlinkHistory.setId("webViewHyperlinkInactive");
836809 webViewAnchorPaneMain.setVisible(true);
837810 webViewAnchorPaneHistory.setVisible(false);
838811 }
--- a/src/com/wiki/standalone/moxkiriya/application.css
+++ b/src/com/wiki/standalone/moxkiriya/application.css
@@ -4,31 +4,31 @@
44 }
55
66 .webViewMenuAnchorPane {
7- -fx-border-color:#f0f0f0;
7+ -fx-border-color: #c0c0c0;
88 -fx-border-style:solid;
99 -fx-border-width:1px;
10- -fx-background-color: #f0f0f0;
10+ -fx-background-color: #f5f5f5;
1111 }
1212
1313 .webViewMainAnchorPane {
14- -fx-border-color:#f0f0f0;
14+ -fx-border-color:#f5f5f5;
1515 -fx-border-style:solid;
1616 -fx-border-width:1px;
17- -fx-background-color: #f0f0f0;
17+ -fx-background-color: #f5f5f5;
1818 }
1919
2020 .webViewHistoryAnchorPane {
21- -fx-border-color:#f0f0f0;
21+ -fx-border-color:#dcdcdc;
2222 -fx-border-style:solid;
2323 -fx-border-width:1px;
24- -fx-background-color: #f0f0f0;
24+ -fx-background-color: #dcdcdc;
2525 }
2626
2727 .webViewHistoryContentAnchorPane {
28- -fx-border-color:#f0f0f0;
28+ -fx-border-color:#c0c0c0;
2929 -fx-border-style:solid;
3030 -fx-border-width:1px;
31- -fx-background-color: white;
31+ -fx-background-color: #f8f8ff;
3232 }
3333
3434 .selectPartyRadioButtonTableCell {
@@ -36,16 +36,16 @@
3636 -fx-alignment:center;
3737 }
3838
39-#webViewHyperlinkActive {
40- -fx-background-color: #f0f0f0;
41- -fx-border-color: #f0f0f0;
39+.webViewMainHyperlink {
40+ -fx-background-color: #f5f5f5;
41+ -fx-border-color: #f5f5f5;
4242 -fx-border-width: 1px;
4343 -fx-border-style: solid;
4444 }
4545
46-#webViewHyperlinkInactive {
47- -fx-background-color: transparent;
48- -fx-border-color: #f0f0f0;
46+.webViewHistoryHyperlink {
47+ -fx-background-color: #dcdcdc;
48+ -fx-border-color: #dcdcdc;
4949 -fx-border-width: 1px;
5050 -fx-border-style: solid;
5151 }