diff --git a/airbnb-scanner.pdy b/airbnb-scanner.pdy index 50b92d7..4bb7c7b 100644 --- a/airbnb-scanner.pdy +++ b/airbnb-scanner.pdy @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/airbnb-scanner.spec b/airbnb-scanner.spec index 23f5c79..c6f60ec 100644 --- a/airbnb-scanner.spec +++ b/airbnb-scanner.spec @@ -36,7 +36,7 @@ exe = EXE(pyz, strip=False, upx=True, icon=icon, - console=True ) + console=False) coll = COLLECT(exe, a.binaries, diff --git a/icons/reload-light.png b/icons/reload-light.png new file mode 100644 index 0000000..54a0c61 Binary files /dev/null and b/icons/reload-light.png differ diff --git a/icons/reload.png b/icons/reload.png new file mode 100644 index 0000000..7c7f288 Binary files /dev/null and b/icons/reload.png differ diff --git a/icons/spy-light.png b/icons/spy-light.png new file mode 100644 index 0000000..3ab4760 Binary files /dev/null and b/icons/spy-light.png differ diff --git a/icons/warning-light.png b/icons/warning-light.png new file mode 100644 index 0000000..bf5c770 Binary files /dev/null and b/icons/warning-light.png differ diff --git a/icons/warning.png b/icons/warning.png new file mode 100644 index 0000000..80fc48a Binary files /dev/null and b/icons/warning.png differ diff --git a/requirements.txt b/requirements.txt index 661f421..3b7f382 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -PyQt5==5.15.2 -PyQt5-sip==12.8.1 -scapy==2.4.3 +PyQt5==5.14.2 +PyQt5-sip==12.8.0 +scapy==2.4.2 sip==5.5.0 PyQt-builder==1.7.0 \ No newline at end of file diff --git a/scripts/download_libraries.sh b/scripts/download_libraries.sh index f3a6108..568a251 100755 --- a/scripts/download_libraries.sh +++ b/scripts/download_libraries.sh @@ -2,5 +2,5 @@ echo "Downloading libs" wget https://www.zlib.net/fossils/zlib-1.2.11.tar.gz wget https://download.qt.io/archive/qt/5.14/5.14.2/single/qt-everywhere-src-5.14.2.tar.xz wget https://www.python.org/ftp/python/3.7.7/Python-3.7.7.tar.xz -wget https://www.riverbankcomputing.com/static/Downloads/sip/4.19.24/sip-4.19.24.tar.gz +wget https://www.riverbankcomputing.com/static/Downloads/sip/4.19.25/sip-4.19.25.tar.gz wget https://files.pythonhosted.org/packages/4d/81/b9a66a28fb9a7bbeb60e266f06ebc4703e7e42b99e3609bf1b58ddd232b9/PyQt5-5.14.2.tar.gz diff --git a/src/application.py b/src/application.py index d9d291f..2eac0ad 100644 --- a/src/application.py +++ b/src/application.py @@ -81,13 +81,14 @@ def __init__(self, config, config_file, *args, **kwargs): self.menu.setStyleSheet(dark_stylesheet) self.device_menu.setStyleSheet(dark_stylesheet) - self.icon = QIcon(os.path.join(prefix_path, "icons", "spy-light.svg")) - self.rescan_icon = QIcon(os.path.join(prefix_path, "icons", "reload-light.svg")) - self.warning_icon = QIcon(os.path.join(prefix_path, "icons", "warning-light.svg")) + self.icon = QIcon(os.path.join(prefix_path, "icons", "spy-light.png")) + self.rescan_icon = QIcon(os.path.join(prefix_path, "icons", "reload-light.png")) + self.warning_icon = QIcon(os.path.join(prefix_path, "icons", "warning-light.png")) else: - self.icon = QIcon(os.path.join(prefix_path, "icons", "spy.svg")) - self.rescan_icon = QIcon(os.path.join(prefix_path, "icons", "reload.svg")) - self.warning_icon = QIcon(os.path.join(prefix_path, "icons", "warning.svg")) + self.icon = QIcon(os.path.join(prefix_path, "icons", "spy.png")) + self.rescan_icon = QIcon(os.path.join(prefix_path, "icons", "reload.png")) + self.warning_icon = QIcon(os.path.join(prefix_path, "icons", "warning.png")) + # Create the tray self.tray = QSystemTrayIcon(self.icon, None) @@ -114,13 +115,13 @@ def handle_dark_mode_change(self): prefix_path = ":" if self.dark_mode: - self.icon = QIcon(os.path.join(prefix_path, "icons", "spy-light.svg")) - self.rescan_icon = QIcon(os.path.join(prefix_path, "icons", "reload-light.svg")) - self.warning_icon = QIcon(os.path.join(prefix_path, "icons", "warning-light.svg")) + self.icon = QIcon(os.path.join(prefix_path, "icons", "spy-light.png")) + self.rescan_icon = QIcon(os.path.join(prefix_path, "icons", "reload-light.png")) + self.warning_icon = QIcon(os.path.join(prefix_path, "icons", "warning-light.png")) else: - self.icon = QIcon(os.path.join(prefix_path, "icons", "spy.svg")) - self.rescan_icon = QIcon(os.path.join(prefix_path, "icons", "reload.svg")) - self.warning_icon = QIcon(os.path.join(prefix_path, "icons", "warning.svg")) + self.icon = QIcon(os.path.join(prefix_path, "icons", "spy.png")) + self.rescan_icon = QIcon(os.path.join(prefix_path, "icons", "reload.png")) + self.warning_icon = QIcon(os.path.join(prefix_path, "icons", "warning.png")) for action in self.device_menu.actions(): if action.iconText() == 'Rescan': @@ -191,13 +192,3 @@ def triggered_info(client_ip, client_mac, company): clients_list.append(client_dict) self.menu.insertMenu(self.separator, self.device_menu) - - -def print_result(results_list): - """ - Print the IP/MAC table - """ - print("IP\t\t\tMAC Address") - print("----------------------------------------------------") - for client in results_list: - print(client["ip"] + "\t\t" + client["mac"]) diff --git a/src/main.py b/src/main.py index 85f8709..719d1b9 100644 --- a/src/main.py +++ b/src/main.py @@ -4,6 +4,7 @@ import configparser from application import Application + def main(): """ main function to launch the program @@ -25,12 +26,10 @@ def main(): config.read(config_file) print('Starting...') - print(sys.argv) app = Application(config, config_file, sys.argv) print('Executing...') sys.exit(app.exec_()) -if __name__ == '__main__': - main() +main() diff --git a/sysroot.json b/sysroot.json index e054c28..edd7aef 100644 --- a/sysroot.json +++ b/sysroot.json @@ -37,7 +37,7 @@ "sip": { "module_name": "PyQt5.sip", - "linux#source": "sip-4.19.24.tar.gz" + "linux#source": "sip-4.19.25.tar.gz" }, "pyqt5": {