Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
plante-qui-pleure
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Puissegur Alexis
plante-qui-pleure
Commits
6fca50f0
Commit
6fca50f0
authored
6 years ago
by
Puissegur Alexis
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of
https://gitlab.insa-rennes.fr/alex/plante-qui-pleure
parents
414f1277
1bb6f2e3
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/src/Vue/FXMLVue.fxml
+1
-1
1 addition, 1 deletion
app/src/Vue/FXMLVue.fxml
app/src/Vue/FXMLVueController.java
+1
-0
1 addition, 0 deletions
app/src/Vue/FXMLVueController.java
with
2 additions
and
1 deletion
app/src/Vue/FXMLVue.fxml
+
1
−
1
View file @
6fca50f0
...
...
@@ -161,7 +161,7 @@
<VBox
alignment=
"CENTER"
prefHeight=
"200.0"
prefWidth=
"100.0"
spacing=
"10.0"
GridPane.halignment=
"CENTER"
GridPane.rowIndex=
"3"
GridPane.valignment=
"CENTER"
>
<children>
<Button
fx:id=
"buttonBluetooth"
mnemonicParsing=
"false"
onAction=
"#clickActivationBluetooth"
text=
"Activation bluetooth"
/>
<Label
fx:id=
"activationMessage"
text=
"Connection bluetooth désactivée"
/>
<Label
fx:id=
"activationMessage"
text=
"Connection bluetooth désactivée"
textFill=
"#d20101"
/>
</children>
<GridPane.margin>
<Insets
bottom=
"10.0"
top=
"10.0"
/>
...
...
This diff is collapsed.
Click to expand it.
app/src/Vue/FXMLVueController.java
+
1
−
0
View file @
6fca50f0
...
...
@@ -154,6 +154,7 @@ public class FXMLVueController implements Initializable, Observer {
try
{
bluetoothManager
.
startThread
();
this
.
activationMessage
.
setText
(
"Connection bluetooth activée"
);
this
.
activationMessage
.
setStyle
(
"-fx-background-color: #7fca5eff"
);
this
.
buttonBluetooth
.
setDisable
(
true
);
}
catch
(
Exception
ex
)
{
Logger
.
getLogger
(
FXMLVueController
.
class
.
getName
()).
log
(
Level
.
SEVERE
,
null
,
ex
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment