Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve UX of layer style categories with html #58729

Merged
merged 9 commits into from
Oct 9, 2024
Merged

Improve UX of layer style categories with html #58729

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3319b8c
Improve UX of layer style categories with html (what means we need to…
signedav Sep 13, 2024
27cd43a
Improve texts and gray description
signedav Sep 19, 2024
d42a040
better icons for style categories
signedav Sep 23, 2024
24f7a76
missing doc
signedav Sep 24, 2024
5808e6f
support word wrap in item list
signedav Sep 26, 2024
d9b4511
Rename delegate to Qgs prefix
signedav Sep 26, 2024
f022253
expose model and delegate to the api
signedav Sep 26, 2024
b667353
better notes icon and apply wordwrap on savestyle as well
signedav Sep 26, 2024
816da02
Merge branch 'master' into categorizelegate
signedav Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/qgsapplayertreeviewmenuprovider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ QMenu *QgsAppLayerTreeViewMenuProvider::createContextMenu()
{
const QModelIndex index = model->index( row, 0 );
const QgsMapLayer::StyleCategory category = model->data( index, Qt::UserRole ).value<QgsMapLayer::StyleCategory>();
const QString name = model->data( index, Qt::DisplayRole ).toString();
const QString name = model->data( index, static_cast< int >( QgsMapLayerStyleCategoriesModel::Role::NameRole ) ).toString();
const QString tooltip = model->data( index, Qt::ToolTipRole ).toString();
const QIcon icon = model->data( index, Qt::DecorationRole ).value<QIcon>();
QAction *copyAction = new QAction( icon, name, copyStyleMenu );
Expand Down Expand Up @@ -681,7 +681,7 @@ QMenu *QgsAppLayerTreeViewMenuProvider::createContextMenu()
{
const QModelIndex index = model->index( row, 0 );
const QgsMapLayer::StyleCategory category = model->data( index, Qt::UserRole ).value<QgsMapLayer::StyleCategory>();
const QString name = model->data( index, Qt::DisplayRole ).toString();
const QString name = model->data( index, static_cast< int >( QgsMapLayerStyleCategoriesModel::Role::NameRole ) ).toString();
const QString tooltip = model->data( index, Qt::ToolTipRole ).toString();
const QIcon icon = model->data( index, Qt::DecorationRole ).value<QIcon>();
QAction *pasteAction = new QAction( icon, name, pasteStyleMenu );
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsmaplayerloadstyledialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include "qgsapplication.h"
#include "qgsgui.h"


QgsMapLayerLoadStyleDialog::QgsMapLayerLoadStyleDialog( QgsMapLayer *layer, QWidget *parent )
: QDialog( parent )
, mLayer( layer )
Expand Down Expand Up @@ -74,6 +73,7 @@ QgsMapLayerLoadStyleDialog::QgsMapLayerLoadStyleDialog( QgsMapLayer *layer, QWid
const QgsMapLayer::StyleCategories lastStyleCategories = settings.flagValue( QStringLiteral( "style/lastStyleCategories" ), QgsMapLayer::AllStyleCategories );
mModel->setCategories( lastStyleCategories );
mStyleCategoriesListView->setModel( mModel );
mStyleCategoriesListView->setItemDelegate( new CategoryDisplayLabelDelegate( this ) );

// load from file setup
switch ( mLayer->type() )
Expand Down
1 change: 1 addition & 0 deletions src/gui/qgsmaplayersavestyledialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ QgsMapLayerSaveStyleDialog::QgsMapLayerSaveStyleDialog( QgsMapLayer *layer, QWid
const QgsMapLayer::StyleCategories lastStyleCategories = settings.flagValue( QStringLiteral( "style/lastStyleCategories" ), QgsMapLayer::AllStyleCategories );
mModel->setCategories( lastStyleCategories );
mStyleCategoriesListView->setModel( mModel );
mStyleCategoriesListView->setItemDelegate( new CategoryDisplayLabelDelegate( this ) );

// select and deselect all categories
connect( mSelectAllButton, &QPushButton::clicked, this, &QgsMapLayerSaveStyleDialog::selectAll );
Expand Down
Loading
Loading