Finish moving all qtlib py files to qt

arsenetar · May 9, 2022 · 36280b0 · 36280b0
1 parent 18359c3
commit 36280b0
Show file tree

Hide file tree

Showing 36 changed files with 40 additions and 50 deletions.
diff --git a/hscommon/desktop.py b/hscommon/desktop.py
@@ -44,7 +44,7 @@ def special_folder_path(special_folder, appname=None, portable=False):
 try:
     from PyQt5.QtCore import QUrl, QStandardPaths
     from PyQt5.QtGui import QDesktopServices
-    from qtlib.util import get_appdata
+    from qt.util import get_appdata
     from core.util import executable_folder
     from hscommon.plat import ISWINDOWS, ISOSX
     import subprocess

diff --git a/qtlib/images/search_clear_13.png → images/search_clear_13.png b/qtlib/images/search_clear_13.png → images/search_clear_13.png
diff --git a/qtlib/about_box.py → qt/about_box.py b/qtlib/about_box.py → qt/about_box.py
@@ -11,10 +11,10 @@
 from PyQt5.QtWidgets import QDialog, QDialogButtonBox, QSizePolicy, QHBoxLayout, QVBoxLayout, QLabel
 
 from core.util import check_for_update
-from qtlib.util import move_to_screen_center
+from qt.util import move_to_screen_center
 from hscommon.trans import trget
 
-tr = trget("qtlib")
+tr = trget("qtlib")  # TODO change to ui
 
 
 class AboutBox(QDialog):

diff --git a/qt/app.py b/qt/app.py
@@ -14,10 +14,10 @@
 from hscommon.trans import trget
 from hscommon import desktop, plat
 
-from qtlib.about_box import AboutBox
-from qtlib.recent import Recent
-from qtlib.util import create_actions
-from qtlib.progress_window import ProgressWindow
+from qt.about_box import AboutBox
+from qt.recent import Recent
+from qt.util import create_actions
+from qt.progress_window import ProgressWindow
 
 from core.app import AppMode, DupeGuru as DupeGuruModel
 import core.pe.photo

diff --git a/qtlib/column.py → qt/column.py b/qtlib/column.py → qt/column.py
diff --git a/qt/deletion_options.py b/qt/deletion_options.py
@@ -10,7 +10,7 @@
 from PyQt5.QtWidgets import QDialog, QVBoxLayout, QLabel, QCheckBox, QDialogButtonBox
 
 from hscommon.trans import trget
-from qtlib.radio_box import RadioBox
+from qt.radio_box import RadioBox
 
 tr = trget("ui")
 

diff --git a/qt/details_dialog.py b/qt/details_dialog.py
@@ -9,7 +9,7 @@
 from PyQt5.QtCore import Qt
 from PyQt5.QtWidgets import QDockWidget, QWidget
 
-from qtlib.util import move_to_screen_center
+from qt.util import move_to_screen_center
 from .details_table import DetailsModel
 from hscommon.plat import ISLINUX
 

diff --git a/qt/dg.qrc b/qt/dg.qrc
@@ -4,7 +4,7 @@
     <file alias="logo_se_big">../images/dgse_logo_128.png</file>
     <file alias="plus">../images/plus_8.png</file>
     <file alias="minus">../images/minus_8.png</file>
-    <file alias="search_clear_13">../qtlib/images/search_clear_13.png</file>
+    <file alias="search_clear_13">../images/search_clear_13.png</file>
     <file alias="exchange">../images/exchange_purple_upscaled.png</file>
     <file alias="zoom_in">../images/old_zoom_in.png</file>
     <file alias="zoom_out">../images/old_zoom_out.png</file>

diff --git a/qt/directories_dialog.py b/qt/directories_dialog.py
@@ -27,9 +27,9 @@
 
 from hscommon.trans import trget
 from core.app import AppMode
-from qtlib.radio_box import RadioBox
-from qtlib.recent import Recent
-from qtlib.util import move_to_screen_center, create_actions
+from qt.radio_box import RadioBox
+from qt.recent import Recent
+from qt.util import move_to_screen_center, create_actions
 
 from . import platform
 from .directories_model import DirectoriesModel, DirectoriesDelegate

