working system

urmillive · Sep 9, 2022 · 01b005b · 01b005b
1 parent 0846b08
commit 01b005b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/J.py b/J.py
@@ -21,7 +21,7 @@ def setupUi(self, MainWindow):
         self.BG_black.setGeometry(QtCore.QRect(0, 0, 1920, 1080))
         self.BG_black.setAutoFillBackground(True)
         self.BG_black.setText("")
-        self.BG_black.setPixmap(QtGui.QPixmap("../G.U.I Material/B.G/Black_Template.jpg"))
+        self.BG_black.setPixmap(QtGui.QPixmap("public/black.jpg"))
         self.BG_black.setScaledContents(True)
         self.BG_black.setWordWrap(False)
         self.BG_black.setObjectName("BG_black")
@@ -41,19 +41,19 @@ def setupUi(self, MainWindow):
         self.gif_1 = QtWidgets.QLabel(self.centralwidget)
         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.setPixmap(QtGui.QPixmap("public/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(400, 70, 1171, 371))
         self.gif_2.setText("")
-        self.gif_2.setPixmap(QtGui.QPixmap("../G.U.I Material/ExtraGui/live.gif"))
+        self.gif_2.setPixmap(QtGui.QPixmap("public/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, 220, 341, 271))
         self.gif_4.setText("")
-        self.gif_4.setPixmap(QtGui.QPixmap("../G.U.I Material/VoiceReg/Ntuks.gif"))
+        self.gif_4.setPixmap(QtGui.QPixmap("public/Ntuks.gif"))
         self.gif_4.setScaledContents(True)
         self.gif_4.setObjectName("gif_4")
         self.btn_start = QtWidgets.QPushButton(self.centralwidget)
@@ -67,7 +67,7 @@ def setupUi(self, MainWindow):
         self.bg_4.setAutoFillBackground(False)
         self.bg_4.setStyleSheet("background-color:rgb(170, 85, 255)")
         self.bg_4.setText("")
-        self.bg_4.setPixmap(QtGui.QPixmap("../G.U.I Material/Buttons/Start.png"))
+        self.bg_4.setPixmap(QtGui.QPixmap("public/Start.png"))
         self.bg_4.setScaledContents(True)
         self.bg_4.setObjectName("bg_4")
         self.btn_stop = QtWidgets.QPushButton(self.centralwidget)
@@ -81,7 +81,7 @@ def setupUi(self, MainWindow):
         self.bg_5.setAutoFillBackground(False)
         self.bg_5.setStyleSheet("background-color:rgb(170, 85, 255)")
         self.bg_5.setText("")
-        self.bg_5.setPixmap(QtGui.QPixmap("../G.U.I Material/Buttons/Quit.png"))
+        self.bg_5.setPixmap(QtGui.QPixmap("public/Quit.png"))
         self.bg_5.setScaledContents(True)
         self.bg_5.setObjectName("bg_5")
         self.ojb_t1 = QtWidgets.QTextBrowser(self.centralwidget)

diff --git a/Jarvis.py b/Jarvis.py
@@ -7,7 +7,6 @@
 from PyQt5.QtCore import Qt, QTimer, QTime, QDate
 from PyQt5.uic import loadUi
 import sys
-import Jarvis_old
 from Task import wishMe
 import random
 import json
@@ -78,7 +77,7 @@ def startTask(self):
         self.gui.gif_4.setMovie(self.gui.label4)
         self.gui.label4.start()
 
-        # wishMe()
+        wishMe()
 
         self.gui.listener.setText("Thinking...")
 

diff --git a/Task.py b/Task.py
@@ -1,6 +1,6 @@
 from Speak import Bol
 import pyjokes
-import datetime
+# import datetime
 from datetime import datetime
 from PyQt5.QtCore import Qt, QTime, QDate
 

diff --git a/data.pth b/data.pth
diff --git a/public/black.jpg b/public/black.jpg
diff --git a/requirements.txt b/requirements.txt
@@ -19,7 +19,6 @@ numpy==1.23.0
 pathspec==0.9.0
 Pillow==9.2.0
 platformdirs==2.5.2
-PyAudio @ file:///C:/Users/Devi/Desktop/JARVIS2.0/PyAudio-0.2.11-cp310-cp310-win_amd64.whl
 PyAutoGUI==0.9.53
 PyGetWindow==0.0.9
 pyjokes==0.6.0