Skip to content

Commit

Permalink
Add license to the about tab
Browse files Browse the repository at this point in the history
  • Loading branch information
Piryus committed Mar 6, 2018
1 parent 78d8373 commit 7bd17b0
Showing 1 changed file with 31 additions and 9 deletions.
40 changes: 31 additions & 9 deletions src/fr/piryus/view/SearchController.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ public SearchController() {

private boolean checkModelsSuffix() {
boolean isOk = true;
for(String object : asList(objectsField.getText().split(","))) {
if(!object.toUpperCase().contains(".M2") && !object.toUpperCase().contains(".WMO"))
for (String object : asList(objectsField.getText().split(","))) {
if (!object.toUpperCase().contains(".M2") && !object.toUpperCase().contains(".WMO"))
isOk = false;
}
return isOk;
Expand Down Expand Up @@ -142,10 +142,10 @@ private void handleSearch(ActionEvent e) {
// Click on cancel button
@FXML
private void handleCancel(ActionEvent e) {
if(filesInFolder!=null && filesInFolder.isRunning())
filesInFolder.cancel(true);
if(search!= null && search.isRunning())
search.cancel(true);
if (filesInFolder != null && filesInFolder.isRunning())
filesInFolder.cancel(true);
if (search != null && search.isRunning())
search.cancel(true);

// Reset the progress bar and label
progressBar.progressProperty().unbind();
Expand All @@ -161,11 +161,33 @@ private void handleCancel(ActionEvent e) {
@FXML
private void handleAbout(ActionEvent e) {
Alert alertAbout = new Alert(Alert.AlertType.INFORMATION);
alertAbout.getDialogPane().setPrefWidth(530);
alertAbout.setResizable(true);
alertAbout.setTitle("About ObjectFinder");
alertAbout.setHeaderText("ObjectFinder by Piryus, 2018.");
alertAbout.setHeaderText("Copyright (c) 2018 Piryus");
alertAbout.setContentText("Please feel free to contact me at : contact@piryus.fr for any questions.\nSpecial thanks to Mjollna for her advice and suggestions.\n\n" +
"World of Warcraft and Warcraft are trademarks or registered trademarks of Blizzard Entertainment, Inc., in the U.S. and/or other countries.\n" +
"ObjectFinder is not affiliated with Blizzard Entertainment.");
"ObjectFinder is not affiliated with Blizzard Entertainment.\n" +
"\n" +
"ObjectFinder is licensed under the MIT License\n" +
"\n" +
"Permission is hereby granted, free of charge, to any person obtaining a copy\n" +
"of this software and associated documentation files (the \"Software\"), to deal\n" +
"in the Software without restriction, including without limitation the rights\n" +
"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n" +
"copies of the Software, and to permit persons to whom the Software is\n" +
"furnished to do so, subject to the following conditions:\n" +
"\n" +
"The above copyright notice and this permission notice shall be included in all\n" +
"copies or substantial portions of the Software.\n" +
"\n" +
"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n" +
"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n" +
"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n" +
"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n" +
"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\n" +
"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\n" +
"SOFTWARE.\n");

alertAbout.showAndWait();
}
Expand Down Expand Up @@ -201,7 +223,7 @@ private void initialize() {
statusLabel.setText("");

// Add choices to the coordinate system choice box
coordsChoiceBox.setItems(FXCollections.observableArrayList("Classic","!tele-ready","worldport-ready"));
coordsChoiceBox.setItems(FXCollections.observableArrayList("Classic", "!tele-ready", "worldport-ready"));
coordsChoiceBox.getSelectionModel().selectFirst();
}
}

0 comments on commit 7bd17b0

Please sign in to comment.