From 34d197c2edb3870ad3fecc6f9f053c68c23ea5fd Mon Sep 17 00:00:00 2001 From: alessandro90 Date: Sun, 9 Jun 2019 12:44:12 +0200 Subject: [PATCH] Remove 'ui' folder --- artemis.py | 2 +- ui/artemis.ui => artemis.ui | 0 ui/default_imgs.qrc => default_imgs.qrc | 0 ui/download_db_window.ui => download_db_window.ui | 0 download_window.py | 3 +-- 5 files changed, 2 insertions(+), 3 deletions(-) rename ui/artemis.ui => artemis.ui (100%) rename ui/default_imgs.qrc => default_imgs.qrc (100%) rename ui/download_db_window.ui => download_db_window.ui (100%) diff --git a/artemis.py b/artemis.py index ce1e831..0c26fff 100644 --- a/artemis.py +++ b/artemis.py @@ -47,7 +47,7 @@ from utilities import (checksum_ok, # import default_imgs_rc -qt_creator_file = resource_path(os.path.join("ui", "artemis.ui")) +qt_creator_file = resource_path("artemis.ui") Ui_MainWindow, _ = uic.loadUiType(qt_creator_file) diff --git a/ui/artemis.ui b/artemis.ui similarity index 100% rename from ui/artemis.ui rename to artemis.ui diff --git a/ui/default_imgs.qrc b/default_imgs.qrc similarity index 100% rename from ui/default_imgs.qrc rename to default_imgs.qrc diff --git a/ui/download_db_window.ui b/download_db_window.ui similarity index 100% rename from ui/download_db_window.ui rename to download_db_window.ui diff --git a/download_window.py b/download_window.py index 9c75aa3..252675e 100644 --- a/download_window.py +++ b/download_window.py @@ -1,4 +1,3 @@ -import os.path from PyQt5 import uic from PyQt5.QtCore import Qt, pyqtSlot, pyqtSignal from PyQt5.QtWidgets import QWidget @@ -7,7 +6,7 @@ from utilities import pop_up, resource_path from constants import Constants, Messages Ui_Download_window, _ = uic.loadUiType( - resource_path(os.path.join("ui", "download_db_window.ui")) + resource_path("download_db_window.ui") )