Skip to content

Commit

Permalink
Merge pull request #21 from GabrielSirtoriCorrea/AjustesFinais
Browse files Browse the repository at this point in the history
ajustandoUpdateFriday
GabrielSirtoriCorrea authored Jun 21, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 448c898 + 4ff26f5 commit 580dc90
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Interface/Interface/src/main/resources/fxml/Scene.fxml
Original file line number Diff line number Diff line change
@@ -29,6 +29,6 @@
<columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
</columnResizePolicy></TableView>
<ImageView fx:id="imageView" fitHeight="589.0" fitWidth="967.0" layoutX="375.0" layoutY="147.0" nodeOrientation="INHERIT" pickOnBounds="true" visible="false" AnchorPane.leftAnchor="375.0" AnchorPane.topAnchor="200.0" />
<ImageView fx:id="imageView" fitHeight="589.0" fitWidth="967.0" layoutX="375.0" layoutY="147.0" nodeOrientation="INHERIT" pickOnBounds="true" visible="false" AnchorPane.leftAnchor="400.0" AnchorPane.topAnchor="200.0" />
</children>
</AnchorPane>
2 changes: 1 addition & 1 deletion Interface/Interface/target/classes/fxml/Scene.fxml
Original file line number Diff line number Diff line change
@@ -29,6 +29,6 @@
<columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
</columnResizePolicy></TableView>
<ImageView fx:id="imageView" fitHeight="589.0" fitWidth="967.0" layoutX="375.0" layoutY="147.0" nodeOrientation="INHERIT" pickOnBounds="true" visible="false" AnchorPane.leftAnchor="375.0" AnchorPane.topAnchor="200.0" />
<ImageView fx:id="imageView" fitHeight="589.0" fitWidth="967.0" layoutX="375.0" layoutY="147.0" nodeOrientation="INHERIT" pickOnBounds="true" visible="false" AnchorPane.leftAnchor="400.0" AnchorPane.topAnchor="200.0" />
</children>
</AnchorPane>
3 changes: 2 additions & 1 deletion Sexta-Feira(A.I.)/Commands.py
Original file line number Diff line number Diff line change
@@ -13,7 +13,8 @@ def dateTime(speech, connection):
Functions.speak(f'Agora são {datetime.now().hour} horas e {datetime.now().minute} minutos ')

def updateFriday(speech, connection):
Functions.speak('Certo. Estou baixando as atualizações de meu sistema')
os.system('git fetch')
Functions.speak('Instalando atualizações')
os.system('git reset --hard origin/master')

def sendCloseToInterface(speech, connection):

0 comments on commit 580dc90

Please sign in to comment.