Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Quentin DRUAULT-AUBIN
lo23-project
Commits
aaa4e365
Commit
aaa4e365
authored
Jan 04, 2018
by
Peining Li
Browse files
Merge branch 'ihm-main/networkInterface2' into 'ihm-main/develop'
[ihm-main] title fix See merge request
!176
parents
89c07dc9
039b54d7
Changes
5
Hide whitespace changes
Inline
Side-by-side
Battleship/src/main/resources/fxml/ihmmain/CreateGame.fxml
View file @
aaa4e365
...
...
@@ -173,7 +173,7 @@
<Tooltip
text=
"Click to create the game."
/>
</tooltip>
</Button>
<Button
GridPane.columnIndex=
"3"
maxWidth=
"Infinity"
GridPane.rowIndex=
"0"
onAction=
"#back"
text=
"R
eturn
"
GridPane.halignment=
"CENTER"
GridPane.valignment=
"CENTER"
>
<Button
GridPane.columnIndex=
"3"
maxWidth=
"Infinity"
GridPane.rowIndex=
"0"
onAction=
"#back"
text=
"R
ETURN
"
GridPane.halignment=
"CENTER"
GridPane.valignment=
"CENTER"
>
<tooltip>
<Tooltip
text=
"Click to go back to the menu."
/>
</tooltip>
...
...
Battleship/src/main/resources/fxml/ihmmain/GameList.fxml
View file @
aaa4e365
...
...
@@ -9,6 +9,7 @@
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.shape.Line?>
<GridPane
id=
"generalGrid"
maxHeight=
"-Infinity"
maxWidth=
"-Infinity"
minHeight=
"-Infinity"
minWidth=
"-Infinity"
prefHeight=
"400.0"
prefWidth=
"600.0"
stylesheets=
"@../../styles/ihmmain.css"
xmlns=
"http://javafx.com/javafx/9"
xmlns:fx=
"http://javafx.com/fxml/1"
fx:controller=
"com.utclo23.ihmmain.controller.GameListController"
>
<columnConstraints>
...
...
@@ -20,7 +21,8 @@
<RowConstraints
percentHeight=
"10.0"
vgrow=
"SOMETIMES"
/>
</rowConstraints>
<children>
<Label
text=
"Games"
GridPane.columnIndex=
"0"
GridPane.halignment=
"CENTER"
GridPane.rowIndex=
"0"
GridPane.valignment=
"CENTER"
/>
<Label
id=
"pageTitleLabel"
text=
"Games"
GridPane.columnIndex=
"0"
GridPane.halignment=
"CENTER"
GridPane.rowIndex=
"0"
GridPane.valignment=
"CENTER"
/>
<Line
fx:id=
"lineDesign"
endX=
"100.0"
startX=
"-100.0"
styleClass=
"lineDesign"
GridPane.halignment=
"CENTER"
GridPane.valignment=
"BOTTOM"
/>
<ScrollPane
id=
"gameListPane"
fx:id=
"gameListPane"
fitToHeight=
"true"
fitToWidth=
"true"
prefHeight=
"200.0"
prefWidth=
"200.0"
GridPane.rowIndex=
"1"
/>
<GridPane
id=
"ManageGrid"
GridPane.rowIndex=
"2"
>
<columnConstraints>
...
...
Battleship/src/main/resources/fxml/ihmmain/PlayerList.fxml
View file @
aaa4e365
...
...
@@ -34,7 +34,7 @@
<ImageView
fx:id=
"avatarImageView1"
fitHeight=
"100.0"
fitWidth=
"100.0"
pickOnBounds=
"true"
preserveRatio=
"true"
GridPane.columnIndex=
"1"
GridPane.halignment=
"CENTER"
GridPane.valignment=
"CENTER"
/>
</children>
</GridPane>
<Label
id=
"pageTitleLabel"
text=
"P
LAYERS
"
GridPane.columnIndex=
"0"
GridPane.halignment=
"CENTER"
GridPane.rowIndex=
"0"
GridPane.valignment=
"CENTER"
/>
<Label
id=
"pageTitleLabel"
text=
"P
layers
"
GridPane.columnIndex=
"0"
GridPane.halignment=
"CENTER"
GridPane.rowIndex=
"0"
GridPane.valignment=
"CENTER"
/>
<GridPane
id=
"ManageGrid"
GridPane.rowIndex=
"2"
>
<columnConstraints>
<ColumnConstraints
hgrow=
"SOMETIMES"
percentWidth=
"42.5"
/>
...
...
Battleship/src/main/resources/fxml/ihmmain/PlayerProfile.fxml
View file @
aaa4e365
...
...
@@ -139,7 +139,7 @@
<RowConstraints
minHeight=
"10.0"
prefHeight=
"30.0"
vgrow=
"SOMETIMES"
/>
</rowConstraints>
<children>
<Button
fx:id=
"backButton"
mnemonicParsing=
"false"
onAction=
"#back"
text=
"R
eturn
"
GridPane.halignment=
"LEFT"
GridPane.valignment=
"TOP"
>
<Button
fx:id=
"backButton"
mnemonicParsing=
"false"
onAction=
"#back"
text=
"R
ETURN
"
GridPane.halignment=
"LEFT"
GridPane.valignment=
"TOP"
>
<GridPane.margin>
<Insets
left=
"80.0"
/>
</GridPane.margin></Button>
...
...
Battleship/src/main/resources/fxml/ihmmain/SavedGameList.fxml
View file @
aaa4e365
...
...
@@ -32,7 +32,7 @@
<ImageView
fx:id=
"avatarImageView1"
fitHeight=
"100.0"
fitWidth=
"100.0"
pickOnBounds=
"true"
preserveRatio=
"true"
GridPane.columnIndex=
"1"
GridPane.halignment=
"CENTER"
GridPane.valignment=
"CENTER"
/>
</children>
</GridPane>
<Label
text=
"Replays"
GridPane.columnIndex=
"0"
GridPane.halignment=
"CENTER"
GridPane.rowIndex=
"0"
GridPane.valignment=
"CENTER"
/>
<Label
id=
"pageTitleLabel"
text=
"Replays"
GridPane.columnIndex=
"0"
GridPane.halignment=
"CENTER"
GridPane.rowIndex=
"0"
GridPane.valignment=
"CENTER"
/>
<ScrollPane
id=
"gameListPane"
fx:id=
"gameListPane"
fitToHeight=
"true"
fitToWidth=
"true"
prefHeight=
"200.0"
prefWidth=
"200.0"
GridPane.rowIndex=
"1"
/>
<GridPane
id=
"ManageGrid"
GridPane.rowIndex=
"2"
>
<columnConstraints>
...
...
Write
Preview
Supports
Markdown
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