remove AddMeshLayer, NewMeshLayer

#865cr0kmv #8692v8p69

opt/patches/app_qgisapp.cpp.patch

@@ -1,5 +1,5 @@
---- a/src/app/qgisapp.cpp	2023-08-22 11:32:52.639350417 +0300
-+++ b/src/app/qgisapp.cpp	2023-10-03 15:55:29.005632825 +0300
+--- a/src/app/qgisapp.cpp
++++ b/src/app/qgisapp.cpp
 @@ -114,7 +114,7 @@
  #include "qgsgeometrycheckregistry.h"
 
@@ -69,18 +69,20 @@
    mLastMapToolMessage = nullptr;
 
    mLogViewer = new QgsMessageLogViewer( this );
-@@ -1627,6 +1627,10 @@
+@@ -1627,6 +1627,12 @@
    // do main window customization - after window state has been restored, before the window is shown
    startProfile( tr( "Update customization on main window" ) );
    QgsCustomization::instance()->updateMainWindow( mToolbarMenu, mPanelMenu );
++  mActionNewMeshLayer->setVisible(false);
++  mActionAddMeshLayer->setVisible(false);
 +  mActionAddAfsLayer->setVisible(false);
 +  mActionAddVectorTileLayer->setVisible(false);
 +  mActionDxfExport->setVisible(false);
 +  mActionDwgImport->setVisible(false);
    endProfile();
 
    mSplash->showMessage( tr( "Populate saved styles" ), Qt::AlignHCenter | Qt::AlignBottom, splashTextColor );
-@@ -1819,7 +1823,7 @@
+@@ -1819,7 +1825,7 @@
    } );
 
    mCodeEditorWidgetFactory.reset( std::make_unique< QgsCodeEditorOptionsFactory >() );
@@ -89,7 +91,7 @@
    mCustomProjectionsWidgetFactory.reset( std::make_unique< QgsCustomProjectionOptionsFactory >() );
 
  #ifdef HAVE_3D
-@@ -1884,7 +1888,7 @@
+@@ -1884,7 +1890,7 @@
 
    delete mpMaptip;
 
@@ -98,7 +100,7 @@
 
    delete mOverviewMapCursor;
 
-@@ -2171,7 +2175,7 @@
+@@ -2171,7 +2177,7 @@
      {
        addPointCloudLayer( uri, u.name, u.providerKey );
      }
@@ -107,7 +109,7 @@
      {
        QgsTemporaryCursorOverride busyCursor( Qt::WaitCursor );
 
-@@ -2200,7 +2204,7 @@
+@@ -2200,7 +2206,7 @@
                                 message, Qgis::MessageLevel::Warning );
        }
        addMapLayer( layer );
@@ -116,7 +118,7 @@
      else if ( u.layerType == QLatin1String( "plugin" ) )
      {
        addPluginLayer( uri, u.name, u.providerKey );
-@@ -2495,7 +2499,7 @@
+@@ -2495,7 +2501,7 @@
      connect( mDataSourceManagerDialog, SIGNAL( addVectorLayers( QStringList const &, QString const &, QString const & ) ),
               this, SLOT( addVectorLayers( QStringList const &, QString const &, QString const & ) ) );
      connect( mDataSourceManagerDialog, &QgsDataSourceManagerDialog::addMeshLayer, this, &QgisApp::addMeshLayer );
@@ -125,7 +127,7 @@
      connect( mDataSourceManagerDialog, &QgsDataSourceManagerDialog::addPointCloudLayer, this, &QgisApp::addPointCloudLayer );
      connect( mDataSourceManagerDialog, &QgsDataSourceManagerDialog::showStatusMessage, this, &QgisApp::showStatusMessage );
      connect( mDataSourceManagerDialog, &QgsDataSourceManagerDialog::addDatabaseLayers, this, &QgisApp::addDatabaseLayers );
-@@ -2695,8 +2699,10 @@
+@@ -2695,8 +2701,10 @@
    connect( mActionNewReport, &QAction::triggered, this, &QgisApp::newReport );
    connect( mActionShowLayoutManager, &QAction::triggered, this, &QgisApp::showLayoutManager );
    connect( mActionExit, &QAction::triggered, this, &QgisApp::fileExit );
@@ -138,7 +140,7 @@
 
    // Edit Menu Items
 
-@@ -2843,7 +2849,7 @@
+@@ -2843,7 +2851,7 @@
    connect( mActionAddHanaLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "hana" ) ); } );
    connect( mActionAddWmsLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "wms" ) ); } );
    connect( mActionAddXyzLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "xyz" ) ); } );
@@ -147,7 +149,7 @@
    connect( mActionAddPointCloudLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "pointcloud" ) ); } );
    connect( mActionAddWcsLayer, &QAction::triggered, this, [ = ] { dataSourceManager( QStringLiteral( "wcs" ) ); } );
  #ifdef HAVE_SPATIALITE
-@@ -4302,7 +4308,7 @@
+@@ -4302,7 +4310,7 @@
    mActionCustomProjection->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionCustomProjection.svg" ) ) );
    mActionAddWmsLayer->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddWmsLayer.svg" ) ) );
    mActionAddXyzLayer->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddXyzLayer.svg" ) ) );
@@ -156,7 +158,7 @@
    mActionAddWcsLayer->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddWcsLayer.svg" ) ) );
  #ifdef HAVE_SPATIALITE
    mActionAddWfsLayer->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddWfsLayer.svg" ) ) );
-@@ -5047,12 +5053,12 @@
+@@ -5047,12 +5055,12 @@
    }
    return QgsLayerTreeRegistryBridge::InsertionPoint( insertGroup, index );
  }
