afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'coretk' into coretk-selectbox

Browse source
This commit is contained in:
Huy Pham 2019-12-12 16:18:20 -08:00
commit 73b27d38cd
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
coretk/coretk/coreclient.py
View file

@ -484,8 +484,11 @@ class CoreClient:
def set_metadata(self): def set_metadata(self):
# create canvas data # create canvas data
wallpaper = None
if self.app.canvas.wallpaper_file:
wallpaper = Path(self.app.canvas.wallpaper_file).name
canvas_config = { canvas_config = {
"wallpaper": Path(self.app.canvas.wallpaper_file).name, "wallpaper": wallpaper,
"wallpaper-style": self.app.canvas.scale_option.get(), "wallpaper-style": self.app.canvas.scale_option.get(),
"gridlines": self.app.canvas.show_grid.get(), "gridlines": self.app.canvas.show_grid.get(),
"fit_image": self.app.canvas.adjust_to_dim.get(), "fit_image": self.app.canvas.adjust_to_dim.get(),

26
coretk/coretk/toolbar.py
View file

@ -14,11 +14,11 @@ from coretk.nodeutils import NodeUtils
from coretk.themes import Styles from coretk.themes import Styles
from coretk.tooltip import Tooltip from coretk.tooltip import Tooltip
WIDTH = 32 TOOLBAR_SIZE = 32
PICKER_SIZE = 24 PICKER_SIZE = 24
def icon(image_enum, width=WIDTH): def icon(image_enum, width=TOOLBAR_SIZE):
return Images.get(image_enum, width) return Images.get(image_enum, width)
@ -146,17 +146,23 @@ class Toolbar(ttk.Frame):
self.node_picker = ttk.Frame(self.master) self.node_picker = ttk.Frame(self.master)
# draw default nodes # draw default nodes
for node_draw in NodeUtils.NODES: for node_draw in NodeUtils.NODES:
toolbar_image = icon(node_draw.image_enum)
image = icon(node_draw.image_enum, PICKER_SIZE) image = icon(node_draw.image_enum, PICKER_SIZE)
func = partial(self.update_button, self.node_button, image, node_draw) func = partial(
self.update_button, self.node_button, toolbar_image, node_draw
)
self.create_picker_button(image, func, self.node_picker, node_draw.label) self.create_picker_button(image, func, self.node_picker, node_draw.label)
# draw custom nodes # draw custom nodes
for name in sorted(self.app.core.custom_nodes): for name in sorted(self.app.core.custom_nodes):
node_draw = self.app.core.custom_nodes[name] node_draw = self.app.core.custom_nodes[name]
image = Images.get_custom(node_draw.image_file, WIDTH) toolbar_image = Images.get_custom(node_draw.image_file, TOOLBAR_SIZE)
func = partial(self.update_button, self.node_button, image, node_draw) image = Images.get_custom(node_draw.image_file, PICKER_SIZE)
func = partial(
self.update_button, self.node_button, toolbar_image, node_draw
)
self.create_picker_button(image, func, self.node_picker, name) self.create_picker_button(image, func, self.node_picker, name)
# draw edit node # draw edit node
image = icon(ImageEnum.EDITNODE) image = icon(ImageEnum.EDITNODE, PICKER_SIZE)
self.create_picker_button( self.create_picker_button(
image, self.click_edit_node, self.node_picker, "Custom" image, self.click_edit_node, self.node_picker, "Custom"
) )
@ -277,10 +283,13 @@ class Toolbar(ttk.Frame):
self.hide_pickers() self.hide_pickers()
self.network_picker = ttk.Frame(self.master) self.network_picker = ttk.Frame(self.master)
for node_draw in NodeUtils.NETWORK_NODES: for node_draw in NodeUtils.NETWORK_NODES:
toolbar_image = icon(node_draw.image_enum)
image = icon(node_draw.image_enum, PICKER_SIZE) image = icon(node_draw.image_enum, PICKER_SIZE)
self.create_picker_button( self.create_picker_button(
image, image,
partial(self.update_button, self.network_button, image, node_draw), partial(
self.update_button, self.network_button, toolbar_image, node_draw
),
self.network_picker, self.network_picker,
node_draw.label, node_draw.label,
) )
@ -319,10 +328,11 @@ class Toolbar(ttk.Frame):
(ImageEnum.TEXT, ShapeType.TEXT), (ImageEnum.TEXT, ShapeType.TEXT),
] ]
for image_enum, shape_type in nodes: for image_enum, shape_type in nodes:
toolbar_image = icon(image_enum)
image = icon(image_enum, PICKER_SIZE) image = icon(image_enum, PICKER_SIZE)
self.create_picker_button( self.create_picker_button(
image, image,
partial(self.update_annotation, image, shape_type), partial(self.update_annotation, toolbar_image, shape_type),
self.annotation_picker, self.annotation_picker,
shape_type.value, shape_type.value,
) )