zdm/envoy
zdm
/
envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Changed some more things requested by @delvh.

This commit is contained in:
Maximilian P. Käfer 2020-08-26 15:12:03 +02:00
parent f6c3da394d
commit 78ade078d4
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/java/envoy/client/event/BackEvent.java
View File

@ -3,9 +3,11 @@ package envoy.client.event;
import envoy.event.Event.Valueless; import envoy.event.Event.Valueless;
/** /**
* This event serves the purpose to trigger the tab change to tab 1 in {@link ChatScene}.<p>
*
* Project: <strong>client</strong><br> * Project: <strong>client</strong><br>
* File: <strong>BackEvent.java</strong><br> * File: <strong>BackEvent.java</strong><br>
* Created: <strong>Aug 23, 2020</strong><br> * Created: <strong>23.08.2020</strong><br>
* *
* @author Maximilian K&auml;fer * @author Maximilian K&auml;fer
* @since Envoy Client v0.2-beta * @since Envoy Client v0.2-beta

6
client/src/main/java/envoy/client/event/LoadGroupCreationEvent.java
View File

@ -1,12 +1,16 @@
package envoy.client.event; package envoy.client.event;
import envoy.client.data.LocalDB; import envoy.client.data.LocalDB;
import envoy.client.ui.controller.ChatScene;
import envoy.event.Event; import envoy.event.Event;
/** /**
* This event carries an instance of {@link LocalDB} so the groupCreationTab has the most recent version of the contactList. <br>
* It is triggered as soon as the corresponding button in {@link ChatScene} is clicked. <p>
*
* Project: <strong>client</strong><br> * Project: <strong>client</strong><br>
* File: <strong>LoadGroupCreationEvent.java</strong><br> * File: <strong>LoadGroupCreationEvent.java</strong><br>
* Created: <strong>Aug 23, 2020</strong><br> * Created: <strong>23.08.2020</strong><br>
* *
* @author Maximilian K&auml;fer * @author Maximilian K&auml;fer
* @since Envoy Client v0.2-beta * @since Envoy Client v0.2-beta

5
client/src/main/java/envoy/client/ui/controller/ChatScene.java
View File

@ -86,9 +86,6 @@ public final class ChatScene implements Restorable {
@FXML @FXML
private Button settingsButton; private Button settingsButton;
@FXML
private Button rotateButton;
@FXML @FXML
private TextArea messageTextArea; private TextArea messageTextArea;
@ -172,7 +169,6 @@ public final class ChatScene implements Restorable {
voiceButton.setGraphic(new ImageView(IconUtil.loadIconThemeSensitive("microphone", DEFAULT_ICON_SIZE))); voiceButton.setGraphic(new ImageView(IconUtil.loadIconThemeSensitive("microphone", DEFAULT_ICON_SIZE)));
attachmentButton.setGraphic(new ImageView(IconUtil.loadIconThemeSensitive("attachment", DEFAULT_ICON_SIZE))); attachmentButton.setGraphic(new ImageView(IconUtil.loadIconThemeSensitive("attachment", DEFAULT_ICON_SIZE)));
attachmentView.setImage(DEFAULT_ATTACHMENT_VIEW_IMAGE); 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))); messageSearchButton.setGraphic(new ImageView(IconUtil.loadIconThemeSensitive("search", DEFAULT_ICON_SIZE)));
clientProfilePic.setImage(IconUtil.loadIconThemeSensitive("user_icon", 43)); clientProfilePic.setImage(IconUtil.loadIconThemeSensitive("user_icon", 43));
final Rectangle clip = new Rectangle(); 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())); 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())); groupCreationTab.setContent(FXMLLoader.load(new File("src/main/resources/fxml/GroupCreationTab.fxml").toURI().toURL()));
} catch (Exception e2) { } catch (Exception e2) {
logger.log(Level.SEVERE, "An error occured when attempting to load the tabs!");
e2.printStackTrace(); e2.printStackTrace();
} }
} else { } else {

7
client/src/main/resources/fxml/ChatScene.fxml
View File

@ -108,7 +108,7 @@
<content> <content>
</content> </content>
</Tab> </Tab>
<Tab fx:id="groupCreationTab" text=""/> <Tab fx:id="groupCreationTab" text="" />
</tabs> </tabs>
<GridPane.margin> <GridPane.margin>
<Insets right="1.0" /> <Insets right="1.0" />
@ -208,11 +208,6 @@
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding> </padding>
</Button> </Button>
<Button id="roundButton" fx:id="rotateButton" minWidth="40.0" mnemonicParsing="false" onAction="#doABarrelRoll" prefHeight="40.0" prefWidth="40.0">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
</Button>
</children> </children>
<HBox.margin> <HBox.margin>
<Insets left="5.0" /> <Insets left="5.0" />