refactor/ui->qt5

drop the old "ui" folder to avoid warning logs
OpenVoiceOS · Apr 9, 2024 · 275ca88 · 275ca88
1 parent ea7995d
commit 275ca88
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 3 deletions.
diff --git a/__init__.py b/__init__.py
@@ -296,7 +296,7 @@ def display_wolfie(self):
         if image:
             self.gui["wolfram_image"] = image
             # scrollable full result page
-            self.gui.show_page(join(self.root_dir, "ui", "wolf"), override_idle=45)
+            self.gui.show_page(join(self.root_dir, "qt5", "wolf"), override_idle=45)
 
     def stop_session(self, sess):
         if sess.session_id in self.session_results:

diff --git a/ui/logo.png → logo.png b/ui/logo.png → logo.png
diff --git a/ui/wolf.qml → qt5/wolf.qml b/ui/wolf.qml → qt5/wolf.qml
diff --git a/scripts/prepare_skillstore.py b/scripts/prepare_skillstore.py
@@ -19,7 +19,7 @@
 
 base_dir = dirname(dirname(__file__))
 desktop_dir = join(base_dir, "res", "desktop")
-android_ui = join(base_dir, "ui", "+android")
+android_ui = join(base_dir, "qt5", "+android")
 makedirs(desktop_dir, exist_ok=True)
 
 readme = join(base_dir, "README.md")

diff --git a/setup.py b/setup.py
@@ -31,7 +31,7 @@ def get_requirements(requirements_filename: str):
 
 
 def find_resource_files():
-    resource_base_dirs = ("locale", "ui", "vocab", "dialog", "regex", "skill")
+    resource_base_dirs = ("locale", "qt5")
     base_dir = path.dirname(__file__)
     package_data = ["*.json"]
     for res in resource_base_dirs: