Skip to content

Commit

Permalink
Merge fb58b3d into 44d7915
Browse files Browse the repository at this point in the history
  • Loading branch information
Max-7 committed Nov 8, 2018
2 parents 44d7915 + fb58b3d commit 948c672
Show file tree
Hide file tree
Showing 27 changed files with 80 additions and 3,596 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,6 @@ random_seed

# PyQt's big ass resource bundle, automatically generated
parsec/core/gui/_resources_rc.py

# PyQt's forms, automatically generated
parsec/core/gui/ui
15 changes: 11 additions & 4 deletions parsec/core/gui/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,17 @@
from PyQt5.QtCore import QTimer
from PyQt5.QtWidgets import QApplication

from parsec.core.gui import lang
from parsec.core.gui import settings
from parsec.core.gui.core_call import init_core_call
from parsec.core.gui.main_window import MainWindow
try:
from parsec.core.gui import lang
from parsec.core.gui import settings
from parsec.core.gui.core_call import init_core_call
from parsec.core.gui.main_window import MainWindow
except ImportError as exc:
raise ModuleNotFoundError(
"""PyQt forms haven't been generated.
You must install the parsec package or run `python setup.py generate_pyqt_forms`
"""
) from exc


def kill_window(window):
Expand Down
7 changes: 0 additions & 7 deletions parsec/core/gui/build_qt.sh
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
#!/bin/bash

mkdir -p ui
mkdir -p rc/translations

pylupdate5 parsec-gui.pro

for f in `ls forms`;
do
echo "Processing form ${f}"
pyuic5 -o "ui/${f%.*}.py" "forms/${f}" --import-from=parsec.core.gui
done

for f in `ls tr`;
do
lrelease -compress "tr/${f}" -qm "rc/translations/${f%.*}.qm"
Expand Down
Empty file removed parsec/core/gui/ui/__init__.py
Empty file.
55 changes: 0 additions & 55 deletions parsec/core/gui/ui/devices_widget.py

This file was deleted.

121 changes: 0 additions & 121 deletions parsec/core/gui/ui/file_item_widget.py

This file was deleted.

0 comments on commit 948c672

Please sign in to comment.