diff --git a/qt/directories_model.py b/qt/directories_model.py
@@ -18,7 +18,7 @@
 from PyQt5.QtGui import QBrush
 
 from hscommon.trans import trget
-from qtlib.tree_model import RefNode, TreeModel
+from qt.tree_model import RefNode, TreeModel
 
 tr = trget("ui")
 

diff --git a/qtlib/error_report_dialog.py → qt/error_report_dialog.py b/qtlib/error_report_dialog.py → qt/error_report_dialog.py
@@ -23,9 +23,9 @@
 
 from hscommon.trans import trget
 from hscommon.desktop import open_url
-from .util import horizontal_spacer
+from qt.util import horizontal_spacer
 
-tr = trget("qtlib")
+tr = trget("qtlib")  # TODO change to ui
 
 
 class ErrorReportDialog(QDialog):

diff --git a/qt/exclude_list_table.py b/qt/exclude_list_table.py
@@ -5,8 +5,8 @@
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QFont, QFontMetrics, QIcon, QColor
 
-from qtlib.column import Column
-from qtlib.table import Table
+from qt.column import Column
+from qt.table import Table
 from hscommon.trans import trget
 
 tr = trget("ui")

diff --git a/qt/ignore_list_dialog.py b/qt/ignore_list_dialog.py
@@ -16,7 +16,7 @@
 )
 
 from hscommon.trans import trget
-from qtlib.util import horizontal_wrap
+from qt.util import horizontal_wrap
 from .ignore_list_table import IgnoreListTable
 
 tr = trget("ui")

diff --git a/qt/ignore_list_table.py b/qt/ignore_list_table.py
@@ -5,8 +5,8 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from qtlib.column import Column
-from qtlib.table import Table
+from qt.column import Column
+from qt.table import Table
 
 
 class IgnoreListTable(Table):

diff --git a/qt/me/results_model.py b/qt/me/results_model.py
@@ -4,7 +4,7 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from qtlib.column import Column
+from qt.column import Column
 from ..results_model import ResultsModel as ResultsModelBase
 
 

diff --git a/qt/pe/preferences_dialog.py b/qt/pe/preferences_dialog.py
@@ -8,7 +8,7 @@
 from PyQt5.QtCore import Qt
 from hscommon.trans import trget
 from hscommon.plat import ISLINUX
-from qtlib.radio_box import RadioBox
+from qt.radio_box import RadioBox
 from core.scanner import ScanType
 from core.app import AppMode
 

diff --git a/qt/pe/results_model.py b/qt/pe/results_model.py
@@ -4,7 +4,7 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from qtlib.column import Column
+from qt.column import Column
 from ..results_model import ResultsModel as ResultsModelBase
 
 

diff --git a/qt/preferences_dialog.py b/qt/preferences_dialog.py
@@ -33,7 +33,7 @@
 
 from hscommon.trans import trget
 from hscommon.plat import ISLINUX
-from qtlib.util import horizontal_wrap, move_to_screen_center
+from qt.util import horizontal_wrap, move_to_screen_center
 from qt.preferences import get_langnames
 from enum import Flag, auto
 

diff --git a/qt/prioritize_dialog.py b/qt/prioritize_dialog.py
@@ -24,8 +24,8 @@
 )
 
 from hscommon.trans import trget
-from qtlib.selectable_list import ComboboxModel, ListviewModel
-from qtlib.util import vertical_spacer
+from qt.selectable_list import ComboboxModel, ListviewModel
+from qt.util import vertical_spacer
 from core.gui.prioritize_dialog import PrioritizeDialog as PrioritizeDialogModel
 
 tr = trget("ui")

diff --git a/qt/problem_dialog.py b/qt/problem_dialog.py
@@ -19,7 +19,7 @@
     QAbstractItemView,
 )
 
-from qtlib.util import move_to_screen_center
+from qt.util import move_to_screen_center
 from hscommon.trans import trget
 from .problem_table import ProblemTable
 

diff --git a/qt/problem_table.py b/qt/problem_table.py
@@ -6,8 +6,8 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from qtlib.column import Column
-from qtlib.table import Table
+from qt.column import Column
+from qt.table import Table
 
 
 class ProblemTable(Table):

