Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
use new API in a setting in GUI
  • Loading branch information
3nids committed Jan 16, 2023
1 parent 715f760 commit ba70fb4
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/app/qgsprojectproperties.cpp
Expand Up @@ -2570,7 +2570,7 @@ void QgsProjectProperties::newStyleDatabase()

void QgsProjectProperties::addStyleDatabasePrivate( bool createNew )
{
QString initialFolder = QgsStyleManagerDialog::settingLastStyleDatabaseFolder.value();
QString initialFolder = QgsStyleManagerDialog::settingLastStyleDatabaseFolder->value();
if ( initialFolder.isEmpty() )
initialFolder = QDir::homePath();

Expand All @@ -2587,7 +2587,7 @@ void QgsProjectProperties::addStyleDatabasePrivate( bool createNew )
tr( "Style databases" ) + " (*.db *.xml)" );
if ( ! databasePath.isEmpty() )
{
QgsStyleManagerDialog::settingLastStyleDatabaseFolder.setValue( QFileInfo( databasePath ).path() );
QgsStyleManagerDialog::settingLastStyleDatabaseFolder->setValue( QFileInfo( databasePath ).path() );

if ( createNew )
{
Expand Down
2 changes: 1 addition & 1 deletion src/core/settings/qgssettings.h
Expand Up @@ -88,6 +88,7 @@ class CORE_EXPORT QgsSettings : public QObject
*/
static QgsSettingsTreeElement *treeRoot();

static inline QgsSettingsTreeElement *sTtreeApp = treeRoot()->createChildElement( QStringLiteral( "app" ) );
static inline QgsSettingsTreeElement *sTtreeConnections = treeRoot()->createChildElement( QStringLiteral( "connections" ) );
static inline QgsSettingsTreeElement *sTreeLocale = treeRoot()->createChildElement( QStringLiteral( "locale" ) );
static inline QgsSettingsTreeElement *sTreeGps = treeRoot()->createChildElement( QStringLiteral( "gps" ) );
Expand Down Expand Up @@ -136,7 +137,6 @@ class CORE_EXPORT QgsSettings : public QObject
static const inline char *SVG = "svg";
static const inline char *ELEVATION_PROFILE = "elevation-profile";
static const inline char *CORE_LAYERTREE = "core/layer-tree";
static const inline char *STYLE_MANAGER = "app/style-manager";
static const inline char *FONTS = "fonts";
static const inline char *WMS = "wms";
};
Expand Down
1 change: 0 additions & 1 deletion src/gui/settings/qgssettingsregistrygui.cpp
Expand Up @@ -24,7 +24,6 @@ QgsSettingsRegistryGui::QgsSettingsRegistryGui()
{
addSettingsEntry( &settingsRespectScreenDPI );
addSettingsEntry( &settingsAutomaticallyCheckForPluginUpdates );
addSettingsEntry( &QgsStyleManagerDialog::settingLastStyleDatabaseFolder );

QgsApplication::settingsRegistryCore()->addSubRegistry( this );
}
Expand Down
4 changes: 2 additions & 2 deletions src/gui/symbology/qgsstylemanagerdialog.cpp
Expand Up @@ -2161,7 +2161,7 @@ bool QgsStyleManagerDialog::editSymbol3D()

void QgsStyleManagerDialog::addStyleDatabase( bool createNew )
{
QString initialFolder = QgsStyleManagerDialog::settingLastStyleDatabaseFolder.value();
QString initialFolder = QgsStyleManagerDialog::settingLastStyleDatabaseFolder->value();
if ( initialFolder.isEmpty() )
initialFolder = QDir::homePath();

Expand All @@ -2178,7 +2178,7 @@ void QgsStyleManagerDialog::addStyleDatabase( bool createNew )
tr( "Style databases" ) + " (*.db *.xml)" );
if ( ! databasePath.isEmpty() )
{
QgsStyleManagerDialog::settingLastStyleDatabaseFolder.setValue( QFileInfo( databasePath ).path() );
QgsStyleManagerDialog::settingLastStyleDatabaseFolder->setValue( QFileInfo( databasePath ).path() );

if ( createNew )
{
Expand Down
4 changes: 3 additions & 1 deletion src/gui/symbology/qgsstylemanagerdialog.h
Expand Up @@ -74,11 +74,13 @@ class GUI_EXPORT QgsStyleManagerDialog : public QDialog, private Ui::QgsStyleMan
public:
#ifndef SIP_RUN

static inline QgsSettingsTreeElement *sTtreeStyleManager = QgsSettings::sTtreeApp->createChildElement( QStringLiteral( "style-manager" ) );

/**
* Last used folder for generic style database actions.
* \since QGIS 3.26
*/
static const inline QgsSettingsEntryString settingLastStyleDatabaseFolder = QgsSettingsEntryString( QStringLiteral( "last-style-database-folder" ), QgsSettings::Prefix::STYLE_MANAGER, QString(), QStringLiteral( "Last used folder for style databases" ) );
static inline QgsSettingsEntryString *settingLastStyleDatabaseFolder = new QgsSettingsEntryString( QStringLiteral( "last-style-database-folder" ), sTtreeStyleManager, QString(), QStringLiteral( "Last used folder for style databases" ) );
#endif

/**
Expand Down

0 comments on commit ba70fb4

Please sign in to comment.