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

fix merge conflict

Browse source
This commit is contained in:
Huy Pham 2019-12-19 11:12:45 -08:00
commit f6c02973c1
11 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
daemon/core/gui/toolbar.py
View file

@ -6,7 +6,7 @@ from tkinter import ttk
from tkinter.font import Font
from core.gui.dialogs.customnodes import CustomNodesDialog
from core.gui.dialogs.marker import Marker
from core.gui.dialogs.marker import MarkerDialog
from core.gui.graph import tags
from core.gui.graph.enums import GraphMode
from core.gui.graph.shapeutils import ShapeType, is_marker
@ -416,7 +416,7 @@ class Toolbar(ttk.Frame):
self.app.canvas.annotation_type = shape_type
if is_marker(shape_type):
if not self.marker_tool:
self.marker_tool = Marker(self.master, self.app)
self.marker_tool = MarkerDialog(self.master, self.app)
self.marker_tool.show()
self.marker_tool.position()
@ -432,7 +432,7 @@ class Toolbar(ttk.Frame):
self.app.canvas.mode = GraphMode.ANNOTATION
self.app.canvas.annotation_type = ShapeType.MARKER
if not self.marker_tool:
self.marker_tool = Marker(self.master, self.app)
self.marker_tool = MarkerDialog(self.master, self.app)
self.marker_tool.show()
self.marker_tool.position()