Merge branch 'master' into dev/2025.7.0

Author: Withalion

README.md

@@ -32,7 +32,7 @@ Click below to download the app on your mobile device:
 <p>
 <a href='https://play.google.com/store/apps/details?id=uk.co.lutraconsulting&ah=GSqwibzO2n63iMlCjHmMuBk89t4&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' src='https://raw.githubusercontent.com/MerginMaps/.github/main/images/google-play-store.png' height="57" /></a>
 <a href='https://apps.apple.com/us/app/input/id1478603559?ls=1'><img alt='Download it from TestFlight' src='https://raw.githubusercontent.com/MerginMaps/.github/main/images/app-store.png' width="170" /></a>
-<a href='https://github.com/MerginMaps/mobile/releases/latest'><img alt='Available on Windows' src='https://raw.githubusercontent.com/MerginMaps/.github/main/images/app_download_windows.png' height="57" /></a>
+<a href='https://github.com/MerginMaps/mobile/releases/tag/2025.3.0'><img alt='Available on Windows' src='https://raw.githubusercontent.com/MerginMaps/.github/main/images/app_download_windows.png' height="57" /></a>
 </p>
 
 **Beta Release**

app/activeproject.cpp

@@ -26,6 +26,7 @@
 #endif
 
 const QString ActiveProject::LOADING_FLAG_FILE_PATH = QString( "%1/.input_loading_project" ).arg( QStandardPaths::standardLocations( QStandardPaths::TempLocation ).first() );
