Skip to content

Commit 2361884

Browse files
nmaarnioLKajan
authored andcommitted
add custom toolbar icons
1 parent af521d3 commit 2361884

11 files changed

+280
-42
lines changed

arho_feature_template/plugin.py

+27-42
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from arho_feature_template.gui.docks.validation_dock import ValidationDock
1414
from arho_feature_template.qgis_plugin_tools.tools.custom_logging import setup_logger, teardown_logger
1515
from arho_feature_template.qgis_plugin_tools.tools.i18n import setup_translation
16-
from arho_feature_template.qgis_plugin_tools.tools.resources import plugin_name
16+
from arho_feature_template.qgis_plugin_tools.tools.resources import plugin_name, resources_path
1717

1818
if TYPE_CHECKING:
1919
from qgis.gui import QgisInterface
@@ -125,13 +125,6 @@ def add_action(
125125
return action
126126

127127
def initGui(self) -> None: # noqa N802
128-
# plan_icon_path = os.path.join(PLUGIN_PATH, "resources/icons/city.png") # A placeholder icon
129-
# load_icon_path = os.path.join(PLUGIN_PATH, "resources/icons/folder.png") # A placeholder icon
130-
# icons to consider:
131-
# icon=QgsApplication.getThemeIcon("mActionStreamingDigitize.svg"),
132-
# icon=QgsApplication.getThemeIcon("mIconGeometryCollectionLayer.svg"),
133-
# icon=QgsApplication.getThemeIcon("mActionSharingExport.svg"),
134-
135128
self.plan_manager = PlanManager()
136129

137130
iface.addDockWidget(Qt.RightDockWidgetArea, self.plan_manager.new_feature_dock)
@@ -159,14 +152,10 @@ def initGui(self) -> None: # noqa N802
159152
# (Re)initialize whenever a project is opened
160153
iface.projectRead.connect(self.plan_manager.initialize_from_project)
161154

162-
# icons to consider:
163-
# icon=QgsApplication.getThemeIcon("mActionStreamingDigitize.svg"),
164-
# icon=QgsApplication.getThemeIcon("mIconGeometryCollectionLayer.svg"),
165-
# icon=QgsApplication.getThemeIcon("mActionSharingExport.svg"),
166-
167155
self.new_land_use_plan_action = self.add_action(
168156
text="Luo kaava",
169-
icon=QgsApplication.getThemeIcon("mActionNewMap.svg"),
157+
icon=QIcon(resources_path("icons", "toolbar", "luo_kaava2.svg")),
158+
# icon=QgsApplication.getThemeIcon("mActionNewMap.svg"),
170159
triggered_callback=self.add_new_plan,
171160
add_to_menu=True,
172161
add_to_toolbar=True,
@@ -175,7 +164,8 @@ def initGui(self) -> None: # noqa N802
175164

176165
self.load_land_use_plan_action = self.add_action(
177166
text="Avaa kaava",
178-
icon=QgsApplication.getThemeIcon("mActionFileOpen.svg"),
167+
# icon=QgsApplication.getThemeIcon("mActionFileOpen.svg"),
168+
icon=QIcon(resources_path("icons", "toolbar", "avaa_kaava4.svg")),
179169
triggered_callback=self.load_existing_land_use_plan,
180170
parent=iface.mainWindow(),
181171
add_to_menu=True,
@@ -186,6 +176,7 @@ def initGui(self) -> None: # noqa N802
186176
self.edit_land_use_plan_action = self.add_action(
187177
text="Muokkaa kaavaa",
188178
# icon=QgsApplication.getThemeIcon("mActionFileOpen.svg"),
179+
icon=QIcon(resources_path("icons", "toolbar", "muokkaa_kaavaa2.svg")),
189180
triggered_callback=self.plan_manager.edit_plan,
190181
parent=iface.mainWindow(),
191182
add_to_menu=True,
@@ -195,42 +186,46 @@ def initGui(self) -> None: # noqa N802
195186

196187
self.new_feature_dock_action = self.add_action(
197188
text="Luo kaavakohde",
198-
icon=QgsApplication.getThemeIcon("mIconFieldGeometry.svg"),
189+
# icon=QgsApplication.getThemeIcon("mIconFieldGeometry.svg"),
190+
icon=QIcon(resources_path("icons", "toolbar", "luo_kaavakohde.svg")),
199191
toggled_callback=self.toggle_new_feature_dock,
200192
checkable=True,
201193
add_to_menu=True,
202194
add_to_toolbar=True,
203195
)
204196

205-
self.validation_dock_action = self.add_action(
206-
text="Validointi",
207-
icon=QgsApplication.getThemeIcon("mActionEditNodesItem.svg"),
208-
toggled_callback=self.toggle_validation_dock,
209-
checkable=True,
210-
add_to_menu=True,
197+
self.identify_plan_features_action = self.add_action(
198+
text="Muokkaa kaavakohdetta",
199+
icon=QIcon(resources_path("icons", "toolbar", "muokkaa_kaavakohdetta1.svg")),
200+
toggled_callback=self.plan_manager.toggle_identify_plan_features,
201+
add_to_menu=False,
211202
add_to_toolbar=True,
203+
checkable=True,
212204
)
213205

214-
# self.new_plan_regulation_group = self.add_action(
215-
# text="Luo kaavamääräysryhmä",
216-
# icon=QgsApplication.getThemeIcon("mActionAddManualTable.svg"),
217-
# triggered_callback=self.open_plan_regulation_group_form,
218-
# add_to_menu=True,
219-
# add_to_toolbar=True,
220-
# )
221-
222206
self.regulation_groups_dock_action = self.add_action(
223207
text="Hallitse kaavamääräysryhmiä",
224-
icon=QgsApplication.getThemeIcon("mActionAddManualTable.svg"),
208+
icon=QgsApplication.getThemeIcon("mActionOpenTable.svg"),
225209
toggled_callback=self.toggle_regulation_groups_dock,
226210
checkable=True,
227211
add_to_menu=True,
228212
add_to_toolbar=True,
229213
)
230214

215+
self.validation_dock_action = self.add_action(
216+
text="Validointi",
217+
# icon=QgsApplication.getThemeIcon("mActionEditNodesItem.svg"),
218+
icon=QIcon(resources_path("icons", "toolbar", "kaavan_validointi2.svg")),
219+
toggled_callback=self.toggle_validation_dock,
220+
checkable=True,
221+
add_to_menu=True,
222+
add_to_toolbar=True,
223+
)
224+
231225
self.serialize_plan_action = self.add_action(
232226
text="Tallenna kaava JSON",
233-
icon=QgsApplication.getThemeIcon("mActionFileSaveAs.svg"),
227+
# icon=QgsApplication.getThemeIcon("mActionFileSaveAs.svg"),
228+
icon=QIcon(resources_path("icons", "toolbar", "tallenna_jsonina2.svg")),
234229
triggered_callback=self.serialize_plan,
235230
add_to_menu=True,
236231
add_to_toolbar=True,
@@ -245,13 +240,6 @@ def initGui(self) -> None: # noqa N802
245240
status_tip="Muokkaa pluginin asetuksia",
246241
)
247242

248-
self.identify_plan_features_action = self.add_action(
249-
text="Muokkaa kohteita",
250-
toggled_callback=self.plan_manager.toggle_identify_plan_features,
251-
add_to_menu=False,
252-
add_to_toolbar=True,
253-
checkable=True,
254-
)
255243
self.plan_manager.inspect_plan_feature_tool.deactivated.connect(
256244
lambda: self.identify_plan_features_action.setChecked(False)
257245
)
@@ -316,6 +304,3 @@ def validation_dock_visibility_changed(self, visible: bool) -> None: # noqa: FB
316304

317305
def toggle_validation_dock(self, show: bool) -> None: # noqa: FBT001
318306
self.validation_dock.setUserVisible(show)
319-
320-
# def open_plan_regulation_group_form(self):
321-
# self.plan_manager.create_new_regulation_group()
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)