Skip to content

Commit

Permalink
feat(qdt export): fix rebase of main
Browse files Browse the repository at this point in the history
  • Loading branch information
jmkerloch committed Oct 3, 2024
1 parent 8a7bf5b commit e9c381f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion profile_manager/gui/interface_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def setup_connections(self):
self.dlg.comboBoxNamesTarget.currentIndexChanged.connect(
self.conditionally_enable_import_button
)
self.dlg.list_profiles.currentItemChanged.connect(
self.dlg.list_profiles.selectionModel().selectionChanged.connect(
self.conditionally_enable_profile_buttons
)

Expand Down
2 changes: 1 addition & 1 deletion profile_manager/gui/mdl_profiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from qgis.PyQt.QtGui import QStandardItemModel
from qgis.core import QgsUserProfileManager, QgsUserProfile, QgsApplication

from ..profiles.utils import qgis_profiles_path
from profile_manager.profiles.utils import qgis_profiles_path


class ProfileListModel(QStandardItemModel):
Expand Down
8 changes: 6 additions & 2 deletions profile_manager/profile_manager_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,18 @@
***************************************************************************/
"""

# standard
import os
from pathlib import Path
from typing import Optional

# pyQGIS
from qgis.PyQt import QtWidgets, uic
from qgis.PyQt.QtWidgets import QMessageBox
from .userInterface.mdl_profiles import ProfileListModel
from .qdt_export.profile_export import export_profile_for_qdt, get_qdt_profile_infos_from_file, QDTProfileInfos

# plugin
from profile_manager.gui.mdl_profiles import ProfileListModel
from profile_manager.qdt_export.profile_export import export_profile_for_qdt, get_qdt_profile_infos_from_file, QDTProfileInfos

# This loads your .ui file so that PyQt can populate your plugin with the elements from Qt Designer
FORM_CLASS, _ = uic.loadUiType(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import pyplugin_installer

from ..profiles.utils import (
from profile_manager.profiles.utils import (
qgis_profiles_path,
get_profile_plugin_list_information,
)
Expand Down

0 comments on commit e9c381f

Please sign in to comment.