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

Removed clicking into a tab to see that you cannot interact with it

Browse Source 
Additionally re-ensured compliance with our CSS conventions.
This commit is contained in:
delvh 2020-09-01 20:57:18 +02:00
parent 9f517cfc6b
commit 661823219c
6 changed files with 235 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,16 +21,14 @@ import javafx.collections.ObservableList;
import javafx.collections.transformation.FilteredList; import javafx.collections.transformation.FilteredList;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.control.Alert.AlertType; import javafx.scene.control.Alert.AlertType;
import javafx.scene.image.Image; import javafx.scene.image.Image;
import javafx.scene.image.ImageView; import javafx.scene.image.ImageView;
import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent; import javafx.scene.input.KeyEvent;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox; import javafx.scene.layout.VBox;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import javafx.scene.shape.Rectangle; import javafx.scene.shape.Rectangle;
@ -98,6 +96,9 @@ public final class ChatScene implements Restorable {
@FXML @FXML
private Button newGroupButton; private Button newGroupButton;
@FXML
private Button newContactButton;
@FXML @FXML
private TextArea messageTextArea; private TextArea messageTextArea;
@ -140,12 +141,16 @@ public final class ChatScene implements Restorable {
@FXML @FXML
private Tab groupCreationTab; private Tab groupCreationTab;
@FXML
private HBox contactSpecificOnlineOperations;
private final LocalDB localDB = context.getLocalDB(); private final LocalDB localDB = context.getLocalDB();
private final Client client = context.getClient(); private final Client client = context.getClient();
private final WriteProxy writeProxy = context.getWriteProxy(); private final WriteProxy writeProxy = context.getWriteProxy();
private final SceneContext sceneContext = context.getSceneContext(); private final SceneContext sceneContext = context.getSceneContext();
private final AudioRecorder recorder = new AudioRecorder(); private final AudioRecorder recorder = new AudioRecorder();
private final SystemCommandsMap messageTextAreaCommands = new SystemCommandsMap(); private final SystemCommandsMap messageTextAreaCommands = new SystemCommandsMap();
private final Tooltip onlyIfOnlineTooltip = new Tooltip("You need to be online to do this");
private Chat currentChat; private Chat currentChat;
private FilteredList<Chat> chats; private FilteredList<Chat> chats;
@ -192,15 +197,21 @@ public final class ChatScene implements Restorable {
initializeSystemCommandsMap(); initializeSystemCommandsMap();
Platform.runLater(() -> { Platform.runLater(() -> {
if (client.isOnline()) try { final var online = client.isOnline();
// no check will be performed in case it has already been disabled - a negative
// GroupCreationResult might have been returned
if (!newGroupButton.isDisabled()) newGroupButton.setDisable(!online);
newContactButton.setDisable(!online);
if (online) try {
Tooltip.uninstall(contactSpecificOnlineOperations, onlyIfOnlineTooltip);
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 (final IOException e2) { } catch (final IOException e2) {
logger.log(Level.SEVERE, "An error occurred when attempting to load tabs: ", e2); logger.log(Level.SEVERE, "An error occurred when attempting to load tabs: ", e2);
} }
else { else {
contactSearchTab.setContent(createOfflineNote()); Tooltip.install(contactSpecificOnlineOperations, onlyIfOnlineTooltip);
groupCreationTab.setContent(createOfflineNote()); updateInfoLabel("You are offline", "info-label-warning");
} }
}); });
@ -293,22 +304,6 @@ public final class ChatScene implements Restorable {
eventBus.register(GroupCreationResult.class, e -> Platform.runLater(() -> { newGroupButton.setDisable(!e.get()); })); eventBus.register(GroupCreationResult.class, e -> Platform.runLater(() -> { newGroupButton.setDisable(!e.get()); }));
} }
private AnchorPane createOfflineNote() {
final var anc = new AnchorPane();
final var vBox = new VBox();
vBox.setAlignment(Pos.TOP_CENTER);
vBox.setPrefWidth(316);
final var label = new Label("You have to be online!");
label.setPadding(new Insets(50, 0, 5, 0));
final var button = new Button("OK");
button.setOnAction(e -> eventBus.dispatch(new BackEvent()));
vBox.getChildren().add(label);
vBox.getChildren().add(button);
anc.getChildren().add(vBox);
anc.setId("note-background");
return anc;
}
/** /**
* Initializes all {@code SystemCommands} used in {@code ChatScene}. * Initializes all {@code SystemCommands} used in {@code ChatScene}.
* *
@ -575,7 +570,7 @@ public final class ChatScene implements Restorable {
if (!infoLabel.getText().equals(noMoreMessaging)) if (!infoLabel.getText().equals(noMoreMessaging))
// Informing the user that he is a f*cking moron and should use Envoy online // Informing the user that he is a f*cking moron and should use Envoy online
// because he ran out of messageIDs to use // because he ran out of messageIDs to use
updateInfoLabel(noMoreMessaging, "infoLabel-error"); updateInfoLabel(noMoreMessaging, "info-label-error");
} }
} }
@ -620,7 +615,7 @@ public final class ChatScene implements Restorable {
postButton.setDisable(true); postButton.setDisable(true);
messageTextArea.setDisable(true); messageTextArea.setDisable(true);
messageTextArea.clear(); messageTextArea.clear();
updateInfoLabel("You need to go online to send more messages", "infoLabel-error"); updateInfoLabel("You need to go online to send more messages", "info-label-error");
return; return;
} }
final var text = messageTextArea.getText().strip(); final var text = messageTextArea.getText().strip();

20
client/src/main/java/envoy/client/ui/controller/GroupCreationTab.java
View File

@ -56,17 +56,17 @@ public class GroupCreationTab {
private Label errorMessageLabel; private Label errorMessageLabel;
@FXML @FXML
private Button proceedDupButton; private Button proceedDuplicateButton;
@FXML @FXML
private Button cancelDupButton; private Button cancelDuplicateButton;
@FXML @FXML
private HBox errorProceedBox; private HBox errorProceedBox;
private String name; private String name;
private final LocalDB localDB = Context.getInstance().getLocalDB(); private final LocalDB localDB = Context.getInstance().getLocalDB();
private static final EventBus eventBus = EventBus.getInstance(); private static final EventBus eventBus = EventBus.getInstance();
@ -194,12 +194,12 @@ public class GroupCreationTab {
} }
private void setProcessPaneSize(int value) { private void setProcessPaneSize(int value) {
proceedDupButton.setPrefHeight(value); proceedDuplicateButton.setPrefHeight(value);
proceedDupButton.setMinHeight(value); proceedDuplicateButton.setMinHeight(value);
proceedDupButton.setMaxHeight(value); proceedDuplicateButton.setMaxHeight(value);
cancelDupButton.setPrefHeight(value); cancelDuplicateButton.setPrefHeight(value);
cancelDupButton.setMinHeight(value); cancelDuplicateButton.setMinHeight(value);
cancelDupButton.setMaxHeight(value); cancelDuplicateButton.setMaxHeight(value);
errorProceedBox.setPrefHeight(value); errorProceedBox.setPrefHeight(value);
errorProceedBox.setMinHeight(value); errorProceedBox.setMinHeight(value);
errorProceedBox.setMaxHeight(value); errorProceedBox.setMaxHeight(value);

2
client/src/main/java/envoy/client/ui/settings/OnlyIfOnlineSettingsPane.java
View File

@ -36,7 +36,7 @@ public abstract class OnlyIfOnlineSettingsPane extends SettingsPane {
if (!online) { if (!online) {
final var infoLabel = new Label("You shall not pass!\n(... Unless you would happen to be online)"); final var infoLabel = new Label("You shall not pass!\n(... Unless you would happen to be online)");
infoLabel.setId("infoLabel-warning"); infoLabel.setId("info-label-warning");
infoLabel.setWrapText(true); infoLabel.setWrapText(true);
getChildren().add(infoLabel); getChildren().add(infoLabel);
setBackground(new Background(new BackgroundFill(Color.grayRgb(100, 0.3), CornerRadii.EMPTY, Insets.EMPTY))); setBackground(new Background(new BackgroundFill(Color.grayRgb(100, 0.3), CornerRadii.EMPTY, Insets.EMPTY)));

12
client/src/main/resources/css/base.css
View File

@ -107,19 +107,19 @@
-fx-background-color: transparent; -fx-background-color: transparent;
} }
#infoLabel-success { #info-label-success {
-fx-text-fill: #00FF00; -fx-text-fill: #00FF00;
} }
#infoLabel-info { #info-label-info {
-fx-text-fill: yellow; -fx-text-fill: yellow;
} }
#infoLabel-warning { #info-label-warning {
-fx-text-fill: orange; -fx-text-fill: orange;
} }
#infoLabel-error { #info-label-error {
-fx-text-fill: red; -fx-text-fill: red;
} }
@ -136,9 +136,9 @@
} }
.tab-pane { .tab-pane {
-fx-tab-max-height: 0 ; -fx-tab-max-height: 0.0 ;
} }
.tab-pane .tab-header-area { .tab-pane .tab-header-area {
visibility: hidden ; visibility: hidden ;
-fx-padding: -20 0 0 0; -fx-padding: -20.0 0.0 0.0 0.0;
} }

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

@ -21,107 +21,146 @@
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<GridPane fx:id="scene" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="400.0" minWidth="500.0" prefHeight="1152.0" prefWidth="2042.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.controller.ChatScene"> <GridPane fx:id="scene" maxHeight="-Infinity"
maxWidth="-Infinity" minHeight="400.0" minWidth="500.0"
prefHeight="1152.0" prefWidth="2042.0"
xmlns="http://javafx.com/javafx/11.0.1"
xmlns:fx="http://javafx.com/fxml/1"
fx:controller="envoy.client.ui.controller.ChatScene">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="NEVER" maxWidth="327.99997965494794" minWidth="-Infinity" prefWidth="317.0" /> <ColumnConstraints hgrow="NEVER"
<ColumnConstraints hgrow="ALWAYS" maxWidth="1.7976931348623157E308" /> maxWidth="327.99997965494794" minWidth="-Infinity" prefWidth="317.0" />
<ColumnConstraints hgrow="ALWAYS"
maxWidth="1.7976931348623157E308" />
</columnConstraints> </columnConstraints>
<rowConstraints> <rowConstraints>
<RowConstraints maxHeight="122.00000508626302" minHeight="-Infinity" prefHeight="96.66666158040364" vgrow="NEVER" /> <RowConstraints maxHeight="122.00000508626302"
<RowConstraints maxHeight="1.7976931348623157E308" minHeight="50.0" prefHeight="949.3333384195963" vgrow="ALWAYS" /> minHeight="-Infinity" prefHeight="96.66666158040364" vgrow="NEVER" />
<RowConstraints maxHeight="59.3333740234375" minHeight="-Infinity" prefHeight="22.666748046875" vgrow="NEVER" /> <RowConstraints maxHeight="1.7976931348623157E308"
<RowConstraints maxHeight="120.0" minHeight="-Infinity" prefHeight="83.333251953125" vgrow="NEVER" /> minHeight="50.0" prefHeight="949.3333384195963" vgrow="ALWAYS" />
<RowConstraints maxHeight="59.3333740234375"
minHeight="-Infinity" prefHeight="22.666748046875" vgrow="NEVER" />
<RowConstraints maxHeight="120.0" minHeight="-Infinity"
prefHeight="83.333251953125" vgrow="NEVER" />
</rowConstraints> </rowConstraints>
<children> <children>
<TabPane fx:id="tabPane" prefHeight="200.0" prefWidth="200.0" tabClosingPolicy="UNAVAILABLE" GridPane.rowIndex="1" GridPane.rowSpan="2147483647"> <TabPane fx:id="tabPane" prefHeight="200.0" prefWidth="200.0"
<tabs> tabClosingPolicy="UNAVAILABLE" GridPane.rowIndex="1"
<Tab text=""> GridPane.rowSpan="2147483647">
<content> <tabs>
<AnchorPane minHeight="0.0" minWidth="0.0"> <Tab text="">
<children> <content>
<VBox fx:id="contactOperations" prefHeight="3000.0" prefWidth="316.0"> <AnchorPane minHeight="0.0" minWidth="0.0">
<children> <children>
<VBox id="search-panel" maxHeight="-Infinity" minHeight="-Infinity" prefHeight="80.0" prefWidth="316.0"> <VBox fx:id="contactOperations" prefHeight="3000.0"
<children> prefWidth="316.0">
<Label id="contact-search-enter-container" maxHeight="30.0" minHeight="30.0" prefHeight="30.0" prefWidth="325.0"> <children>
<graphic> <VBox id="search-panel" maxHeight="-Infinity"
<TextArea id="contact-search-input" fx:id="contactSearch" focusTraversable="false" maxHeight="30.0" minHeight="30.0" onInputMethodTextChanged="#searchContacts" onKeyTyped="#searchContacts" prefHeight="30.0" prefWidth="200.0" promptText="Search Contacts"> minHeight="-Infinity" prefHeight="80.0" prefWidth="316.0">
<font> <children>
<Font size="14.0" /> <Label id="contact-search-enter-container"
</font> maxHeight="30.0" minHeight="30.0" prefHeight="30.0"
<padding> prefWidth="325.0">
<Insets left="12.0" right="12.0" /> <graphic>
</padding> <TextArea id="contact-search-input"
</TextArea> fx:id="contactSearch" focusTraversable="false"
</graphic> maxHeight="30.0" minHeight="30.0"
<VBox.margin> onInputMethodTextChanged="#searchContacts"
<Insets left="10.0" right="10.0" top="3.0" /> onKeyTyped="#searchContacts" prefHeight="30.0"
</VBox.margin> prefWidth="200.0" promptText="Search Contacts">
</Label> <font>
<HBox id="underline" alignment="TOP_CENTER" prefHeight="41.0" prefWidth="296.0" spacing="5.0"> <Font size="14.0" />
<children> </font>
<Button mnemonicParsing="true" onAction="#addContactButtonClicked" prefWidth="100.0" text=" Add Contact"> <padding>
<padding> <Insets left="12.0" right="12.0" />
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> </padding>
</padding> </TextArea>
<HBox.margin> </graphic>
<Insets /> <VBox.margin>
</HBox.margin> <Insets left="10.0" right="10.0" top="3.0" />
</Button> </VBox.margin>
<Button mnemonicParsing="false" onAction="#groupCreationButtonClicked" prefWidth="100.0" text="New Group"> </Label>
<HBox.margin> <HBox fx:id="contactSpecificOnlineOperations"
<Insets /> id="underline" alignment="TOP_CENTER" prefHeight="41.0"
</HBox.margin> prefWidth="296.0" spacing="5.0">
<padding> <children>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Button fx:id="newContactButton"
</padding> mnemonicParsing="true"
</Button> onAction="#addContactButtonClicked" prefWidth="100.0"
</children> text=" Add Contact">
<VBox.margin> <padding>
<Insets left="10.0" right="10.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0"
</VBox.margin> top="5.0" />
<padding> </padding>
<Insets top="3.0" /> <HBox.margin>
</padding> <Insets />
</HBox> </HBox.margin>
</children> </Button>
</VBox> <Button fx:id="newGroupButton"
<ListView id="chat-list" fx:id="chatList" focusTraversable="false" onMouseClicked="#chatListClicked" prefWidth="316.0" VBox.vgrow="ALWAYS"> mnemonicParsing="false"
<contextMenu> onAction="#groupCreationButtonClicked" prefWidth="100.0"
<ContextMenu anchorLocation="CONTENT_TOP_LEFT"> text="New Group">
<items> <HBox.margin>
<MenuItem fx:id="deleteContactMenuItem" mnemonicParsing="false" onAction="#deleteContact" text="Delete" /> <Insets />
</items> </HBox.margin>
</ContextMenu> <padding>
</contextMenu> <Insets bottom="5.0" left="5.0" right="5.0"
<padding> top="5.0" />
<Insets bottom="5.0" left="5.0" right="2.0" top="5.0" /> </padding>
</padding> </Button>
</ListView> </children>
</children> <VBox.margin>
</VBox> <Insets left="10.0" right="10.0" top="5.0" />
</children> </VBox.margin>
</AnchorPane> <padding>
</content> <Insets top="3.0" />
</Tab> </padding>
<Tab fx:id="contactSearchTab" text=""> </HBox>
<content> </children>
</content> </VBox>
</Tab> <ListView id="chat-list" fx:id="chatList"
<Tab fx:id="groupCreationTab" text="" /> focusTraversable="false" onMouseClicked="#chatListClicked"
</tabs> prefWidth="316.0" VBox.vgrow="ALWAYS">
<GridPane.margin> <contextMenu>
<Insets right="1.0" /> <ContextMenu anchorLocation="CONTENT_TOP_LEFT">
</GridPane.margin> <items>
</TabPane> <MenuItem fx:id="deleteContactMenuItem"
mnemonicParsing="false" onAction="#deleteContact"
text="Delete" />
</items>
</ContextMenu>
</contextMenu>
<padding>
<Insets bottom="5.0" left="5.0" right="2.0" top="5.0" />
</padding>
</ListView>
</children>
</VBox>
</children>
</AnchorPane>
</content>
</Tab>
<Tab fx:id="contactSearchTab" text="">
<content>
</content>
</Tab>
<Tab fx:id="groupCreationTab" text="" />
</tabs>
<GridPane.margin>
<Insets right="1.0" />
</GridPane.margin>
</TabPane>
<HBox id="top-bar" alignment="CENTER_LEFT" prefHeight="100.0"> <HBox id="top-bar" alignment="CENTER_LEFT" prefHeight="100.0">
<children> <children>
<ImageView id="profile-pic" fx:id="clientProfilePic" fitHeight="43.0" fitWidth="43.0" pickOnBounds="true" preserveRatio="true"> <ImageView id="profile-pic" fx:id="clientProfilePic"
fitHeight="43.0" fitWidth="43.0" pickOnBounds="true"
preserveRatio="true">
<HBox.margin> <HBox.margin>
<Insets left="15.0" top="5.0" /> <Insets left="15.0" top="5.0" />
</HBox.margin> </HBox.margin>
</ImageView> </ImageView>
<Label id="transparent-background" fx:id="contactLabel" prefHeight="27.0" prefWidth="134.0"> <Label id="transparent-background" fx:id="contactLabel"
prefHeight="27.0" prefWidth="134.0">
<padding> <padding>
<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>
@ -132,10 +171,14 @@
<Insets left="10.0" top="5.0" /> <Insets left="10.0" top="5.0" />
</HBox.margin> </HBox.margin>
</Label> </Label>
<Region id="transparent-background" prefHeight="77.0" prefWidth="115.0" /> <Region id="transparent-background" prefHeight="77.0"
<VBox id="transparent-background" alignment="CENTER_RIGHT" prefHeight="200.0" prefWidth="100.0" spacing="5.0"> prefWidth="115.0" />
<VBox id="transparent-background" alignment="CENTER_RIGHT"
prefHeight="200.0" prefWidth="100.0" spacing="5.0">
<children> <children>
<Button fx:id="settingsButton" mnemonicParsing="true" onAction="#settingsButtonClicked" prefHeight="30.0" prefWidth="30.0" text=""> <Button fx:id="settingsButton" mnemonicParsing="true"
onAction="#settingsButtonClicked" prefHeight="30.0"
prefWidth="30.0" text="">
<padding> <padding>
<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>
@ -156,7 +199,10 @@
<Insets bottom="1.0" right="1.0" /> <Insets bottom="1.0" right="1.0" />
</GridPane.margin> </GridPane.margin>
</HBox> </HBox>
<ListView id="message-list" fx:id="messageList" focusTraversable="false" GridPane.columnIndex="1" GridPane.columnSpan="2147483647" GridPane.rowIndex="1" GridPane.rowSpan="2"> <ListView id="message-list" fx:id="messageList"
focusTraversable="false" GridPane.columnIndex="1"
GridPane.columnSpan="2147483647" GridPane.rowIndex="1"
GridPane.rowSpan="2">
<GridPane.margin> <GridPane.margin>
<Insets /> <Insets />
</GridPane.margin> </GridPane.margin>
@ -164,11 +210,17 @@
<Insets bottom="5.0" top="5.0" /> <Insets bottom="5.0" top="5.0" />
</padding> </padding>
</ListView> </ListView>
<HBox alignment="CENTER" GridPane.columnIndex="1" GridPane.rowIndex="3"> <HBox alignment="CENTER" GridPane.columnIndex="1"
GridPane.rowIndex="3">
<children> <children>
<Label id="text-enter-container" alignment="CENTER" minWidth="300.0" prefHeight="100.0" prefWidth="800.0"> <Label id="text-enter-container" alignment="CENTER"
minWidth="300.0" prefHeight="100.0" prefWidth="800.0">
<graphic> <graphic>
<TextArea id="message-enter" fx:id="messageTextArea" disable="true" onInputMethodTextChanged="#messageTextUpdated" onKeyPressed="#checkPostConditions" onKeyTyped="#checkKeyCombination" prefHeight="100.0" prefWidth="1250.0" promptText="Enter Message" wrapText="true"> <TextArea id="message-enter" fx:id="messageTextArea"
disable="true" onInputMethodTextChanged="#messageTextUpdated"
onKeyPressed="#checkPostConditions"
onKeyTyped="#checkKeyCombination" prefHeight="100.0"
prefWidth="1250.0" promptText="Enter Message" wrapText="true">
<opaqueInsets> <opaqueInsets>
<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" />
</opaqueInsets> </opaqueInsets>
@ -180,30 +232,42 @@
</Label> </Label>
<HBox prefHeight="38.0" prefWidth="100.0" spacing="5.0"> <HBox prefHeight="38.0" prefWidth="100.0" spacing="5.0">
<children> <children>
<Button id="round-button" fx:id="postButton" defaultButton="true" disable="true" minWidth="40.0" mnemonicParsing="true" onAction="#postMessage" prefHeight="40.0" prefWidth="40.0" text="Post"> <Button id="round-button" fx:id="postButton"
defaultButton="true" disable="true" minWidth="40.0"
mnemonicParsing="true" onAction="#postMessage" prefHeight="40.0"
prefWidth="40.0" text="Post">
<tooltip> <tooltip>
<Tooltip anchorLocation="WINDOW_TOP_LEFT" autoHide="true" maxWidth="350.0" text="Click this button to send the message. If it is disabled, you first have to select a contact to send it to. A message may automatically be sent when you press (Ctrl + ) Enter, according to your preferences. Additionally sends a message when pressing &quot;Alt&quot; + &quot;P&quot;." wrapText="true" /> <Tooltip anchorLocation="WINDOW_TOP_LEFT"
autoHide="true" maxWidth="350.0"
text="Click this button to send the message. If it is disabled, you first have to select a contact to send it to. A message may automatically be sent when you press (Ctrl + ) Enter, according to your preferences. Additionally sends a message when pressing &quot;Alt&quot; + &quot;P&quot;."
wrapText="true" />
</tooltip> </tooltip>
<contextMenu> <contextMenu>
<ContextMenu anchorLocation="CONTENT_TOP_LEFT"> <ContextMenu anchorLocation="CONTENT_TOP_LEFT">
<items> <items>
<MenuItem mnemonicParsing="false" onAction="#copyAndPostMessage" text="Copy and Send" /> <MenuItem mnemonicParsing="false"
onAction="#copyAndPostMessage" text="Copy and Send" />
</items> </items>
</ContextMenu> </ContextMenu>
</contextMenu> </contextMenu>
<padding> <padding>
<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>
<HBox.margin> <HBox.margin>
<Insets left="10.0" /> <Insets left="10.0" />
</HBox.margin> </HBox.margin>
</Button> </Button>
<Button id="round-button" fx:id="voiceButton" disable="true" minWidth="40.0" onAction="#voiceButtonClicked" prefHeight="40.0" prefWidth="40.0"> <Button id="round-button" fx:id="voiceButton"
disable="true" minWidth="40.0" onAction="#voiceButtonClicked"
prefHeight="40.0" prefWidth="40.0">
<padding> <padding>
<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="round-button" fx:id="attachmentButton" disable="true" minWidth="40.0" mnemonicParsing="false" onAction="#attachmentButtonClicked" prefHeight="40.0" prefWidth="40.0"> <Button id="round-button" fx:id="attachmentButton"
disable="true" minWidth="40.0" mnemonicParsing="false"
onAction="#attachmentButtonClicked" prefHeight="40.0"
prefWidth="40.0">
<padding> <padding>
<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>
@ -218,9 +282,13 @@
<Insets bottom="40.0" left="10.0" right="10.0" top="15.0" /> <Insets bottom="40.0" left="10.0" right="10.0" top="15.0" />
</GridPane.margin> </GridPane.margin>
</HBox> </HBox>
<HBox prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2"> <HBox prefHeight="100.0" prefWidth="200.0"
GridPane.columnIndex="1" GridPane.rowIndex="2">
<children> <children>
<Label id="remaining-chars-label" fx:id="remainingChars" ellipsisString="" maxHeight="30.0" maxWidth="180.0" prefHeight="30.0" prefWidth="180.0" text="remaining chars: 0/x" textFill="LIME" textOverrun="LEADING_WORD_ELLIPSIS" visible="false"> <Label id="remaining-chars-label" fx:id="remainingChars"
ellipsisString="" maxHeight="30.0" maxWidth="180.0"
prefHeight="30.0" prefWidth="180.0" text="remaining chars: 0/x"
textFill="LIME" textOverrun="LEADING_WORD_ELLIPSIS" visible="false">
<padding> <padding>
<Insets bottom="5.0" top="5.0" /> <Insets bottom="5.0" top="5.0" />
</padding> </padding>
@ -228,17 +296,23 @@
<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" />
</opaqueInsets> </opaqueInsets>
<tooltip> <tooltip>
<Tooltip text="Shows how many chars you can still enter in this message" wrapText="true" /> <Tooltip
text="Shows how many chars you can still enter in this message"
wrapText="true" />
</tooltip> </tooltip>
</Label> </Label>
<Label fx:id="infoLabel" text="Something happened" textFill="#faa007" visible="false" wrapText="true"> <Label fx:id="infoLabel" text="Something happened"
textFill="#faa007" visible="false" wrapText="true">
<padding> <padding>
<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>
</Label> </Label>
</children> </children>
</HBox> </HBox>
<ImageView fx:id="attachmentView" pickOnBounds="true" preserveRatio="true" visible="false" GridPane.columnIndex="1" GridPane.columnSpan="2147483647" GridPane.halignment="RIGHT" GridPane.rowIndex="2"> <ImageView fx:id="attachmentView" pickOnBounds="true"
preserveRatio="true" visible="false" GridPane.columnIndex="1"
GridPane.columnSpan="2147483647" GridPane.halignment="RIGHT"
GridPane.rowIndex="2">
<viewport> <viewport>
<Rectangle2D height="20.0" width="20.0" /> <Rectangle2D height="20.0" width="20.0" />
</viewport> </viewport>
@ -246,14 +320,18 @@
<Insets bottom="5.0" right="10.0" top="5.0" /> <Insets bottom="5.0" right="10.0" top="5.0" />
</GridPane.margin> </GridPane.margin>
</ImageView> </ImageView>
<HBox id="top-bar" alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1"> <HBox id="top-bar" alignment="CENTER_LEFT" prefHeight="100.0"
prefWidth="200.0" GridPane.columnIndex="1">
<children> <children>
<ImageView id="profile-pic" fx:id="recipientProfilePic" fitHeight="43.0" fitWidth="43.0" pickOnBounds="true" preserveRatio="true"> <ImageView id="profile-pic" fx:id="recipientProfilePic"
fitHeight="43.0" fitWidth="43.0" pickOnBounds="true"
preserveRatio="true">
<HBox.margin> <HBox.margin>
<Insets left="20.0" top="5.0" /> <Insets left="20.0" top="5.0" />
</HBox.margin> </HBox.margin>
</ImageView> </ImageView>
<VBox alignment="CENTER_LEFT" prefHeight="97.0" prefWidth="316.0"> <VBox alignment="CENTER_LEFT" prefHeight="97.0"
prefWidth="316.0">
<children> <children>
<Label fx:id="topBarContactLabel" text=""> <Label fx:id="topBarContactLabel" text="">
<font> <font>
@ -266,8 +344,12 @@
<Insets left="15.0" /> <Insets left="15.0" />
</HBox.margin> </HBox.margin>
</VBox> </VBox>
<Region prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" /> <Region prefHeight="200.0" prefWidth="200.0"
<Button id="round-button" fx:id="messageSearchButton" contentDisplay="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" prefHeight="40.0" prefWidth="40.0" visible="false"> HBox.hgrow="ALWAYS" />
<Button id="round-button" fx:id="messageSearchButton"
contentDisplay="CENTER" maxHeight="-Infinity" maxWidth="-Infinity"
minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false"
prefHeight="40.0" prefWidth="40.0" visible="false">
<HBox.margin> <HBox.margin>
<Insets right="20.0" /> <Insets right="20.0" />
</HBox.margin> </HBox.margin>

4
client/src/main/resources/fxml/GroupCreationTab.fxml
View File

@ -40,8 +40,8 @@
<Label id="infoLabel-error" fx:id="errorMessageLabel" maxHeight="0.0" minHeight="0.0" prefHeight="0.0" textAlignment="CENTER" textFill="RED" VBox.vgrow="ALWAYS" /> <Label id="infoLabel-error" fx:id="errorMessageLabel" maxHeight="0.0" minHeight="0.0" prefHeight="0.0" textAlignment="CENTER" textFill="RED" VBox.vgrow="ALWAYS" />
<HBox fx:id="errorProceedBox" alignment="TOP_CENTER" maxHeight="0.0" minHeight="0.0" prefHeight="0.0" prefWidth="316.0" spacing="5.0"> <HBox fx:id="errorProceedBox" alignment="TOP_CENTER" maxHeight="0.0" minHeight="0.0" prefHeight="0.0" prefWidth="316.0" spacing="5.0">
<children> <children>
<Button id="proceed-button" fx:id="proceedDupButton" maxHeight="0.0" minHeight="0.0" mnemonicParsing="false" onAction="#proceedOnNameDuplication" prefHeight="0.0" text="Proceed" /> <Button id="proceed-button" fx:id="proceedDuplicateButton" maxHeight="0.0" minHeight="0.0" mnemonicParsing="false" onAction="#proceedOnNameDuplication" prefHeight="0.0" text="Proceed" />
<Button id="proceed-button" fx:id="cancelDupButton" maxHeight="0.0" minHeight="0.0" mnemonicParsing="false" onAction="#cancelOnNameDuplication" prefHeight="0.0" text="Cancel" /> <Button id="proceed-button" fx:id="cancelDuplicateButton" maxHeight="0.0" minHeight="0.0" mnemonicParsing="false" onAction="#cancelOnNameDuplication" prefHeight="0.0" text="Cancel" />
</children> </children>
</HBox> </HBox>
<HBox id="underline" alignment="TOP_CENTER" prefWidth="200.0" spacing="5.0"> <HBox id="underline" alignment="TOP_CENTER" prefWidth="200.0" spacing="5.0">