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

updating dialog based classes to have dialog in name

Browse source
This commit is contained in:
Blake Harnden 2019-12-19 09:50:58 -08:00
parent 1114e4b975
commit 05d3b58c5f
11 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/core/gui/dialogs/canvaswallpaper.py
View file

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

2
daemon/core/gui/dialogs/colorpicker.py
View file

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

6
daemon/core/gui/dialogs/linkconfig.py
View file

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

6
daemon/core/gui/dialogs/marker.py
View file

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

6
daemon/core/gui/dialogs/nodeservice.py
View file

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

2
daemon/core/gui/dialogs/serviceconfiguration.py → daemon/core/gui/dialogs/serviceconfig.py
View file

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

8
daemon/core/gui/dialogs/shapemod.py
View file

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

4
daemon/core/gui/graph/edges.py
View file

@ -3,7 +3,7 @@ import tkinter as tk
from tkinter.font import Font from tkinter.font import Font
from core.gui import themes from core.gui import themes
from core.gui.dialogs.linkconfig import LinkConfiguration from core.gui.dialogs.linkconfig import LinkConfigurationDialog
from core.gui.graph import tags from core.gui.graph import tags
from core.gui.nodeutils import NodeUtils from core.gui.nodeutils import NodeUtils
@ -177,5 +177,5 @@ class CanvasEdge:
def configure(self): def configure(self):
logging.debug("link configuration") logging.debug("link configuration")
dialog = LinkConfiguration(self.canvas, self.canvas.app, self) dialog = LinkConfigurationDialog(self.canvas, self.canvas.app, self)
dialog.show() dialog.show()

4
daemon/core/gui/graph/node.py
View file

@ -9,7 +9,7 @@ from core.gui import themes
from core.gui.dialogs.emaneconfig import EmaneConfigDialog from core.gui.dialogs.emaneconfig import EmaneConfigDialog
from core.gui.dialogs.mobilityconfig import MobilityConfigDialog from core.gui.dialogs.mobilityconfig import MobilityConfigDialog
from core.gui.dialogs.nodeconfig import NodeConfigDialog from core.gui.dialogs.nodeconfig import NodeConfigDialog
from core.gui.dialogs.nodeservice import NodeService from core.gui.dialogs.nodeservice import NodeServiceDialog
from core.gui.dialogs.wlanconfig import WlanConfigDialog from core.gui.dialogs.wlanconfig import WlanConfigDialog
from core.gui.errors import show_grpc_error from core.gui.errors import show_grpc_error
from core.gui.graph import tags from core.gui.graph import tags
@ -243,7 +243,7 @@ class CanvasNode:
def show_services(self): def show_services(self):
self.canvas.context = None self.canvas.context = None
dialog = NodeService(self.app.master, self.app, self) dialog = NodeServiceDialog(self.app.master, self.app, self)
dialog.show() dialog.show()
def has_emane_link(self, interface_id): def has_emane_link(self, interface_id):

4
daemon/core/gui/menuaction.py
View file

@ -13,7 +13,7 @@ import grpc
from core.gui.appconfig import XMLS_PATH from core.gui.appconfig import XMLS_PATH
from core.gui.dialogs.about import AboutDialog from core.gui.dialogs.about import AboutDialog
from core.gui.dialogs.canvassizeandscale import SizeAndScaleDialog from core.gui.dialogs.canvassizeandscale import SizeAndScaleDialog
from core.gui.dialogs.canvaswallpaper import CanvasBackgroundDialog from core.gui.dialogs.canvaswallpaper import CanvasWallpaperDialog
from core.gui.dialogs.hooks import HooksDialog from core.gui.dialogs.hooks import HooksDialog
from core.gui.dialogs.observers import ObserverDialog from core.gui.dialogs.observers import ObserverDialog
from core.gui.dialogs.preferences import PreferencesDialog from core.gui.dialogs.preferences import PreferencesDialog
@ -113,7 +113,7 @@ class MenuAction:
dialog.show() dialog.show()
def canvas_set_wallpaper(self): def canvas_set_wallpaper(self):
dialog = CanvasBackgroundDialog(self.app, self.app) dialog = CanvasWallpaperDialog(self.app, self.app)
dialog.show() dialog.show()
def help_core_github(self): def help_core_github(self):

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

@ -6,7 +6,7 @@ from tkinter import ttk
from tkinter.font import Font from tkinter.font import Font
from core.gui.dialogs.customnodes import CustomNodesDialog 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 import tags
from core.gui.graph.enums import GraphMode from core.gui.graph.enums import GraphMode
from core.gui.graph.shapeutils import ShapeType, is_marker from core.gui.graph.shapeutils import ShapeType, is_marker
@ -407,7 +407,7 @@ class Toolbar(ttk.Frame):
self.app.canvas.annotation_type = shape_type self.app.canvas.annotation_type = shape_type
if is_marker(shape_type): if is_marker(shape_type):
if not self.marker_tool: 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.show()
def click_run_button(self): def click_run_button(self):
@ -418,7 +418,7 @@ class Toolbar(ttk.Frame):
def click_marker_button(self): def click_marker_button(self):
logging.debug("Click on marker button") logging.debug("Click on marker button")
dialog = Marker(self.master, self.app) dialog = MarkerDialog(self.master, self.app)
dialog.show() dialog.show()
# dialog.position() # dialog.position()