forked from 1b-agent/opencadstudio-upstream
Merge pull request #1549 from MarcelP102/codex/graphic-attributes-cleanup
[UX] Introducing graphic attributes panel # Conflicts: # locales/ar-SA/opencadstudio.ftl # locales/bg-BG/opencadstudio.ftl # locales/cs-CZ/opencadstudio.ftl # locales/de-DE/opencadstudio.ftl # locales/el-GR/opencadstudio.ftl # locales/en-US/opencadstudio.ftl # locales/es-ES/opencadstudio.ftl # locales/fi-FI/opencadstudio.ftl # locales/fr-FR/opencadstudio.ftl # locales/hi-IN/opencadstudio.ftl # locales/hu-HU/opencadstudio.ftl # locales/it-IT/opencadstudio.ftl # locales/ja-JP/opencadstudio.ftl # locales/ko-KR/opencadstudio.ftl # locales/lo-LA/opencadstudio.ftl # locales/nl-NL/opencadstudio.ftl # locales/pl-PL/opencadstudio.ftl # locales/pt-BR/opencadstudio.ftl # locales/ru-RU/opencadstudio.ftl # locales/tr-TR/opencadstudio.ftl # locales/zh-CN/opencadstudio.ftl # locales/zh-TW/opencadstudio.ftl # src/app/mod.rs # src/app/update/dialog.rs # src/app/view/mod.rs # src/locale_catalog.rs # src/ui/dock.rs
This commit is contained in:
commit
1333efcad2
68 files changed
+6178
-173
No files matched your search
@@ -442,6 +442,11 @@ impl OpenCADStudio {
|
||||
self.show_properties = true;
|
||||
self.ribbon.set_properties(true);
|
||||
}
|
||||
PanelId::GraphicAttributes => {
|
||||
self.show_graphic_attributes = true;
|
||||
self.ribbon.set_graphic_attributes(true);
|
||||
self.save_config();
|
||||
}
|
||||
PanelId::BlockPalette => self.open_blocks_palette(None),
|
||||
PanelId::ExternalReferences => {
|
||||
self.show_external_references = true;
|
||||
@@ -488,6 +493,12 @@ impl OpenCADStudio {
|
||||
self.show_layers = false;
|
||||
self.ribbon.deactivate_tool_if("LAYERS");
|
||||
}
|
||||
PanelId::GraphicAttributes => {
|
||||
self.show_graphic_attributes = false;
|
||||
self.ribbon.set_graphic_attributes(false);
|
||||
self.graphic_attributes.close_popups();
|
||||
self.save_config();
|
||||
}
|
||||
}
|
||||
self.dock_unpeek(id);
|
||||
// A closed pallet cannot stay held by the pointer.
|
||||
@@ -555,6 +566,7 @@ impl OpenCADStudio {
|
||||
PanelId::Count => self.count_palette.show,
|
||||
PanelId::SheetSetManager => self.sheet_set.show,
|
||||
PanelId::Layers => self.show_layers,
|
||||
PanelId::GraphicAttributes => self.show_graphic_attributes,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -381,6 +381,20 @@ impl OpenCADStudio {
|
||||
};
|
||||
match id {
|
||||
crate::ui::dock::PanelId::Properties => tab.properties.view(width, chrome),
|
||||
crate::ui::dock::PanelId::GraphicAttributes => crate::ui::window::graphic_attributes::view(
|
||||
&self.graphic_attributes,
|
||||
&tab.scene,
|
||||
&tab.properties,
|
||||
width,
|
||||
chrome,
|
||||
self.dock
|
||||
.location(id)
|
||||
.map_or(crate::app::config::DockSide::Right, |(side, _)| side),
|
||||
matches!(
|
||||
self.color_pick_target,
|
||||
Some((crate::app::ColorPickTarget::Gradient(_), _))
|
||||
),
|
||||
),
|
||||
crate::ui::dock::PanelId::BlockPalette => {
|
||||
crate::ui::window::block_palette::view(&self.block_palette, width, chrome)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user