@@ -171,7 +173,7 @@
  void QgisApp::autoSelectAddedLayer( QList<QgsMapLayer *> layers )
  {
    if ( !layers.isEmpty() )
-@@ -5360,7 +5366,7 @@
+@@ -5360,7 +5368,7 @@
    QgsPluginRegistry::instance()->unloadAll();
  }
 
@@ -180,7 +182,7 @@
 
  void QgisApp::restoreWindowState()
  {
-@@ -5952,7 +5958,7 @@
+@@ -5952,7 +5960,7 @@
        meshLayer->loadDefaultMetadata( ok );
        break;
      }
@@ -189,7 +191,7 @@
      case QgsMapLayerType::VectorTileLayer:
      {
        bool ok = false;
-@@ -5965,7 +5971,7 @@
+@@ -5965,7 +5973,7 @@
 
        break;
      }
@@ -198,7 +200,7 @@
      case QgsMapLayerType::AnnotationLayer:
      case QgsMapLayerType::GroupLayer:
        break;
-@@ -6007,17 +6013,17 @@
+@@ -6007,17 +6015,17 @@
      }
    }
  }
@@ -219,7 +221,7 @@
  QgsVectorTileLayer *QgisApp::addVectorTileLayerPrivate( const QString &url, const QString &baseName, const bool guiWarning )
  {
    QgsCanvasRefreshBlocker refreshBlocker;
-@@ -6055,7 +6061,7 @@
+@@ -6055,7 +6063,7 @@
 
    return layer.release();
  }
@@ -228,7 +230,7 @@
  QgsPointCloudLayer *QgisApp::addPointCloudLayerPrivate( const QString &uri, const QString &baseName, const QString &providerKey, bool guiWarning )
  {
    QgsCanvasRefreshBlocker refreshBlocker;
-@@ -7381,7 +7387,7 @@
+@@ -7381,7 +7389,7 @@
    }
    mProjectLastModified = fullPath.lastModified();
  } // QgisApp::fileSaveAs
@@ -237,7 +239,7 @@
  void QgisApp::dxfExport()
  {
    QgsDxfExportDialog d;
-@@ -7447,7 +7453,7 @@
+@@ -7447,7 +7455,7 @@
    QgsDwgImportDialog d;
    d.exec();
  }
@@ -246,7 +248,7 @@
  void QgisApp::openLayerDefinition( const QString &path )
  {
    QString errorMessage;
-@@ -7651,36 +7657,36 @@
+@@ -7651,36 +7659,36 @@
      }
    }
 
@@ -313,7 +315,7 @@
 
    QList< QgsProviderSublayerModel::NonLayerItem > nonLayerItems;
    if ( QgsProjectStorage *ps = QgsApplication::projectStorageRegistry()->projectStorageFromUri( fileName ) )
-@@ -13012,7 +13018,7 @@
+@@ -13012,7 +13020,7 @@
  {
    QgsScopedRuntimeProfile profile( tr( "Loading Python support" ) );
 
@@ -322,7 +324,7 @@
  #if defined(Q_OS_UNIX)
    pythonlibName.prepend( QgsApplication::libraryPath() );
  #endif
-@@ -13321,7 +13327,7 @@
+@@ -13321,7 +13329,7 @@
      mMagnifierWidget->setDefaultFactor( factor );
      mMagnifierWidget->updateMagnification( factor );
 
@@ -331,7 +333,7 @@
    }
  }
 
-@@ -16163,7 +16169,7 @@
+@@ -16163,7 +16171,7 @@
      }
 
      break;
@@ -340,7 +342,7 @@
      case QgsMapLayerType::VectorTileLayer:
        mActionLocalHistogramStretch->setEnabled( false );
        mActionFullHistogramStretch->setEnabled( false );
-@@ -16233,7 +16239,7 @@
+@@ -16233,7 +16241,7 @@
        enableDigitizeTechniqueActions( false );
        enableMeshEditingTools( false );
        break;
@@ -349,7 +351,7 @@
      case QgsMapLayerType::PointCloudLayer:
        mActionLocalHistogramStretch->setEnabled( false );
        mActionFullHistogramStretch->setEnabled( false );
-@@ -17169,7 +17175,7 @@
+@@ -17169,7 +17177,7 @@
        delete vectorLayerPropertiesDialog; // delete since dialog cannot be reused without updating code
        break;
      }
@@ -358,7 +360,7 @@
      case QgsMapLayerType::VectorTileLayer:
      {
        QgsVectorTileLayerProperties vectorTileLayerPropertiesDialog( qobject_cast<QgsVectorTileLayer *>( mapLayer ), mMapCanvas, visibleMessageBar(), this );
-@@ -17187,7 +17193,7 @@
+@@ -17187,7 +17195,7 @@
        mMapStyleWidget->blockUpdates( false ); // delete since dialog cannot be reused without updating code
        break;
      }
@@ -367,3 +369,4 @@
      case QgsMapLayerType::PointCloudLayer:
      {
        QgsPointCloudLayerProperties pointCloudLayerPropertiesDialog( qobject_cast<QgsPointCloudLayer *>( mapLayer ), mMapCanvas, visibleMessageBar(), this );
+

src/app/qgisapp.cpp

@@ -1627,6 +1627,8 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipBadLayers
   // do main window customization - after window state has been restored, before the window is shown
   startProfile( tr( "Update customization on main window" ) );
   QgsCustomization::instance()->updateMainWindow( mToolbarMenu, mPanelMenu );
+  mActionNewMeshLayer->setVisible(false);
+  mActionAddMeshLayer->setVisible(false);
   mActionAddAfsLayer->setVisible(false);
   mActionAddVectorTileLayer->setVisible(false);
   mActionDxfExport->setVisible(false);