+const int ActiveProject::LOADING_FLAG_FILE_EXPIRATION_MS = 5000;
 
 ActiveProject::ActiveProject( AppSettings &appSettings
                               , ActiveLayer &activeLayer
@@ -197,7 +198,13 @@ bool ActiveProject::forceLoad( const QString &filePath, bool force )
 
   bool foundErrorsInLoadedProject = validateProject();
 
-  flagFile.remove();
+  // Remove the loading flag file after a while, in case the app crashes not during load, but during the first renderings
+  QTimer::singleShot( LOADING_FLAG_FILE_EXPIRATION_MS, this, []()
+  {
+    QFile::remove( ActiveProject::LOADING_FLAG_FILE_PATH );
+    CoreUtils::log( QStringLiteral( "Project loading" ), QStringLiteral( "Removed project loading flag" ) );
+  } );
+
   if ( !force )
   {
     emit loadingFinished();

app/activeproject.h

@@ -111,6 +111,7 @@ class ActiveProject: public QObject
 
     //! A File on this path represents that project is loading and exists only during the process.
     static const QString LOADING_FLAG_FILE_PATH;
+    static const int LOADING_FLAG_FILE_EXPIRATION_MS;
 
     const QString &mapTheme() const;
 

app/attributes/attributecontroller.cpp

@@ -1623,7 +1623,7 @@ void AttributeController::renamePhotos()
         const QFileInfo fi( src );
         newName = QStringLiteral( "%1.%2" ).arg( newName, fi.completeSuffix() );
 
-        const QString dst = InputUtils::getAbsolutePath( newName, targetDir );
+        const QString dst = CoreUtils::findUniquePath( InputUtils::getAbsolutePath( newName, targetDir ) );
         if ( InputUtils::renameFile( src, dst ) )
         {
           const QString newValue = InputUtils::getRelativePath( dst, prefix );

app/attributes/attributepreviewcontroller.cpp

@@ -12,12 +12,18 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+#include <QDate>
+#include <QTime>
+#include <QDateTime>
+#include <QLocale>
 
 #include "attributepreviewcontroller.h"
 #include "featurelayerpair.h"
 #include "qgsfield.h"
 #include "qgsvectorlayer.h"
 #include "qgsexpressioncontextutils.h"
+#include "qgseditorwidgetsetup.h"
+
 
 AttributePreviewModel::AttributePreviewModel( const QVector<QPair<QString, QString>> &items )
   : QAbstractListModel( nullptr )
@@ -79,10 +85,16 @@ QVector<QPair<QString, QString>> AttributePreviewController::mapTipFields( )
     {
       if ( featureTitleExpression != field.name() )
       {
-        const QPair<QString, QString> item = qMakePair(
-                                               field.displayName(),
-                                               mFeatureLayerPair.feature().attribute( field.name() ).toString()
-                                             );
+        const int idx = fields.indexFromName( field.name() );
+        const QVariant raw = mFeatureLayerPair.feature().attribute( idx );
+
+        // Use the editor widget setup to retrieve the same display format the form uses.
+        // DO NOT use .toString() directly for date-time values- that can show raw UTC/ISO.
+        // This keeps the preview and the editor in perfect sync for locale and timezone.
+        const QgsEditorWidgetSetup ew = mFeatureLayerPair.layer()->editorWidgetSetup( idx );
+        const QString pretty = formatDateForPreview( fields[idx], raw, ew.config() );
+
+        const QPair<QString, QString> item = qMakePair( field.displayName(), pretty );
 
         lst.append( item );
       }
@@ -100,11 +112,12 @@ QVector<QPair<QString, QString>> AttributePreviewController::mapTipFields( )
       const int index = fields.indexFromName( lines[i] );
       if ( index >= 0 )
       {
-        const QString val = mFeatureLayerPair.feature().attribute( index ).toString();
-        const QPair<QString, QString> item = qMakePair(
-                                               fields[index].displayName(),
-                                               val
-                                             );
+        // Type-aware formatting (dates in local time, honor display_format)
+        const QVariant raw = mFeatureLayerPair.feature().attribute( index );
+        const QgsEditorWidgetSetup ew = mFeatureLayerPair.layer()->editorWidgetSetup( index );
+        const QString pretty = formatDateForPreview( fields[index], raw, ew.config() );
+
+        const QPair<QString, QString> item = qMakePair( fields[index].displayName(), pretty );
 
         lst.append( item );
       }
@@ -115,6 +128,107 @@ QVector<QPair<QString, QString>> AttributePreviewController::mapTipFields( )
   return lst;
 }
 
+QString AttributePreviewController::formatDateForPreview( const QgsField &field,
+    const QVariant &value,
+    const QVariantMap &fieldCfg ) const
+{
+  const QString displayFmt = fieldCfg.value( QStringLiteral( "display_format" ) ).toString();
+
+  //fallback value as raw QString
+  const QString fallback = value.toString();
+
+  //QDate
+  if ( field.type() == QMetaType::QDate )
+  {
+    QDate date;
+    if ( value.canConvert<QDate>() )
+    {
+      date = value.toDate();
+    }
+
+    else if ( value.userType() == QMetaType::QString )
+    {
+      date = QDate::fromString( value.toString(), Qt::ISODate );
+    }
+
+    if ( !date.isValid() )
+    {
+      return fallback;
+    }
+
+    if ( displayFmt.isEmpty() )
+    {
+      return QLocale().toString( date, QLocale::ShortFormat );
+    }
+
+    return date.toString( displayFmt );
+  }
+
+  //QTime
+  if ( field.type() == QMetaType::QTime )
+  {
+    QTime time;
+    if ( value.canConvert<QTime>() )
+    {
+      time = value.toTime();
+    }
+
+    else if ( value.userType() == QMetaType::QString )
+    {
+      time = QTime::fromString( value.toString(), Qt::ISODate );
+    }
+
+    if ( !time.isValid() )
+    {
+      return fallback;
+    }
+
+    const QString fmt = displayFmt.isEmpty() ? QStringLiteral( "HH:mm:ss" ) : displayFmt;
+    return time.toString( fmt );
+  }
+
+  //QDateTime
+  if ( field.type() == QMetaType::QDateTime )
+  {
+    QDateTime dateTime;
+    if ( value.canConvert<QDateTime>() )
+    {
+      dateTime = value.toDateTime();
+    }
+    else if ( value.userType() == QMetaType::QString )
+    {
+      dateTime = QDateTime::fromString( value.toString(), Qt::ISODateWithMs );
+
+      if ( !dateTime.isValid() )
+      {
+        dateTime = QDateTime::fromString( value.toString(), Qt::ISODate );
+      }
+    }
+
+    if ( !dateTime.isValid() )
+    {
+      return fallback;
+    }
+
+    // IMPORTANT If the source was UTC (ex., "...Z"), convert to local so the preview
+    if ( dateTime.timeSpec() != Qt::LocalTime )
+    {
+      dateTime = dateTime.toLocalTime();
+    }
+
+    //force LocalTime to prevent Qt from re-attaching an offset during format
+    // on some platforms the spec remains "OffsetFromUTC" or "UTC".
+    dateTime.setTimeSpec( Qt::LocalTime );
+
+    // We use the editor widget's display format so the preview obeys the same way
+    // formatting rules as the form editor "keeps UX consistent".
+    const QString fmt = displayFmt.isEmpty() ? QStringLiteral( "yyyy-MM-dd HH:mm:ss" ) : displayFmt;
+    return dateTime.toString( fmt );
+  }
+
+  return fallback;
+}
+
 QString AttributePreviewController::mapTipImage()
 {
   QgsExpressionContext context( globalProjectLayerScopes( mFeatureLayerPair.layer() ) );

app/attributes/attributepreviewcontroller.h

@@ -142,6 +142,7 @@ class AttributePreviewController: public QObject
     QVector<QPair<QString, QString>> mapTipFields();
     QString mapTipHtml();
     QString featureTitle();
+    QString formatDateForPreview( const QgsField &field, const QVariant &value, const QVariantMap &fieldCfg ) const;
 
     QgsProject *mProject = nullptr;
     FeatureLayerPair mFeatureLayerPair;

app/i18n/input_ca.ts

@@ -444,17 +444,17 @@ No s&apos;afegirà al projecte.</translation>
 <context>
     <name>MMAccountController</name>
     <message>
-        <location filename="../qml/account/MMAccountController.qml" line="91"/>
+        <location filename="../qml/account/MMAccountController.qml" line="93"/>
         <source>Please update the app to use the latest features.</source>
         <translation>Si us plau actualitzeu l&apos;aplicació per utilitzar les funcions més noves.</translation>
     </message>
     <message>
-        <location filename="../qml/account/MMAccountController.qml" line="95"/>
+        <location filename="../qml/account/MMAccountController.qml" line="97"/>
         <source>Server is currently unavailable, check your connection or try again later.</source>
         <translation>El servidor no està disponible actualment, comproveu la vostra connexió o torneu-ho a provar més tard.</translation>
     </message>
     <message>
-        <location filename="../qml/account/MMAccountController.qml" line="148"/>
+        <location filename="../qml/account/MMAccountController.qml" line="150"/>
         <source>I accept the %1Terms and Conditions%3 and %2Privacy Policy%3</source>
         <translation>Accepto els %1Termes i condicions%3 i la %2Política de privadesa%3</translation>
     </message>
@@ -873,31 +873,39 @@ No s&apos;afegirà al projecte.</translation>
 <context>
     <name>MMFormPhotoEditor</name>
     <message>
-        <location filename="../qml/form/editors/MMFormPhotoEditor.qml" line="81"/>
+        <location filename="../qml/form/editors/MMFormPhotoEditor.qml" line="84"/>
         <source>Photo is missing.</source>
         <translation>Manca la foto</translation>
     </message>
     <message>
-        <location filename="../qml/form/editors/MMFormPhotoEditor.qml" line="108"/>
+        <location filename="../qml/form/editors/MMFormPhotoEditor.qml" line="113"/>
         <source>Open Image</source>
         <translation>Obrir imatge</translation>
     </message>
     <message>
-        <location filename="../qml/form/editors/MMFormPhotoEditor.qml" line="110"/>
+        <location filename="../qml/form/editors/MMFormPhotoEditor.qml" line="115"/>
         <source>Image files (*.gif *.png *.jpg)</source>
         <translation>Arxius d&apos;imatge (*.gif *.png *.jpg)</translation>
     </message>
     <message>
-        <location filename="../qml/form/editors/MMFormPhotoEditor.qml" line="242"/>
+        <location filename="../qml/form/editors/MMFormPhotoEditor.qml" line="281"/>
         <source>Could not create directory %1.</source>
         <translation>No s&apos;ha pogut crear el directori %1.</translation>
     </message>
     <message>
-        <location filename="../qml/form/editors/MMFormPhotoEditor.qml" line="314"/>
+        <location filename="../qml/form/editors/MMFormPhotoEditor.qml" line="353"/>
         <source>Failed to process the image</source>
         <translation>No s&apos;ha pogut processar la imatge</translation>
     </message>
 </context>
+<context>
+    <name>MMFormPhotoSketchingPageDialog</name>
+    <message>
+        <location filename="../qml/form/components/MMFormPhotoSketchingPageDialog.qml" line="60"/>
+        <source>Undo</source>
+        <translation>Desfer</translation>
+    </message>
+</context>
 <context>
     <name>MMFormRelationEditor</name>
     <message>
@@ -1780,6 +1788,12 @@ No s&apos;afegirà al projecte.</translation>
         <source>Unsupported server, please contact your server administrator.</source>
         <translation>Servidor no compatible, poseu-vos en contacte amb l&apos;administrador del vostre servidor.</translation>
     </message>
+    <message>
+        <location filename="../qml/project/MMProjectController.qml" line="468"/>
+        <source>Download a project and start collecting.</source>
+        <translation>Descarrega un projecte i comença a enregistrar. 
+ </translation>
+    </message>
 </context>
 <context>
     <name>MMProjectDelegate</name>
@@ -2851,28 +2865,28 @@ només permet fins a %1 projectes baixats.</translation>
         <translation>S&apos;ha creat l&apos;espai de treball</translation>
     </message>
     <message>
-        <location filename="../../core/merginapi.cpp" line="1881"/>
+        <location filename="../../core/merginapi.cpp" line="1902"/>
         <source>Project detached from the server</source>
         <translation>Projecte desconnectat del servidor</translation>
     </message>
     <message>
-        <location filename="../../core/merginapi.cpp" line="4119"/>
+        <location filename="../../core/merginapi.cpp" line="4164"/>
         <source>Workspace name contains invalid characters</source>
         <translation>El nom de l&apos;espai de treball conté caràcters no vàlids</translation>
     </message>
     <message>
-        <location filename="../../core/merginapi.cpp" line="4186"/>
+        <location filename="../../core/merginapi.cpp" line="4231"/>
         <source>Workspace %1 already exists</source>
         <translation>L&apos;espai de treball %1 ja existeix</translation>
     </message>
     <message>
-        <location filename="../../core/merginapi.cpp" line="4292"/>
+        <location filename="../../core/merginapi.cpp" line="4337"/>
         <source>You can now close this page and return to Mergin Maps</source>
         <translation>Ara podeu tancar aquesta pàgina i tornar a Mergin Maps</translation>
     </message>
     <message>
-        <location filename="../../core/merginapi.cpp" line="4318"/>
-        <location filename="../../core/merginapi.cpp" line="4345"/>
+        <location filename="../../core/merginapi.cpp" line="4363"/>
+        <location filename="../../core/merginapi.cpp" line="4390"/>
         <source>SSO authorization failed</source>
         <translation>L&apos;autorització SSO ha fallat</translation>
     </message>
@@ -3097,12 +3111,12 @@ només permet fins a %1 projectes baixats.</translation>
         <translation>Posició desconeguda</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="556"/>
+        <location filename="../main.cpp" line="557"/>
         <source>Report submitted. Please contact the support</source>
         <translation>Informe enviat. Poseu-vos en contacte amb el servei d&apos;assistència.</translation>
     </message>
     <message>
-        <location filename="../main.cpp" line="561"/>
+        <location filename="../main.cpp" line="562"/>
         <source>Failed to submit report. Please check your internet connection.</source>
         <translation>No s&apos;ha pogut enviar l&apos;informe. Comproveu la vostra connexió a Internet.</translation>
     </message>