diff --git a/qtlib/progress_window.py → qt/progress_window.py b/qtlib/progress_window.py → qt/progress_window.py
diff --git a/qtlib/radio_box.py → qt/radio_box.py b/qtlib/radio_box.py → qt/radio_box.py
@@ -8,7 +8,7 @@
 from PyQt5.QtCore import pyqtSignal
 from PyQt5.QtWidgets import QWidget, QHBoxLayout, QRadioButton
 
-from .util import horizontal_spacer
+from qt.util import horizontal_spacer
 
 
 class RadioBox(QWidget):

diff --git a/qtlib/recent.py → qt/recent.py b/qtlib/recent.py → qt/recent.py
@@ -14,7 +14,7 @@
 from hscommon.trans import trget
 from hscommon.util import dedupe
 
-tr = trget("qtlib")
+tr = trget("qtlib")  # TODO move to ui
 
 MenuEntry = namedtuple("MenuEntry", "menu fixedItemCount")
 

diff --git a/qt/result_window.py b/qt/result_window.py
@@ -24,8 +24,8 @@
 )
 
 from hscommon.trans import trget
-from qtlib.util import move_to_screen_center, horizontal_wrap, create_actions
-from qtlib.search_edit import SearchEdit
+from qt.util import move_to_screen_center, horizontal_wrap, create_actions
+from qt.search_edit import SearchEdit
 
 from core.app import AppMode
 from .results_model import ResultsView

diff --git a/qt/results_model.py b/qt/results_model.py
@@ -10,7 +10,7 @@
 from PyQt5.QtGui import QBrush, QFont, QFontMetrics
 from PyQt5.QtWidgets import QTableView
 
-from qtlib.table import Table
+from qt.table import Table
 
 
 class ResultsModel(Table):

diff --git a/qt/se/results_model.py b/qt/se/results_model.py
@@ -4,7 +4,7 @@
 # which should be included with this package. The terms are also available at
 # http://www.gnu.org/licenses/gpl-3.0.html
 
-from qtlib.column import Column
+from qt.column import Column
 from ..results_model import ResultsModel as ResultsModelBase
 
 

diff --git a/qtlib/search_edit.py → qt/search_edit.py b/qtlib/search_edit.py → qt/search_edit.py
@@ -12,7 +12,7 @@
 
 from hscommon.trans import trget
 
-tr = trget("qtlib")
+tr = trget("qtlib")  # TODO change to ui
 
 # IMPORTANT: For this widget to work propertly, you have to add "search_clear_13" from the
 # "images" folder in your resources.

diff --git a/qtlib/selectable_list.py → qt/selectable_list.py b/qtlib/selectable_list.py → qt/selectable_list.py
diff --git a/qt/tabbed_window.py b/qt/tabbed_window.py
@@ -14,7 +14,7 @@
     QStackedWidget,
 )
 from hscommon.trans import trget
-from qtlib.util import move_to_screen_center, create_actions
+from qt.util import move_to_screen_center, create_actions
 from .directories_dialog import DirectoriesDialog
 from .result_window import ResultWindow
 from .ignore_list_dialog import IgnoreListDialog

diff --git a/qtlib/table.py → qt/table.py b/qtlib/table.py → qt/table.py
diff --git a/qtlib/tree_model.py → qt/tree_model.py b/qtlib/tree_model.py → qt/tree_model.py
diff --git a/qtlib/util.py → qt/util.py b/qtlib/util.py → qt/util.py
diff --git a/qtlib/LICENSE b/qtlib/LICENSE
diff --git a/qtlib/__init__.py b/qtlib/__init__.py
diff --git a/run.py b/run.py
@@ -14,8 +14,8 @@
 from PyQt5.QtWidgets import QApplication
 
 from hscommon.trans import install_gettext_trans_under_qt
-from qtlib.error_report_dialog import install_excepthook
-from qtlib.util import setup_qt_logging
+from qt.error_report_dialog import install_excepthook
+from qt.util import setup_qt_logging
 from qt.preferences import create_qsettings
 from qt import dg_rc  # noqa: F401
 from qt.platform import BASE_PATH