Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
2de61c7
Add hashtag to all links
kuhlkrein Oct 29, 2021
1cc0bfe
Download one software
kuhlkrein Oct 29, 2021
e001f90
change size of text in download and makes it clickable
kuhlkrein Oct 29, 2021
a884bf2
increase size of the option Menu
kuhlkrein Oct 29, 2021
d12e70d
ergonomic button (we see the langage selected in the button area)
Oct 29, 2021
6402b1b
Merge pull request #61 from InteraactionGroup/fix_eyetrackermanager_name
kuhlkrein Nov 2, 2021
21d8fca
Update UpdateService.java
kuhlkrein Nov 2, 2021
d5d508b
Update UpdateMenu.java
kuhlkrein Nov 2, 2021
87c4253
Merge pull request #62 from InteraactionGroup/download_one_software
kuhlkrein Nov 2, 2021
d659d2f
adding user information menu
kuhlkrein Nov 2, 2021
81bd3a0
add possibiliy to change password
kuhlkrein Nov 3, 2021
b5cf7d3
add small fixes
kuhlkrein Nov 4, 2021
de62b91
Update UpdateManager.java
kuhlkrein Nov 5, 2021
764ba99
add contact system with hidden code
kuhlkrein Nov 18, 2021
08cfb22
add version label to bottom of the option and update menu
kuhlkrein Nov 18, 2021
1295112
auto format and put codes out of the interface
kuhlkrein Nov 19, 2021
9ed9ea6
change path with ~
kuhlkrein Nov 19, 2021
84143b1
fix changePassword script and add inheritIO
kuhlkrein Nov 22, 2021
a28dce6
fix changePassword issue
kuhlkrein Nov 22, 2021
2f1c32f
remove useless label
kuhlkrein Nov 22, 2021
e8edfcc
Merge pull request #65 from InteraactionGroup/let_user_change_passwd
kuhlkrein Nov 22, 2021
5447e8c
Merge branches 'Create_new_user' and 'master' of https://github.com/I…
kuhlkrein Nov 22, 2021
29a0673
add contact in parameter menu
kuhlkrein Nov 22, 2021
7abbcd0
Merge pull request #67 from InteraactionGroup/Create_new_user
kuhlkrein Nov 22, 2021
f984312
Merge pull request #66 from InteraactionGroup/add_version_to_interface
kuhlkrein Nov 22, 2021
29e6f55
Merge branch 'master' of https://github.com/InteraactionGroup/interaa…
kuhlkrein Nov 22, 2021
6ead402
change gap values
kuhlkrein Nov 22, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ dependencies {
compile 'ws.schild:jave-core:2.5.0'
runtime 'org.slf4j:jcl-over-slf4j:1.7.25'
runtime 'org.slf4j:log4j-over-slf4j:1.7.25'
compile group: 'javax.mail', name: 'mail', version: '1.4.5'
compile group: 'javax.activation', name: 'activation', version: '1.1.1'
}


Expand Down
2 changes: 2 additions & 0 deletions scripts/changePassword.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
echo -e $(echo -e $(zenity --forms --title="Changer de mot de passe" --text="Mot de passe pour $USER" --separator="\n" --add-password="Ancien mot de passe" --add-password="Nouveau mot de passe" --add-password="Confirmez le mot de passe") | sed ':a;N;$!ba;s/\n/\\n/g') | passwd
2 changes: 2 additions & 0 deletions src/main/java/main/Configuration.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@

