From 8744e3bd692f509662e303157ff7fd6fb3e5daa9 Mon Sep 17 00:00:00 2001 From: Ivan Ivanov Date: Thu, 4 Jan 2024 02:17:18 +0200 Subject: [PATCH] Use the new `QgisCoreOffliner` that wraps `QgsOfflineEditing` --- qfieldsync/gui/package_dialog.py | 7 ++++--- requirements.txt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/qfieldsync/gui/package_dialog.py b/qfieldsync/gui/package_dialog.py index 2674c063..db67948d 100644 --- a/qfieldsync/gui/package_dialog.py +++ b/qfieldsync/gui/package_dialog.py @@ -24,6 +24,7 @@ from libqfieldsync.layer import LayerSource from libqfieldsync.offline_converter import ExportType, OfflineConverter +from libqfieldsync.offliners import QgisCoreOffliner from libqfieldsync.project import ProjectConfiguration from libqfieldsync.project_checker import ProjectChecker from libqfieldsync.utils.file_utils import fileparts @@ -53,7 +54,7 @@ def __init__(self, iface, project, offline_editing, parent=None): self.setupUi(self) self.iface = iface - self.offline_editing = offline_editing + self.offliner = QgisCoreOffliner(offline_editing=offline_editing) self.project = project self.qfield_preferences = Preferences() self.dirsToCopyWidget = DirsToCopyWidget() @@ -82,7 +83,7 @@ def __init__(self, iface, project, offline_editing, parent=None): # self.refresh_devices() self.setup_gui() - self.offline_editing.warning.connect(self.show_warning) + self.offliner.warning.connect(self.show_warning) def update_progress(self, sent, total): progress = float(sent) / total * 100 @@ -159,7 +160,7 @@ def package_project(self): area_of_interest, area_of_interest_crs, self.qfield_preferences.value("attachmentDirs"), - self.offline_editing, + self.offliner, ExportType.Cable, dirs_to_copy=self.dirsToCopyWidget.dirs_to_copy(), ) diff --git a/requirements.txt b/requirements.txt index a903c4ea..655ba7c4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ pytest future transifex-client -libqfieldsync @ https://github.com/opengisch/libqfieldsync/archive/a6162194f5b7e2448da26d3cf67ed542653c4012.tar.gz +libqfieldsync @ git+https://github.com/opengisch/libqfieldsync@4ba790aa2cd57072c61d766e01e2c0e74b09507d