Merge pull request #2 from urmil404/urmil

Urmil

GUI.py

@@ -7,24 +7,25 @@
 from PyQt5.QtCore import Qt, QTimer, QTime, QDate
 from PyQt5.uic import loadUi
 import sys
-import Jarvis
-
-
+import Jarvis_old
+from Task import wishMe
+from Listen import Suno
+from Speak import Bol
+# vvv = Listen()
 class MainThread(QThread):
     def __init__(self):
         super(MainThread, self).__init__()
+
 
     def run(self):
-        print("_________M_________")
-        Jarvis.Main()
+        Jarvis_old.Main()
 
 
 startExe = MainThread()
 
 class GUI_MOVIE(QMainWindow):
     def __init__(self):
         super().__init__()
-
         self.gui = Ui_MainWindow()
         self.gui.setupUi(self)
 
@@ -50,11 +51,16 @@ def startTask(self):
         )
         self.gui.gif_4.setMovie(self.gui.label4)
         self.gui.label4.start()
-
+
+        wishMe()
+
+        self.gui.txt_final.setText(listeningSir)
+
         timer = QTimer(self)
         timer.timeout.connect(self.showTime)
         timer.start(10)
         startExe.start()
+
 
 
     def showTime(self):

GUI2.py

@@ -0,0 +1,79 @@
+from J import Ui_MainWindow
+from PyQt5 import QtCore, QtGui, QtWidgets
+from PyQt5.QtCore import *
+from PyQt5.QtGui import QMovie
+from PyQt5.QtGui import *
+from PyQt5.QtWidgets import *
+from PyQt5.QtCore import Qt, QTimer, QTime, QDate
+from PyQt5.uic import loadUi
+import sys
+import time
+from Jarvis_old import JARVIS
+from Task import wishMe
+from Listen import Suno
+from Speak import Bol
+
+
+class MainThread(QThread):
+    def __init__(self):
+        super(MainThread, self).__init__()
+
+    # def run(self):
+    #     j = JARVIS()
+    #     j.PROCESS_()
+
+
+startExe = MainThread()
+
+
+class GUI_MOVIE(QMainWindow):
+    def __init__(self):
+        super().__init__()
+        self.gui = Ui_MainWindow()
+        self.gui.setupUi(self)
+
+        # self.gui.btn_start.clicked(self.startTask)
+        self.gui.btn_start.clicked.connect(self.startTask)
+        self.gui.btn_stop.clicked.connect(self.close)
+
+    def startTask(self):
+        self.gui.label1 = QtGui.QMovie("public//initial.gif")
+        self.gui.gif_1.setMovie(self.gui.label1)
+        self.gui.label1.start()
+
+        self.gui.label2 = QtGui.QMovie("public//live.gif")
+        self.gui.gif_2.setMovie(self.gui.label2)
+        self.gui.label2.start()
+
+        self.gui.label4 = QtGui.QMovie("public//ring.gif")
+        self.gui.gif_4.setMovie(self.gui.label4)
+        self.gui.label4.start()
+
+        # wishMe()
+
+        timer = QTimer(self)
+        timer.timeout.connect(self.showTime)
+        timer.start(10)
+        startExe.start()
+
+        while True:
+            sentence = Suno()
+            # result = str(sentence)
+            if sentence == "bye":
+                exit()
+            else:
+                self.gui.txt_final.setText(sentence)
+
+    def showTime(self):
+        current_time = QTime.currentTime()
+        current_date = QDate.currentDate()
+        label_time = current_time.toString("hh:mm:ss")
+        label_date = current_date.toString(Qt.ISODate)
+        self.gui.ojb_t1.setText(label_date)
+        self.gui.obj_t2.setText(label_time)
+
+
+GUIApp = QApplication(sys.argv)
+jarvis_GUI = GUI_MOVIE()
+jarvis_GUI.show()
+exit(GUIApp.exec_())

J.py

@@ -32,26 +32,26 @@ def setupUi(self, MainWindow):
         self.bg_2.setText("")
         self.bg_2.setObjectName("bg_2")
         self.bg_3 = QtWidgets.QLabel(self.centralwidget)
-        self.bg_3.setGeometry(QtCore.QRect(380, 10, 1241, 611))
+        self.bg_3.setGeometry(QtCore.QRect(380, 10, 1211, 451))
         self.bg_3.setAutoFillBackground(False)
         self.bg_3.setStyleSheet("background-color:transparent")
         self.bg_3.setText("")
         self.bg_3.setScaledContents(True)
         self.bg_3.setObjectName("bg_3")
         self.gif_1 = QtWidgets.QLabel(self.centralwidget)
-        self.gif_1.setGeometry(QtCore.QRect(20, 80, 341, 121))
+        self.gif_1.setGeometry(QtCore.QRect(20, 30, 341, 121))
         self.gif_1.setText("")
         self.gif_1.setPixmap(QtGui.QPixmap("../G.U.I Material/ExtraGui/initial.gif"))
         self.gif_1.setScaledContents(True)
         self.gif_1.setObjectName("gif_1")
         self.gif_2 = QtWidgets.QLabel(self.centralwidget)
