Skip to content

SymbolRenderWidget: Use more intuitive icons #2486

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

Open
dl3sdo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SymbolRenderWidget: Use more intuitive icons #2486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file added images/deselect-objects.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/select-additional-objects.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/select-all-objects.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<file>images/cursor-zoom.png</file>
<file>images/cut.png</file>
<file>images/delete.png</file>
<file>images/deselect-objects.png</file>
<file>images/draw-circle.png</file>
<file>images/draw-freehand.png</file>
<file>images/draw-path.png</file>
Expand Down Expand Up @@ -72,6 +73,8 @@
<file>images/rotate-map.png</file>
<file>images/save.png</file>
<file>images/scribble-fill-shapes.png</file>
<file>images/select-additional-objects.png</file>
<file>images/select-all-objects.png</file>
<file>images/settings.png</file>
<file>images/symbols.png</file>
<file>images/symbol_point_explanation.png</file>
Expand Down
10 changes: 5 additions & 5 deletions src/gui/widgets/symbol_render_widget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright 2012, 2013 Thomas Schöps
* Copyright 2014-2020, 2025 Kai Pastor
* Copyright 2014-2020, 2025, 2026 Kai Pastor
*
* This file is part of OpenOrienteering.
*
Expand Down Expand Up @@ -115,7 +115,7 @@ SymbolRenderWidget::SymbolRenderWidget(Map* map, bool mobile_mode, QWidget* pare
/*QAction* new_combined_action =*/ new_menu->addAction(tr("Combined"), this, SLOT(newCombinedSymbol()));
context_menu->addMenu(new_menu);

edit_action = context_menu->addAction(tr("Edit"), this, SLOT(editSymbol()));
edit_action = context_menu->addAction(QIcon(QStringLiteral(":/images/tool-edit.png")), tr("Edit"), this, SLOT(editSymbol()));
duplicate_action = context_menu->addAction(QIcon(QStringLiteral(":/images/tool-duplicate.png")), tr("Duplicate"), this, SLOT(duplicateSymbol()));
delete_action = context_menu->addAction(QIcon(QStringLiteral(":/images/minus.png")), tr("Delete"), this, SLOT(deleteSymbols()));
scale_action = context_menu->addAction(QIcon(QStringLiteral(":/images/tool-scale.png")), tr("Scale..."), this, SLOT(scaleSymbol()));
Expand All @@ -126,9 +126,9 @@ SymbolRenderWidget::SymbolRenderWidget(Map* map, bool mobile_mode, QWidget* pare
switch_symbol_action = context_menu->addAction(QIcon(QStringLiteral(":/images/tool-switch-symbol.png")), tr("Switch symbol of selected objects"), this, SIGNAL(switchSymbolClicked()));
fill_border_action = context_menu->addAction(QIcon(QStringLiteral(":/images/tool-fill-border.png")), tr("Fill / Create border for selected objects"), this, SIGNAL(fillBorderClicked()));
// text will be filled in by updateContextMenuState()
select_objects_action = context_menu->addAction(QIcon(QStringLiteral(":/images/tool-edit.png")), {}, this, SLOT(selectObjectsExclusively()));
select_objects_additionally_action = context_menu->addAction(QIcon(QStringLiteral(":/images/tool-edit.png")), {}, this, SLOT(selectObjectsAdditionally()));
deselect_objects_action = context_menu->addAction(QIcon(QStringLiteral(":/images/tool-edit.png")), {}, this, SLOT(deselectObjects()));
select_objects_action = context_menu->addAction(QIcon(QStringLiteral(":/images/select-all-objects.png")), {}, this, SLOT(selectObjectsExclusively()));
select_objects_additionally_action = context_menu->addAction(QIcon(QStringLiteral(":/images/select-additional-objects.png")), {}, this, SLOT(selectObjectsAdditionally()));
deselect_objects_action = context_menu->addAction(QIcon(QStringLiteral(":/images/deselect-objects.png")), {}, this, SLOT(deselectObjects()));
context_menu->addSeparator();
hide_action = context_menu->addAction({}, this, SLOT(setSelectedSymbolVisibility(bool)));
hide_action->setCheckable(true);
Expand Down