-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Supports merging PEF-files (fixes #55)
- Loading branch information
Joel Håkansson
committed
Mar 2, 2018
1 parent
7000bcd
commit 24cc158
Showing
13 changed files
with
343 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| #upButton { | ||
| -fx-graphic: url('resource-files/arrow-up.png'); | ||
| } | ||
|
|
||
| #downButton { | ||
| -fx-graphic: url('resource-files/arrow-down.png'); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <?import javafx.geometry.Insets?> | ||
| <?import javafx.scene.control.Button?> | ||
| <?import javafx.scene.control.Label?> | ||
| <?import javafx.scene.control.ListView?> | ||
| <?import javafx.scene.control.TextField?> | ||
| <?import javafx.scene.control.Tooltip?> | ||
| <?import javafx.scene.layout.HBox?> | ||
| <?import javafx.scene.layout.Region?> | ||
| <?import javafx.scene.layout.VBox?> | ||
| <?import javafx.scene.text.Font?> | ||
| <?import javafx.scene.text.Text?> | ||
| <?import javafx.scene.text.TextFlow?> | ||
|
|
||
| <VBox prefHeight="300.0" prefWidth="300.0" spacing="10.0" stylesheets="@ImportMerge.css" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="application.ui.imports.ImportMergeController"> | ||
| <children> | ||
| <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0"> | ||
| <children> | ||
| <Label text="%label-identifier" /> | ||
| <Region HBox.hgrow="ALWAYS" /> | ||
| <TextField fx:id="identifier" /> | ||
| </children> | ||
| </HBox> | ||
| <TextFlow prefHeight="200.0" prefWidth="200.0"> | ||
| <children> | ||
| <Text strokeType="OUTSIDE" strokeWidth="0.0" text="%message-other-metadata-from-first-file"> | ||
| <font> | ||
| <Font name="System Italic" size="12.0" /> | ||
| </font> | ||
| </Text> | ||
| </children> | ||
| </TextFlow> | ||
| <Label text="%label-merge-order"> | ||
| <font> | ||
| <Font name="System Bold" size="12.0" /> | ||
| </font> | ||
| </Label> | ||
| <HBox VBox.vgrow="ALWAYS"> | ||
| <children> | ||
| <ListView fx:id="filesList" HBox.hgrow="ALWAYS"> | ||
| <HBox.margin> | ||
| <Insets /> | ||
| </HBox.margin> | ||
| </ListView> | ||
| <VBox alignment="TOP_CENTER" spacing="10.0"> | ||
| <children> | ||
| <Button fx:id="upButton" mnemonicParsing="false" onAction="#moveUp"> | ||
| <tooltip> | ||
| <Tooltip text="%tooltip-move-up" /> | ||
| </tooltip></Button> | ||
| <Button fx:id="downButton" mnemonicParsing="false" onAction="#moveDown"> | ||
| <tooltip> | ||
| <Tooltip text="%tooltip-move-down" /> | ||
| </tooltip></Button> | ||
| </children> | ||
| <HBox.margin> | ||
| <Insets /> | ||
| </HBox.margin> | ||
| <padding> | ||
| <Insets bottom="10.0" left="10.0" /> | ||
| </padding> | ||
| </VBox> | ||
| </children> | ||
| </HBox> | ||
| <HBox alignment="CENTER" spacing="20.0"> | ||
| <children> | ||
| <Button fx:id="ok" mnemonicParsing="false" onAction="#doImport" text="%button-ok" /> | ||
| <Button fx:id="cancel" mnemonicParsing="false" onAction="#closeWindow" text="%button-cancel" /> | ||
| </children> | ||
| <VBox.margin> | ||
| <Insets /> | ||
| </VBox.margin> | ||
| <padding> | ||
| <Insets left="10.0" right="10.0" top="10.0" /> | ||
| </padding> | ||
| </HBox> | ||
| </children> | ||
| <padding> | ||
| <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" /> | ||
| </padding> | ||
| </VBox> |
Oops, something went wrong.