From 68e82f7c4c17ad862b474abc99d55c9d0c3b1e6f Mon Sep 17 00:00:00 2001
From: Andreas Bolin <andbo467@student.liu.se>
Date: Tue, 5 Jul 2022 16:40:11 +0200
Subject: [PATCH] changed branch and folder-name from 'schedule-gui' to
'scheduler-gui'
---
b_asic/{schedule-gui => scheduler-gui}/__init__.py | 0
.../{schedule-gui => scheduler-gui}/main_window.py | 2 +-
.../{schedule-gui => scheduler-gui}/main_window.ui | 0
.../{schedule-gui => scheduler-gui}/resources.qrc | 0
.../resources/logo.png | Bin
.../resources/logo_tiny.png | Bin
.../resources/small_logo.png | Bin
.../{schedule-gui => scheduler-gui}/resources_rc.py | 0
.../schedule-demo.py | 0
b_asic/{schedule-gui => scheduler-gui}/schedule.py | 0
b_asic/{schedule-gui => scheduler-gui}/schedule2.py | 0
b_asic/{schedule-gui => scheduler-gui}/scheduler.py | 0
.../{schedule-gui => scheduler-gui}/scheduler2.py | 0
.../{schedule-gui => scheduler-gui}/tests/demo.py | 0
.../tests/power_bar.py | 0
15 files changed, 1 insertion(+), 1 deletion(-)
rename b_asic/{schedule-gui => scheduler-gui}/__init__.py (100%)
rename b_asic/{schedule-gui => scheduler-gui}/main_window.py (99%)
rename b_asic/{schedule-gui => scheduler-gui}/main_window.ui (100%)
rename b_asic/{schedule-gui => scheduler-gui}/resources.qrc (100%)
rename b_asic/{schedule-gui => scheduler-gui}/resources/logo.png (100%)
rename b_asic/{schedule-gui => scheduler-gui}/resources/logo_tiny.png (100%)
rename b_asic/{schedule-gui => scheduler-gui}/resources/small_logo.png (100%)
rename b_asic/{schedule-gui => scheduler-gui}/resources_rc.py (100%)
rename b_asic/{schedule-gui => scheduler-gui}/schedule-demo.py (100%)
rename b_asic/{schedule-gui => scheduler-gui}/schedule.py (100%)
rename b_asic/{schedule-gui => scheduler-gui}/schedule2.py (100%)
rename b_asic/{schedule-gui => scheduler-gui}/scheduler.py (100%)
rename b_asic/{schedule-gui => scheduler-gui}/scheduler2.py (100%)
rename b_asic/{schedule-gui => scheduler-gui}/tests/demo.py (100%)
rename b_asic/{schedule-gui => scheduler-gui}/tests/power_bar.py (100%)
diff --git a/b_asic/schedule-gui/__init__.py b/b_asic/scheduler-gui/__init__.py
similarity index 100%
rename from b_asic/schedule-gui/__init__.py
rename to b_asic/scheduler-gui/__init__.py
diff --git a/b_asic/schedule-gui/main_window.py b/b_asic/scheduler-gui/main_window.py
similarity index 99%
rename from b_asic/schedule-gui/main_window.py
rename to b_asic/scheduler-gui/main_window.py
index f3a80fe4..48546dc6 100644
--- a/b_asic/schedule-gui/main_window.py
+++ b/b_asic/scheduler-gui/main_window.py
@@ -41,7 +41,7 @@ from ui.main_window_ui import Ui_MainWindow
-class MainWindow(QMainWindow):
+class MainWindow(QMainWindow, Ui_MainWindow):
"""Schedule of an SFG with scheduled Operations."""
#_ui: QMainWindow # <class '__main__.Ui_MainWindow'>
diff --git a/b_asic/schedule-gui/main_window.ui b/b_asic/scheduler-gui/main_window.ui
similarity index 100%
rename from b_asic/schedule-gui/main_window.ui
rename to b_asic/scheduler-gui/main_window.ui
diff --git a/b_asic/schedule-gui/resources.qrc b/b_asic/scheduler-gui/resources.qrc
similarity index 100%
rename from b_asic/schedule-gui/resources.qrc
rename to b_asic/scheduler-gui/resources.qrc
diff --git a/b_asic/schedule-gui/resources/logo.png b/b_asic/scheduler-gui/resources/logo.png
similarity index 100%
rename from b_asic/schedule-gui/resources/logo.png
rename to b_asic/scheduler-gui/resources/logo.png
diff --git a/b_asic/schedule-gui/resources/logo_tiny.png b/b_asic/scheduler-gui/resources/logo_tiny.png
similarity index 100%
rename from b_asic/schedule-gui/resources/logo_tiny.png
rename to b_asic/scheduler-gui/resources/logo_tiny.png
diff --git a/b_asic/schedule-gui/resources/small_logo.png b/b_asic/scheduler-gui/resources/small_logo.png
similarity index 100%
rename from b_asic/schedule-gui/resources/small_logo.png
rename to b_asic/scheduler-gui/resources/small_logo.png
diff --git a/b_asic/schedule-gui/resources_rc.py b/b_asic/scheduler-gui/resources_rc.py
similarity index 100%
rename from b_asic/schedule-gui/resources_rc.py
rename to b_asic/scheduler-gui/resources_rc.py
diff --git a/b_asic/schedule-gui/schedule-demo.py b/b_asic/scheduler-gui/schedule-demo.py
similarity index 100%
rename from b_asic/schedule-gui/schedule-demo.py
rename to b_asic/scheduler-gui/schedule-demo.py
diff --git a/b_asic/schedule-gui/schedule.py b/b_asic/scheduler-gui/schedule.py
similarity index 100%
rename from b_asic/schedule-gui/schedule.py
rename to b_asic/scheduler-gui/schedule.py
diff --git a/b_asic/schedule-gui/schedule2.py b/b_asic/scheduler-gui/schedule2.py
similarity index 100%
rename from b_asic/schedule-gui/schedule2.py
rename to b_asic/scheduler-gui/schedule2.py
diff --git a/b_asic/schedule-gui/scheduler.py b/b_asic/scheduler-gui/scheduler.py
similarity index 100%
rename from b_asic/schedule-gui/scheduler.py
rename to b_asic/scheduler-gui/scheduler.py
diff --git a/b_asic/schedule-gui/scheduler2.py b/b_asic/scheduler-gui/scheduler2.py
similarity index 100%
rename from b_asic/schedule-gui/scheduler2.py
rename to b_asic/scheduler-gui/scheduler2.py
diff --git a/b_asic/schedule-gui/tests/demo.py b/b_asic/scheduler-gui/tests/demo.py
similarity index 100%
rename from b_asic/schedule-gui/tests/demo.py
rename to b_asic/scheduler-gui/tests/demo.py
diff --git a/b_asic/schedule-gui/tests/power_bar.py b/b_asic/scheduler-gui/tests/power_bar.py
similarity index 100%
rename from b_asic/schedule-gui/tests/power_bar.py
rename to b_asic/scheduler-gui/tests/power_bar.py
--
GitLab