Skip to content

Commit 12cc995

Browse files
ValentinBuiraValentinBuira
committed
Merge branch 'master' into fix-center-behaviour-when-highligh
2 parents a8985e9 + d91c10a commit 12cc995

15 files changed

Lines changed: 387 additions & 364 deletions

‎.zenodo.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"description": "<p>Mergin Maps mobile app is a QGIS powered app for Android and iOS devices.</p>",
33
"license": "GPLv3",
44
"title": "Mergin Maps mobile app",
5-
"version": "2025.2.0",
5+
"version": "2025.1.1",
66
"upload_type": "software",
77
"publication_date": "2022-02-24",
88
"creators": [
@@ -39,7 +39,7 @@
3939
"related_identifiers": [
4040
{
4141
"scheme": "url",
42-
"identifier": "https://github.com/MerginMaps/mobile/tree/2025.2.0",
42+
"identifier": "https://github.com/MerginMaps/mobile/tree/2025.1.1",
4343
"relation": "isSupplementTo"
4444
},
4545
{

‎CITATION.cff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cff-version: 2025.2.0
1+
cff-version: 2025.1.1
22
message: "If you use this software, please cite it as below."
33
authors:
44
- family-names: "Martin"

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ cmake_minimum_required(VERSION 3.22)
66

77
# TODO automatically change with the scripts/update version script
88
set(MM_VERSION_MAJOR "2025")
9-
set(MM_VERSION_MINOR "2")
10-
set(MM_VERSION_PATCH "0")
9+
set(MM_VERSION_MINOR "1")
10+
set(MM_VERSION_PATCH "1")
1111
set(QT_VERSION_DEFAULT "6.6.3")
1212

1313
# Note: we cannot set this for non-android build, since CMake will start looking for

‎app/activeproject.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@ ActiveProject::ActiveProject( AppSettings &appSettings
7676

7777
ActiveProject::~ActiveProject() = default;
7878

79-
QgsProject *ActiveProject::qgsProject()
79+
QgsProject *ActiveProject::qgsProject() const
8080
{
8181
return mQgsProject;
8282
}
8383

84-
LocalProject ActiveProject::localProject()
84+
LocalProject ActiveProject::localProject() const
8585
{
8686
return mLocalProject;
8787
}

‎app/activeproject.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ class ActiveProject: public QObject
4949
virtual ~ActiveProject();
5050

5151
//! Returns active project's QgsProject instance to do QGIS API magic
52-
QgsProject *qgsProject();
52+
QgsProject *qgsProject() const;
5353

5454
//! Returns Input related info about active project
55-
LocalProject localProject();
55+
LocalProject localProject() const;
5656

5757
Q_INVOKABLE QString projectFullName() const;
5858

‎app/fieldsmodel.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ bool FieldsModel::removeField( int row )
4747
return true;
4848
}
4949

50-
QList<FieldConfiguration> FieldsModel::fields()
50+
QList<FieldConfiguration> FieldsModel::fields() const
5151
{
5252
return mFields;
5353
}

‎app/fieldsmodel.h‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/***************************************************************************
2+
* *
3+
* This program is free software; you can redistribute it and/or modify *
4+
* it under the terms of the GNU General Public License as published by *
5+
* the Free Software Foundation; either version 2 of the License, or *
6+
* (at your option) any later version. *
7+
* *
8+
***************************************************************************/
9+
110
#ifndef FIELDSMODEL_H
211
#define FIELDSMODEL_H
312

@@ -45,7 +54,7 @@ class FieldsModel: public QAbstractListModel
4554
QVariant data( const QModelIndex &index, int role ) const override;
4655
bool setData( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole ) override;
4756
//! Returns fields configuration
48-
QList<FieldConfiguration> fields();
57+
QList<FieldConfiguration> fields() const;
4958

5059
signals:
5160
void widgetListChanged();

‎app/i18n/input_cs.qm‎

66.2 KB
Binary file not shown.

‎app/i18n/input_cs_CZ.qm‎

66.2 KB
Binary file not shown.

‎app/i18n/input_en.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,47 +1327,47 @@ Won&apos;t be added to the project.</source>
13271327
<translation type="unfinished"></translation>
13281328
</message>
13291329
<message>
1330-
<location filename="../qml/map/MMMapController.qml" line="867"/>
1330+
<location filename="../qml/map/MMMapController.qml" line="875"/>
13311331
<source>More options</source>
13321332
<translation type="unfinished"></translation>
13331333
</message>
13341334
<message>
1335-
<location filename="../qml/map/MMMapController.qml" line="872"/>
1335+
<location filename="../qml/map/MMMapController.qml" line="880"/>
13361336
<source>Split geometry</source>
13371337
<translation type="unfinished"></translation>
13381338
</message>
13391339
<message>
1340-
<location filename="../qml/map/MMMapController.qml" line="884"/>
1340+
<location filename="../qml/map/MMMapController.qml" line="892"/>
13411341
<source>Redraw geometry</source>
13421342
<translation type="unfinished"></translation>
13431343
</message>
13441344
<message>
1345-
<location filename="../qml/map/MMMapController.qml" line="896"/>
1345+
<location filename="../qml/map/MMMapController.qml" line="904"/>
13461346
<source>Streaming mode</source>
13471347
<translation type="unfinished"></translation>
13481348
</message>
13491349
<message>
1350-
<location filename="../qml/map/MMMapController.qml" line="902"/>
1350+
<location filename="../qml/map/MMMapController.qml" line="910"/>
13511351
<source>Active</source>
13521352
<translation type="unfinished"></translation>
13531353
</message>
13541354
<message>
1355-
<location filename="../qml/map/MMMapController.qml" line="1040"/>
1355+
<location filename="../qml/map/MMMapController.qml" line="1048"/>
13561356
<source>Splitting done successfully</source>
13571357
<translation type="unfinished"></translation>
13581358
</message>
13591359
<message>
1360-
<location filename="../qml/map/MMMapController.qml" line="1131"/>
1360+
<location filename="../qml/map/MMMapController.qml" line="1139"/>
13611361
<source>Select some point to start editing the geometry</source>
13621362
<translation type="unfinished"></translation>
13631363
</message>
13641364
<message>
1365-
<location filename="../qml/map/MMMapController.qml" line="1144"/>
1365+
<location filename="../qml/map/MMMapController.qml" line="1152"/>
13661366
<source>Record new geometry for the feature</source>
13671367
<translation type="unfinished"></translation>
13681368
</message>
13691369
<message>
1370-
<location filename="../qml/map/MMMapController.qml" line="1234"/>
1370+
<location filename="../qml/map/MMMapController.qml" line="1242"/>
13711371
<source>GPS currently unavailable.</source>
13721372
<translation type="unfinished"></translation>
13731373
</message>

0 commit comments

Comments
 (0)