From 1d7d36e9defaacf7780e6c396eb0bd5f382dd3d0 Mon Sep 17 00:00:00 2001
From: Owen Zou <owen.zou@outlook.com>
Date: Mon, 22 Aug 2016 20:43:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=BF=98=E6=98=AF=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E4=B9=9F=E8=8B=B1=E6=96=87=E7=9A=84=E5=B9=B6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=8C=89=E9=92=AE=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  4 +-
 .../controller/GeneratorConfigController.java |  4 +-
 src/main/resources/fxml/MainUI.fxml           | 60 ++++++++++++-------
 src/main/resources/fxml/generatorConfigs.fxml |  4 +-
 src/main/resources/fxml/newConnection.fxml    | 18 +++++-
 src/main/resources/style.css                  | 28 +++++++++
 6 files changed, 89 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 9f6f5750..706ad989 100644
--- a/README.md
+++ b/README.md
@@ -3,11 +3,11 @@ mybatis-generator-gui
 
 mybatis-generator-gui是基于[mybatis generator](http://www.mybatis.org/generator/index.html)开发一款界面工具, 本工具可以使你非常容易及快速生成Mybatis的Java POJO文件及数据库Mapping文件。
 
-![MainUI](https://cloud.githubusercontent.com/assets/3505708/16894610/0416f83a-4b8e-11e6-9a25-904f8d2e5583.png)
+![MainUI](https://cloud.githubusercontent.com/assets/3505708/17854987/ab4ed078-68a8-11e6-824e-ada64d0b4ad1.png)
 
 ### 核心特性
 * 按照界面步骤轻松生成代码，省去XML繁琐的学习与配置过程
-* 保存数据库连接与配置，每次代码生成轻松搞定
+* 保存数据库连接与Generator配置，每次代码生成轻松搞定
 * 内置常用插件，比如offset
 * 可选的去除掉对版本管理不友好的注释，这样新增或删除字段重新生成的文件比较过来清楚
 * 目前已经支持Mysql、Oracle与PostgreSQL，如果有对其它数据库有需求的请提Issue我会跟进。
diff --git a/src/main/java/com/zzg/mybatis/generator/controller/GeneratorConfigController.java b/src/main/java/com/zzg/mybatis/generator/controller/GeneratorConfigController.java
index 7a81e287..63be6eef 100644
--- a/src/main/java/com/zzg/mybatis/generator/controller/GeneratorConfigController.java
+++ b/src/main/java/com/zzg/mybatis/generator/controller/GeneratorConfigController.java
@@ -53,8 +53,8 @@ protected void updateItem(Object item, boolean empty) {
                         setText(null);
                         setGraphic(null);
                     } else {
-                        Button btn1 = new Button("应用");
-                        Button btn2 = new Button("删除");
+                        Button btn1 = new Button("Apply");
+                        Button btn2 = new Button("Delete");
                         HBox hBox = new HBox();
                         hBox.setSpacing(10);
                         hBox.getChildren().add(btn1);
diff --git a/src/main/resources/fxml/MainUI.fxml b/src/main/resources/fxml/MainUI.fxml
index f378d247..70b40592 100644
--- a/src/main/resources/fxml/MainUI.fxml
+++ b/src/main/resources/fxml/MainUI.fxml
@@ -35,12 +35,12 @@
                 </MenuBar>
                 <ToolBar minHeight="70.0" prefHeight="40.0" prefWidth="200.0" BorderPane.alignment="CENTER">
                     <items>
-                        <Label fx:id="connectionLabel" contentDisplay="TOP" text="数据库连接">
+                        <Label fx:id="connectionLabel" contentDisplay="TOP" text="Connections">
                             <cursor>
                                 <Cursor fx:constant="HAND" />
                             </cursor>
                         </Label>
-                  <Label fx:id="configsLabel" contentDisplay="TOP" text="生成器配置" />
+                  <Label fx:id="configsLabel" contentDisplay="TOP" text="Generator Configs" />
                     </items>
                 </ToolBar>
             </children>
@@ -77,25 +77,29 @@
                                       <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
                                   </rowConstraints>
                                   <children>
-                                      <Label text="数据库连接驱动" />
+                                      <Label text="Connector Jar" />
                                       <TextField fx:id="connectorPathField" promptText="C:\path\mysql-connector-java-5.1.37.jar" GridPane.columnIndex="1" GridPane.columnSpan="2" />
-                                      <Button mnemonicParsing="false" onAction="#chooseConnectorFile" text="选择" GridPane.columnIndex="3">
+                                      <Button mnemonicParsing="false" onAction="#chooseConnectorFile" text="Choose" GridPane.columnIndex="3">
                                  <GridPane.margin>
                                     <Insets left="5.0" />
-                                 </GridPane.margin></Button>
-                                      <Label text="数据库表名" GridPane.rowIndex="1" />
+                                 </GridPane.margin>
+                                 <styleClass>
+                                    <String fx:value="btn" />
+                                    <String fx:value="btn-default" />
+                                 </styleClass></Button>
+                                      <Label text="Table Name" GridPane.rowIndex="1" />
                                       <TextField fx:id="tableNameField" promptText="person" GridPane.columnIndex="1" GridPane.rowIndex="1">
                                           <GridPane.margin>
                                               <Insets right="5.0" />
                                           </GridPane.margin>
                                       </TextField>
-                                      <Label text="Java Domain名" GridPane.rowIndex="2" />
+                                      <Label text="Domain Object Name" GridPane.rowIndex="2" />
                                       <TextField fx:id="domainObjectNameField" promptText="Person" GridPane.columnIndex="1" GridPane.rowIndex="2">
                                           <GridPane.margin>
                                               <Insets right="5.0" />
                                           </GridPane.margin>
                                       </TextField>
-                                      <Label text="项目目录" GridPane.rowIndex="3" />
+                                      <Label text="Project Folder" GridPane.rowIndex="3" />
                                       <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="3">
                                           <children>
                                               <TextField fx:id="projectFolderField" prefHeight="27.0" prefWidth="348.0" promptText="D:\workspace\example">
@@ -103,10 +107,14 @@
                                                       <Insets right="5.0" />
                                                   </HBox.margin>
                                               </TextField>
-                                              <Button mnemonicParsing="false" onAction="#chooseProjectFolder" text="选择" />
+                                              <Button mnemonicParsing="false" onAction="#chooseProjectFolder" text="Choose">
+                                       <styleClass>
+                                          <String fx:value="btn" />
+                                          <String fx:value="btn-default" />
+                                       </styleClass></Button>
                                           </children>
                                       </HBox>
-                                      <Label text="Model包名" GridPane.rowIndex="4" />
+                                      <Label text="Model Package" GridPane.rowIndex="4" />
                                       <HBox alignment="CENTER_LEFT" prefHeight="27.0" prefWidth="261.0" spacing="10.0" GridPane.columnIndex="1" GridPane.rowIndex="4">
                                           <children>
                                               <TextField fx:id="modelTargetPackage" prefHeight="27.0" prefWidth="248.0" promptText="com.example.model">
@@ -116,9 +124,9 @@
                                               </TextField>
                                           </children>
                                       </HBox>
-                                      <Label text="目标目录" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+                                      <Label text="Target Folder" GridPane.columnIndex="2" GridPane.rowIndex="4" />
                                       <TextField fx:id="modelTargetProject" promptText="src/main/java" GridPane.columnIndex="3" GridPane.rowIndex="4" />
-                                      <Label text="DAO包名" GridPane.rowIndex="5" />
+                                      <Label text="DAO Package" GridPane.rowIndex="5" />
                                       <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.columnIndex="1" GridPane.rowIndex="5">
                                           <children>
                                               <TextField fx:id="daoTargetPackage" prefHeight="27.0" prefWidth="248.0" promptText="com.example.mapper">
@@ -128,9 +136,9 @@
                                               </TextField>
                                           </children>
                                       </HBox>
-                                      <Label text="目标目录" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+                                      <Label text="Target Folder" GridPane.columnIndex="2" GridPane.rowIndex="5" />
                                       <TextField fx:id="daoTargetProject" promptText="src/main/java" GridPane.columnIndex="3" GridPane.rowIndex="5" />
-                                      <Label text="XML包名" GridPane.rowIndex="6" />
+                                      <Label text="Mapping XML Package" GridPane.rowIndex="6" />
                                       <HBox alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.columnIndex="1" GridPane.rowIndex="6">
                                           <children>
                                               <TextField fx:id="mapperTargetPackage" prefHeight="27.0" prefWidth="248.0" promptText="com.example">
@@ -140,19 +148,31 @@
                                               </TextField>
                                           </children>
                                       </HBox>
-                                      <Label text="目标目录" GridPane.columnIndex="2" GridPane.rowIndex="6" />
+                                      <Label text="Target Folder" GridPane.columnIndex="2" GridPane.rowIndex="6" />
                                       <TextField fx:id="mappingTargetProject" promptText="src/main/resources" GridPane.columnIndex="3" GridPane.rowIndex="6" />
                               <HBox alignment="CENTER_LEFT" spacing="10.0" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="7">
                                  <children>
-                                    <CheckBox fx:id="offsetLimitCheckBox" mnemonicParsing="false" selected="true" text="分页" GridPane.columnIndex="1" GridPane.rowIndex="7" />
-                                    <CheckBox fx:id="commentCheckBox" mnemonicParsing="false" selected="true" text="数据库列注释作为Model属性注释" />
+                                    <CheckBox fx:id="offsetLimitCheckBox" mnemonicParsing="false" selected="true" text="Pagination" GridPane.columnIndex="1" GridPane.rowIndex="7" />
+                                    <CheckBox fx:id="commentCheckBox" mnemonicParsing="false" selected="true" text="Use Column Comments As Java Model Comments" />
                                  </children>
                               </HBox>
-                              <Button mnemonicParsing="false" onAction="#openTableColumnCustomizationPage" text="选择" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+                              <Button mnemonicParsing="false" onAction="#openTableColumnCustomizationPage" text="Choose" GridPane.columnIndex="2" GridPane.rowIndex="2">
+                                 <styleClass>
+                                    <String fx:value="btn" />
+                                    <String fx:value="btn-default" />
+                                 </styleClass></Button>
                               <HBox prefHeight="100.0" prefWidth="200.0" spacing="10.0" GridPane.columnIndex="1" GridPane.columnSpan="3" GridPane.rowIndex="8">
                                  <children>
-                                            <Button mnemonicParsing="false" onAction="#generateCode" text="代码生成" />
-                                    <Button mnemonicParsing="false" onAction="#saveGeneratorConfig" text="保存配置" />
+                                            <Button mnemonicParsing="false" onAction="#generateCode" text="Generate">
+                                       <styleClass>
+                                          <String fx:value="btn-success" />
+                                          <String fx:value="btn" />
+                                       </styleClass></Button>
+                                    <Button mnemonicParsing="false" onAction="#saveGeneratorConfig" text="Save Config">
+                                       <styleClass>
+                                          <String fx:value="btn" />
+                                          <String fx:value="btn-default" />
+                                       </styleClass></Button>
                                  </children>
                               </HBox>
                                   </children>
diff --git a/src/main/resources/fxml/generatorConfigs.fxml b/src/main/resources/fxml/generatorConfigs.fxml
index e82aa126..85bf33e4 100644
--- a/src/main/resources/fxml/generatorConfigs.fxml
+++ b/src/main/resources/fxml/generatorConfigs.fxml
@@ -8,8 +8,8 @@
    <children>
       <TableView fx:id="configTable" layoutX="47.0" layoutY="53.0" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <columns>
-          <TableColumn fx:id="nameColumn" prefWidth="75.0" text="配置名称" />
-          <TableColumn fx:id="opsColumn" editable="false" prefWidth="75.0" sortable="false" text="操作" />
+          <TableColumn fx:id="nameColumn" prefWidth="75.0" text="Config Name" />
+          <TableColumn fx:id="opsColumn" editable="false" prefWidth="75.0" sortable="false" text="Operations" />
         </columns>
          <columnResizePolicy>
             <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
diff --git a/src/main/resources/fxml/newConnection.fxml b/src/main/resources/fxml/newConnection.fxml
index 03b3f8a3..d5ed0203 100644
--- a/src/main/resources/fxml/newConnection.fxml
+++ b/src/main/resources/fxml/newConnection.fxml
@@ -67,9 +67,21 @@
       </GridPane>
       <AnchorPane layoutY="390.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
          <children>
-            <Button layoutX="27.0" layoutY="6.0" mnemonicParsing="false" onAction="#testConnection" text="Test Connection" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="10.0" />
-          <Button layoutX="467.0" layoutY="12.0" mnemonicParsing="false" onAction="#saveConnection" prefHeight="28.0" prefWidth="61.0" styleClass="btn-primary" text="OK" textFill="WHITE" AnchorPane.bottomAnchor="5.0" AnchorPane.rightAnchor="10.0" />
-            <Button layoutX="427.0" mnemonicParsing="false" onAction="#cancel" text="Cancel" AnchorPane.bottomAnchor="5.0" />
+            <Button layoutX="27.0" layoutY="6.0" mnemonicParsing="false" onAction="#testConnection" text="Test Connection" AnchorPane.bottomAnchor="5.0" AnchorPane.leftAnchor="10.0">
+               <styleClass>
+                  <String fx:value="btn" />
+                  <String fx:value="btn-default" />
+               </styleClass></Button>
+          <Button layoutX="467.0" layoutY="12.0" mnemonicParsing="false" onAction="#saveConnection" prefHeight="28.0" prefWidth="61.0" text="OK" textFill="WHITE" AnchorPane.bottomAnchor="5.0" AnchorPane.rightAnchor="10.0">
+               <styleClass>
+                  <String fx:value="btn-success" />
+                  <String fx:value="btn" />
+               </styleClass></Button>
+            <Button layoutX="427.0" mnemonicParsing="false" onAction="#cancel" text="Cancel" AnchorPane.bottomAnchor="5.0">
+               <styleClass>
+                  <String fx:value="btn" />
+                  <String fx:value="btn-default" />
+               </styleClass></Button>
          </children>
       </AnchorPane>
    </children>
diff --git a/src/main/resources/style.css b/src/main/resources/style.css
index 1a1d25c7..e49eaa31 100644
--- a/src/main/resources/style.css
+++ b/src/main/resources/style.css
@@ -10,6 +10,11 @@
 	-fx-border: none;
 }
 
+.btn {
+    -fx-border: 1px solid transparent;
+    -fx-border-radius: 4px;
+}
+
 .btn-primary {
 	-fx-background-color: #378bfa;
 	-fx-text-fill: white;
@@ -19,6 +24,29 @@
 	-fx-background-color: #579efa;
 }
 
+.btn-default {
+    -fx-text-fill: #333;
+    -fx-background-color: #fff;
+    -fx-border-color: #ccc;
+}
+
+.btn-default:hover {
+    -fx-background-color: #e6e6e6;
+    -fx-border-color: #adadad;
+}
+
+.btn-success:hover {
+    -fx-text-fill: #fff;
+    -fx-background-color: #449d44;
+    -fx-border-color: #398439;
+}
+
+.btn-success {
+    -fx-text-fill: #fff;
+    -fx-background-color: #5cb85c;
+    -fx-border-color: #4cae4c;
+}
+
 .consoleTextArea {
 	-fx-stroke: white;
 	-fx-fill: black;