diff --git a/client/src/main/java/eu/hansolo/enzo/notification/Notification.java b/client/src/main/java/eu/hansolo/enzo/notification/Notification.java deleted file mode 100644 index 567beaaa..00000000 --- a/client/src/main/java/eu/hansolo/enzo/notification/Notification.java +++ /dev/null @@ -1,373 +0,0 @@ -/* - * Copyright (c) 2013 by Gerrit Grunwald - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package eu.hansolo.enzo.notification; - -import javafx.animation.KeyFrame; -import javafx.animation.KeyValue; -import javafx.animation.Timeline; -import javafx.application.Platform; -import javafx.collections.FXCollections; -import javafx.collections.ObservableList; -import javafx.geometry.Insets; -import javafx.geometry.Pos; -import javafx.scene.Scene; -import javafx.scene.control.Label; -import javafx.scene.image.Image; -import javafx.scene.image.ImageView; -import javafx.scene.layout.Region; -import javafx.scene.layout.StackPane; -import javafx.scene.layout.VBox; -import javafx.stage.Popup; -import javafx.stage.Screen; -import javafx.stage.Stage; -import javafx.stage.StageStyle; -import javafx.util.Duration; - - -/** - * Created by - * User: hansolo - * Date: 01.07.13 - * Time: 07:10 - */ -public class Notification { - public static final Image INFO_ICON = new Image(Notifier.class.getResourceAsStream("info.png")); - public static final Image WARNING_ICON = new Image(Notifier.class.getResourceAsStream("warning.png")); - public static final Image SUCCESS_ICON = new Image(Notifier.class.getResourceAsStream("success.png")); - public static final Image ERROR_ICON = new Image(Notifier.class.getResourceAsStream("error.png")); - public final String TITLE; - public final String MESSAGE; - public final Image IMAGE; - - - // ******************** Constructors ************************************** - public Notification(final String TITLE, final String MESSAGE) { - this(TITLE, MESSAGE, null); - } - public Notification(final String MESSAGE, final Image IMAGE) { - this("", MESSAGE, IMAGE); - } - public Notification(final String TITLE, final String MESSAGE, final Image IMAGE) { - this.TITLE = TITLE; - this.MESSAGE = MESSAGE; - this.IMAGE = IMAGE; - } - - - // ******************** Inner Classes ************************************* - public enum Notifier { - INSTANCE; - - private static final double ICON_WIDTH = 24; - private static final double ICON_HEIGHT = 24; - private static double width = 300; - private static double height = 80; - private static double offsetX = 0; - private static double offsetY = 25; - private static double spacingY = 5; - private static Pos popupLocation = Pos.BOTTOM_RIGHT; - private static Stage stageRef = null; - private Duration popupLifetime; - private Stage stage; - private Scene scene; - private ObservableList popups; - - - // ******************** Constructor *************************************** - private Notifier() { - init(); - initGraphics(); - } - - - // ******************** Initialization ************************************ - private void init() { - popupLifetime = Duration.millis(5000); - popups = FXCollections.observableArrayList(); - } - - private void initGraphics() { - Region region = new Region(); - region.resize(0, 0); - region.setVisible(false); - scene = new Scene(region); - scene.setFill(null); - scene.getStylesheets().add(getClass().getResource("notifier.css").toExternalForm()); - - stage = new Stage(); - stage.initStyle(StageStyle.TRANSPARENT); - stage.setScene(scene); - } - - - // ******************** Methods ******************************************* - /** - * @param STAGE_REF The Notification will be positioned relative to the given Stage.
- * If null then the Notification will be positioned relative to the primary Screen. - * @param POPUP_LOCATION The default is TOP_RIGHT of primary Screen. - */ - public static void setPopupLocation(final Stage STAGE_REF, final Pos POPUP_LOCATION) { - if (null != STAGE_REF) { - INSTANCE.stage.initOwner(STAGE_REF); - Notifier.stageRef = STAGE_REF; - } - Notifier.popupLocation = POPUP_LOCATION; - } - - /** - * Sets the Notification's owner stage so that when the owner - * stage is closed Notifications will be shut down as well.
- * This is only needed if setPopupLocation is called - * without a stage reference. - * @param OWNER - */ - public static void setNotificationOwner(final Stage OWNER) { - INSTANCE.stage.initOwner(OWNER); - INSTANCE.stage.getScene().getStylesheets().addAll(OWNER.getScene().getStylesheets()); - } - - /** - * @param OFFSET_X The horizontal shift required. - *
The default is 0 px. - */ - public static void setOffsetX(final double OFFSET_X) { - Notifier.offsetX = OFFSET_X; - } - - /** - * @param OFFSET_Y The vertical shift required. - *
The default is 25 px. - */ - public static void setOffsetY(final double OFFSET_Y) { - Notifier.offsetY = OFFSET_Y; - } - - /** - * @param WIDTH The default is 300 px. - */ - public static void setWidth(final double WIDTH) { - Notifier.width = WIDTH; - } - - /** - * @param HEIGHT The default is 80 px. - */ - public static void setHeight(final double HEIGHT) { - Notifier.height = HEIGHT; - } - - /** - * @param SPACING_Y The spacing between multiple Notifications. - *
The default is 5 px. - */ - public static void setSpacingY(final double SPACING_Y) { - Notifier.spacingY = SPACING_Y; - } - - public void stop() { - popups.clear(); - stage.close(); - } - - /** - * Returns the Duration that the notification will stay on screen before it - * will fade out. - * @return the Duration the popup notification will stay on screen - */ - public Duration getPopupLifetime() { - return popupLifetime; - } - - /** - * Defines the Duration that the popup notification will stay on screen before it - * will fade out. The parameter is limited to values between 2 and 20 seconds. - * @param POPUP_LIFETIME - */ - public void setPopupLifetime(final Duration POPUP_LIFETIME) { - popupLifetime = Duration.millis(clamp(2000, 20000, POPUP_LIFETIME.toMillis())); - } - - /** - * Show the given Notification on the screen - * @param NOTIFICATION - */ - public void notify(final Notification NOTIFICATION) { - preOrder(); - showPopup(NOTIFICATION); - } - - /** - * Show a Notification with the given parameters on the screen - * @param TITLE - * @param MESSAGE - * @param IMAGE - */ - public void notify(final String TITLE, final String MESSAGE, final Image IMAGE) { - notify(new Notification(TITLE, MESSAGE, IMAGE)); - } - - /** - * Show a Notification with the given title and message and an Info icon - * @param TITLE - * @param MESSAGE - */ - public void notifyInfo(final String TITLE, final String MESSAGE) { - notify(new Notification(TITLE, MESSAGE, Notification.INFO_ICON)); - } - - /** - * Show a Notification with the given title and message and a Warning icon - * @param TITLE - * @param MESSAGE - */ - public void notifyWarning(final String TITLE, final String MESSAGE) { - notify(new Notification(TITLE, MESSAGE, Notification.WARNING_ICON)); - } - - /** - * Show a Notification with the given title and message and a Checkmark icon - * @param TITLE - * @param MESSAGE - */ - public void notifySuccess(final String TITLE, final String MESSAGE) { - notify(new Notification(TITLE, MESSAGE, Notification.SUCCESS_ICON)); - } - - /** - * Show a Notification with the given title and message and an Error icon - * @param TITLE - * @param MESSAGE - */ - public void notifyError(final String TITLE, final String MESSAGE) { - notify(new Notification(TITLE, MESSAGE, Notification.ERROR_ICON)); - } - - /** - * Makes sure that the given VALUE is within the range of MIN to MAX - * @param MIN - * @param MAX - * @param VALUE - * @return - */ - private double clamp(final double MIN, final double MAX, final double VALUE) { - if (VALUE < MIN) return MIN; - if (VALUE > MAX) return MAX; - return VALUE; - } - - /** - * Reorder the popup Notifications on screen so that the latest Notification will stay on top - */ - private void preOrder() { - if (popups.isEmpty()) return; - for (int i = 0 ; i < popups.size() ; i++) { - switch (popupLocation) { - case TOP_LEFT: case TOP_CENTER: case TOP_RIGHT: popups.get(i).setY(popups.get(i).getY() + height + spacingY); break; - default: popups.get( i ).setY( popups.get( i ).getY() - height - spacingY); - } - } - } - - /** - * Creates and shows a popup with the data from the given Notification object - * @param NOTIFICATION - */ - private void showPopup(final Notification NOTIFICATION) { - Label title = new Label(NOTIFICATION.TITLE); - title.getStyleClass().add("title"); - - ImageView icon = new ImageView(NOTIFICATION.IMAGE); - icon.setFitWidth(ICON_WIDTH); - icon.setFitHeight(ICON_HEIGHT); - - Label message = new Label(NOTIFICATION.MESSAGE, icon); - message.getStyleClass().add("message"); - - VBox popupLayout = new VBox(); - popupLayout.setSpacing(10); - popupLayout.setPadding(new Insets(10, 10, 10, 10)); - popupLayout.getChildren().addAll(title, message); - - StackPane popupContent = new StackPane(); - popupContent.setPrefSize(width, height); - popupContent.getStyleClass().add("notification"); - popupContent.getChildren().addAll(popupLayout); - - final Popup POPUP = new Popup(); - POPUP.setX( getX() ); - POPUP.setY( getY() ); - POPUP.getContent().add(popupContent); - - popups.add(POPUP); - - // Add a timeline for popup fade out - KeyValue fadeOutBegin = new KeyValue(POPUP.opacityProperty(), 1.0); - KeyValue fadeOutEnd = new KeyValue(POPUP.opacityProperty(), 0.0); - - KeyFrame kfBegin = new KeyFrame(Duration.ZERO, fadeOutBegin); - KeyFrame kfEnd = new KeyFrame(Duration.millis(500), fadeOutEnd); - - Timeline timeline = new Timeline(kfBegin, kfEnd); - timeline.setDelay(popupLifetime); - timeline.setOnFinished(actionEvent -> Platform.runLater(() -> { - POPUP.hide(); - popups.remove(POPUP); - stage.hide(); - })); - - // Move popup to the right during fade out - //POPUP.opacityProperty().addListener((observableValue, oldOpacity, opacity) -> popup.setX(popup.getX() + (1.0 - opacity.doubleValue()) * popup.getWidth()) ); - - if (stage.isShowing()) { - stage.toFront(); - } else { - stage.show(); - } - - POPUP.show(stage); - timeline.play(); - } - - private double getX() { - if (null == stageRef) return calcX( 0.0, Screen.getPrimary().getBounds().getWidth() ); - - return calcX(stageRef.getX(), stageRef.getWidth()); - } - private double getY() { - if (null == stageRef) return calcY( 0.0, Screen.getPrimary().getBounds().getHeight() ); - - return calcY(stageRef.getY(), stageRef.getHeight()); - } - - private double calcX(final double LEFT, final double TOTAL_WIDTH) { - switch (popupLocation) { - case TOP_LEFT : case CENTER_LEFT : case BOTTOM_LEFT : return LEFT + offsetX; - case TOP_CENTER: case CENTER : case BOTTOM_CENTER: return LEFT + (TOTAL_WIDTH - width) * 0.5 - offsetX; - case TOP_RIGHT : case CENTER_RIGHT: case BOTTOM_RIGHT : return LEFT + TOTAL_WIDTH - width - offsetX; - default: return 0.0; - } - } - private double calcY(final double TOP, final double TOTAL_HEIGHT ) { - switch (popupLocation) { - case TOP_LEFT : case TOP_CENTER : case TOP_RIGHT : return TOP + offsetY; - case CENTER_LEFT: case CENTER : case CENTER_RIGHT: return TOP + (TOTAL_HEIGHT- height)/2 - offsetY; - case BOTTOM_LEFT: case BOTTOM_CENTER: case BOTTOM_RIGHT: return TOP + TOTAL_HEIGHT - height - offsetY; - default: return 0.0; - } - } - } -} diff --git a/client/src/main/resources/eu/hansolo/enzo/notification/README.md b/client/src/main/resources/eu/hansolo/enzo/notification/README.md deleted file mode 100644 index 849c6e92..00000000 --- a/client/src/main/resources/eu/hansolo/enzo/notification/README.md +++ /dev/null @@ -1,4 +0,0 @@ -Enzo -==== - -A repo that contains custom controls for JavaFX 8 (current version is hosted on bitbucket) diff --git a/client/src/main/resources/eu/hansolo/enzo/notification/error.png b/client/src/main/resources/eu/hansolo/enzo/notification/error.png deleted file mode 100644 index f0651ec3..00000000 Binary files a/client/src/main/resources/eu/hansolo/enzo/notification/error.png and /dev/null differ diff --git a/client/src/main/resources/eu/hansolo/enzo/notification/info.png b/client/src/main/resources/eu/hansolo/enzo/notification/info.png deleted file mode 100644 index 87037497..00000000 Binary files a/client/src/main/resources/eu/hansolo/enzo/notification/info.png and /dev/null differ diff --git a/client/src/main/resources/eu/hansolo/enzo/notification/license.txt b/client/src/main/resources/eu/hansolo/enzo/notification/license.txt deleted file mode 100644 index 7a4a3ea2..00000000 --- a/client/src/main/resources/eu/hansolo/enzo/notification/license.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/client/src/main/resources/eu/hansolo/enzo/notification/notifier.css b/client/src/main/resources/eu/hansolo/enzo/notification/notifier.css deleted file mode 100644 index ded966ed..00000000 --- a/client/src/main/resources/eu/hansolo/enzo/notification/notifier.css +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2013 by Gerrit Grunwald - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -.root { - -fx-background-color: transparent; - -fx-fill : transparent; -} -.notification { - -fx-background-color : -fx-base; - -fx-background-radius: 5; - -fx-effect : dropshadow(gaussian, rgba(0, 0, 0, 0.8), 20, 0, 0, 0); - -foreground-color : -fx-text-background-color; - -icon-color : -fx-text-background-color; -} - -.notification .title { - -fx-font-size : 1.083333em; - -fx-font-weight: bold; - -fx-text-fill : -foreground-color; -} -.notification .message { - -fx-font-size : 1.0em; - -fx-content-display : left; - -fx-graphic-text-gap: 10; - -fx-text-fill : -foreground-color; -} - diff --git a/client/src/main/resources/eu/hansolo/enzo/notification/success.png b/client/src/main/resources/eu/hansolo/enzo/notification/success.png deleted file mode 100644 index 472804af..00000000 Binary files a/client/src/main/resources/eu/hansolo/enzo/notification/success.png and /dev/null differ diff --git a/client/src/main/resources/eu/hansolo/enzo/notification/warning.png b/client/src/main/resources/eu/hansolo/enzo/notification/warning.png deleted file mode 100644 index 0a89e132..00000000 Binary files a/client/src/main/resources/eu/hansolo/enzo/notification/warning.png and /dev/null differ