fix merge conflict

daemon/core/gui/dialogs/canvaswallpaper.py

@@ -12,7 +12,7 @@ from core.gui.themes import PADX, PADY
 from core.gui.widgets import image_chooser
 
 
-class CanvasBackgroundDialog(Dialog):
+class CanvasWallpaperDialog(Dialog):
     def __init__(self, master, app):
         """
         create an instance of CanvasWallpaper object

daemon/core/gui/dialogs/colorpicker.py

@@ -8,7 +8,7 @@ from tkinter import ttk
 from core.gui.dialogs.dialog import Dialog
 
 
-class ColorPicker(Dialog):
+class ColorPickerDialog(Dialog):
     def __init__(self, master, app, initcolor="#000000"):
         super().__init__(master, app, "color picker", modal=True)
         self.red_entry = None

daemon/core/gui/dialogs/linkconfig.py

@@ -6,7 +6,7 @@ import tkinter as tk
 from tkinter import ttk
 
 from core.api.grpc import core_pb2
-from core.gui.dialogs.colorpicker import ColorPicker
+from core.gui.dialogs.colorpicker import ColorPickerDialog
 from core.gui.dialogs.dialog import Dialog
 from core.gui.themes import PADX, PADY
 
@@ -27,7 +27,7 @@ def get_float(var):
         return None
 
 
-class LinkConfiguration(Dialog):
+class LinkConfigurationDialog(Dialog):
     def __init__(self, master, app, edge):
         super().__init__(master, app, "Link Configuration", modal=True)
         self.app = app
@@ -237,7 +237,7 @@ class LinkConfiguration(Dialog):
         return frame
 
     def click_color(self):
-        dialog = ColorPicker(self, self.app, self.color.get())
+        dialog = ColorPickerDialog(self, self.app, self.color.get())
         color = dialog.askcolor()
         self.color.set(color)
         self.color_button.config(background=color)

daemon/core/gui/dialogs/marker.py

@@ -6,13 +6,13 @@ import logging
 import tkinter as tk
 from tkinter import ttk
 
-from core.gui.dialogs.colorpicker import ColorPicker
+from core.gui.dialogs.colorpicker import ColorPickerDialog
 from core.gui.dialogs.dialog import Dialog
 
 MARKER_THICKNESS = [3, 5, 8, 10]
 
 
-class Marker(Dialog):
+class MarkerDialog(Dialog):
     def __init__(self, master, app, initcolor="#000000"):
         super().__init__(master, app, "marker tool", modal=False)
         self.app = app
@@ -56,7 +56,7 @@ class Marker(Dialog):
             canvas.delete(i)
 
     def change_color(self, event):
-        color_picker = ColorPicker(self, self.app, self.color)
+        color_picker = ColorPickerDialog(self, self.app, self.color)
         color = color_picker.askcolor()
         event.widget.configure(background=color)
         self.color = color

daemon/core/gui/dialogs/nodeservice.py

@@ -5,12 +5,12 @@ import tkinter as tk
 from tkinter import messagebox, ttk
 
 from core.gui.dialogs.dialog import Dialog
-from core.gui.dialogs.serviceconfiguration import ServiceConfiguration
+from core.gui.dialogs.serviceconfig import ServiceConfigDialog
 from core.gui.themes import FRAME_PAD, PADX, PADY
 from core.gui.widgets import CheckboxList, ListboxScroll
 
 
-class NodeService(Dialog):
+class NodeServiceDialog(Dialog):
     def __init__(self, master, app, canvas_node, services=None):
         title = f"{canvas_node.core_node.name} Services"
         super().__init__(master, app, title, modal=True)
@@ -106,7 +106,7 @@ class NodeService(Dialog):
     def click_configure(self):
         current_selection = self.current.listbox.curselection()
         if len(current_selection):
-            dialog = ServiceConfiguration(
+            dialog = ServiceConfigDialog(
                 master=self,
                 app=self.app,
                 service_name=self.current.listbox.get(current_selection[0]),

daemon/core/gui/dialogs/serviceconfig.py

@@ -13,7 +13,7 @@ from core.gui.themes import FRAME_PAD, PADX, PADY
 from core.gui.widgets import CodeText, ListboxScroll
 
 
-class ServiceConfiguration(Dialog):
+class ServiceConfigDialog(Dialog):
     def __init__(self, master, app, service_name, node_id):
         title = f"{service_name} Service"
         super().__init__(master, app, title, modal=True)

daemon/core/gui/dialogs/shapemod.py

@@ -4,7 +4,7 @@ shape input dialog
 import tkinter as tk
 from tkinter import font, ttk
 
-from core.gui.dialogs.colorpicker import ColorPicker
+from core.gui.dialogs.colorpicker import ColorPickerDialog
 from core.gui.dialogs.dialog import Dialog
 from core.gui.graph import tags
 from core.gui.graph.shapeutils import is_draw_shape, is_shape_text
@@ -135,18 +135,18 @@ class ShapeDialog(Dialog):
         button.grid(row=0, column=1, sticky="ew")
 
     def choose_text_color(self):
-        color_picker = ColorPicker(self, self.app, "#000000")
+        color_picker = ColorPickerDialog(self, self.app, "#000000")
         color = color_picker.askcolor()
         self.text_color = color
 
     def choose_fill_color(self):
-        color_picker = ColorPicker(self, self.app, self.fill_color)
+        color_picker = ColorPickerDialog(self, self.app, self.fill_color)
         color = color_picker.askcolor()
         self.fill_color = color
         self.fill.config(background=color, text=color)
 
     def choose_border_color(self):
-        color_picker = ColorPicker(self, self.app, self.border_color)
+        color_picker = ColorPickerDialog(self, self.app, self.border_color)
         color = color_picker.askcolor()
         self.border_color = color
         self.border.config(background=color, text=color)