Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Tristan MAISONNEUVE
projetS2-2021-23-LJ
Commits
5bcd450c
Commit
5bcd450c
authored
Jun 22, 2021
by
E194212A
Browse files
Remise à jour vue
parent
9b360a89
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Application.java
View file @
5bcd450c
...
...
@@ -22,7 +22,7 @@ public class Application {
test
.
setVisible
(
true
);
//TODO IHM changer le nom de jaquie
Player
jaquie
=
new
Player
(
"Jaquie"
);
/*
Player jaquie = new Player("Jaquie");
try {
Network.suscribeNewPlayer("http://37.187.38.219/api/v0/", jaquie);
} catch (UnirestException e) {
...
...
@@ -53,7 +53,7 @@ public class Application {
-100 si la partie est perdue par le joueur courant ;
-9999 sinon
*/
/*
boolean partie_bool = true;
int info;
while(partie_bool){
...
...
@@ -91,7 +91,7 @@ public class Application {
break;
}
Thread.sleep(500);
}
}
*/
...
...
src/vue/FenetreConnexion.java
View file @
5bcd450c
...
...
@@ -29,15 +29,11 @@ public class FenetreConnexion extends JFrame {
public
FenetreConnexion
(
String
titre
)
{
super
(
titre
);
/
/ Le JPanel principal
/
*
JPanel principal = new JPanel();
principal.setLayout(new BorderLayout());
// Le JPanel connexion
JPanel connexion = new JPanel();
connexion
.
setLayout
(
new
GridLayout
(
1
,
3
));
// Le JPanel login
connexion.setLayout(new GridLayout(1,2));
JPanel login = new JPanel();
JLabel textelogin = new JLabel("Login : ");
login.add(textelogin);
...
...
@@ -45,13 +41,27 @@ public class FenetreConnexion extends JFrame {
Dimension taille = new Dimension(300, 20);
textLogin.setPreferredSize(taille);
login.add(textLogin);
login
.
setLayout
(
new
FlowLayout
(
FlowLayout
.
LEFT
));
//
login.setLayout(new FlowLayout(FlowLayout.LEFT));
connexion.add(login);
boutonConnexion = new JButton("Connexion");
connexion.add(boutonConnexion);
principal.add(connexion, BorderLayout.EAST);*/
JPanel
principal
=
new
JPanel
();
principal
.
setLayout
(
new
BorderLayout
());
JPanel
connexion
=
new
JPanel
();
connexion
.
setLayout
(
new
FlowLayout
());
JLabel
login
=
new
JLabel
(
"Connexion : "
);
connexion
.
add
(
login
,
FlowLayout
.
LEFT
);
principal
.
add
(
login
,
BorderLayout
.
NORTH
);
// Vue pour choisir une partie
listePartie
=
new
JList
<>(
new
DefaultListModel
<>());
/*
listePartie = new JList<>(new DefaultListModel<>());
listeStringPartie = new JList<>(new DefaultListModel<>());
JScrollPane panelListe = new JScrollPane(listeStringPartie);
panelListe.setPreferredSize(new Dimension(200,300));
...
...
@@ -97,5 +107,5 @@ public class FenetreConnexion extends JFrame {
public void visibleRejoidre(){ boutonRejoindre.setEnabled(true); }
public
void
visibleActualiser
(){
boutonActualiser
.
setEnabled
(
true
);
}
public void visibleActualiser(){ boutonActualiser.setEnabled(true);
*/
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment