Move ui_*.py to ui/forms/

picard/coverart/providers/caa.py

@@ -66,7 +66,7 @@ from picard.i18n import (
 from picard.webservice import ratecontrol
 
 from picard.ui.caa_types_selector import display_caa_types_selector
-from picard.ui.ui_provider_options_caa import Ui_CaaOptions
+from picard.ui.forms.ui_provider_options_caa import Ui_CaaOptions
 
 
 CaaSizeItem = namedtuple('CaaSizeItem', ['thumbnail', 'label'])

picard/coverart/providers/local.py

@@ -35,7 +35,7 @@ from picard.coverart.providers.provider import (
 from picard.coverart.utils import CAA_TYPES
 from picard.i18n import N_
 
-from picard.ui.ui_provider_options_local import Ui_LocalOptions
+from picard.ui.forms.ui_provider_options_local import Ui_LocalOptions
 
 
 class ProviderOptionsLocal(ProviderOptions):

picard/ui/aboutdialog.py

@@ -38,7 +38,7 @@ from picard.ui import (
     PicardDialog,
     SingletonDialog,
 )
-from picard.ui.ui_aboutdialog import Ui_AboutDialog
+from picard.ui.forms.ui_aboutdialog import Ui_AboutDialog
 
 
 class AboutDialog(PicardDialog, SingletonDialog):

picard/ui/cdlookup.py

@@ -46,7 +46,7 @@ from picard.util import (
 )
 
 from picard.ui import PicardDialog
-from picard.ui.ui_cdlookup import Ui_Dialog
+from picard.ui.forms.ui_cdlookup import Ui_Dialog
 
 
 class CDLookupDialog(PicardDialog):

picard/ui/edittagdialog.py

@@ -43,7 +43,7 @@ from picard.i18n import gettext as _
 from picard.util.tags import TAG_NAMES
 
 from picard.ui import PicardDialog
-from picard.ui.ui_edittagdialog import Ui_EditTagDialog
+from picard.ui.forms.ui_edittagdialog import Ui_EditTagDialog
 
 
 AUTOCOMPLETE_RELEASE_TYPES = [s.lower() for s

picard/ui/infodialog.py

@@ -61,7 +61,7 @@ from picard.util import (
 
 from picard.ui import PicardDialog
 from picard.ui.colors import interface_colors
-from picard.ui.ui_infodialog import Ui_InfoDialog
+from picard.ui.forms.ui_infodialog import Ui_InfoDialog
 from picard.ui.util import StandardButton
 
 

picard/ui/infostatus.py

@@ -34,7 +34,7 @@ from picard.i18n import gettext as _
 from picard.util import icontheme
 from picard.util.time import get_timestamp
 
-from picard.ui.ui_infostatus import Ui_InfoStatus
+from picard.ui.forms.ui_infostatus import Ui_InfoStatus
 
 
 class InfoStatus(QtWidgets.QWidget, Ui_InfoStatus):

picard/ui/options/advanced.py

@@ -26,8 +26,8 @@ from picard.config import get_config
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
+from picard.ui.forms.ui_options_advanced import Ui_AdvancedOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_advanced import Ui_AdvancedOptionsPage
 
 
 class AdvancedOptionsPage(OptionsPage):

picard/ui/options/cdlookup.py

@@ -36,9 +36,11 @@ from picard.ui.options import OptionsPage
 
 
 if AUTO_DETECT_DRIVES:
-    from picard.ui.ui_options_cdlookup_select import Ui_CDLookupOptionsPage
+    from picard.ui.forms.ui_options_cdlookup_select import (
+        Ui_CDLookupOptionsPage,
+    )
 else:
-    from picard.ui.ui_options_cdlookup import Ui_CDLookupOptionsPage
+    from picard.ui.forms.ui_options_cdlookup import Ui_CDLookupOptionsPage
 
 
 class CDLookupOptionsPage(OptionsPage):

picard/ui/options/cover.py

@@ -39,9 +39,9 @@ from picard.i18n import (
 )
 
 from picard.ui.checkbox_list_item import CheckboxListItem
+from picard.ui.forms.ui_options_cover import Ui_CoverOptionsPage
 from picard.ui.moveable_list_view import MoveableListView
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_cover import Ui_CoverOptionsPage
 from picard.ui.util import qlistwidget_items
 
 

picard/ui/options/dialog.py

@@ -61,6 +61,9 @@ from picard.ui import (
     PicardDialog,
     SingletonDialog,
 )
+from picard.ui.forms.ui_options_attached_profiles import (
+    Ui_AttachedProfilesDialog,
+)
 from picard.ui.options import (  # noqa: F401 # pylint: disable=unused-import
     OptionsCheckError,
     OptionsPage,
@@ -91,7 +94,6 @@ from picard.ui.options import (  # noqa: F401 # pylint: disable=unused-import
     tags_compatibility_id3,
     tags_compatibility_wave,
 )
-from picard.ui.ui_options_attached_profiles import Ui_AttachedProfilesDialog
 from picard.ui.util import StandardButton
 
 
@@ -176,7 +178,7 @@ class OptionsDialog(PicardDialog, SingletonDialog):
         self.setWindowModality(QtCore.Qt.WindowModality.ApplicationModal)
         self.setAttribute(QtCore.Qt.WidgetAttribute.WA_DeleteOnClose)
 
-        from picard.ui.ui_options import Ui_Dialog
+        from picard.ui.forms.ui_options import Ui_Dialog
         self.ui = Ui_Dialog()
         self.ui.setupUi(self)
 

picard/ui/options/fingerprinting.py

@@ -41,11 +41,13 @@ from picard.i18n import (
 )
 from picard.util import webbrowser2
 
+from picard.ui.forms.ui_options_fingerprinting import (
+    Ui_FingerprintingOptionsPage,
+)
 from picard.ui.options import (
     OptionsCheckError,
     OptionsPage,
 )
-from picard.ui.ui_options_fingerprinting import Ui_FingerprintingOptionsPage
 
 
 class ApiKeyValidator(QtGui.QValidator):

picard/ui/options/general.py

@@ -47,8 +47,8 @@ from picard.i18n import (
 )
 from picard.util.mbserver import is_official_server
 
+from picard.ui.forms.ui_options_general import Ui_GeneralOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_general import Ui_GeneralOptionsPage
 
 
 class GeneralOptionsPage(OptionsPage):

picard/ui/options/genres.py

@@ -36,8 +36,8 @@ from picard.i18n import (
 )
 from picard.track import TagGenreFilter
 
+from picard.ui.forms.ui_options_genres import Ui_GenresOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_genres import Ui_GenresOptionsPage
 
 
 TOOLTIP_GENRES_FILTER = N_("""<html><head/><body>

picard/ui/options/interface.py

@@ -46,13 +46,13 @@ from picard.i18n import (
 )
 from picard.util import strxfrm
 
+from picard.ui.forms.ui_options_interface import Ui_InterfaceOptionsPage
 from picard.ui.options import OptionsPage
 from picard.ui.theme import (
     AVAILABLE_UI_THEMES,
     OS_SUPPORTS_THEMES,
     UiTheme,
 )
-from picard.ui.ui_options_interface import Ui_InterfaceOptionsPage
 from picard.ui.util import changes_require_restart_warning
 
 

picard/ui/options/interface_colors.py

@@ -36,8 +36,10 @@ from picard.i18n import (
 )
 
 from picard.ui.colors import interface_colors
+from picard.ui.forms.ui_options_interface_colors import (
+    Ui_InterfaceColorsOptionsPage,
+)
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_interface_colors import Ui_InterfaceColorsOptionsPage
 from picard.ui.util import changes_require_restart_warning
 
 

picard/ui/options/interface_toolbar.py

@@ -48,11 +48,11 @@ from picard.util import icontheme
 
 from picard.ui import PicardDialog
 from picard.ui.enums import MainAction
-from picard.ui.moveable_list_view import MoveableListView
+from picard.ui.forms.ui_options_interface_toolbar import (
-from picard.ui.options import OptionsPage
-from picard.ui.ui_options_interface_toolbar import (
     Ui_InterfaceToolbarOptionsPage,
 )
+from picard.ui.moveable_list_view import MoveableListView
+from picard.ui.options import OptionsPage
 from picard.ui.util import qlistwidget_items
 
 

picard/ui/options/interface_top_tags.py

@@ -24,10 +24,10 @@ from picard.config import get_config
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
-from picard.ui.options import OptionsPage
+from picard.ui.forms.ui_options_interface_top_tags import (
-from picard.ui.ui_options_interface_top_tags import (
     Ui_InterfaceTopTagsOptionsPage,
 )
+from picard.ui.options import OptionsPage
 
 
 class InterfaceTopTagsOptionsPage(OptionsPage):

picard/ui/options/maintenance.py

@@ -45,8 +45,8 @@ from picard.i18n import (
 )
 from picard.util import open_local_path
 
+from picard.ui.forms.ui_options_maintenance import Ui_MaintenanceOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_maintenance import Ui_MaintenanceOptionsPage
 
 
 OPTIONS_NOT_IN_PAGES = {

picard/ui/options/matching.py

@@ -26,8 +26,8 @@ from picard.config import get_config
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
+from picard.ui.forms.ui_options_matching import Ui_MatchingOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_matching import Ui_MatchingOptionsPage
 
 
 class MatchingOptionsPage(OptionsPage):

picard/ui/options/metadata.py

@@ -49,11 +49,13 @@ from picard.i18n import (
 )
 
 from picard.ui import PicardDialog
+from picard.ui.forms.ui_exception_script_selector import (
+    Ui_ExceptionScriptSelector,
+)
+from picard.ui.forms.ui_multi_locale_selector import Ui_MultiLocaleSelector
+from picard.ui.forms.ui_options_metadata import Ui_MetadataOptionsPage
 from picard.ui.moveable_list_view import MoveableListView
 from picard.ui.options import OptionsPage
-from picard.ui.ui_exception_script_selector import Ui_ExceptionScriptSelector
-from picard.ui.ui_multi_locale_selector import Ui_MultiLocaleSelector
-from picard.ui.ui_options_metadata import Ui_MetadataOptionsPage
 from picard.ui.util import qlistwidget_items
 
 

picard/ui/options/network.py

@@ -27,8 +27,8 @@ from picard.const import CACHE_SIZE_DISPLAY_UNIT
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
+from picard.ui.forms.ui_options_network import Ui_NetworkOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_network import Ui_NetworkOptionsPage
 
 
 class NetworkOptionsPage(OptionsPage):

picard/ui/options/plugins.py

@@ -62,9 +62,9 @@ from picard.util import (
 )
 
 from picard.ui import HashableTreeWidgetItem
+from picard.ui.forms.ui_options_plugins import Ui_PluginsOptionsPage
 from picard.ui.options import OptionsPage
 from picard.ui.theme import theme
-from picard.ui.ui_options_plugins import Ui_PluginsOptionsPage
 
 
 COLUMN_NAME, COLUMN_VERSION, COLUMN_ACTIONS = range(3)

picard/ui/options/profiles.py

@@ -47,9 +47,9 @@ from picard.profile import profile_groups_values
 from picard.script import get_file_naming_script_presets
 from picard.util import get_base_title
 
+from picard.ui.forms.ui_options_profiles import Ui_ProfileEditorDialog
 from picard.ui.moveable_list_view import MoveableListView
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_profiles import Ui_ProfileEditorDialog
 from picard.ui.util import qlistwidget_items
 from picard.ui.widgets.profilelistwidget import ProfileListWidgetItem
 

picard/ui/options/ratings.py

@@ -25,8 +25,8 @@ from picard.config import get_config
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
+from picard.ui.forms.ui_options_ratings import Ui_RatingsOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_ratings import Ui_RatingsOptionsPage
 
 
 class RatingsOptionsPage(OptionsPage):

picard/ui/options/releases.py

@@ -50,8 +50,8 @@ from picard.i18n import (
 )
 from picard.util import strxfrm
 
+from picard.ui.forms.ui_options_releases import Ui_ReleasesOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_releases import Ui_ReleasesOptionsPage
 from picard.ui.util import qlistwidget_items
 from picard.ui.widgets import ClickableSlider
 

picard/ui/options/renaming.py

@@ -47,6 +47,7 @@ from picard.i18n import (
 from picard.script import ScriptParser
 
 from picard.ui.enums import MainAction
+from picard.ui.forms.ui_options_renaming import Ui_RenamingOptionsPage
 from picard.ui.options import (
     OptionsCheckError,
     OptionsPage,
@@ -61,7 +62,6 @@ from picard.ui.scripteditor import (
     populate_script_selection_combo_box,
     synchronize_vertical_scrollbars,
 )
-from picard.ui.ui_options_renaming import Ui_RenamingOptionsPage
 
 
 class RenamingOptionsPage(OptionsPage):

picard/ui/options/renaming_compat.py

@@ -52,9 +52,11 @@ from picard.i18n import (
 from picard.util import system_supports_long_paths
 
 from picard.ui import PicardDialog
+from picard.ui.forms.ui_options_renaming_compat import (
+    Ui_RenamingCompatOptionsPage,
+)
+from picard.ui.forms.ui_win_compat_dialog import Ui_WinCompatDialog
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_renaming_compat import Ui_RenamingCompatOptionsPage
-from picard.ui.ui_win_compat_dialog import Ui_WinCompatDialog
 
 
 class RenamingCompatOptionsPage(OptionsPage):

picard/ui/options/scripting.py

@@ -50,15 +50,15 @@ from picard.ui import (
     PicardDialog,
     SingletonDialog,
 )
+from picard.ui.forms.ui_options_script import Ui_ScriptingOptionsPage
+from picard.ui.forms.ui_scripting_documentation_dialog import (
+    Ui_ScriptingDocumentationDialog,
+)
 from picard.ui.moveable_list_view import MoveableListView
 from picard.ui.options import (
     OptionsCheckError,
     OptionsPage,
 )
-from picard.ui.ui_options_script import Ui_ScriptingOptionsPage
-from picard.ui.ui_scripting_documentation_dialog import (
-    Ui_ScriptingDocumentationDialog,
-)
 from picard.ui.util import qlistwidget_items
 from picard.ui.widgets.scriptdocumentation import ScriptingDocumentationWidget
 from picard.ui.widgets.scriptlistwidget import ScriptListWidgetItem

picard/ui/options/tags.py

@@ -33,8 +33,8 @@ from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
 from picard.ui.enums import MainAction
+from picard.ui.forms.ui_options_tags import Ui_TagsOptionsPage
 from picard.ui.options import OptionsPage
-from picard.ui.ui_options_tags import Ui_TagsOptionsPage
 
 
 class TagsOptionsPage(OptionsPage):

picard/ui/options/tags_compatibility_aac.py

@@ -25,10 +25,10 @@ from picard.config import get_config
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
-from picard.ui.options import OptionsPage
+from picard.ui.forms.ui_options_tags_compatibility_aac import (
-from picard.ui.ui_options_tags_compatibility_aac import (
     Ui_TagsCompatibilityOptionsPage,
 )
+from picard.ui.options import OptionsPage
 
 
 class TagsCompatibilityAACOptionsPage(OptionsPage):

picard/ui/options/tags_compatibility_ac3.py

@@ -25,10 +25,10 @@ from picard.config import get_config
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
-from picard.ui.options import OptionsPage
+from picard.ui.forms.ui_options_tags_compatibility_ac3 import (
-from picard.ui.ui_options_tags_compatibility_ac3 import (
     Ui_TagsCompatibilityOptionsPage,
 )
+from picard.ui.options import OptionsPage
 
 
 class TagsCompatibilityAC3OptionsPage(OptionsPage):

picard/ui/options/tags_compatibility_id3.py

@@ -27,10 +27,10 @@ from picard.config import get_config
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
-from picard.ui.options import OptionsPage
+from picard.ui.forms.ui_options_tags_compatibility_id3 import (
-from picard.ui.ui_options_tags_compatibility_id3 import (
     Ui_TagsCompatibilityOptionsPage,
 )
+from picard.ui.options import OptionsPage
 
 
 class TagsCompatibilityID3OptionsPage(OptionsPage):

picard/ui/options/tags_compatibility_wave.py

@@ -26,10 +26,10 @@ from picard.extension_points.options_pages import register_options_page
 from picard.formats.wav import WAVFile
 from picard.i18n import N_
 
-from picard.ui.options import OptionsPage
+from picard.ui.forms.ui_options_tags_compatibility_wave import (
-from picard.ui.ui_options_tags_compatibility_wave import (
     Ui_TagsCompatibilityOptionsPage,
 )
+from picard.ui.options import OptionsPage
 
 
 class TagsCompatibilityWaveOptionsPage(OptionsPage):

picard/ui/passworddialog.py

@@ -30,7 +30,7 @@ from picard.config import get_config
 from picard.i18n import gettext as _
 
 from picard.ui import PicardDialog
-from picard.ui.ui_passworddialog import Ui_PasswordDialog
+from picard.ui.forms.ui_passworddialog import Ui_PasswordDialog
 
 
 class PasswordDialog(PicardDialog):

picard/ui/scripteditor.py

@@ -76,13 +76,13 @@ from picard.ui import (
     PicardDialog,
     SingletonDialog,
 )
+from picard.ui.forms.ui_scripteditor import Ui_ScriptEditor
+from picard.ui.forms.ui_scripteditor_details import Ui_ScriptDetails
 from picard.ui.options import OptionsPage
 from picard.ui.options.scripting import (
     OptionsCheckError,
     ScriptCheckError,
 )
-from picard.ui.ui_scripteditor import Ui_ScriptEditor
-from picard.ui.ui_scripteditor_details import Ui_ScriptDetails
 from picard.ui.widgets.scriptdocumentation import ScriptingDocumentationWidget
 
 

picard/ui/tagsfromfilenames.py

@@ -38,7 +38,7 @@ from picard.script.parser import normalize_tagname
 from picard.util.tags import display_tag_name
 
 from picard.ui import PicardDialog
-from picard.ui.ui_tagsfromfilenames import Ui_TagsFromFileNamesDialog
+from picard.ui.forms.ui_tagsfromfilenames import Ui_TagsFromFileNamesDialog
 from picard.ui.util import StandardButton
 
 

picard/ui/widgets/taglisteditor.py

@@ -24,7 +24,7 @@ from PyQt6 import QtWidgets
 
 from picard.util.tags import TAG_NAMES
 
-from picard.ui.ui_widget_taglisteditor import Ui_TagListEditor
+from picard.ui.forms.ui_widget_taglisteditor import Ui_TagListEditor
 from picard.ui.widgets.editablelistview import (
     AutocompleteItemDelegate,
     EditableListModel,

setup.py

@@ -325,7 +325,7 @@ def py_from_ui(uifile):
 
 
 def py_from_ui_with_defaultdir(uifile):
-    return os.path.join("picard", "ui", py_from_ui(uifile))
+    return os.path.join('picard', 'ui', 'forms', py_from_ui(uifile))
 
 
 def ui_files():