-        self.gif_2.setGeometry(QtCore.QRect(370, 70, 1221, 591))
+        self.gif_2.setGeometry(QtCore.QRect(400, 70, 1171, 371))
         self.gif_2.setText("")
         self.gif_2.setPixmap(QtGui.QPixmap("../G.U.I Material/ExtraGui/live.gif"))
         self.gif_2.setScaledContents(True)
         self.gif_2.setObjectName("gif_2")
         self.gif_4 = QtWidgets.QLabel(self.centralwidget)
-        self.gif_4.setGeometry(QtCore.QRect(30, 390, 341, 271))
+        self.gif_4.setGeometry(QtCore.QRect(30, 220, 341, 271))
         self.gif_4.setText("")
         self.gif_4.setPixmap(QtGui.QPixmap("../G.U.I Material/VoiceReg/Ntuks.gif"))
         self.gif_4.setScaledContents(True)
@@ -85,28 +85,47 @@ def setupUi(self, MainWindow):
         self.bg_5.setScaledContents(True)
         self.bg_5.setObjectName("bg_5")
         self.ojb_t1 = QtWidgets.QTextBrowser(self.centralwidget)
-        self.ojb_t1.setGeometry(QtCore.QRect(580, 730, 256, 51))
+        self.ojb_t1.setGeometry(QtCore.QRect(110, 560, 381, 121))
         font = QtGui.QFont()
-        font.setFamily("Harlow Solid Italic")
-        font.setPointSize(20)
-        font.setItalic(True)
+        font.setFamily("Maiandra GD")
+        font.setPointSize(26)
+        font.setItalic(False)
         self.ojb_t1.setFont(font)
         self.ojb_t1.setAutoFillBackground(False)
         self.ojb_t1.setStyleSheet("background-color:transparent;\n"
 "border-radius:none;\n"
-"color:white;")
+"color:white;\n"
+"text-align:center;")
         self.ojb_t1.setObjectName("ojb_t1")
         self.obj_t2 = QtWidgets.QTextBrowser(self.centralwidget)
-        self.obj_t2.setGeometry(QtCore.QRect(850, 730, 256, 51))
+        self.obj_t2.setGeometry(QtCore.QRect(100, 690, 381, 111))
         font = QtGui.QFont()
-        font.setFamily("Harlow Solid Italic")
-        font.setPointSize(20)
-        font.setItalic(True)
+        font.setFamily("Maiandra GD")
+        font.setPointSize(26)
+        font.setItalic(False)
         self.obj_t2.setFont(font)
         self.obj_t2.setStyleSheet("background-color:transparent;\n"
 "border-radius:none;\n"
 "color:white;")
         self.obj_t2.setObjectName("obj_t2")
+        self.speaker = QtWidgets.QTextBrowser(self.centralwidget)
+        self.speaker.setGeometry(QtCore.QRect(430, 650, 801, 161))
+        font = QtGui.QFont()
+        font.setFamily("Monaco")
+        font.setPointSize(20)
+        self.speaker.setFont(font)
+        self.speaker.setStyleSheet("background-color:transparant;\n"
+"color:rgb(255, 255, 0);")
+        self.speaker.setObjectName("speaker")
+        self.listener = QtWidgets.QTextBrowser(self.centralwidget)
+        self.listener.setGeometry(QtCore.QRect(430, 480, 801, 161))
+        font = QtGui.QFont()
+        font.setFamily("Monaco")
+        font.setPointSize(28)
+        self.listener.setFont(font)
+        self.listener.setStyleSheet("background-color:transparant;\n"
+"color:green;")
+        self.listener.setObjectName("listener")
         self.BG_black.raise_()
         self.bg_2.raise_()
         self.bg_3.raise_()
@@ -119,6 +138,8 @@ def setupUi(self, MainWindow):
         self.btn_stop.raise_()
         self.ojb_t1.raise_()
         self.obj_t2.raise_()
+        self.speaker.raise_()
+        self.listener.raise_()
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QtWidgets.QMenuBar(MainWindow)
         self.menubar.setGeometry(QtCore.QRect(0, 0, 1635, 26))
@@ -134,6 +155,16 @@ def setupUi(self, MainWindow):
     def retranslateUi(self, MainWindow):
         _translate = QtCore.QCoreApplication.translate
         MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow"))
+        self.ojb_t1.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:\'Maiandra GD\'; font-size:26pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'Dubai Medium\'; font-size:36pt; color:#ffff00;\">Date</span></p></body></html>"))
+        self.obj_t2.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:\'Maiandra GD\'; font-size:26pt; font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'Dubai Medium\'; font-size:36pt; color:#ffff00;\">Time</span></p></body></html>"))
 
 
 if __name__ == "__main__":