Skip to content

Commit 98843ca

Browse files
3nidsm-kuhn
authored andcommittedOct 15, 2018
fix bad rebase
1 parent 1f1ec0f commit 98843ca

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed
 

‎src/app/qgisapp.h

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,6 +694,13 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
694694
//! Returns pointer to the identify map tool - used by identify tool in 3D view
695695
QgsMapToolIdentifyAction *identifyMapTool() const { return mMapTools.mIdentify; }
696696

697+
/**
698+
* Take screenshots for user documentation
699+
* @param saveDirectory path were the screenshots will be saved
700+
* @param categories an int as a flag value of QgsAppScreenShots::Categories
701+
*/
702+
void takeAppScreenShots( const QString &saveDirectory, const int categories = 0 );
703+
697704
public slots:
698705
//! save current vector layer
699706
void saveAsFile( QgsMapLayer *layer = nullptr, bool onlySelected = false );
@@ -1967,6 +1974,9 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
19671974
//! Populates project "load from" / "save to" menu based on project storages (when the menu is about to be shown)
19681975
void populateProjectStorageMenu( QMenu *menu, bool saving );
19691976

1977+
//! Create the option dialog
1978+
QgsOptions *createOptionsDialog( QWidget *parent = nullptr );
1979+
19701980
QgisAppStyleSheet *mStyleSheetBuilder = nullptr;
19711981

19721982
// actions for menus and toolbars -----------------
@@ -2139,7 +2149,6 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
21392149

21402150
//! interface to QgisApp for plugins
21412151
QgisAppInterface *mQgisInterface = nullptr;
2142-
friend class QgisAppInterface;
21432152

21442153
QSplashScreen *mSplash = nullptr;
21452154
//! list of recently opened/saved project files
@@ -2305,7 +2314,13 @@ class APP_EXPORT QgisApp : public QMainWindow, private Ui::MainWindow
23052314
//! True if we are blocking the activeLayerChanged signal from being emitted
23062315
bool mBlockActiveLayerChanged = false;
23072316

2317+
std::unique_ptr<QgsGeometryValidationService> mGeometryValidationService;
2318+
QgsGeometryValidationModel *mGeometryValidationModel = nullptr;
2319+
QgsGeometryValidationDock *mGeometryValidationDock = nullptr;
2320+
23082321
friend class TestQgisAppPython;
2322+
friend class QgisAppInterface;
2323+
friend class QgsAppScreenShots;
23092324
};
23102325

23112326
#ifdef ANDROID

‎src/app/qgsvectorlayerproperties.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -793,9 +793,6 @@ void QgsVectorLayerProperties::apply()
793793
}
794794
mLayer->geometryOptions()->setGeometryChecks( activeChecks );
795795

796-
// update symbology
797-
emit refreshLegend( mLayer->id() );
798-
799796
mLayer->triggerRepaint();
800797
// notify the project we've made a change
801798
QgsProject::instance()->setDirty( true );

0 commit comments

Comments
 (0)
Please sign in to comment.