From 8a3b0bdb69a7ebb9be2ec544f363880cf0417df8 Mon Sep 17 00:00:00 2001 From: DieGurke Date: Wed, 26 Aug 2020 15:12:03 +0200 Subject: [PATCH] Changed some more things requested by @delvh. --- client/src/main/java/envoy/client/event/BackEvent.java | 4 +++- .../java/envoy/client/event/LoadGroupCreationEvent.java | 6 +++++- .../main/java/envoy/client/ui/controller/ChatScene.java | 5 +---- client/src/main/resources/fxml/ChatScene.fxml | 7 +------ 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/client/src/main/java/envoy/client/event/BackEvent.java b/client/src/main/java/envoy/client/event/BackEvent.java index 61cdb50..ba73134 100644 --- a/client/src/main/java/envoy/client/event/BackEvent.java +++ b/client/src/main/java/envoy/client/event/BackEvent.java @@ -3,9 +3,11 @@ package envoy.client.event; import envoy.event.Event.Valueless; /** + * This event serves the purpose to trigger the tab change to tab 1 in {@link ChatScene}.

+ * * Project: client
* File: BackEvent.java
- * Created: Aug 23, 2020
+ * Created: 23.08.2020
* * @author Maximilian Käfer * @since Envoy Client v0.2-beta diff --git a/client/src/main/java/envoy/client/event/LoadGroupCreationEvent.java b/client/src/main/java/envoy/client/event/LoadGroupCreationEvent.java index 676e883..96f3620 100644 --- a/client/src/main/java/envoy/client/event/LoadGroupCreationEvent.java +++ b/client/src/main/java/envoy/client/event/LoadGroupCreationEvent.java @@ -1,12 +1,16 @@ package envoy.client.event; import envoy.client.data.LocalDB; +import envoy.client.ui.controller.ChatScene; import envoy.event.Event; /** + * This event carries an instance of {@link LocalDB} so the groupCreationTab has the most recent version of the contactList.
+ * It is triggered as soon as the corresponding button in {@link ChatScene} is clicked.

+ * * Project: client
* File: LoadGroupCreationEvent.java
- * Created: Aug 23, 2020
+ * Created: 23.08.2020
* * @author Maximilian Käfer * @since Envoy Client v0.2-beta diff --git a/client/src/main/java/envoy/client/ui/controller/ChatScene.java b/client/src/main/java/envoy/client/ui/controller/ChatScene.java index 071ceba..7df92bc 100644 --- a/client/src/main/java/envoy/client/ui/controller/ChatScene.java +++ b/client/src/main/java/envoy/client/ui/controller/ChatScene.java @@ -86,9 +86,6 @@ public final class ChatScene implements Restorable { @FXML private Button settingsButton; - @FXML - private Button rotateButton; - @FXML private TextArea messageTextArea; @@ -172,7 +169,6 @@ public final class ChatScene implements Restorable { voiceButton.setGraphic(new ImageView(IconUtil.loadIconThemeSensitive("microphone", DEFAULT_ICON_SIZE))); attachmentButton.setGraphic(new ImageView(IconUtil.loadIconThemeSensitive("attachment", DEFAULT_ICON_SIZE))); attachmentView.setImage(DEFAULT_ATTACHMENT_VIEW_IMAGE); - rotateButton.setGraphic(new ImageView(IconUtil.loadIconThemeSensitive("rotate", (int) (DEFAULT_ICON_SIZE * 1.5)))); messageSearchButton.setGraphic(new ImageView(IconUtil.loadIconThemeSensitive("search", DEFAULT_ICON_SIZE))); clientProfilePic.setImage(IconUtil.loadIconThemeSensitive("user_icon", 43)); final Rectangle clip = new Rectangle(); @@ -188,6 +184,7 @@ public final class ChatScene implements Restorable { contactSearchTab.setContent(FXMLLoader.load(new File("src/main/resources/fxml/ContactSearchTab.fxml").toURI().toURL())); groupCreationTab.setContent(FXMLLoader.load(new File("src/main/resources/fxml/GroupCreationTab.fxml").toURI().toURL())); } catch (Exception e2) { + logger.log(Level.SEVERE, "An error occured when attempting to load the tabs!"); e2.printStackTrace(); } } else { diff --git a/client/src/main/resources/fxml/ChatScene.fxml b/client/src/main/resources/fxml/ChatScene.fxml index bc8f7c1..ac0ab92 100644 --- a/client/src/main/resources/fxml/ChatScene.fxml +++ b/client/src/main/resources/fxml/ChatScene.fxml @@ -108,7 +108,7 @@ - + @@ -208,11 +208,6 @@ -