Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
f09f9095 committed Nov 11, 2022
1 parent f6f0093 commit c7175d7
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 14 deletions.
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import os
import sys
from distutils.core import setup
import py2exe, sys, os

import py2exe

sys.argv.append('py2exe')

Expand Down
3 changes: 1 addition & 2 deletions src/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@

from PyQt6.QtWidgets import QApplication

from utils import Directory
import main_ui as main_ui

from utils import Directory

if __name__ == "__main__":
app = QApplication(sys.argv)
Expand Down
2 changes: 1 addition & 1 deletion src/database/database_ui.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from PyQt6.QtCore import QRect
from PyQt6.QtSql import QSqlDatabase, QSqlTableModel
from PyQt6.QtWidgets import QTableView, QAbstractItemView, QLabel
from PyQt6.QtWidgets import QAbstractItemView, QLabel, QTableView

from database import data_jaboody
from utils import Button, DialogWindow
Expand Down
2 changes: 1 addition & 1 deletion src/encoder.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import re
import subprocess

from PyQt6.QtCore import QRunnable, pyqtSlot, pyqtSignal, QObject
from PyQt6.QtCore import QObject, QRunnable, pyqtSignal, pyqtSlot
from PyQt6.QtWidgets import QMessageBox

from utils import ErrorDialog
Expand Down
2 changes: 1 addition & 1 deletion src/main_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from PyQt6.QtCore import QRect, QRegularExpression, QThreadPool
from PyQt6.QtGui import QRegularExpressionValidator
from PyQt6.QtWidgets import QLineEdit, QProgressBar, QFileDialog
from PyQt6.QtWidgets import QFileDialog, QLineEdit, QProgressBar

import encoder
from database import database_ui
Expand Down
18 changes: 11 additions & 7 deletions src/media_editor.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
import ffmpeg
#import numpy as np
from threading import Thread

import ffmpeg
from PyQt6.QtCore import QRect, QSize, Qt, QUrl
from PyQt6.QtGui import QIcon
from PyQt6.QtCore import QRect, QUrl, QSize, Qt
from PyQt6.QtWidgets import QLabel, QFrame, QSpinBox
from PyQt6.QtMultimedia import QMediaPlayer, QAudioOutput, QVideoSink, QVideoFrame
from PyQt6.QtMultimediaWidgets import QVideoWidget, QGraphicsVideoItem
from threading import Thread
from PyQt6.QtMultimedia import (QAudioOutput, QMediaPlayer, QVideoFrame,
QVideoSink)
from PyQt6.QtMultimediaWidgets import QGraphicsVideoItem, QVideoWidget
from PyQt6.QtWidgets import QFrame, QLabel, QSpinBox

from utils import Button, DialogWindow, Slider

#import numpy as np




class Editor(DialogWindow):
def __init__(self, video_loc, audio_loc):
Expand Down
2 changes: 1 addition & 1 deletion src/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from PyQt6.QtCore import QRect, Qt
from PyQt6.QtGui import QIcon, QPixmap
from PyQt6.QtWidgets import QWidget, QPushButton, QLabel, QDialog, QSlider
from PyQt6.QtWidgets import QDialog, QLabel, QPushButton, QSlider, QWidget


class Directory:
Expand Down

0 comments on commit c7175d7

Please sign in to comment.