public class Configuration {

public final static String VERSION = "InterAACtionBox-Interface 1.0.0 Dev v.2021.18.11";

public final static int MOUSE_INTERACTION = 0;
public final static int GAZE_INTERACTION = 1;
@Setter
Expand Down
1 change: 1 addition & 0 deletions src/main/java/main/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import javafx.stage.Screen;
import javafx.stage.Stage;
import javafx.stage.StageStyle;
import main.UI.menu.ContactUs;
import main.UI.menu.GraphicalMenus;
import main.utils.StageUtils;
import main.utils.UtilsOS;
Expand Down
120 changes: 120 additions & 0 deletions src/main/java/main/UI/menu/ContactUs.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
package main.UI.menu;

import javafx.geometry.HPos;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.control.TextArea;
import javafx.scene.control.TextField;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.GridPane;
import lombok.extern.slf4j.Slf4j;
import main.utils.UtilsMail;
import main.utils.UtilsUI;

@Slf4j
public class ContactUs extends BorderPane {


Label errorLabel = new Label();

public ContactUs(GraphicalMenus graphicalMenus) {

this.getChildren().add(UtilsUI.createBackground(graphicalMenus));

this.prefWidthProperty().bind(graphicalMenus.primaryStage.widthProperty());
this.prefHeightProperty().bind(graphicalMenus.primaryStage.heightProperty());

this.setTop(UtilsUI.createTopBar(graphicalMenus.getOptionsMenu(), graphicalMenus, "Contact"));

GridPane settings = new GridPane();
settings.setHgap(20);
settings.setVgap(graphicalMenus.primaryStage.getHeight() / 20);
settings.prefWidthProperty().bind(this.prefWidthProperty());


Label firstNameLabel = new Label("Nom*:");
TextField firstName = new TextField();
firstName.setPromptText("Dupont");
firstName.minWidthProperty().bind(settings.prefWidthProperty().divide(8));
firstName.prefWidthProperty().bind(settings.prefWidthProperty().divide(8));
firstName.maxWidthProperty().bind(settings.prefWidthProperty().divide(8));


Label lastNameLabel = new Label("Pr\u00e9nom*:");
TextField lastName = new TextField();
lastName.setPromptText("Martin");
lastName.minWidthProperty().bind(settings.prefWidthProperty().divide(8));
lastName.prefWidthProperty().bind(settings.prefWidthProperty().divide(8));
lastName.maxWidthProperty().bind(settings.prefWidthProperty().divide(8));


Label mailLabel = new Label("E-mail*:");
TextField email = new TextField();
email.setPromptText("Martin.Dupont@email.fr");
email.minWidthProperty().bind(settings.prefWidthProperty().divide(4));
email.prefWidthProperty().bind(settings.prefWidthProperty().divide(4));
email.maxWidthProperty().bind(settings.prefWidthProperty().divide(4));


Label objectLabel = new Label("Objet*:");
TextField object = new TextField();
object.setPromptText("Objet du message");
object.minWidthProperty().bind(settings.prefWidthProperty().divide(4));
object.prefWidthProperty().bind(settings.prefWidthProperty().divide(4));
object.maxWidthProperty().bind(settings.prefWidthProperty().divide(4));

Label messageLabel = new Label("Message*:");
TextArea message = new TextArea();
message.setPromptText("Un probl\u00e8me, Une id\u00e9e, vous voulez travailler avec nous ? Dites-nous tout ! ");
message.setWrapText(true);
message.minWidthProperty().bind(settings.prefWidthProperty().divide(3));
message.prefWidthProperty().bind(settings.prefWidthProperty().divide(3));
message.maxWidthProperty().bind(settings.prefWidthProperty().divide(3));

message.minHeightProperty().bind(this.prefHeightProperty().divide(3));
message.prefHeightProperty().bind(this.prefHeightProperty().divide(3));
message.maxHeightProperty().bind(this.prefHeightProperty().divide(3));

Button ok = new Button("Envoyer");
ok.setOnAction((event) -> {
send(errorLabel, firstName.getText(), lastName.getText(), email.getText(), object.getText(), message.getText());
});

GridPane.setHalignment(firstName, HPos.CENTER);
GridPane.setHalignment(lastName, HPos.CENTER);
GridPane.setHalignment(email, HPos.CENTER);

GridPane.setHalignment(object, HPos.CENTER);
GridPane.setHalignment(message, HPos.CENTER);
GridPane.setHalignment(errorLabel, HPos.CENTER);
GridPane.setHalignment(ok, HPos.CENTER);

settings.add(firstNameLabel, 0, 0);
settings.add(firstName, 1, 0);
settings.add(lastNameLabel, 2, 0);
settings.add(lastName, 3, 0);
settings.add(mailLabel, 0, 1);
settings.add(email, 1, 1, 3, 1);
settings.add(objectLabel, 0, 2);
settings.add(object, 1, 2, 3, 1);
settings.add(messageLabel, 0, 3);
settings.add(message, 0, 4, 4, 1);
settings.add(errorLabel, 0, 5, 4, 1);
settings.add(ok, 0, 6, 4, 1);

settings.setAlignment(Pos.CENTER);
this.setCenter(settings);
}

public static void send(Label errorLabel, String firstname, String lastname, String email, String object, String text) {
UtilsMail.send(errorLabel,
firstname,
lastname,
email,
object,
text
);
}

}
8 changes: 7 additions & 1 deletion src/main/java/main/UI/menu/GraphicalMenus.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,21 @@ public class GraphicalMenus {
private final OptionsMenu optionsMenu;
@Getter
private final UpdateMenu updateMenu;
@Getter
private final UserPageMenu userPageMenu;
@Getter
private final ContactUs contactUs;

public NamedProcess process = new NamedProcess();

public GraphicalMenus(Stage primaryStage) {
this.primaryStage = primaryStage;
UpdateManager updateManager = new UpdateManager();
this.optionsMenu = new OptionsMenu(this);
this.homeScreen = new HomeScreen(this, updateManager);
this.optionsMenu = new OptionsMenu(this);
this.updateMenu = new UpdateMenu(this, updateManager);
this.userPageMenu = new UserPageMenu(this);
this.contactUs = new ContactUs(this);
}

}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/main/UI/menu/HomeScreen.java
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public HomeScreen(GraphicalMenus graphicalMenus, UpdateManager updateManager) {
showCloseProcessButtonIfProcessNotNull();

Button tobiiButton = createTopBarButton(
"Tobii Manager",
"Eye-Tracker Manager",
"images/eye-tracking_white.png",
(e) -> {
StageUtils.killRunningProcess(graphicalMenus);
Expand Down Expand Up @@ -311,7 +311,7 @@ private void takeSnapShot() {

public ProgressButton createCloseMenuButton() {
ProgressButton closeButton = new ProgressButton();
closeButton.getButton().setRadius(graphicalMenus.primaryStage.getWidth() / 10);
closeButton.getButton().setRadius(graphicalMenus.primaryStage.getWidth() / 15);
closeButton.getButton().setStroke(Color.web("#cd2653"));
closeButton.getButton().setStrokeWidth(3);

Expand All @@ -331,7 +331,7 @@ public void showCloseProcessButtonIfProcessNotNull() {
centerMenu.setSpacing(rest / 2);
centerMenu.setTranslateY(rest / 2);
centerMenu.getChildren().add(0, closeMenuButton);
closeMenuButton.getLabel().setText("Back To :\n" + graphicalMenus.process.getName());
closeMenuButton.getLabel().setText("Retourner sur :\n" + graphicalMenus.process.getName());
} else if (graphicalMenus.process == null || graphicalMenus.process.get() == null) {
double rest = graphicalMenus.primaryStage.getHeight() - (graphicalMenus.primaryStage.getHeight() / 10 + graphicalMenus.primaryStage.getWidth() / 5);
double spacingoffset = (graphicalMenus.primaryStage.getHeight() - (graphicalMenus.primaryStage.getHeight() / 10 + 2 * graphicalMenus.primaryStage.getWidth() / 5)) / 3;
Expand Down
Loading