Skip to content

Commit 1513ddc

Browse files
finalizandoProjeto\o/
1 parent 122334e commit 1513ddc

9 files changed

+753
-721
lines changed

.idea/workspace.xml

Lines changed: 22 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
-72 Bytes
Binary file not shown.

__pycache__/main.cpython-310.pyc

156 Bytes
Binary file not shown.

areaTeste.py

Lines changed: 0 additions & 99 deletions
This file was deleted.

main.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
from PyQt5 import uic, QtWidgets, QtGui
22

33

4-
def chamar_sobre():
5-
print('cliquei em sobre')
6-
7-
84
def chamar_calculadora():
95
import calculadora
106
calculadora.tela_calculadora.show()
@@ -40,17 +36,22 @@ def chamar_tela_login():
4036
tela_main.close()
4137

4238

39+
def chamar_tela_noticia():
40+
login.app.exec()
41+
tela_main.close()
42+
43+
4344
app = QtWidgets.QApplication([])
4445
tela_main = uic.loadUi('tela_main.ui')
4546
tela_main.setWindowIcon(QtGui.QIcon('imagens/application-icon.png'))
4647
tela_main.setWindowTitle('Projetos Python')
4748

48-
tela_main.btn_sobre.clicked.connect(chamar_sobre)
4949
tela_main.btn_calculadora.clicked.connect(chamar_calculadora)
5050
tela_main.btn_imc.clicked.connect(chamar_imc)
5151
tela_main.btn_gerarSenha.clicked.connect(chamar_gerar_senha)
5252
tela_main.btn_lista.clicked.connect(chamar_lista)
5353
tela_main.btn_telaLogin.clicked.connect(chamar_tela_login)
54+
tela_main.btn_noticias.clicked.connect(chamar_tela_noticia)
5455

5556
tela_main.show()
5657
app.exec()

noticias.py

Lines changed: 49 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@
99
import json
1010
from datetime import date, datetime
1111
import requests
12+
import random
1213

1314
global textos
1415
global capitais
1516
global estados
17+
global cotacao
18+
global proverbios
1619

1720

1821
def buscar_noticias():
@@ -35,12 +38,6 @@ def buscar_noticias():
3538
textos.append(i.text)
3639

3740

38-
def chamar_atualizar():
39-
import random
40-
print(textos[random.choice(range(len(textos)))])
41-
tela_noticias.label_noticias.setText(textos[random.choice(range(len(textos)))])
42-
43-
4441
def montar_listas_capitais():
4542
global capitais
4643
global estados
@@ -54,6 +51,36 @@ def montar_listas_capitais():
5451
print(estados)
5552

5653

54+
def buscar_cotacao():
55+
global cotacao
56+
cotacoes = requests.get('https://economia.awesomeapi.com.br/last/USD-BRL,EUR-BRL,BTC-BRL')
57+
cotacoes = cotacoes.json()
58+
59+
dolar = str(cotacoes['USDBRL']['bid'])
60+
dolar = dolar.replace('.', ',')
61+
print('Dolar Americano')
62+
print(f'R$ {dolar}')
63+
64+
euro = str(cotacoes['EURBRL']['bid'])
65+
euro = euro.replace('.', ',')
66+
print('Euro')
67+
print(f'R$ {euro}')
68+
69+
btc = str(cotacoes['BTCBRL']['bid'])
70+
print('Bitcoin')
71+
print(f'{btc} mil reais')
72+
73+
cotacao = f'Dólar Americano: R$ {dolar} - Euro: R$ {euro} - Bitcoin {btc} mil reais'
74+
print(cotacao)
75+
76+
77+
def montar_proverbios():
78+
global proverbios
79+
with open('arquivos/proverbios.txt', 'r', encoding="utf8") as arquivo:
80+
proverbios = arquivo.readlines()
81+
print(random.choice(proverbios))
82+
83+
5784
def previsao_capital():
5885
consulta = tela_noticias.comboBox.currentText()
5986
print(consulta)
@@ -108,18 +135,33 @@ def previsao_capital():
108135
f'{data_hora.hour}:{data_hora.minute}'))
109136

110137

138+
def chamar_atualizar():
139+
print(textos[random.choice(range(len(textos)))])
140+
print(cotacao)
141+
tela_noticias.label_noticias.setText(textos[random.choice(range(len(textos)))])
142+
tela_noticias.label_cotacao.setText(cotacao)
143+
tela_noticias.label_proverbio.setText(proverbios[random.choice(range(len(proverbios)))])
144+
145+
146+
def botao_voltar():
147+
import main
148+
main.tela_main.show()
149+
app.exec()
111150

112151

113152
app = QtWidgets.QApplication([])
114153
tela_noticias = uic.loadUi('tela_noticias.ui')
115154
tela_noticias.setWindowTitle('Notícias')
116155
tela_noticias.setWindowIcon(QtGui.QIcon('imagens/informativo_icon.png'))
117156

118-
tela_noticias.btn_atualizar.clicked.connect(chamar_atualizar)
119157
tela_noticias.btn_tempo.clicked.connect(previsao_capital)
158+
tela_noticias.btn_atualizar.clicked.connect(chamar_atualizar)
159+
tela_noticias.btn_voltar.clicked.connect(botao_voltar)
120160

121161
buscar_noticias()
122162
montar_listas_capitais()
163+
buscar_cotacao()
164+
montar_proverbios()
123165

124166
tela_noticias.show()
125167
app.exec()

0 commit comments

Comments
 (0)