nqrduck/nqrduck-autotm
1
0
Fork 0
mirror of https://github.com/nqrduck/nqrduck-autotm.git synced 2024-12-30 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge stuff.

Browse source
This commit is contained in:
jupfi 2023-12-07 10:27:13 +01:00
parent 9777ba3570
commit c993512c9b
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/nqrduck_autotm/view.py
View file

@ -18,10 +18,7 @@ from PyQt6.QtWidgets import (
from PyQt6.QtCore import pyqtSlot, Qt from PyQt6.QtCore import pyqtSlot, Qt
from nqrduck.module.module_view import ModuleView from nqrduck.module.module_view import ModuleView
from nqrduck.contrib.mplwidget import MplWidget from nqrduck.contrib.mplwidget import MplWidget
<<<<<<< HEAD
=======
from nqrduck.assets.icons import Logos from nqrduck.assets.icons import Logos
>>>>>>> c21dc155fa5b50d6dce64605a6d86007ea8086c7
from nqrduck.assets.animations import DuckAnimations from nqrduck.assets.animations import DuckAnimations
from .widget import Ui_Form from .widget import Ui_Form
@ -310,12 +307,7 @@ class AutoTMView(ModuleView):
self.setWindowFlag(Qt.WindowType.FramelessWindowHint) self.setWindowFlag(Qt.WindowType.FramelessWindowHint)
self.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) self.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
<<<<<<< HEAD
self.spinner_movie = DuckAnimations.DuckKick128x128()
=======
self.spinner_movie = DuckAnimations.DuckSleep128x128() self.spinner_movie = DuckAnimations.DuckSleep128x128()
>>>>>>> c21dc155fa5b50d6dce64605a6d86007ea8086c7
self.spinner_label = QLabel(self) self.spinner_label = QLabel(self)
self.spinner_label.setMovie(self.spinner_movie) self.spinner_label.setMovie(self.spinner_movie)