Skip to content

Commit a43b234

Browse files
committed
style
1 parent e5149df commit a43b234

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Mergin/diff.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ def diff_table_to_features(diff_table, schema_table, fields, cols_to_flds, db_co
233233
else:
234234
f[cols_to_flds[i]] = db_row[i]
235235
f[cols_to_flds[i] + fld_old_offset] = db_row[i]
236-
236+
237237
# try to fill in unchanged columns from the diff
238238
for entry_change in entry_changes:
239239
i = entry_change["column"]

Mergin/utils.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,10 +1581,8 @@ def icon_for_layer(layer) -> QIcon:
15811581

15821582

15831583
# Copy a layer and it's legend
1584-
def layer_copy(layer, style_name = 'mergin_diff'):
1585-
lyr_clone = layer.materialize(
1586-
QgsFeatureRequest().setFilterFids(layer.allFeatureIds())
1587-
)
1584+
def layer_copy(layer, style_name="mergin_diff"):
1585+
lyr_clone = layer.materialize(QgsFeatureRequest().setFilterFids(layer.allFeatureIds()))
15881586
lyr_clone.setName(layer.name())
15891587
lyr_clone.setAttributeTableConfig(layer.attributeTableConfig())
15901588

@@ -1595,7 +1593,7 @@ def layer_copy(layer, style_name = 'mergin_diff'):
15951593

15961594
# add the style to the target layer with a custom name (in this case: 'copied')
15971595
lyr_clone.styleManager().addStyle(style_name, source_style)
1598-
lyr_clone.styleManager().setCurrentStyle(style_name)
1596+
lyr_clone.styleManager().setCurrentStyle(style_name)
15991597

16001598
lyr_clone.setRenderer(layer.renderer())
16011599

Mergin/version_viewer_dialog.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
is_versioned_file,
5656
mergin_project_local_path,
5757
parse_user_agent,
58-
layer_copy
58+
layer_copy,
5959
)
6060

6161
ui_file = os.path.join(os.path.dirname(os.path.realpath(__file__)), "ui", "ui_versions_viewer.ui")
@@ -616,7 +616,9 @@ def show_version_changes(self, version):
616616
else:
617617
self.toolbar.setEnabled(False)
618618
self.stackedWidget.setCurrentIndex(1)
619-
self.label_info.setText("No GeoPackage features were added, removed or updated in this version (Note: adding or removing an entire GeoPackage is not shown here).")
619+
self.label_info.setText(
620+
"No GeoPackage features were added, removed or updated in this version (Note: adding or removing an entire GeoPackage is not shown here)."
621+
)
620622
self.tabWidget.setCurrentIndex(1)
621623
self.tabWidget.setTabEnabled(0, False)
622624

0 commit comments

Comments
 (0)