From 69a475b549a8f04d89127a8561398b122736389b Mon Sep 17 00:00:00 2001 From: zkovari Date: Tue, 18 Jul 2023 15:09:29 +0200 Subject: [PATCH] settings --- .../plotlyst/view/world_building_view.py | 28 +++++++++---------- ui/world_building_view.ui | 26 ++++++++++++++--- 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/src/main/python/plotlyst/view/world_building_view.py b/src/main/python/plotlyst/view/world_building_view.py index 41c99fc18..f61f03153 100644 --- a/src/main/python/plotlyst/view/world_building_view.py +++ b/src/main/python/plotlyst/view/world_building_view.py @@ -20,7 +20,7 @@ from overrides import overrides from qthandy import incr_font, transparent -from src.main.python.plotlyst.core.domain import Novel +from src.main.python.plotlyst.core.domain import Novel, WorldBuildingEntity from src.main.python.plotlyst.core.template import default_location_profiles from src.main.python.plotlyst.view._view import AbstractNovelView from src.main.python.plotlyst.view.common import link_buttons_to_pages, ButtonPressResizeEventFilter @@ -47,29 +47,27 @@ def __init__(self, novel: Novel): self._lineName = AutoAdjustableLineEdit() self._lineName.setPlaceholderText('Name') transparent(self._lineName) - incr_font(self._lineName, 8) + incr_font(self._lineName, 15) self._btnIcon = IconSelectorButton() self.ui.wdgName.layout().addWidget(self._btnIcon) self.ui.wdgName.layout().addWidget(self._lineName) - link_buttons_to_pages(self.ui.stackedWidget, [(self.ui.btnWorldView, self.ui.pageEditor), - (self.ui.btnHistoryView, self.ui.pageHistory)]) - self.ui.btnWorldView.setChecked(True) self.ui.treeWorld.setSettings(TreeSettings(font_incr=2)) self.ui.treeWorld.setNovel(self.novel) + self.ui.treeWorld.entitySelected.connect(self._selection_changed) self.ui.treeWorld.selectRoot() + link_buttons_to_pages(self.ui.stackedWidget, [(self.ui.btnWorldView, self.ui.pageEditor), + (self.ui.btnHistoryView, self.ui.pageHistory)]) + self.ui.btnWorldView.setChecked(True) + @overrides def refresh(self): pass - # def _selectionChanged(self): - # self._settingTemplate.clearValues() - # - # items = self._editor.scene().selectedItems() - # if len(items) == 1 and isinstance(items[0], WorldBuildingItem): - # self.ui.wdgSidebar.setEnabled(True) - # entity: WorldBuildingEntity = items[0].entity() - # self._settingTemplate.setLocation(entity) - # else: - # self.ui.wdgSidebar.setDisabled(True) + def _selection_changed(self, entity: WorldBuildingEntity): + self._lineName.setText(entity.name) + if entity.icon: + self._btnIcon.selectIcon(entity.icon, entity.icon_color) + else: + self._btnIcon.reset() diff --git a/ui/world_building_view.ui b/ui/world_building_view.ui index e3c1d3b31..8e5b551d5 100644 --- a/ui/world_building_view.ui +++ b/ui/world_building_view.ui @@ -231,6 +231,9 @@ 0 + + false + 3 @@ -239,13 +242,13 @@ 2 - 2 + 0 2 - 2 + 0 @@ -254,13 +257,13 @@ 8 - 15 + 5 8 - 20 + 40 @@ -363,6 +366,21 @@ + + 3 + + + 2 + + + 2 + + + 2 + + + 2 +